diff --git a/.eslintignore b/.eslintignore
index 6773d535d8c4..6bde0a2282ed 100644
--- a/.eslintignore
+++ b/.eslintignore
@@ -5,4 +5,8 @@ build/
 dist/
 volumes/
 .tslintrc.js
-bellman-cuda
\ No newline at end of file
+bellman-cuda
+
+# Ignore contract submodules
+contracts
+etc/system-contracts
\ No newline at end of file
diff --git a/.github/release-please/manifest.json b/.github/release-please/manifest.json
index 2da7bd30bcce..bd4e3ffdad9a 100644
--- a/.github/release-please/manifest.json
+++ b/.github/release-please/manifest.json
@@ -1,5 +1,5 @@
 {
   "sdk/zksync-rs": "0.4.0",
-  "core": "16.2.0",
-  "prover": "7.2.0"
+  "core": "17.1.0",
+  "prover": "8.1.0"
 }
diff --git a/.github/workflows/build-core-template.yml b/.github/workflows/build-core-template.yml
index 6c7f5c922600..7845ed9ced23 100644
--- a/.github/workflows/build-core-template.yml
+++ b/.github/workflows/build-core-template.yml
@@ -82,8 +82,10 @@ jobs:
           DOCKER_ACTION: ${{ inputs.action }}
           COMPONENT: ${{ matrix.component }}
         run: |
+          ci_run docker login -u ${{ secrets.DOCKERHUB_USER }} -p ${{ secrets.DOCKERHUB_TOKEN }}
+          ci_run gcloud auth configure-docker us-docker.pkg.dev,asia-docker.pkg.dev -q
+          ci_run rustup default nightly-2023-07-21
           ci_run zk docker $DOCKER_ACTION $COMPONENT -- --public
-
       - name: Show sccache stats
         if: always()
         run: |
diff --git a/.github/workflows/build-docker-from-tag.yml b/.github/workflows/build-docker-from-tag.yml
index 3de3afa61a89..90fe234a7c6c 100644
--- a/.github/workflows/build-docker-from-tag.yml
+++ b/.github/workflows/build-docker-from-tag.yml
@@ -25,6 +25,8 @@ jobs:
     runs-on: [ubuntu-latest]
     outputs:
       image_tag_suffix: ${{ steps.set.outputs.image_tag_suffix }}
+      prover_fri_cpu_key_id: ${{ steps.extract-prover-fri-setup-key-ids.outputs.cpu_short_commit_sha }}
+      prover_fri_gpu_key_id: ${{ steps.extract-prover-fri-setup-key-ids.outputs.gpu_short_commit_sha }}
     steps:
       - uses: actions/checkout@ac593985615ec2ede58e132d2e21d2b1cbd6127c # v3
         with:
@@ -42,6 +44,20 @@ jobs:
           version=$(cut -d "-" -f2 <<< ${git_tag})
           echo "image_tag_suffix=${version}" >> $GITHUB_OUTPUT
 
+      - name: Generate outputs with Prover FRI setup data keys IDs
+        id: extract-prover-fri-setup-key-ids
+        run: |
+          declare -A json_files=(
+            ["cpu"]="setup-data-cpu-keys.json"
+            ["gpu"]="setup-data-gpu-keys.json"
+          )
+          for type in "${!json_files[@]}"; do
+            file=${json_files[$type]}
+            value=$(jq -r '.us' "./prover/$file")
+            short_sha=$(echo $value | sed 's|gs://matterlabs-setup-data-us/\(.*\)/|\1|')
+            echo "${type}_short_commit_sha=$short_sha" >> $GITHUB_OUTPUT"
+          done
+
   build-push-core-images:
     name: Build and push image
     needs: [setup]
@@ -73,7 +89,7 @@ jobs:
     uses: ./.github/workflows/build-gar-reusable.yml
     if: contains(github.ref_name, 'prover')
     with:
-      setup_keys_id: 4989f12
+      setup_keys_id: bccc7de
       image_tag_suffix: ${{ needs.setup.outputs.image_tag_suffix }}
       push_asia: true
       push_europe: true
@@ -84,5 +100,5 @@ jobs:
     uses: ./.github/workflows/build-prover-fri-gpu-gar.yml
     if: contains(github.ref_name, 'prover')
     with:
-      setup_keys_id: 2d33a27-gpu
+      setup_keys_id: ${{ needs.setup.outputs.prover_fri_gpu_key_id }}
       image_tag_suffix: ${{ needs.setup.outputs.image_tag_suffix }}
diff --git a/.github/workflows/release-test-stage.yml b/.github/workflows/release-test-stage.yml
index 49de6081296a..b54a021573b2 100644
--- a/.github/workflows/release-test-stage.yml
+++ b/.github/workflows/release-test-stage.yml
@@ -27,7 +27,8 @@ jobs:
         uses: tj-actions/changed-files@v37
         with:
           files_yaml: |
-            # If you want to exclude some files, please adjust here.
+            # TODO: make it more granular, as already implemented in CI workflow
+            # We don't want to be rebuilding and redeploying all the Docker images when eg. only document have changed
             prover:
               - prover/**
             core:
@@ -40,6 +41,8 @@ jobs:
     runs-on: [matterlabs-deployer-stage]
     outputs:
       image_tag_suffix: ${{ steps.generate-tag-suffix.outputs.image_tag_suffix }}
+      prover_fri_cpu_key_id: ${{ steps.extract-prover-fri-setup-key-ids.outputs.cpu_short_commit_sha }}
+      prover_fri_gpu_key_id: ${{ steps.extract-prover-fri-setup-key-ids.outputs.gpu_short_commit_sha }}
     steps:
       - uses: actions/checkout@ac593985615ec2ede58e132d2e21d2b1cbd6127c # v3
         with:
@@ -52,6 +55,20 @@ jobs:
           ts=$(date +%s%N | cut -b1-13)
           echo "image_tag_suffix=${sha}-${ts}" >> $GITHUB_OUTPUT
 
+      - name: Generate outputs with Prover FRI setup data keys IDs
+        id: extract-prover-fri-setup-key-ids
+        run: |
+          declare -A json_files=(
+            ["cpu"]="setup-data-cpu-keys.json"
+            ["gpu"]="setup-data-gpu-keys.json"
+          )
+          for type in "${!json_files[@]}"; do
+            file=${json_files[$type]}
+            value=$(jq -r '.us' "./prover/$file")
+            short_sha=$(echo $value | sed 's|gs://matterlabs-setup-data-us/\(.*\)/|\1|')
+            echo "${type}_short_commit_sha=$short_sha" >> $GITHUB_OUTPUT"
+          done
+
   build-push-core-images:
     name: Build and push images
     needs: [setup, changed_files]
@@ -83,7 +100,7 @@ jobs:
     uses: ./.github/workflows/build-gar-reusable.yml
     if: needs.changed_files.outputs.prover == 'true' || needs.changed_files.outputs.all == 'true'
     with:
-      setup_keys_id: 4989f12
+      setup_keys_id: bccc7de
       image_tag_suffix: ${{ needs.setup.outputs.image_tag_suffix }}
       push_asia: false
       push_europe: false
@@ -94,5 +111,5 @@ jobs:
     uses: ./.github/workflows/build-prover-fri-gpu-gar.yml
     if: needs.changed_files.outputs.prover == 'true' || needs.changed_files.outputs.all == 'true'
     with:
-      setup_keys_id: 2d33a27-gpu
+      setup_keys_id: ${{ needs.setup.outputs.prover_fri_gpu_key_id }}
       image_tag_suffix: ${{ needs.setup.outputs.image_tag_suffix }}
diff --git a/.markdownlintignore b/.markdownlintignore
index 05ba7370295a..17f362751de3 100644
--- a/.markdownlintignore
+++ b/.markdownlintignore
@@ -1,2 +1,6 @@
 # Ignore submodule
 bellman-cuda
+
+# Ignore contract submodules
+contracts
+etc/system-contracts
\ No newline at end of file
diff --git a/.prettierignore b/.prettierignore
index aab23740d8e9..a68a572643c2 100644
--- a/.prettierignore
+++ b/.prettierignore
@@ -2,3 +2,7 @@
 bellman-cuda
 sdk/zksync-rs/CHANGELOG.md
 CHANGELOG.md
+
+# Ignore contract submodules
+contracts
+etc/system-contracts
diff --git a/.solhintignore b/.solhintignore
new file mode 100644
index 000000000000..24b618546bb7
--- /dev/null
+++ b/.solhintignore
@@ -0,0 +1,3 @@
+# Ignore contract submodules
+contracts
+etc/system-contracts
\ No newline at end of file
diff --git a/Cargo.lock b/Cargo.lock
index 150123dc6145..29e9b3be3b9f 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -9,13 +9,13 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "617a8268e3537fe1d8c9ead925fca49ef6400927ee7bc26750e90ecee14ce4b8"
 dependencies = [
  "bitflags 1.3.2",
- "bytes 1.4.0",
+ "bytes 1.5.0",
  "futures-core",
  "futures-sink",
  "memchr",
  "pin-project-lite",
  "tokio",
- "tokio-util 0.7.8",
+ "tokio-util 0.7.9",
  "tracing",
 ]
 
@@ -36,19 +36,19 @@ dependencies = [
 
 [[package]]
 name = "actix-http"
-version = "3.3.1"
+version = "3.4.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c2079246596c18b4a33e274ae10c0e50613f4d32a4198e09c7b93771013fed74"
+checksum = "a92ef85799cba03f76e4f7c10f533e66d87c9a7e7055f3391f09000ad8351bc9"
 dependencies = [
  "actix-codec",
  "actix-rt",
  "actix-service",
  "actix-utils",
- "ahash 0.8.3",
- "base64 0.21.2",
- "bitflags 1.3.2",
+ "ahash 0.8.5",
+ "base64 0.21.5",
+ "bitflags 2.4.1",
  "brotli",
- "bytes 1.4.0",
+ "bytes 1.5.0",
  "bytestring",
  "derive_more",
  "encoding_rs",
@@ -68,19 +68,19 @@ dependencies = [
  "sha1",
  "smallvec",
  "tokio",
- "tokio-util 0.7.8",
+ "tokio-util 0.7.9",
  "tracing",
- "zstd 0.12.3+zstd.1.5.2",
+ "zstd 0.12.4",
 ]
 
 [[package]]
 name = "actix-macros"
-version = "0.2.3"
+version = "0.2.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "465a6172cf69b960917811022d8f29bc0b7fa1398bc4f78b3c466673db1213b6"
+checksum = "e01ed3140b2f8d422c68afa1ed2e85d996ea619c988ac834d255db32138655cb"
 dependencies = [
  "quote 1.0.33",
- "syn 1.0.109",
+ "syn 2.0.38",
 ]
 
 [[package]]
@@ -98,9 +98,9 @@ dependencies = [
 
 [[package]]
 name = "actix-rt"
-version = "2.8.0"
+version = "2.9.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "15265b6b8e2347670eb363c47fc8c75208b4a4994b27192f345fcbe707804f3e"
+checksum = "28f32d40287d3f402ae0028a9d54bef51af15c8769492826a69d28f81893151d"
 dependencies = [
  "actix-macros",
  "futures-core",
@@ -109,18 +109,17 @@ dependencies = [
 
 [[package]]
 name = "actix-server"
-version = "2.2.0"
+version = "2.3.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3e8613a75dd50cc45f473cee3c34d59ed677c0f7b44480ce3b8247d7dc519327"
+checksum = "3eb13e7eef0423ea6eab0e59f6c72e7cb46d33691ad56a726b3cd07ddec2c2d4"
 dependencies = [
  "actix-rt",
  "actix-service",
  "actix-utils",
  "futures-core",
  "futures-util",
- "mio 0.8.8",
- "num_cpus",
- "socket2",
+ "mio 0.8.9",
+ "socket2 0.5.5",
  "tokio",
  "tracing",
 ]
@@ -148,9 +147,9 @@ dependencies = [
 
 [[package]]
 name = "actix-web"
-version = "4.3.1"
+version = "4.4.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cd3cb42f9566ab176e1ef0b8b3a896529062b4efc6be0123046095914c4c1c96"
+checksum = "0e4a5b5e29603ca8c94a77c65cf874718ceb60292c5a5c3e5f4ace041af462b9"
 dependencies = [
  "actix-codec",
  "actix-http",
@@ -161,8 +160,8 @@ dependencies = [
  "actix-service",
  "actix-utils",
  "actix-web-codegen",
- "ahash 0.7.6",
- "bytes 1.4.0",
+ "ahash 0.8.5",
+ "bytes 1.5.0",
  "bytestring",
  "cfg-if 1.0.0",
  "cookie",
@@ -170,7 +169,6 @@ dependencies = [
  "encoding_rs",
  "futures-core",
  "futures-util",
- "http",
  "itoa",
  "language-tags",
  "log",
@@ -182,21 +180,21 @@ dependencies = [
  "serde_json",
  "serde_urlencoded",
  "smallvec",
- "socket2",
+ "socket2 0.5.5",
  "time",
  "url",
 ]
 
 [[package]]
 name = "actix-web-codegen"
-version = "4.2.0"
+version = "4.2.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2262160a7ae29e3415554a3f1fc04c764b1540c116aa524683208078b7a75bc9"
+checksum = "eb1f50ebbb30eca122b188319a4398b3f7bb4a8cdf50ecfb73bfc6a3c3ce54f5"
 dependencies = [
  "actix-router",
- "proc-macro2 1.0.66",
+ "proc-macro2 1.0.69",
  "quote 1.0.33",
- "syn 1.0.109",
+ "syn 2.0.38",
 ]
 
 [[package]]
@@ -212,9 +210,9 @@ dependencies = [
 
 [[package]]
 name = "addr2line"
-version = "0.19.0"
+version = "0.21.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a76fd60b23679b7d19bd066031410fb7e458ccc5e958eb5c325888ce4baedc97"
+checksum = "8a30b2e23b9e17a9f90641c7ab1549cd9b44f296d3ccbf309d2863cfe398a0cb"
 dependencies = [
  "gimli",
 ]
@@ -270,9 +268,9 @@ dependencies = [
 
 [[package]]
 name = "ahash"
-version = "0.7.6"
+version = "0.7.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fcb51a0695d8f838b1ee009b3fbf66bda078cd64590202a864a8f3e8c4315c47"
+checksum = "5a824f2aa7e75a0c98c5a504fceb80649e9c35265d44525b5f94de4771a395cd"
 dependencies = [
  "getrandom 0.2.10",
  "once_cell",
@@ -281,30 +279,22 @@ dependencies = [
 
 [[package]]
 name = "ahash"
-version = "0.8.3"
+version = "0.8.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2c99f64d1e06488f620f932677e24bc6e2897582980441ae90a671415bd7ec2f"
+checksum = "cd7d5a2cecb58716e47d67d5703a249964b14c7be1ec3cad3affc295b2d1c35d"
 dependencies = [
  "cfg-if 1.0.0",
  "getrandom 0.2.10",
  "once_cell",
  "version_check",
+ "zerocopy",
 ]
 
 [[package]]
 name = "aho-corasick"
-version = "0.7.20"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cc936419f96fa211c1b9166887b38e5e40b19958e5b895be7c1f93adec7071ac"
-dependencies = [
- "memchr",
-]
-
-[[package]]
-name = "aho-corasick"
-version = "1.0.2"
+version = "1.1.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "43f6cb1bf222025340178f382c426f13757b2960e89779dfcb319c32542a5a41"
+checksum = "b2969dcb958b36655471fc61f7e416fa76033bdd4bfed0678d8fee1e2d07a1f0"
 dependencies = [
  "memchr",
 ]
@@ -356,30 +346,29 @@ dependencies = [
 
 [[package]]
 name = "anstream"
-version = "0.3.2"
+version = "0.6.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0ca84f3628370c59db74ee214b3263d58f9aadd9b4fe7e711fd87dc452b7f163"
+checksum = "2ab91ebe16eb252986481c5b62f6098f3b698a45e34b5b98200cf20dd2484a44"
 dependencies = [
  "anstyle",
  "anstyle-parse",
  "anstyle-query",
  "anstyle-wincon",
  "colorchoice",
- "is-terminal",
  "utf8parse",
 ]
 
 [[package]]
 name = "anstyle"
-version = "1.0.0"
+version = "1.0.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "41ed9a86bf92ae6580e0a31281f65a1b1d867c0cc68d5346e2ae128dddfa6a7d"
+checksum = "7079075b41f533b8c61d2a4d073c4676e1f8b249ff94a393b0595db304e0dd87"
 
 [[package]]
 name = "anstyle-parse"
-version = "0.2.0"
+version = "0.2.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e765fd216e48e067936442276d1d57399e37bce53c264d6fefbe298080cb57ee"
+checksum = "317b9a89c1868f5ea6ff1d9539a69f45dffc21ce321ac1fd1160dfa48c8e2140"
 dependencies = [
  "utf8parse",
 ]
@@ -395,9 +384,9 @@ dependencies = [
 
 [[package]]
 name = "anstyle-wincon"
-version = "1.0.1"
+version = "3.0.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "180abfa45703aebe0093f79badacc01b8fd4ea2e35118747e5811127f926e188"
+checksum = "f0699d10d2f4d628a98ee7b57b289abbc98ff3bad977cb3152709d4bf2330628"
 dependencies = [
  "anstyle",
  "windows-sys 0.48.0",
@@ -405,9 +394,9 @@ dependencies = [
 
 [[package]]
 name = "anyhow"
-version = "1.0.71"
+version = "1.0.75"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9c7d0618f0e0b7e8ff11427422b64564d5fb0be1940354bfe2e0529b18a9d9b8"
+checksum = "a4668cab20f66d8d020e1fbc0ebe47217433c1b6c8f2040faf858554e394ace6"
 
 [[package]]
 name = "arr_macro"
@@ -453,9 +442,9 @@ checksum = "23b62fc65de8e4e7f52534fb52b0f3ed04746ae267519eef2a83941e8085068b"
 
 [[package]]
 name = "arrayvec"
-version = "0.7.3"
+version = "0.7.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8868f09ff8cea88b079da74ae569d9b8c62a23c68c746240b704ee6f7525c89c"
+checksum = "96d30a06541fbafbc7f82ed10c06164cfbd2c401138f6addd8404629c4b16711"
 
 [[package]]
 name = "assert_matches"
@@ -465,9 +454,9 @@ checksum = "9b34d609dfbaf33d6889b2b7106d3ca345eacad44200913df5ba02bfd31d2ba9"
 
 [[package]]
 name = "async-compression"
-version = "0.3.15"
+version = "0.4.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "942c7cd7ae39e91bde4820d74132e9862e62c2f386c3aa90ccf55949f5bad63a"
+checksum = "f658e2baef915ba0f26f1f7c42bfb8e12f532a01f449a090ded75ae7a07e9ba2"
 dependencies = [
  "brotli",
  "flate2",
@@ -475,15 +464,15 @@ dependencies = [
  "memchr",
  "pin-project-lite",
  "tokio",
- "zstd 0.11.2+zstd.1.5.2",
- "zstd-safe 5.0.2+zstd.1.5.2",
+ "zstd 0.13.0",
+ "zstd-safe 7.0.0",
 ]
 
 [[package]]
 name = "async-lock"
-version = "2.7.0"
+version = "2.8.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fa24f727524730b077666307f2734b4a1a1c57acb79193127dcc8914d5242dd7"
+checksum = "287272293e9d8c41773cec55e365490fe034813a2f172f502d6ddcf75b2f582b"
 dependencies = [
  "event-listener",
 ]
@@ -505,20 +494,20 @@ version = "0.3.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "16e62a023e7c117e27523144c5d2459f4397fcc3cab0085af8e2224f643a0193"
 dependencies = [
- "proc-macro2 1.0.66",
+ "proc-macro2 1.0.69",
  "quote 1.0.33",
- "syn 2.0.27",
+ "syn 2.0.38",
 ]
 
 [[package]]
 name = "async-trait"
-version = "0.1.73"
+version = "0.1.74"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bc00ceb34980c03614e35a3a4e218276a0a824e911d07651cd0d858a51e8c0f0"
+checksum = "a66537f1bb974b254c98ed142ff995236e81b9d0fe4db0575f46612cb15eb0f9"
 dependencies = [
- "proc-macro2 1.0.66",
+ "proc-macro2 1.0.69",
  "quote 1.0.33",
- "syn 2.0.27",
+ "syn 2.0.38",
 ]
 
 [[package]]
@@ -558,14 +547,14 @@ checksum = "d468802bab17cbc0cc575e9b053f41e72aa36bfa6b7f55e3529ffa43161b97fa"
 
 [[package]]
 name = "axum"
-version = "0.6.19"
+version = "0.6.20"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a6a1de45611fdb535bfde7b7de4fd54f4fd2b17b1737c0a59b69bf9b92074b8c"
+checksum = "3b829e4e32b91e643de6eafe82b1d90675f5874230191a4ffbc1b336dec4d6bf"
 dependencies = [
  "async-trait",
  "axum-core",
  "bitflags 1.3.2",
- "bytes 1.4.0",
+ "bytes 1.5.0",
  "futures-util",
  "http",
  "http-body",
@@ -594,7 +583,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "759fa577a247914fd3f7f76d62972792636412fbfd634cd452f6a385a74d2d2c"
 dependencies = [
  "async-trait",
- "bytes 1.4.0",
+ "bytes 1.5.0",
  "futures-util",
  "http",
  "http-body",
@@ -610,7 +599,7 @@ version = "0.4.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "0c1a6197b2120bb2185a267f6515038558b019e92b832bb0320e96d66268dcf9"
 dependencies = [
- "fastrand",
+ "fastrand 1.9.0",
  "futures-core",
  "pin-project",
  "tokio",
@@ -618,15 +607,15 @@ dependencies = [
 
 [[package]]
 name = "backtrace"
-version = "0.3.67"
+version = "0.3.69"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "233d376d6d185f2a3093e58f283f60f880315b6c60075b01f36b3b85154564ca"
+checksum = "2089b7e3f35b9dd2d0ed921ead4f6d318c27680d4a5bd167b3ee120edb105837"
 dependencies = [
  "addr2line",
  "cc",
  "cfg-if 1.0.0",
  "libc",
- "miniz_oxide 0.6.2",
+ "miniz_oxide",
  "object",
  "rustc-demangle",
 ]
@@ -645,15 +634,9 @@ checksum = "9e1b586273c5702936fe7b7d6896644d8be71e6314cfe09d3167c95f712589e8"
 
 [[package]]
 name = "base64"
-version = "0.20.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0ea22880d78093b0cbe17c89f64a7d457941e65759157ec6cb31a31d652b05e5"
-
-[[package]]
-name = "base64"
-version = "0.21.2"
+version = "0.21.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "604178f6c5c21f02dc555784810edfb88d34ac2c73b2eae109655649ee73ce3d"
+checksum = "35636a1494ede3b646cc98f74f8e62c773a38a659ebc777a2cf26b9b74171df9"
 
 [[package]]
 name = "base64ct"
@@ -675,7 +658,7 @@ name = "bellman_ce"
 version = "0.3.2"
 source = "git+https://github.com/matter-labs/bellman?branch=dev#5520aa2274afe73d281373c92b007a2ecdebfbea"
 dependencies = [
- "arrayvec 0.7.3",
+ "arrayvec 0.7.4",
  "bit-vec",
  "blake2s_const 0.6.0 (git+https://github.com/matter-labs/bellman?branch=dev)",
  "blake2s_simd",
@@ -698,7 +681,7 @@ name = "bellman_ce"
 version = "0.3.2"
 source = "git+https://github.com/matter-labs/bellman?branch=snark-wrapper#e01e5fa08a97a113e76ec8a69d06fe6cc2c82d17"
 dependencies = [
- "arrayvec 0.7.3",
+ "arrayvec 0.7.4",
  "bit-vec",
  "blake2s_const 0.6.0 (git+https://github.com/matter-labs/bellman?branch=snark-wrapper)",
  "blake2s_simd",
@@ -750,12 +733,12 @@ dependencies = [
  "lazycell",
  "peeking_take_while",
  "prettyplease",
- "proc-macro2 1.0.66",
+ "proc-macro2 1.0.69",
  "quote 1.0.33",
  "regex",
  "rustc-hash",
  "shlex",
- "syn 2.0.27",
+ "syn 2.0.38",
 ]
 
 [[package]]
@@ -775,9 +758,9 @@ checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a"
 
 [[package]]
 name = "bitflags"
-version = "2.3.2"
+version = "2.4.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6dbe3c979c178231552ecba20214a8272df4e09f232a87aef4320cf06539aded"
+checksum = "327762f6e5a765692301e5bb513e0d9fef63be86bbc14528052b1cd3e6f03e07"
 
 [[package]]
 name = "bitvec"
@@ -934,7 +917,7 @@ name = "block_reverter"
 version = "0.1.0"
 dependencies = [
  "anyhow",
- "clap 4.3.4",
+ "clap 4.4.6",
  "serde_json",
  "tokio",
  "vlog",
@@ -949,7 +932,7 @@ name = "boojum"
 version = "0.1.0"
 source = "git+https://github.com/matter-labs/era-boojum.git?branch=main#84754b066959c8fdfb77edf730fc13ed87404907"
 dependencies = [
- "arrayvec 0.7.3",
+ "arrayvec 0.7.4",
  "bincode",
  "blake2 0.10.6 (registry+https://github.com/rust-lang/crates.io-index)",
  "const_format",
@@ -977,9 +960,9 @@ dependencies = [
 
 [[package]]
 name = "brotli"
-version = "3.3.4"
+version = "3.4.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a1a0b1dbcc8ae29329621f8d4f0d835787c1c38bb1401979b49d13b0b305ff68"
+checksum = "516074a47ef4bce09577a3b379392300159ce5b1ba2e501ff1c819950066100f"
 dependencies = [
  "alloc-no-stdlib",
  "alloc-stdlib",
@@ -988,9 +971,9 @@ dependencies = [
 
 [[package]]
 name = "brotli-decompressor"
-version = "2.3.4"
+version = "2.5.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4b6561fd3f895a11e8f72af2cb7d22e08366bebc2b6b57f7744c4bda27034744"
+checksum = "da74e2b81409b1b743f8f0c62cc6254afefb8b8e50bbfe3735550f7aeefa3448"
 dependencies = [
  "alloc-no-stdlib",
  "alloc-stdlib",
@@ -998,9 +981,9 @@ dependencies = [
 
 [[package]]
 name = "bstr"
-version = "1.5.0"
+version = "1.7.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a246e68bb43f6cd9db24bea052a53e40405417c5fb372e3d1a8a7f770a564ef5"
+checksum = "c79ad7fb2dd38f3dabd76b09c6a5a20c038fc0213ef1e9afd30eb777f120f019"
 dependencies = [
  "memchr",
  "serde",
@@ -1008,9 +991,9 @@ dependencies = [
 
 [[package]]
 name = "bumpalo"
-version = "3.13.0"
+version = "3.14.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a3e2c3daef883ecc1b5d58c15adae93470a91d425f3532ba1695849656af3fc1"
+checksum = "7f30e7476521f6f8af1a1c4c0b8cc94f0bee37d91763d0ca2665f299b6cd8aec"
 
 [[package]]
 name = "byte-slice-cast"
@@ -1026,15 +1009,15 @@ checksum = "e3b5ca7a04898ad4bcd41c90c5285445ff5b791899bb1b0abdd2a2aa791211d7"
 
 [[package]]
 name = "bytecount"
-version = "0.6.3"
+version = "0.6.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2c676a478f63e9fa2dd5368a42f28bba0d6c560b775f38583c8bbaa7fcd67c9c"
+checksum = "d1a12477b7237a01c11a80a51278165f9ba0edd28fa6db00a65ab230320dc58c"
 
 [[package]]
 name = "byteorder"
-version = "1.4.3"
+version = "1.5.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "14c189c53d098945499cdfa7ecc63567cf3886b3332b312a5b4585d8d3a6a610"
+checksum = "1fd0f2584146f6f2ef48085050886acf353beff7305ebd1ae69500e27c67f64b"
 
 [[package]]
 name = "bytes"
@@ -1048,9 +1031,9 @@ dependencies = [
 
 [[package]]
 name = "bytes"
-version = "1.4.0"
+version = "1.5.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "89b2fd2a0dcf38d7971e2194b6b6eebab45ae01067456a7fd93d5547a61b70be"
+checksum = "a2bd12c1caf447e69cd4528f47f94d203fd2582878ecb9e9465484c4148a8223"
 
 [[package]]
 name = "bytestring"
@@ -1058,7 +1041,7 @@ version = "1.3.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "238e4886760d98c4f899360c834fa93e62cf7f721ac3c2da375cbdf4b8679aae"
 dependencies = [
- "bytes 1.4.0",
+ "bytes 1.5.0",
 ]
 
 [[package]]
@@ -1074,18 +1057,18 @@ dependencies = [
 
 [[package]]
 name = "camino"
-version = "1.1.4"
+version = "1.1.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c530edf18f37068ac2d977409ed5cd50d53d73bc653c7647b48eb78976ac9ae2"
+checksum = "c59e92b5a388f549b863a7bea62612c09f24c8393560709a54558a9abdfb3b9c"
 dependencies = [
  "serde",
 ]
 
 [[package]]
 name = "cargo-platform"
-version = "0.1.2"
+version = "0.1.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cbdb825da8a5df079a43676dbe042702f1707b1109f713a01420fbb4cc71fa27"
+checksum = "12024c4645c97566567129c204f65d5815a8c9aecf30fcbe682b2fe034996d36"
 dependencies = [
  "serde",
 ]
@@ -1111,11 +1094,12 @@ checksum = "37b2a672a2cb129a2e41c10b1224bb368f9f37a2b16b612598138befd7b37eb5"
 
 [[package]]
 name = "cc"
-version = "1.0.79"
+version = "1.0.83"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "50d30906286121d95be3d479533b458f87493b30a4b5f79a607db8f5d11aa91f"
+checksum = "f1174fb0b6ec23863f8b971027804a42614e347eafb0a95bf0b12cdae21fc4d0"
 dependencies = [
  "jobserver",
+ "libc",
 ]
 
 [[package]]
@@ -1151,7 +1135,7 @@ dependencies = [
  "num-traits",
  "serde",
  "wasm-bindgen",
- "windows-targets 0.48.0",
+ "windows-targets 0.48.5",
 ]
 
 [[package]]
@@ -1245,44 +1229,42 @@ checksum = "4ea181bf566f71cb9a5d17a59e1871af638180a18fb0035c92ae62b705207123"
 dependencies = [
  "bitflags 1.3.2",
  "clap_lex 0.2.4",
- "indexmap",
+ "indexmap 1.9.3",
  "textwrap 0.16.0",
 ]
 
 [[package]]
 name = "clap"
-version = "4.3.4"
+version = "4.4.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "80672091db20273a15cf9fdd4e47ed43b5091ec9841bf4c6145c9dfbbcae09ed"
+checksum = "d04704f56c2cde07f43e8e2c154b43f216dc5c92fc98ada720177362f953b956"
 dependencies = [
  "clap_builder",
  "clap_derive",
- "once_cell",
 ]
 
 [[package]]
 name = "clap_builder"
-version = "4.3.4"
+version = "4.4.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c1458a1df40e1e2afebb7ab60ce55c1fa8f431146205aa5f4887e0b111c27636"
+checksum = "0e231faeaca65ebd1ea3c737966bf858971cd38c3849107aa3ea7de90a804e45"
 dependencies = [
  "anstream",
  "anstyle",
- "bitflags 1.3.2",
- "clap_lex 0.5.0",
+ "clap_lex 0.5.1",
  "strsim 0.10.0",
 ]
 
 [[package]]
 name = "clap_derive"
-version = "4.3.2"
+version = "4.4.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b8cd2b2a819ad6eec39e8f1d6b53001af1e5469f8c177579cdaeb313115b825f"
+checksum = "0862016ff20d69b84ef8247369fabf5c008a7417002411897d40ee1f4532b873"
 dependencies = [
  "heck 0.4.1",
- "proc-macro2 1.0.66",
+ "proc-macro2 1.0.69",
  "quote 1.0.33",
- "syn 2.0.27",
+ "syn 2.0.38",
 ]
 
 [[package]]
@@ -1296,9 +1278,9 @@ dependencies = [
 
 [[package]]
 name = "clap_lex"
-version = "0.5.0"
+version = "0.5.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2da6da31387c7e4ef160ffab6d5e7f00c42626fe39aea70a7b0f1773f7dd6c1b"
+checksum = "cd7cc57abe963c6d3b9d8be5b06ba7c8957a930305ca90304f24ef040aa6f961"
 
 [[package]]
 name = "cloudabi"
@@ -1331,7 +1313,7 @@ version = "0.2.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "ff61280aed771c3070e7dcc9e050c66f1eb1e3b96431ba66f9f74641d02fc41d"
 dependencies = [
- "indexmap",
+ "indexmap 1.9.3",
 ]
 
 [[package]]
@@ -1346,7 +1328,7 @@ version = "4.6.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "35ed6e9d84f0b51a7f52daf1c7d71dd136fd7a3f41a8462b8cdb8c78d920fad4"
 dependencies = [
- "bytes 1.4.0",
+ "bytes 1.5.0",
  "memchr",
 ]
 
@@ -1370,26 +1352,26 @@ checksum = "e4c78c047431fee22c1a7bb92e00ad095a02a983affe4d8a72e2a2c62c1b94f3"
 
 [[package]]
 name = "const-oid"
-version = "0.9.2"
+version = "0.9.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "520fbf3c07483f94e3e3ca9d0cfd913d7718ef2483d2cfd91c0d9e91474ab913"
+checksum = "28c122c3980598d243d63d9a704629a2d748d101f278052ff068be5a4423ab6f"
 
 [[package]]
 name = "const_format"
-version = "0.2.31"
+version = "0.2.32"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c990efc7a285731f9a4378d81aff2f0e85a2c8781a05ef0f8baa8dac54d0ff48"
+checksum = "e3a214c7af3d04997541b18d432afaff4c455e79e2029079647e72fc2bd27673"
 dependencies = [
  "const_format_proc_macros",
 ]
 
 [[package]]
 name = "const_format_proc_macros"
-version = "0.2.31"
+version = "0.2.32"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e026b6ce194a874cb9cf32cd5772d1ef9767cc8fcb5765948d74f37a9d8b2bf6"
+checksum = "c7f6ff08fd20f4f299298a28e2dfa8a8ba1036e6cd2460ac1de7b425d76f2500"
 dependencies = [
- "proc-macro2 1.0.66",
+ "proc-macro2 1.0.69",
  "quote 1.0.33",
  "unicode-xid 0.2.4",
 ]
@@ -1444,9 +1426,9 @@ checksum = "e496a50fda8aacccc86d7529e2c1e0892dbd0f898a6b5645b5561b89c3210efa"
 
 [[package]]
 name = "cpufeatures"
-version = "0.2.8"
+version = "0.2.10"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "03e69e28e9f7f77debdedbaafa2866e1de9ba56df55a8bd7cfc724c25a09987c"
+checksum = "3fbc60abd742b35f2492f808e1abbb83d45f72db402e14c55057edc9c7b1e9e4"
 dependencies = [
  "libc",
 ]
@@ -1739,10 +1721,10 @@ dependencies = [
 [[package]]
 name = "cs_derive"
 version = "0.1.0"
-source = "git+https://github.com/matter-labs/era-boojum.git?branch=main#2771569baab9a59690d88cee6ba9b295c8a1e4c4"
+source = "git+https://github.com/matter-labs/era-boojum.git?branch=main#84754b066959c8fdfb77edf730fc13ed87404907"
 dependencies = [
  "proc-macro-error",
- "proc-macro2 1.0.66",
+ "proc-macro2 1.0.69",
  "quote 1.0.33",
  "syn 1.0.109",
 ]
@@ -1750,10 +1732,10 @@ dependencies = [
 [[package]]
 name = "cs_derive"
 version = "0.1.0"
-source = "git+https://github.com/matter-labs/era-sync_vm.git?branch=v1.3.3#dad50e7eb7462a3819af8d5209d6ca243395bf51"
+source = "git+https://github.com/matter-labs/era-sync_vm.git?branch=v1.3.3#ed8ab8984cae05d00d9d62196753c8d40df47c7d"
 dependencies = [
  "proc-macro-error",
- "proc-macro2 1.0.66",
+ "proc-macro2 1.0.69",
  "quote 1.0.33",
  "serde",
  "syn 1.0.109",
@@ -1770,9 +1752,9 @@ dependencies = [
 
 [[package]]
 name = "ctrlc"
-version = "3.4.0"
+version = "3.4.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2a011bbe2c35ce9c1f143b7af6f94f29a167beb4cd1d29e6740ce836f723120e"
+checksum = "82e95fbd621905b854affdc67943b043a0fbb6ed7385fd5a25650d19a8a6cfdf"
 dependencies = [
  "nix",
  "windows-sys 0.48.0",
@@ -1796,7 +1778,7 @@ checksum = "859d65a907b6852c9361e3185c862aae7fafd2887876799fa55f5f99dc40d610"
 dependencies = [
  "fnv",
  "ident_case",
- "proc-macro2 1.0.66",
+ "proc-macro2 1.0.69",
  "quote 1.0.33",
  "strsim 0.10.0",
  "syn 1.0.109",
@@ -1815,15 +1797,15 @@ dependencies = [
 
 [[package]]
 name = "dashmap"
-version = "5.4.0"
+version = "5.5.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "907076dfda823b0b36d2a1bb5f90c96660a5bbcd7729e10727f07858f22c4edc"
+checksum = "978747c1d849a7d2ee5e8adc0159961c48fb7e5db2f06af6723b80123bb53856"
 dependencies = [
  "cfg-if 1.0.0",
- "hashbrown 0.12.3",
+ "hashbrown 0.14.2",
  "lock_api",
  "once_cell",
- "parking_lot_core 0.9.8",
+ "parking_lot_core 0.9.9",
 ]
 
 [[package]]
@@ -1853,17 +1835,27 @@ version = "0.6.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "f1a467a65c5e759bce6e65eaf91cc29f466cdc57cb65777bd646872a8a1fd4de"
 dependencies = [
- "const-oid 0.9.2",
+ "const-oid 0.9.5",
  "zeroize",
 ]
 
+[[package]]
+name = "deranged"
+version = "0.3.9"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0f32d04922c60427da6f9fef14d042d9edddef64cb9d4ce0d64d0685fbeb1fd3"
+dependencies = [
+ "powerfmt",
+ "serde",
+]
+
 [[package]]
 name = "derivative"
 version = "2.2.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "fcc3dd5e9e9c0b295d6e1e4d811fb6f157d5ffd784b8d202fc62eac8035a770b"
 dependencies = [
- "proc-macro2 1.0.66",
+ "proc-macro2 1.0.69",
  "quote 1.0.33",
  "syn 1.0.109",
 ]
@@ -1875,7 +1867,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "4fb810d30a7c1953f91334de7244731fc3f3c10d7fe163338a35b9f640960321"
 dependencies = [
  "convert_case 0.4.0",
- "proc-macro2 1.0.66",
+ "proc-macro2 1.0.69",
  "quote 1.0.33",
  "rustc_version",
  "syn 1.0.109",
@@ -1956,9 +1948,9 @@ dependencies = [
 
 [[package]]
 name = "either"
-version = "1.8.1"
+version = "1.9.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7fcaabb2fef8c910e7f4c7ce9f67a1283a1715879a7c230ca9d6d1ae31f16d91"
+checksum = "a26ae43d7bcc3b814de94796a5e736d4029efb0ee900c12e2d54c993ad1a1e07"
 dependencies = [
  "serde",
 ]
@@ -2000,9 +1992,9 @@ checksum = "a357d28ed41a50f9c765dbfe56cbc04a64e53e5fc58ba79fbc34c10ef3df831f"
 
 [[package]]
 name = "encoding_rs"
-version = "0.8.32"
+version = "0.8.33"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "071a31f4ee85403370b58aca746f01041ede6f0da2730960ad001edc2b71b394"
+checksum = "7268b386296a025e474d5140678f75d6de9493ae55a5d709eeb9dd08149945e1"
 dependencies = [
  "cfg-if 1.0.0",
 ]
@@ -2020,6 +2012,19 @@ dependencies = [
  "termcolor",
 ]
 
+[[package]]
+name = "env_logger"
+version = "0.10.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "85cdab6a89accf66733ad5a1693a4dcced6aeff64602b634530dd73c1f3ee9f0"
+dependencies = [
+ "humantime",
+ "is-terminal",
+ "log",
+ "regex",
+ "termcolor",
+]
+
 [[package]]
 name = "envy"
 version = "0.4.2"
@@ -2030,24 +2035,19 @@ dependencies = [
 ]
 
 [[package]]
-name = "errno"
-version = "0.3.1"
+name = "equivalent"
+version = "1.0.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4bcfec3a70f97c962c307b2d2c56e358cf1d00b558d74262b5f929ee8cc7e73a"
-dependencies = [
- "errno-dragonfly",
- "libc",
- "windows-sys 0.48.0",
-]
+checksum = "5443807d6dff69373d433ab9ef5378ad8df50ca6298caf15de6e52e24aaf54d5"
 
 [[package]]
-name = "errno-dragonfly"
-version = "0.1.2"
+name = "errno"
+version = "0.3.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "aa68f1b12764fab894d2755d2518754e71b4fd80ecfb822714a1206c2aab39bf"
+checksum = "ac3e13f66a2f95e32a39eaa81f6b95d42878ca0e1db0c7543723dfe12557e860"
 dependencies = [
- "cc",
  "libc",
+ "windows-sys 0.48.0",
 ]
 
 [[package]]
@@ -2126,7 +2126,7 @@ dependencies = [
  "fixed-hash 0.8.0",
  "impl-rlp",
  "impl-serde 0.4.0",
- "primitive-types 0.12.1",
+ "primitive-types 0.12.2",
  "uint",
 ]
 
@@ -2151,6 +2151,12 @@ dependencies = [
  "instant",
 ]
 
+[[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"
@@ -2180,10 +2186,10 @@ version = "0.11.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "b96fbccd88dbb1fac4ee4a07c2fcc4ca719a74ffbd9d2b9d41d8c8eb073d8b20"
 dependencies = [
- "num-bigint 0.4.3",
+ "num-bigint 0.4.4",
  "num-integer",
  "num-traits",
- "proc-macro2 1.0.66",
+ "proc-macro2 1.0.69",
  "quote 1.0.33",
  "serde",
  "syn 1.0.109",
@@ -2201,6 +2207,12 @@ dependencies = [
  "winapi 0.3.9",
 ]
 
+[[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"
@@ -2233,12 +2245,12 @@ dependencies = [
 
 [[package]]
 name = "flate2"
-version = "1.0.26"
+version = "1.0.28"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3b9429470923de8e8cbd4d2dc513535400b4b3fef0319fb5c4e1f520a7bef743"
+checksum = "46303f565772937ffe1d394a4fac6f411c6013172fadde9dcdb1e147a086940e"
 dependencies = [
  "crc32fast",
- "miniz_oxide 0.7.1",
+ "miniz_oxide",
 ]
 
 [[package]]
@@ -2285,10 +2297,10 @@ dependencies = [
  "byteorder",
  "digest 0.9.0",
  "hex",
- "indexmap",
+ "indexmap 1.9.3",
  "itertools",
  "lazy_static",
- "num-bigint 0.4.3",
+ "num-bigint 0.4.4",
  "num-derive 0.2.5",
  "num-integer",
  "num-traits",
@@ -2317,10 +2329,10 @@ dependencies = [
  "derivative",
  "digest 0.9.0",
  "hex",
- "indexmap",
+ "indexmap 1.9.3",
  "itertools",
  "lazy_static",
- "num-bigint 0.4.3",
+ "num-bigint 0.4.4",
  "num-derive 0.2.5",
  "num-integer",
  "num-traits",
@@ -2439,9 +2451,9 @@ version = "0.3.28"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "89ca545a94061b6365f2c7355b4b32bd20df3ff95f02da9329b34ccc3bd6ee72"
 dependencies = [
- "proc-macro2 1.0.66",
+ "proc-macro2 1.0.69",
  "quote 1.0.33",
- "syn 2.0.27",
+ "syn 2.0.38",
 ]
 
 [[package]]
@@ -2528,9 +2540,9 @@ dependencies = [
 
 [[package]]
 name = "gimli"
-version = "0.27.3"
+version = "0.28.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b6c80984affa11d98d1b88b66ac8853f143217b399d3c74116778ff8fdb4ed2e"
+checksum = "6fb8d784f27acf97159b40fc4db5ecd8aa23b9ad5ef69cdd136d3bc80665f0c0"
 
 [[package]]
 name = "glob"
@@ -2540,11 +2552,11 @@ checksum = "d2fabcfbdc87f4758337ca535fb41a6d701b65693ce38287d856d1674551ec9b"
 
 [[package]]
 name = "globset"
-version = "0.4.10"
+version = "0.4.13"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "029d74589adefde59de1a0c4f4732695c32805624aec7b68d91503d4dba79afc"
+checksum = "759c97c1e17c55525b57192c06a267cda0ac5210b222d6b82189a2338fa1c13d"
 dependencies = [
- "aho-corasick 0.7.20",
+ "aho-corasick",
  "bstr",
  "fnv",
  "log",
@@ -2586,9 +2598,9 @@ dependencies = [
 
 [[package]]
 name = "gloo-utils"
-version = "0.1.6"
+version = "0.1.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a8e8fc851e9c7b9852508bc6e3f690f452f474417e8545ec9857b7f7377036b5"
+checksum = "037fcb07216cb3a30f7292bd0176b050b7b9a052ba830ef7d5d65f6dc64ba58e"
 dependencies = [
  "js-sys",
  "serde",
@@ -2604,7 +2616,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "644f40175857d0b8d7b6cad6cd9594284da5041387fa2ddff30ab6d8faef65eb"
 dependencies = [
  "async-trait",
- "base64 0.21.2",
+ "base64 0.21.5",
  "google-cloud-metadata",
  "google-cloud-token",
  "home",
@@ -2637,8 +2649,8 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "215abab97e07d144428425509c1dad07e57ea72b84b21bcdb6a8a5f12a5c4932"
 dependencies = [
  "async-stream",
- "base64 0.21.2",
- "bytes 1.4.0",
+ "base64 0.21.5",
+ "bytes 1.5.0",
  "futures-util",
  "google-cloud-auth",
  "google-cloud-metadata",
@@ -2699,20 +2711,20 @@ dependencies = [
 
 [[package]]
 name = "h2"
-version = "0.3.19"
+version = "0.3.21"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d357c7ae988e7d2182f7d7871d0b963962420b0678b0997ce7de72001aeab782"
+checksum = "91fc23aa11be92976ef4729127f1a74adf36d8436f7816b185d18df956790833"
 dependencies = [
- "bytes 1.4.0",
+ "bytes 1.5.0",
  "fnv",
  "futures-core",
  "futures-sink",
  "futures-util",
  "http",
- "indexmap",
+ "indexmap 1.9.3",
  "slab",
  "tokio",
- "tokio-util 0.7.8",
+ "tokio-util 0.7.9",
  "tracing",
 ]
 
@@ -2724,9 +2736,9 @@ checksum = "eabb4a44450da02c90444cf74558da904edde8fb4e9035a9a6a4e15445af0bd7"
 
 [[package]]
 name = "handlebars"
-version = "4.3.7"
+version = "4.4.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "83c3372087601b532857d332f5957cbae686da52bb7810bf038c3e3c3cc2fa0d"
+checksum = "c39b3bc2a8f715298032cf5087e58573809374b08160aa7d750582bdb82d2683"
 dependencies = [
  "log",
  "pest",
@@ -2742,7 +2754,7 @@ version = "0.11.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "ab5ef0d4909ef3724cc8cce6ccc8572c5c817592e9285f5464f8e86f8bd3726e"
 dependencies = [
- "ahash 0.7.6",
+ "ahash 0.7.7",
 ]
 
 [[package]]
@@ -2757,9 +2769,15 @@ version = "0.13.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "33ff8ae62cd3a9102e5637afc8452c55acf3844001bd5374e0b0bd7b6616c038"
 dependencies = [
- "ahash 0.8.3",
+ "ahash 0.8.5",
 ]
 
+[[package]]
+name = "hashbrown"
+version = "0.14.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f93e7192158dbcda357bdec5fb5788eebf8bbac027f3f33e719d29135ae84156"
+
 [[package]]
 name = "hashlink"
 version = "0.7.0"
@@ -2781,13 +2799,12 @@ dependencies = [
 
 [[package]]
 name = "headers"
-version = "0.3.8"
+version = "0.3.9"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f3e372db8e5c0d213e0cd0b9be18be2aca3d44cf2fe30a9d46a65581cd454584"
+checksum = "06683b93020a07e3dbcf5f8c0f6d40080d725bea7936fc01ad345c01b97dc270"
 dependencies = [
- "base64 0.13.1",
- "bitflags 1.3.2",
- "bytes 1.4.0",
+ "base64 0.21.5",
+ "bytes 1.5.0",
  "headers-core",
  "http",
  "httpdate",
@@ -2833,18 +2850,9 @@ dependencies = [
 
 [[package]]
 name = "hermit-abi"
-version = "0.2.6"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ee512640fe35acbfb4bb779db6f0d80704c2cacfa2e39b601ef3e3f47d1ae4c7"
-dependencies = [
- "libc",
-]
-
-[[package]]
-name = "hermit-abi"
-version = "0.3.1"
+version = "0.3.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fed44880c466736ef9a5c5b5facefb5ed0785676d0c02d612db14e54f0d84286"
+checksum = "d77f7ec81a6d05a3abb01ab6eb7590f6083d08449fe5a1c8b1e620283546ccb7"
 
 [[package]]
 name = "hex"
@@ -2906,7 +2914,7 @@ version = "0.2.9"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "bd6effc99afb63425aff9b05836f029929e345a6148a14b7ecd5ab67af944482"
 dependencies = [
- "bytes 1.4.0",
+ "bytes 1.5.0",
  "fnv",
  "itoa",
 ]
@@ -2917,16 +2925,16 @@ version = "0.4.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "d5f38f16d184e36f2408a55281cd658ecbd3ca05cce6d6510a176eca393e26d1"
 dependencies = [
- "bytes 1.4.0",
+ "bytes 1.5.0",
  "http",
  "pin-project-lite",
 ]
 
 [[package]]
 name = "http-range-header"
-version = "0.3.0"
+version = "0.3.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0bfe8eed0a9285ef776bb792479ea3834e8b94e13d615c2f66d03dd50a435a29"
+checksum = "add0ab9360ddbd88cfeb3bd9574a1d85cfdfa14db10b3e21d3700dbc4328758f"
 
 [[package]]
 name = "httparse"
@@ -2936,9 +2944,9 @@ checksum = "d897f394bad6a705d5f4104762e116a75639e470d80901eed05a860a95cb1904"
 
 [[package]]
 name = "httpdate"
-version = "1.0.2"
+version = "1.0.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c4a1e36c821dbe04574f602848a19f742f4fb3c98d40449f11bcad18d6b17421"
+checksum = "df3b46402a9d5adb4c86a0cf463f42e19994e3ee891101b1841f30a545cb49a9"
 
 [[package]]
 name = "humantime"
@@ -2948,11 +2956,11 @@ checksum = "9a3a5bfb195931eeb336b2a7b4d761daec841b97f947d34394601737a7bba5e4"
 
 [[package]]
 name = "hyper"
-version = "0.14.26"
+version = "0.14.27"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ab302d72a6f11a3b910431ff93aae7e773078c769f0a3ef15fb9ec692ed147d4"
+checksum = "ffb1cfd654a8219eaef89881fdb3bb3b1cdc5fa75ded05d6933b2b382e395468"
 dependencies = [
- "bytes 1.4.0",
+ "bytes 1.5.0",
  "futures-channel",
  "futures-core",
  "futures-util",
@@ -2963,7 +2971,7 @@ dependencies = [
  "httpdate",
  "itoa",
  "pin-project-lite",
- "socket2",
+ "socket2 0.4.10",
  "tokio",
  "tower-service",
  "tracing",
@@ -2972,10 +2980,11 @@ dependencies = [
 
 [[package]]
 name = "hyper-rustls"
-version = "0.24.0"
+version = "0.24.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0646026eb1b3eea4cd9ba47912ea5ce9cc07713d105b1a14698f4e6433d348b7"
+checksum = "8d78e1e73ec14cf7375674f74d7dde185c8206fd9dea6fb6295e8a98098aaa97"
 dependencies = [
+ "futures-util",
  "http",
  "hyper",
  "log",
@@ -2991,7 +3000,7 @@ version = "0.5.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "d6183ddfa99b85da61a140bea0efc93fdf56ceaa041b37d553518030827f9905"
 dependencies = [
- "bytes 1.4.0",
+ "bytes 1.5.0",
  "hyper",
  "native-tls",
  "tokio",
@@ -3006,16 +3015,16 @@ checksum = "71a816c97c42258aa5834d07590b718b4c9a598944cd39a52dc25b351185d678"
 
 [[package]]
 name = "iana-time-zone"
-version = "0.1.57"
+version = "0.1.58"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2fad5b825842d2b38bd206f3e81d6957625fd7f0a361e345c30e01a0ae2dd613"
+checksum = "8326b86b6cff230b97d0d312a6c40a60726df3332e721f72a1b035f451663b20"
 dependencies = [
  "android_system_properties",
  "core-foundation-sys",
  "iana-time-zone-haiku",
  "js-sys",
  "wasm-bindgen",
- "windows",
+ "windows-core",
 ]
 
 [[package]]
@@ -3058,7 +3067,7 @@ version = "0.6.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "ba6a270039626615617f3f36d15fc827041df3b78c439da2cadfa47455a77f2f"
 dependencies = [
- "parity-scale-codec 3.6.1",
+ "parity-scale-codec 3.6.5",
 ]
 
 [[package]]
@@ -3094,7 +3103,7 @@ version = "0.2.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "11d7a9f6330b71fea57921c9b61c47ee6e84f72d394754eff6163ae67e7395eb"
 dependencies = [
- "proc-macro2 1.0.66",
+ "proc-macro2 1.0.69",
  "quote 1.0.33",
  "syn 1.0.109",
 ]
@@ -3109,11 +3118,21 @@ dependencies = [
  "hashbrown 0.12.3",
 ]
 
+[[package]]
+name = "indexmap"
+version = "2.0.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8adf3ddd720272c6ea8bf59463c04e0f93d0bbf7c5439b691bca2987e0270897"
+dependencies = [
+ "equivalent",
+ "hashbrown 0.14.2",
+]
+
 [[package]]
 name = "insta"
-version = "1.29.0"
+version = "1.34.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9a28d25139df397cbca21408bb742cf6837e04cdbebf1b07b760caf971d6a972"
+checksum = "5d64600be34b2fcfc267740a243fa7744441bb4947a619ac4e5bb6507f35fbfc"
 dependencies = [
  "console",
  "lazy_static",
@@ -3132,17 +3151,6 @@ dependencies = [
  "cfg-if 1.0.0",
 ]
 
-[[package]]
-name = "io-lifetimes"
-version = "1.0.11"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "eae7b9aee968036d54dce06cebaefd919e4472e753296daccd6d344e3e2df0c2"
-dependencies = [
- "hermit-abi 0.3.1",
- "libc",
- "windows-sys 0.48.0",
-]
-
 [[package]]
 name = "iovec"
 version = "0.1.4"
@@ -3154,9 +3162,9 @@ dependencies = [
 
 [[package]]
 name = "ipnet"
-version = "2.7.2"
+version = "2.9.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "12b6ee2129af8d4fb011108c73d99a1b83a85977f23b82460c0ae2e25bb4b57f"
+checksum = "8f518f335dce6725a761382244631d86cf0ccb2863413590b31338feb467f9c3"
 
 [[package]]
 name = "ipnetwork"
@@ -3176,12 +3184,11 @@ dependencies = [
 
 [[package]]
 name = "is-terminal"
-version = "0.4.7"
+version = "0.4.9"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "adcf93614601c8129ddf72e2d5633df827ba6551541c6d8c59520a371475be1f"
+checksum = "cb0889898416213fab133e1d33a0e5858a48177452750691bde3666d0fdbaf8b"
 dependencies = [
- "hermit-abi 0.3.1",
- "io-lifetimes",
+ "hermit-abi 0.3.3",
  "rustix",
  "windows-sys 0.48.0",
 ]
@@ -3197,15 +3204,15 @@ dependencies = [
 
 [[package]]
 name = "itoa"
-version = "1.0.6"
+version = "1.0.9"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "453ad9f582a441959e5f0d088b02ce04cfe8d51a8eaf077f12ac6d3e94164ca6"
+checksum = "af150ab688ff2122fcef229be89cb50dd66af9e01a4ff320cc137eecc9bacc38"
 
 [[package]]
 name = "jobserver"
-version = "0.1.26"
+version = "0.1.27"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "936cfd212a0155903bcbc060e316fb6cc7cbf2e1907329391ebadc1fe0ce77c2"
+checksum = "8c37f63953c4c63420ed5fd3d6d398c719489b9f872b9fa683262f8edd363c7d"
 dependencies = [
  "libc",
 ]
@@ -3277,7 +3284,7 @@ version = "18.0.0"
 source = "git+https://github.com/matter-labs/jsonrpc.git?branch=master#12c53e3e20c09c2fb9966a4ef1b0ea63de172540"
 dependencies = [
  "proc-macro-crate 0.1.5",
- "proc-macro2 1.0.66",
+ "proc-macro2 1.0.69",
  "quote 1.0.33",
  "syn 1.0.109",
 ]
@@ -3316,7 +3323,7 @@ name = "jsonrpc-server-utils"
 version = "18.0.0"
 source = "git+https://github.com/matter-labs/jsonrpc.git?branch=master#12c53e3e20c09c2fb9966a4ef1b0ea63de172540"
 dependencies = [
- "bytes 1.4.0",
+ "bytes 1.5.0",
  "futures 0.3.28",
  "globset",
  "jsonrpc-core 18.0.0 (git+https://github.com/matter-labs/jsonrpc.git?branch=master)",
@@ -3376,7 +3383,7 @@ dependencies = [
  "thiserror",
  "tokio",
  "tokio-rustls",
- "tokio-util 0.7.8",
+ "tokio-util 0.7.9",
  "tracing",
  "webpki-roots 0.24.0",
 ]
@@ -3436,7 +3443,7 @@ checksum = "21dc12b1d4f16a86e8c522823c4fab219c88c03eb7c924ec0501a64bf12e058b"
 dependencies = [
  "heck 0.4.1",
  "proc-macro-crate 1.3.1",
- "proc-macro2 1.0.66",
+ "proc-macro2 1.0.69",
  "quote 1.0.33",
  "syn 1.0.109",
 ]
@@ -3456,7 +3463,7 @@ dependencies = [
  "soketto",
  "tokio",
  "tokio-stream",
- "tokio-util 0.7.8",
+ "tokio-util 0.7.9",
  "tower",
  "tracing",
 ]
@@ -3504,7 +3511,7 @@ version = "8.3.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "6971da4d9c3aa03c3d8f3ff0f4155b534aad021292003895a469716b2a230378"
 dependencies = [
- "base64 0.21.2",
+ "base64 0.21.5",
  "pem",
  "ring",
  "serde",
@@ -3572,9 +3579,9 @@ checksum = "884e2677b40cc8c339eaefcb701c32ef1fd2493d71118dc0ca4b6a736c93bd67"
 
 [[package]]
 name = "libc"
-version = "0.2.146"
+version = "0.2.149"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f92be4933c13fd498862a9e02a3055f8a8d9c039ce33db97306fd5a6caa7f29b"
+checksum = "a08173bc88b7955d1b3145aa561539096c421ac8debde8cbc3612ec635fee29b"
 
 [[package]]
 name = "libloading"
@@ -3588,9 +3595,9 @@ dependencies = [
 
 [[package]]
 name = "libm"
-version = "0.2.7"
+version = "0.2.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f7012b1bbb0719e1097c47611d3898568c546d597c2e74d66f6087edd5233ff4"
+checksum = "4ec2a862134d2a7d32d7983ddcdd1c4923530833c9f2ea1a44fc5fa473989058"
 
 [[package]]
 name = "librocksdb-sys"
@@ -3608,9 +3615,9 @@ dependencies = [
 
 [[package]]
 name = "libz-sys"
-version = "1.1.9"
+version = "1.1.12"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "56ee889ecc9568871456d42f603d6a0ce59ff328d291063a45cbdf0036baf6db"
+checksum = "d97137b25e321a73eef1418d1d5d2eda4d77e12813f8e6dead84bc52c5870a7b"
 dependencies = [
  "cc",
  "pkg-config",
@@ -3625,29 +3632,29 @@ checksum = "0717cef1bc8b636c6e1c1bbdefc09e6322da8a9321966e8928ef80d20f7f770f"
 
 [[package]]
 name = "linkme"
-version = "0.3.15"
+version = "0.3.17"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9f948366ad5bb46b5514ba7a7a80643726eef08b06632592699676748c8bc33b"
+checksum = "91ed2ee9464ff9707af8e9ad834cffa4802f072caad90639c583dd3c62e6e608"
 dependencies = [
  "linkme-impl",
 ]
 
 [[package]]
 name = "linkme-impl"
-version = "0.3.15"
+version = "0.3.17"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bc28438cad73dcc90ff3466fc329a9252b1b8ba668eb0d5668ba97088cf4eef0"
+checksum = "ba125974b109d512fccbc6c0244e7580143e460895dfd6ea7f8bbb692fd94396"
 dependencies = [
- "proc-macro2 1.0.66",
+ "proc-macro2 1.0.69",
  "quote 1.0.33",
- "syn 2.0.27",
+ "syn 2.0.38",
 ]
 
 [[package]]
 name = "linux-raw-sys"
-version = "0.3.8"
+version = "0.4.10"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ef53942eb7bf7ff43a617b3e2c1c4a5ecf5944a7c1bc12d7ee39bbb15e5c1519"
+checksum = "da2479e8c062e40bf0066ffa0bc823de0a9368974af99c9f6df941d2c231e03f"
 
 [[package]]
 name = "loadnext"
@@ -3685,13 +3692,12 @@ dependencies = [
 
 [[package]]
 name = "local-channel"
-version = "0.1.3"
+version = "0.1.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7f303ec0e94c6c54447f84f3b0ef7af769858a9c4ef56ef2a986d3dcd4c3fc9c"
+checksum = "e0a493488de5f18c8ffcba89eebb8532ffc562dc400490eb65b84893fae0b178"
 dependencies = [
  "futures-core",
  "futures-sink",
- "futures-util",
  "local-waker",
 ]
 
@@ -3703,9 +3709,9 @@ checksum = "e34f76eb3611940e0e7d53a9aaa4e6a3151f69541a282fd0dad5571420c53ff1"
 
 [[package]]
 name = "lock_api"
-version = "0.4.10"
+version = "0.4.11"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c1cc9717a20b1bb222f333e6a92fd32f7d8a18ddc5a3191a11af45dcbf4dcd16"
+checksum = "3c168f8615b12bc01f9c17e2eb0cc07dcae1940121185446edc3744920e8ef45"
 dependencies = [
  "autocfg 1.1.0",
  "scopeguard",
@@ -3713,9 +3719,9 @@ dependencies = [
 
 [[package]]
 name = "log"
-version = "0.4.19"
+version = "0.4.20"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b06a4cde4c0f271a446782e3eff8de789548ce57dbc8eca9292c27f4a42004b4"
+checksum = "b5e6163cb8c49088c2c36f57875e58ccd8c87c7427f7fbd50ea6710b2f3f2e8f"
 
 [[package]]
 name = "mach"
@@ -3752,9 +3758,9 @@ dependencies = [
 
 [[package]]
 name = "matchit"
-version = "0.7.0"
+version = "0.7.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b87248edafb776e59e6ee64a79086f65890d3510f2c656c000bf2a7e8a0aea40"
+checksum = "0e7465ac9959cc2b1404e8e2367b43684a6d13790fe23056cc8c6c5a6b7bcb94"
 
 [[package]]
 name = "maybe-uninit"
@@ -3764,18 +3770,19 @@ checksum = "60302e4db3a61da70c0cb7991976248362f30319e88850c487b9b95bbf059e00"
 
 [[package]]
 name = "md-5"
-version = "0.10.5"
+version = "0.10.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6365506850d44bff6e2fbcb5176cf63650e48bd45ef2fe2665ae1570e0f4b9ca"
+checksum = "d89e7ee0cfbedfc4da3340218492196241d89eefb6dab27de5df917a6d2e78cf"
 dependencies = [
+ "cfg-if 1.0.0",
  "digest 0.10.7",
 ]
 
 [[package]]
 name = "memchr"
-version = "2.5.0"
+version = "2.6.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2dffe52ecf27772e601905b7522cb4ef790d2cc203488bbd0e2fe85fcb74566d"
+checksum = "f665ee40bc4a3c5590afb1e9677db74a508659dfd71e126420da8274909a0167"
 
 [[package]]
 name = "memoffset"
@@ -3800,7 +3807,7 @@ name = "merkle_tree_consistency_checker"
 version = "0.1.0"
 dependencies = [
  "anyhow",
- "clap 4.3.4",
+ "clap 4.4.6",
  "tracing",
  "vlog",
  "zksync_config",
@@ -3815,7 +3822,7 @@ version = "0.21.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "fde3af1a009ed76a778cb84fdef9e7dbbdf5775ae3e4cc1f434a6a307f6f76c5"
 dependencies = [
- "ahash 0.8.3",
+ "ahash 0.8.5",
  "metrics-macros",
  "portable-atomic",
 ]
@@ -3826,9 +3833,9 @@ version = "0.12.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "8a4964177ddfdab1e3a2b37aec7cf320e14169abb0ed73999f558136409178d5"
 dependencies = [
- "base64 0.21.2",
+ "base64 0.21.5",
  "hyper",
- "indexmap",
+ "indexmap 1.9.3",
  "ipnet",
  "metrics",
  "metrics-util",
@@ -3844,9 +3851,9 @@ version = "0.7.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "ddece26afd34c31585c74a4db0630c376df271c285d682d1e55012197830b6df"
 dependencies = [
- "proc-macro2 1.0.66",
+ "proc-macro2 1.0.69",
  "quote 1.0.33",
- "syn 2.0.27",
+ "syn 2.0.38",
 ]
 
 [[package]]
@@ -3882,9 +3889,9 @@ dependencies = [
 
 [[package]]
 name = "mini-moka"
-version = "0.10.0"
+version = "0.10.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5cafc5ec7807288595f9c20c86e6ce6d262b722f61e0547fe7e6e6e6451b58d5"
+checksum = "23e0b72e7c9042467008b10279fc732326bd605459ae03bda88825909dd19b56"
 dependencies = [
  "crossbeam-channel 0.5.8",
  "crossbeam-utils 0.8.16",
@@ -3901,15 +3908,6 @@ version = "0.2.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "68354c5c6bd36d73ff3feceb05efa59b6acb7626617f4962be322a825e61f79a"
 
-[[package]]
-name = "miniz_oxide"
-version = "0.6.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b275950c28b37e794e8c55d88aeb5e139d0ce23fdbbeda68f8d7174abdf9e8fa"
-dependencies = [
- "adler",
-]
-
 [[package]]
 name = "miniz_oxide"
 version = "0.7.1"
@@ -3940,9 +3938,9 @@ dependencies = [
 
 [[package]]
 name = "mio"
-version = "0.8.8"
+version = "0.8.9"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "927a765cd3fc26206e66b296465fa9d3e5ab003e651c1b3c060e7956d96b19d2"
+checksum = "3dce281c5e46beae905d4de1870d8b1509a9142b62eedf18b443b011ca8343d0"
 dependencies = [
  "libc",
  "log",
@@ -3989,6 +3987,7 @@ dependencies = [
  "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",
  "zksync_contracts",
  "zksync_eth_signer",
  "zksync_state",
@@ -4029,14 +4028,13 @@ dependencies = [
 
 [[package]]
 name = "nix"
-version = "0.26.2"
+version = "0.27.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bfdda3d196821d6af13126e40375cdf7da646a96114af134d5f417a9a1dc8e1a"
+checksum = "2eb04e9c688eff1c89d72b407f168cf79bb9e867a9d3323ed6c01519eb9cc053"
 dependencies = [
- "bitflags 1.3.2",
+ "bitflags 2.4.1",
  "cfg-if 1.0.0",
  "libc",
- "static_assertions",
 ]
 
 [[package]]
@@ -4093,12 +4091,12 @@ dependencies = [
 
 [[package]]
 name = "num"
-version = "0.4.0"
+version = "0.4.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "43db66d1170d347f9a065114077f7dccb00c1b9478c89384490a3425279a4606"
+checksum = "b05180d69e3da0e530ba2a1dae5110317e49e3b7f3d41be227dc5f92e49ee7af"
 dependencies = [
- "num-bigint 0.4.3",
- "num-complex 0.4.3",
+ "num-bigint 0.4.4",
+ "num-complex 0.4.4",
  "num-integer",
  "num-iter",
  "num-rational 0.4.1",
@@ -4119,9 +4117,9 @@ dependencies = [
 
 [[package]]
 name = "num-bigint"
-version = "0.4.3"
+version = "0.4.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f93ab6289c7b344a8a9f60f88d80aa20032336fe78da341afc91c8a2341fc75f"
+checksum = "608e7659b5c3d7cba262d894801b9ec9d00de989e8a82bd4bef91d08da45cdc0"
 dependencies = [
  "autocfg 1.1.0",
  "num-integer",
@@ -4131,9 +4129,9 @@ dependencies = [
 
 [[package]]
 name = "num-bigint-dig"
-version = "0.8.2"
+version = "0.8.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2399c9463abc5f909349d8aa9ba080e0b88b3ce2885389b60b993f39b1a56905"
+checksum = "dc84195820f291c7697304f3cbdadd1cb7199c0efc917ff5eafd71225c136151"
 dependencies = [
  "byteorder",
  "lazy_static",
@@ -4158,9 +4156,9 @@ dependencies = [
 
 [[package]]
 name = "num-complex"
-version = "0.4.3"
+version = "0.4.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "02e0d21255c828d6f128a1e41534206671e8c3ea0c62f32291e808dc82cff17d"
+checksum = "1ba157ca0885411de85d6ca030ba7e2a83a28636056c7c699b07c8b6f7383214"
 dependencies = [
  "num-traits",
 ]
@@ -4182,7 +4180,7 @@ version = "0.3.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "876a53fff98e03a936a674b29568b0e605f06b29372c2489ff4de23f1949743d"
 dependencies = [
- "proc-macro2 1.0.66",
+ "proc-macro2 1.0.69",
  "quote 1.0.33",
  "syn 1.0.109",
 ]
@@ -4238,16 +4236,16 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "0638a1c9d0a3c0914158145bc76cff373a75a627e6ecbfb71cbe6f453a5a19b0"
 dependencies = [
  "autocfg 1.1.0",
- "num-bigint 0.4.3",
+ "num-bigint 0.4.4",
  "num-integer",
  "num-traits",
 ]
 
 [[package]]
 name = "num-traits"
-version = "0.2.15"
+version = "0.2.17"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "578ede34cf02f8924ab9447f50c28075b4d3e5b269972345e7e0372b38c6cdcd"
+checksum = "39e3200413f237f41ab11ad6d161bc7239c84dcb631773ccd7de3dfe4b5c267c"
 dependencies = [
  "autocfg 1.1.0",
  "libm",
@@ -4255,11 +4253,11 @@ dependencies = [
 
 [[package]]
 name = "num_cpus"
-version = "1.15.0"
+version = "1.16.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0fac9e2da13b5eb447a6ce3d392f23a29d8694bff781bf03a16cd9ac8697593b"
+checksum = "4161fcb6d602d4d2081af7c3a45852d875a03dd337a6bfdd6e06407b61342a43"
 dependencies = [
- "hermit-abi 0.2.6",
+ "hermit-abi 0.3.3",
  "libc",
 ]
 
@@ -4279,16 +4277,16 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "96667db765a921f7b295ffee8b60472b686a51d4f21c2ee4ffdb94c7013b65a6"
 dependencies = [
  "proc-macro-crate 1.3.1",
- "proc-macro2 1.0.66",
+ "proc-macro2 1.0.69",
  "quote 1.0.33",
- "syn 2.0.27",
+ "syn 2.0.38",
 ]
 
 [[package]]
 name = "object"
-version = "0.30.4"
+version = "0.32.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "03b4680b86d9cfafba8fc491dc9b6df26b68cf40e9e6cd73909194759a63c385"
+checksum = "9cf5f9dd3933bd50a9e1f149ec995f39ae2c496d31fd772c1fd45ebc27e902b0"
 dependencies = [
  "memchr",
 ]
@@ -4323,7 +4321,7 @@ version = "0.10.57"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "bac25ee399abb46215765b1cb35bc0212377e58a061560d8b29b024fd0430e7c"
 dependencies = [
- "bitflags 2.3.2",
+ "bitflags 2.4.1",
  "cfg-if 1.0.0",
  "foreign-types",
  "libc",
@@ -4338,9 +4336,9 @@ version = "0.1.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "a948666b637a0f465e8564c73e89d4dde00d72d4d473cc972f390fc3dcee7d9c"
 dependencies = [
- "proc-macro2 1.0.66",
+ "proc-macro2 1.0.69",
  "quote 1.0.33",
- "syn 2.0.27",
+ "syn 2.0.38",
 ]
 
 [[package]]
@@ -4374,9 +4372,9 @@ dependencies = [
 
 [[package]]
 name = "os_str_bytes"
-version = "6.5.1"
+version = "6.6.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4d5d9eb14b174ee9aa2ef96dc2b94637a2d4b6e7cb873c7e171f0c20c6cf3eac"
+checksum = "e2355d85b9a3786f481747ced0e0ff2ba35213a1f9bd406ed906554d7af805a1"
 
 [[package]]
 name = "overload"
@@ -4449,7 +4447,7 @@ version = "2.3.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "373b1a4c1338d9cd3d1fa53b3a11bdab5ab6bd80a20f7f7becd76953ae2be909"
 dependencies = [
- "arrayvec 0.7.3",
+ "arrayvec 0.7.4",
  "bitvec 0.20.4",
  "byte-slice-cast",
  "impl-trait-for-tuples",
@@ -4459,15 +4457,15 @@ dependencies = [
 
 [[package]]
 name = "parity-scale-codec"
-version = "3.6.1"
+version = "3.6.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2287753623c76f953acd29d15d8100bcab84d29db78fb6f352adb3c53e83b967"
+checksum = "0dec8a8073036902368c2cdc0387e85ff9a37054d7e7c98e592145e0c92cd4fb"
 dependencies = [
- "arrayvec 0.7.3",
+ "arrayvec 0.7.4",
  "bitvec 1.0.1",
  "byte-slice-cast",
  "impl-trait-for-tuples",
- "parity-scale-codec-derive 3.6.1",
+ "parity-scale-codec-derive 3.6.5",
  "serde",
 ]
 
@@ -4478,19 +4476,19 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "1557010476e0595c9b568d16dcfb81b93cdeb157612726f5170d31aa707bed27"
 dependencies = [
  "proc-macro-crate 1.3.1",
- "proc-macro2 1.0.66",
+ "proc-macro2 1.0.69",
  "quote 1.0.33",
  "syn 1.0.109",
 ]
 
 [[package]]
 name = "parity-scale-codec-derive"
-version = "3.6.1"
+version = "3.6.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2b6937b5e67bfba3351b87b040d48352a2fcb6ad72f81855412ce97b45c8f110"
+checksum = "312270ee71e1cd70289dacf597cab7b207aa107d2f28191c2ae45b2ece18a260"
 dependencies = [
  "proc-macro-crate 1.3.1",
- "proc-macro2 1.0.66",
+ "proc-macro2 1.0.69",
  "quote 1.0.33",
  "syn 1.0.109",
 ]
@@ -4531,7 +4529,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "3742b2c103b9f06bc9fff0a37ff4912935851bee6d36f3c02bcc755bcfec228f"
 dependencies = [
  "lock_api",
- "parking_lot_core 0.9.8",
+ "parking_lot_core 0.9.9",
 ]
 
 [[package]]
@@ -4550,15 +4548,15 @@ dependencies = [
 
 [[package]]
 name = "parking_lot_core"
-version = "0.9.8"
+version = "0.9.9"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "93f00c865fe7cabf650081affecd3871070f26767e7b2070a3ffae14c654b447"
+checksum = "4c42a9226546d68acdd9c0a280d17ce19bfe27a46bf68784e4066115788d008e"
 dependencies = [
  "cfg-if 1.0.0",
  "libc",
- "redox_syscall 0.3.5",
+ "redox_syscall 0.4.1",
  "smallvec",
- "windows-targets 0.48.0",
+ "windows-targets 0.48.5",
 ]
 
 [[package]]
@@ -4573,9 +4571,9 @@ dependencies = [
 
 [[package]]
 name = "paste"
-version = "1.0.12"
+version = "1.0.14"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9f746c4065a8fa3fe23974dd82f15431cc8d40779821001404d10d2e79ca7d79"
+checksum = "de3145af08024dea9fa9914f381a17b8fc6034dfb00f3a84013f7ff43f29ed4c"
 
 [[package]]
 name = "pbkdf2"
@@ -4631,19 +4629,20 @@ checksum = "9b2a4787296e9989611394c33f193f676704af1686e70b8f8033ab5ba9a35a94"
 
 [[package]]
 name = "pest"
-version = "2.6.0"
+version = "2.7.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e68e84bfb01f0507134eac1e9b410a12ba379d064eab48c50ba4ce329a527b70"
+checksum = "c022f1e7b65d6a24c0dbbd5fb344c66881bc01f3e5ae74a1c8100f2f985d98a4"
 dependencies = [
+ "memchr",
  "thiserror",
  "ucd-trie",
 ]
 
 [[package]]
 name = "pest_derive"
-version = "2.6.0"
+version = "2.7.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6b79d4c71c865a25a4322296122e3924d30bc8ee0834c8bfc8b95f7f054afbfb"
+checksum = "35513f630d46400a977c4cb58f78e1bfbe01434316e60c37d27b9ad6139c66d8"
 dependencies = [
  "pest",
  "pest_generator",
@@ -4651,22 +4650,22 @@ dependencies = [
 
 [[package]]
 name = "pest_generator"
-version = "2.6.0"
+version = "2.7.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6c435bf1076437b851ebc8edc3a18442796b30f1728ffea6262d59bbe28b077e"
+checksum = "bc9fc1b9e7057baba189b5c626e2d6f40681ae5b6eb064dc7c7834101ec8123a"
 dependencies = [
  "pest",
  "pest_meta",
- "proc-macro2 1.0.66",
+ "proc-macro2 1.0.69",
  "quote 1.0.33",
- "syn 2.0.27",
+ "syn 2.0.38",
 ]
 
 [[package]]
 name = "pest_meta"
-version = "2.6.0"
+version = "2.7.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "745a452f8eb71e39ffd8ee32b3c5f51d03845f99786fa9b68db6ff509c505411"
+checksum = "1df74e9e7ec4053ceb980e7c0c8bd3594e977fde1af91daba9c928e8e8c6708d"
 dependencies = [
  "once_cell",
  "pest",
@@ -4675,29 +4674,29 @@ dependencies = [
 
 [[package]]
 name = "pin-project"
-version = "1.1.0"
+version = "1.1.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c95a7476719eab1e366eaf73d0260af3021184f18177925b07f54b30089ceead"
+checksum = "fda4ed1c6c173e3fc7a83629421152e01d7b1f9b7f65fb301e490e8cfc656422"
 dependencies = [
  "pin-project-internal",
 ]
 
 [[package]]
 name = "pin-project-internal"
-version = "1.1.0"
+version = "1.1.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "39407670928234ebc5e6e580247dd567ad73a3578460c5990f9503df207e8f07"
+checksum = "4359fd9c9171ec6e8c62926d6faaf553a8dc3f64e1507e76da7911b4f6a04405"
 dependencies = [
- "proc-macro2 1.0.66",
+ "proc-macro2 1.0.69",
  "quote 1.0.33",
- "syn 2.0.27",
+ "syn 2.0.38",
 ]
 
 [[package]]
 name = "pin-project-lite"
-version = "0.2.9"
+version = "0.2.13"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e0a7ae3ac2f1173085d398531c705756c94a4c56843785df85a60c1a0afac116"
+checksum = "8afb450f006bf6385ca15ef45d71d2288452bc3683ce2e2cacc0d18e4be60b58"
 
 [[package]]
 name = "pin-utils"
@@ -4745,9 +4744,9 @@ checksum = "26072860ba924cbfa98ea39c8c19b4dd6a4a25423dbdf219c1eca91aa0cf6964"
 
 [[package]]
 name = "plotters"
-version = "0.3.4"
+version = "0.3.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2538b639e642295546c50fcd545198c9d64ee2a38620a628724a3b266d5fbf97"
+checksum = "d2c224ba00d7cadd4d5c660deaf2098e5e80e07846537c51f9cfa4be50c1fd45"
 dependencies = [
  "num-traits",
  "plotters-backend",
@@ -4758,24 +4757,30 @@ dependencies = [
 
 [[package]]
 name = "plotters-backend"
-version = "0.3.4"
+version = "0.3.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "193228616381fecdc1224c62e96946dfbc73ff4384fba576e052ff8c1bea8142"
+checksum = "9e76628b4d3a7581389a35d5b6e2139607ad7c75b17aed325f210aa91f4a9609"
 
 [[package]]
 name = "plotters-svg"
-version = "0.3.3"
+version = "0.3.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f9a81d2759aae1dae668f783c308bc5c8ebd191ff4184aaa1b37f65a6ae5a56f"
+checksum = "38f6d39893cca0701371e3c27294f09797214b86f1fb951b89ade8ec04e2abab"
 dependencies = [
  "plotters-backend",
 ]
 
 [[package]]
 name = "portable-atomic"
-version = "1.3.3"
+version = "1.5.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b559898e0b4931ed2d3b959ab0c2da4d99cc644c4b0b1a35b4d344027f474023"
+
+[[package]]
+name = "powerfmt"
+version = "0.2.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "767eb9f07d4a5ebcb39bbf2d452058a93c011373abf6832e24194a1c3f004794"
+checksum = "439ee305def115ba05938db6eb1644ff94165c5ab5e9420d1c1bcedbba909391"
 
 [[package]]
 name = "ppv-lite86"
@@ -4785,12 +4790,12 @@ checksum = "5b40af805b3121feab8a3c29f04d8ad262fa8e0561883e7653e024ae4479e6de"
 
 [[package]]
 name = "prettyplease"
-version = "0.2.6"
+version = "0.2.15"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3b69d39aab54d069e7f2fe8cb970493e7834601ca2d8c65fd7bbd183578080d1"
+checksum = "ae005bd773ab59b4725093fd7df83fd7892f7d8eafb48dbd7de6e024e4215f9d"
 dependencies = [
- "proc-macro2 1.0.66",
- "syn 2.0.27",
+ "proc-macro2 1.0.69",
+ "syn 2.0.38",
 ]
 
 [[package]]
@@ -4808,9 +4813,9 @@ dependencies = [
 
 [[package]]
 name = "primitive-types"
-version = "0.12.1"
+version = "0.12.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9f3486ccba82358b11a77516035647c34ba167dfa53312630de83b12bd4f3d66"
+checksum = "0b34d9fd68ae0b74a41b21c03c2f62847aa0ffea044eee893b4c140b37e244e2"
 dependencies = [
  "fixed-hash 0.8.0",
  "impl-codec 0.6.0",
@@ -4835,7 +4840,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "7f4c021e1093a56626774e81216a4ce732a735e5bad4868a03f3ed65ca0c3919"
 dependencies = [
  "once_cell",
- "toml_edit 0.19.10",
+ "toml_edit 0.19.15",
 ]
 
 [[package]]
@@ -4845,7 +4850,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "da25490ff9892aab3fcf7c36f08cfb902dd3e71ca0f9f9517bea02a73a5ce38c"
 dependencies = [
  "proc-macro-error-attr",
- "proc-macro2 1.0.66",
+ "proc-macro2 1.0.69",
  "quote 1.0.33",
  "syn 1.0.109",
  "version_check",
@@ -4857,7 +4862,7 @@ version = "1.0.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "a1be40180e52ecc98ad80b184934baf3d0d29f979574e439af5a55274b35f869"
 dependencies = [
- "proc-macro2 1.0.66",
+ "proc-macro2 1.0.69",
  "quote 1.0.33",
  "version_check",
 ]
@@ -4879,9 +4884,9 @@ dependencies = [
 
 [[package]]
 name = "proc-macro2"
-version = "1.0.66"
+version = "1.0.69"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "18fb31db3f9bddb2ea821cde30a9f70117e3f119938b5ee630b7403aa6e2ead9"
+checksum = "134c189feb4956b20f6f547d2cf727d4c0fe06722b20a0eec87ed445a97f92da"
 dependencies = [
  "unicode-ident",
 ]
@@ -4904,9 +4909,9 @@ version = "0.4.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "440f724eba9f6996b75d63681b0a92b06947f1457076d503a4d2e2c8f56442b8"
 dependencies = [
- "proc-macro2 1.0.66",
+ "proc-macro2 1.0.69",
  "quote 1.0.33",
- "syn 2.0.27",
+ "syn 2.0.38",
 ]
 
 [[package]]
@@ -4979,7 +4984,7 @@ version = "1.0.33"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "5267fca4496028628a95160fc423a33e8b2e6af8a5302579e322e4b520293cae"
 dependencies = [
- "proc-macro2 1.0.66",
+ "proc-macro2 1.0.69",
 ]
 
 [[package]]
@@ -5195,9 +5200,9 @@ dependencies = [
 
 [[package]]
 name = "rayon"
-version = "1.7.0"
+version = "1.8.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1d2df5196e37bcc87abebc0053e20787d73847bb33134a69841207dd0a47f03b"
+checksum = "9c27db03db7734835b3f53954b534c91069375ce6ccaa2e065441e07d9b6cdb1"
 dependencies = [
  "either",
  "rayon-core",
@@ -5205,14 +5210,12 @@ dependencies = [
 
 [[package]]
 name = "rayon-core"
-version = "1.11.0"
+version = "1.12.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4b8f95bd6966f5c87776639160a66bd8ab9895d9d4ab01ddba9fc60661aebe8d"
+checksum = "5ce3fb6ad83f861aac485e76e1985cd109d9a3713802152be56c3b1f0e0658ed"
 dependencies = [
- "crossbeam-channel 0.5.8",
  "crossbeam-deque 0.8.3",
  "crossbeam-utils 0.8.16",
- "num_cpus",
 ]
 
 [[package]]
@@ -5242,6 +5245,15 @@ dependencies = [
  "bitflags 1.3.2",
 ]
 
+[[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.3"
@@ -5255,14 +5267,14 @@ dependencies = [
 
 [[package]]
 name = "regex"
-version = "1.9.1"
+version = "1.10.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b2eae68fc220f7cf2532e4494aded17545fce192d59cd996e0fe7887f4ceb575"
+checksum = "380b951a9c5e80ddfd6136919eef32310721aa4aacd4889a8d39124b026ab343"
 dependencies = [
- "aho-corasick 1.0.2",
+ "aho-corasick",
  "memchr",
- "regex-automata 0.3.2",
- "regex-syntax 0.7.3",
+ "regex-automata 0.4.3",
+ "regex-syntax 0.8.2",
 ]
 
 [[package]]
@@ -5276,13 +5288,13 @@ dependencies = [
 
 [[package]]
 name = "regex-automata"
-version = "0.3.2"
+version = "0.4.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "83d3daa6976cffb758ec878f108ba0e062a45b2d6ca3a2cca965338855476caf"
+checksum = "5f804c7828047e88b2d32e2d7fe5a105da8ee3264f01902f796c8e067dc2483f"
 dependencies = [
- "aho-corasick 1.0.2",
+ "aho-corasick",
  "memchr",
- "regex-syntax 0.7.3",
+ "regex-syntax 0.8.2",
 ]
 
 [[package]]
@@ -5293,9 +5305,9 @@ checksum = "f162c6dd7b008981e4d40210aca20b4bd0f9b60ca9271061b07f78537722f2e1"
 
 [[package]]
 name = "regex-syntax"
-version = "0.7.3"
+version = "0.8.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2ab07dc67230e4a4718e70fd5c20055a4334b121f1f9db8fe63ef39ce9b8c846"
+checksum = "c08c74e62047bb2de4ff487b251e4a92e24f48745648451635cec7d591162d9f"
 
 [[package]]
 name = "remove_dir_all"
@@ -5308,12 +5320,12 @@ dependencies = [
 
 [[package]]
 name = "reqwest"
-version = "0.11.18"
+version = "0.11.22"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cde824a14b7c14f85caff81225f411faacc04a2013f41670f41443742b1c1c55"
+checksum = "046cd98826c46c2ac8ddecae268eb5c2e58628688a5fc7a2643704a73faba95b"
 dependencies = [
- "base64 0.21.2",
- "bytes 1.4.0",
+ "base64 0.21.5",
+ "bytes 1.5.0",
  "encoding_rs",
  "futures-core",
  "futures-util",
@@ -5337,17 +5349,18 @@ dependencies = [
  "serde",
  "serde_json",
  "serde_urlencoded",
+ "system-configuration",
  "tokio",
  "tokio-native-tls",
  "tokio-rustls",
- "tokio-util 0.7.8",
+ "tokio-util 0.7.9",
  "tower-service",
  "url",
  "wasm-bindgen",
  "wasm-bindgen-futures",
  "wasm-streams",
  "web-sys",
- "webpki-roots 0.22.6",
+ "webpki-roots 0.25.2",
  "winreg",
 ]
 
@@ -5357,7 +5370,7 @@ version = "0.4.1"
 source = "git+https://github.com/matter-labs/rescue-poseidon.git?branch=poseidon2#c4a788471710bdb7aa0f59e8756b45ef93cdd2b2"
 dependencies = [
  "addchain",
- "arrayvec 0.7.3",
+ "arrayvec 0.7.4",
  "blake2 0.10.6 (registry+https://github.com/rust-lang/crates.io-index)",
  "byteorder",
  "derivative",
@@ -5379,7 +5392,7 @@ version = "0.4.1"
 source = "git+https://github.com/matter-labs/rescue-poseidon#d059b5042df5ed80e151f05751410b524a54d16c"
 dependencies = [
  "addchain",
- "arrayvec 0.7.3",
+ "arrayvec 0.7.4",
  "blake2 0.10.6 (registry+https://github.com/rust-lang/crates.io-index)",
  "byteorder",
  "franklin-crypto 0.0.5 (git+https://github.com/matter-labs/franklin-crypto?branch=dev)",
@@ -5436,7 +5449,7 @@ version = "0.5.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "bb919243f34364b6bd2fc10ef797edbfa75f33c252e7998527479c6d6b47e1ec"
 dependencies = [
- "bytes 1.4.0",
+ "bytes 1.5.0",
  "rustc-hex",
 ]
 
@@ -5455,7 +5468,7 @@ name = "rocksdb_util"
 version = "0.1.0"
 dependencies = [
  "anyhow",
- "clap 4.3.4",
+ "clap 4.4.6",
  "tempfile",
  "zksync_config",
  "zksync_storage",
@@ -5510,13 +5523,12 @@ dependencies = [
 
 [[package]]
 name = "rustix"
-version = "0.37.20"
+version = "0.38.20"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b96e891d04aa506a6d1f318d2771bcb1c7dfda84e126660ace067c9b474bb2c0"
+checksum = "67ce50cb2e16c2903e30d1cbccfd8387a74b9d4c938b6a4c5ec6cc7556f7a8a0"
 dependencies = [
- "bitflags 1.3.2",
+ "bitflags 2.4.1",
  "errno",
- "io-lifetimes",
  "libc",
  "linux-raw-sys",
  "windows-sys 0.48.0",
@@ -5524,13 +5536,13 @@ dependencies = [
 
 [[package]]
 name = "rustls"
-version = "0.21.2"
+version = "0.21.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e32ca28af694bc1bbf399c33a516dbdf1c90090b8ab23c2bc24f834aa2247f5f"
+checksum = "cd8d6c9f025a446bc4d18ad9632e69aec8f287aa84499ee335599fabd20c3fd8"
 dependencies = [
  "log",
  "ring",
- "rustls-webpki 0.100.3",
+ "rustls-webpki",
  "sct",
 ]
 
@@ -5548,21 +5560,11 @@ dependencies = [
 
 [[package]]
 name = "rustls-pemfile"
-version = "1.0.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d194b56d58803a43635bdc398cd17e383d6f71f9182b9a192c127ca42494a59b"
-dependencies = [
- "base64 0.21.2",
-]
-
-[[package]]
-name = "rustls-webpki"
-version = "0.100.3"
+version = "1.0.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5f6a5fc258f1c1276dfe3016516945546e2d5383911efc0fc4f1cdc5df3a4ae3"
+checksum = "2d3987094b1d07b653b7dfdc3f70ce9a1da9c51ac18c1b06b662e4f9a0e9f4b2"
 dependencies = [
- "ring",
- "untrusted",
+ "base64 0.21.5",
 ]
 
 [[package]]
@@ -5577,15 +5579,15 @@ dependencies = [
 
 [[package]]
 name = "rustversion"
-version = "1.0.12"
+version = "1.0.14"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4f3208ce4d8448b3f3e7d168a73f5e0c43a61e32930de3bceeccedb388b6bf06"
+checksum = "7ffc183a10b4478d04cbbbfc96d0873219d962dd5accaff2ffbd4ceb7df837f4"
 
 [[package]]
 name = "ryu"
-version = "1.0.13"
+version = "1.0.15"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f91339c0467de62360649f8d3e185ca8de4224ff281f66000de5eb2a77a79041"
+checksum = "1ad4cc8da4ef723ed60bced201181d83791ad433213d8c24efffda1eec85d741"
 
 [[package]]
 name = "salsa20"
@@ -5607,18 +5609,18 @@ dependencies = [
 
 [[package]]
 name = "schannel"
-version = "0.1.21"
+version = "0.1.22"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "713cfb06c7059f3588fb8044c0fad1d09e3c01d225e25b9220dbfdcf16dbb1b3"
+checksum = "0c3733bf4cf7ea0880754e19cb5a462007c4a8c1914bff372ccc95b464f1df88"
 dependencies = [
- "windows-sys 0.42.0",
+ "windows-sys 0.48.0",
 ]
 
 [[package]]
 name = "scopeguard"
-version = "1.1.0"
+version = "1.2.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d29ab0c6d3fc0ee92fe66e2d99f700eab17a8d57d1c1d3b748380fb20baa78cd"
+checksum = "94143f37725109f92c262ed2cf5e59bce7498c01bcc1502d7b9afe439a4e9f49"
 
 [[package]]
 name = "scrypt"
@@ -5699,9 +5701,9 @@ dependencies = [
 
 [[package]]
 name = "security-framework"
-version = "2.9.1"
+version = "2.9.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1fc758eb7bffce5b308734e9b0c1468893cae9ff70ebf13e7090be8dcbcc83a8"
+checksum = "05b64fb303737d99b81884b2c63433e9ae28abebe5eb5045dcdd175dc2ecf4de"
 dependencies = [
  "bitflags 1.3.2",
  "core-foundation",
@@ -5712,9 +5714,9 @@ dependencies = [
 
 [[package]]
 name = "security-framework-sys"
-version = "2.9.0"
+version = "2.9.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f51d0c0d83bec45f16480d0ce0058397a69e48fcdc52d1dc8855fb68acbd31a7"
+checksum = "e932934257d3b408ed8f30db49d85ea163bfe74961f017f405b025af298f0c7a"
 dependencies = [
  "core-foundation-sys",
  "libc",
@@ -5722,9 +5724,9 @@ dependencies = [
 
 [[package]]
 name = "semver"
-version = "1.0.17"
+version = "1.0.20"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bebd363326d05ec3e2f532ab7660680f3b02130d780c299bca73469d521bc0ed"
+checksum = "836fa6a3e1e547f9a2c4040802ec865b5d85f4014efe00555d7090a3dcaa1090"
 dependencies = [
  "serde",
 ]
@@ -5737,9 +5739,9 @@ checksum = "f638d531eccd6e23b980caf34876660d38e265409d8e99b397ab71eb3612fad0"
 
 [[package]]
 name = "sentry"
-version = "0.31.4"
+version = "0.31.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9e0bd2cbc3398be701a933e5b7357a4b6b1f94038d2054f118cba90b481a9fbe"
+checksum = "0097a48cd1999d983909f07cb03b15241c5af29e5e679379efac1c06296abecc"
 dependencies = [
  "httpdate",
  "native-tls",
@@ -5756,9 +5758,9 @@ dependencies = [
 
 [[package]]
 name = "sentry-backtrace"
-version = "0.31.4"
+version = "0.31.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9cf043f9bcb6c9ae084b7f10fb363a697c924badcbe7dac2dbeecea31271ed0c"
+checksum = "18a7b80fa1dd6830a348d38a8d3a9761179047757b7dca29aef82db0118b9670"
 dependencies = [
  "backtrace",
  "once_cell",
@@ -5768,9 +5770,9 @@ dependencies = [
 
 [[package]]
 name = "sentry-contexts"
-version = "0.31.4"
+version = "0.31.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "16bde19e361cff463253371dbabee51dab416c6f9285d6e62106539f96d12079"
+checksum = "7615dc588930f1fd2e721774f25844ae93add2dbe2d3c2f995ce5049af898147"
 dependencies = [
  "hostname",
  "libc",
@@ -5782,9 +5784,9 @@ dependencies = [
 
 [[package]]
 name = "sentry-core"
-version = "0.31.4"
+version = "0.31.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fe345c342f17e48b65451f424ce0848405b6b3a84fa0007ba444b84754bf760a"
+checksum = "8f51264e4013ed9b16558cce43917b983fa38170de2ca480349ceb57d71d6053"
 dependencies = [
  "once_cell",
  "rand 0.8.5",
@@ -5795,9 +5797,9 @@ dependencies = [
 
 [[package]]
 name = "sentry-debug-images"
-version = "0.31.4"
+version = "0.31.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "be9460cda9409f799f839510ff3b2ab8db6e457f3085298e18eefc463948e157"
+checksum = "2fe6180fa564d40bb942c9f0084ffb5de691c7357ead6a2b7a3154fae9e401dd"
 dependencies = [
  "findshlibs",
  "once_cell",
@@ -5806,9 +5808,9 @@ dependencies = [
 
 [[package]]
 name = "sentry-panic"
-version = "0.31.4"
+version = "0.31.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "063ac270f11157e435f8b133a007669a3e1a7920e23374485357a8692996188f"
+checksum = "323160213bba549f9737317b152af116af35c0410f4468772ee9b606d3d6e0fa"
 dependencies = [
  "sentry-backtrace",
  "sentry-core",
@@ -5816,9 +5818,9 @@ dependencies = [
 
 [[package]]
 name = "sentry-tracing"
-version = "0.31.4"
+version = "0.31.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "dc167b6746500ea4bb86c2c13afe7ca6f75f2ed1bcfd84243e870780b8ced529"
+checksum = "38033822128e73f7b6ca74c1631cef8868890c6cb4008a291cf73530f87b4eac"
 dependencies = [
  "sentry-backtrace",
  "sentry-core",
@@ -5828,13 +5830,13 @@ dependencies = [
 
 [[package]]
 name = "sentry-types"
-version = "0.31.4"
+version = "0.31.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "62d10a5962144f5fb65bb1290551623e6b976f442cb2fcb4e1dfe9fe6f8e8df4"
+checksum = "0e663b3eb62ddfc023c9cf5432daf5f1a4f6acb1df4d78dd80b740b32dd1a740"
 dependencies = [
  "debugid",
- "getrandom 0.2.10",
  "hex",
+ "rand 0.8.5",
  "serde",
  "serde_json",
  "thiserror",
@@ -5845,22 +5847,22 @@ dependencies = [
 
 [[package]]
 name = "serde"
-version = "1.0.175"
+version = "1.0.189"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5d25439cd7397d044e2748a6fe2432b5e85db703d6d097bd014b3c0ad1ebff0b"
+checksum = "8e422a44e74ad4001bdc8eede9a4570ab52f71190e9c076d14369f38b9200537"
 dependencies = [
  "serde_derive",
 ]
 
 [[package]]
 name = "serde_derive"
-version = "1.0.175"
+version = "1.0.189"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b23f7ade6f110613c0d63858ddb8b94c1041f550eab58a16b371bdf2c9c80ab4"
+checksum = "1e48d1f918009ce3145511378cf68d613e3b3d9137d67272562080d68a2b32d5"
 dependencies = [
- "proc-macro2 1.0.66",
+ "proc-macro2 1.0.69",
  "quote 1.0.33",
- "syn 2.0.27",
+ "syn 2.0.38",
 ]
 
 [[package]]
@@ -5915,7 +5917,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "e182d6ec6f05393cc0e5ed1bf81ad6db3a8feedf8ee515ecdd369809bcce8082"
 dependencies = [
  "darling",
- "proc-macro2 1.0.66",
+ "proc-macro2 1.0.69",
  "quote 1.0.33",
  "syn 1.0.109",
 ]
@@ -5958,9 +5960,9 @@ dependencies = [
 
 [[package]]
 name = "sha1"
-version = "0.10.5"
+version = "0.10.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f04293dc80c3993519f2d7f6f511707ee7094fe0c6d3406feb330cdb3540eba3"
+checksum = "e3bf829a2d51ab4a5ddf1352d8470c140cadc8301b2ae1789db023f01cedd6ba"
 dependencies = [
  "cfg-if 1.0.0",
  "cpufeatures",
@@ -6034,18 +6036,18 @@ dependencies = [
 
 [[package]]
 name = "sharded-slab"
-version = "0.1.4"
+version = "0.1.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "900fba806f70c630b0a382d0d825e17a0f19fcd059a2ade1ff237bcddf446b31"
+checksum = "f40ca3c46823713e0d4209592e8d6e826aa57e928f09752619fc696c499637f6"
 dependencies = [
  "lazy_static",
 ]
 
 [[package]]
 name = "shlex"
-version = "1.1.0"
+version = "1.2.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "43b2853a4d09f215c24cc5489c992ce46052d359b5109343cbafbf26bc62f8a3"
+checksum = "a7cee0529a6d40f580e7a5e6c495c8fbfe21b7b52795ed4bb5e62cdf92bc6380"
 
 [[package]]
 name = "signal-hook-registry"
@@ -6068,9 +6070,9 @@ dependencies = [
 
 [[package]]
 name = "similar"
-version = "2.2.1"
+version = "2.3.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "420acb44afdae038210c99e69aae24109f32f15500aa708e81d46c9f29d55fcf"
+checksum = "2aeaf503862c419d66959f5d7ca015337d864e9c49485d771b732e2a20453597"
 
 [[package]]
 name = "simple_asn1"
@@ -6078,7 +6080,7 @@ version = "0.6.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "adc4e5204eb1910f40f9cfa375f6f05b68c3abac4b6fd879c8ff5e7ae8a0a085"
 dependencies = [
- "num-bigint 0.4.3",
+ "num-bigint 0.4.4",
  "num-traits",
  "thiserror",
  "time",
@@ -6107,18 +6109,18 @@ checksum = "68a406c1882ed7f29cd5e248c9848a80e7cb6ae0fea82346d2746f2f941c07e1"
 
 [[package]]
 name = "slab"
-version = "0.4.8"
+version = "0.4.9"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6528351c9bc8ab22353f9d776db39a20288e8d6c37ef8cfe3317cf875eecfc2d"
+checksum = "8f92a496fb766b417c996b9c5e57daf2f7ad3b0bebe1ccfca4856390e3d3bb67"
 dependencies = [
  "autocfg 1.1.0",
 ]
 
 [[package]]
 name = "smallvec"
-version = "1.10.0"
+version = "1.11.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a507befe795404456341dfab10cef66ead4c041f62b8b11bbb92bffe5d0953e0"
+checksum = "942b4a808e05215192e39f4ab80813e599068285906cc91aa64f923db842bd5a"
 dependencies = [
  "serde",
 ]
@@ -6126,25 +6128,33 @@ dependencies = [
 [[package]]
 name = "snark_wrapper"
 version = "0.1.0"
-source = "git+https://github.com/matter-labs/snark-wrapper.git?branch=main#450ea6c9f3ede11e149b86ad3a072e673f9846e7"
+source = "git+https://github.com/matter-labs/snark-wrapper.git?branch=main#52f9ef98a7e6c86b405dd0ec42291dacf6e2bcb4"
 dependencies = [
- "boojum",
  "derivative",
- "franklin-crypto 0.0.5 (git+https://github.com/matter-labs/franklin-crypto?branch=snark_wrapper)",
  "rand 0.4.6",
  "rescue_poseidon 0.4.1 (git+https://github.com/matter-labs/rescue-poseidon.git?branch=poseidon2)",
 ]
 
 [[package]]
 name = "socket2"
-version = "0.4.9"
+version = "0.4.10"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "64a4a911eed85daf18834cfaa86a79b7d266ff93ff5ba14005426219480ed662"
+checksum = "9f7916fc008ca5542385b89a3d3ce689953c143e9304a9bf8beec1de48994c0d"
 dependencies = [
  "libc",
  "winapi 0.3.9",
 ]
 
+[[package]]
+name = "socket2"
+version = "0.5.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7b5fac59a5cb5dd637972e5fca70daf0523c9067fcdc4842f053dae04a18f8e9"
+dependencies = [
+ "libc",
+ "windows-sys 0.48.0",
+]
+
 [[package]]
 name = "soketto"
 version = "0.7.1"
@@ -6152,7 +6162,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "41d1c5305e39e09653383c2c7244f2f78b3bcae37cf50c64cb4789c9f5096ec2"
 dependencies = [
  "base64 0.13.1",
- "bytes 1.4.0",
+ "bytes 1.5.0",
  "futures 0.3.28",
  "http",
  "httparse",
@@ -6220,13 +6230,13 @@ version = "0.5.13"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "e48c61941ccf5ddcada342cd59e3e5173b007c509e1e8e990dafc830294d9dc5"
 dependencies = [
- "ahash 0.7.6",
+ "ahash 0.7.7",
  "atoi",
  "base64 0.13.1",
  "bigdecimal",
  "bitflags 1.3.2",
  "byteorder",
- "bytes 1.4.0",
+ "bytes 1.5.0",
  "chrono",
  "crc",
  "crossbeam-queue 0.3.8",
@@ -6241,7 +6251,7 @@ dependencies = [
  "hex",
  "hkdf",
  "hmac 0.12.1",
- "indexmap",
+ "indexmap 1.9.3",
  "ipnetwork",
  "itoa",
  "libc",
@@ -6278,7 +6288,7 @@ dependencies = [
  "heck 0.4.1",
  "hex",
  "once_cell",
- "proc-macro2 1.0.66",
+ "proc-macro2 1.0.69",
  "quote 1.0.33",
  "serde",
  "serde_json",
@@ -6317,7 +6327,7 @@ checksum = "a2eb9349b6444b326872e140eb1cf5e7c522154d69e7a0ffb0fb81c06b37543f"
 name = "storage_logs_dedup_migration"
 version = "0.1.0"
 dependencies = [
- "clap 4.3.4",
+ "clap 4.4.6",
  "tokio",
  "zksync_dal",
  "zksync_types",
@@ -6325,10 +6335,11 @@ dependencies = [
 
 [[package]]
 name = "stringprep"
-version = "0.1.2"
+version = "0.1.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8ee348cb74b87454fff4b551cbf727025810a004f88aeacae7f85b87f4e9a1c1"
+checksum = "bb41d74e231a107a1b4ee36bd1214b11285b77768d2e3824aedafa988fd36ee6"
 dependencies = [
+ "finl_unicode",
  "unicode-bidi",
  "unicode-normalization",
 ]
@@ -6364,7 +6375,7 @@ checksum = "dcb5ae327f9cc13b68763b5749770cb9e048a99bd9dfdfa58d0cf05d5f64afe0"
 dependencies = [
  "heck 0.3.3",
  "proc-macro-error",
- "proc-macro2 1.0.66",
+ "proc-macro2 1.0.69",
  "quote 1.0.33",
  "syn 1.0.109",
 ]
@@ -6385,7 +6396,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "1e385be0d24f186b4ce2f9982191e7101bb737312ad61c1f2f984f34bcf85d59"
 dependencies = [
  "heck 0.4.1",
- "proc-macro2 1.0.66",
+ "proc-macro2 1.0.69",
  "quote 1.0.33",
  "rustversion",
  "syn 1.0.109",
@@ -6414,18 +6425,18 @@ version = "1.0.109"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "72b64191b275b66ffe2469e8af2c1cfe3bafa67b529ead792a6d0160888b4237"
 dependencies = [
- "proc-macro2 1.0.66",
+ "proc-macro2 1.0.69",
  "quote 1.0.33",
  "unicode-ident",
 ]
 
 [[package]]
 name = "syn"
-version = "2.0.27"
+version = "2.0.38"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b60f673f44a8255b9c8c657daf66a596d435f2da81a555b06dc644d080ba45e0"
+checksum = "e96b79aaa137db8f61e26363a0c9b47d8b4ec75da28b7d1d614c2303e232408b"
 dependencies = [
- "proc-macro2 1.0.66",
+ "proc-macro2 1.0.69",
  "quote 1.0.33",
  "unicode-ident",
 ]
@@ -6433,15 +6444,15 @@ dependencies = [
 [[package]]
 name = "sync_vm"
 version = "1.3.3"
-source = "git+https://github.com/matter-labs/era-sync_vm.git?branch=v1.3.3#dad50e7eb7462a3819af8d5209d6ca243395bf51"
+source = "git+https://github.com/matter-labs/era-sync_vm.git?branch=v1.3.3#ed8ab8984cae05d00d9d62196753c8d40df47c7d"
 dependencies = [
- "arrayvec 0.7.3",
+ "arrayvec 0.7.4",
  "cs_derive 0.1.0 (git+https://github.com/matter-labs/era-sync_vm.git?branch=v1.3.3)",
  "derivative",
  "franklin-crypto 0.0.5 (git+https://github.com/matter-labs/franklin-crypto?branch=dev)",
  "hex",
  "itertools",
- "num-bigint 0.4.3",
+ "num-bigint 0.4.4",
  "num-derive 0.3.3",
  "num-integer",
  "num-traits",
@@ -6449,11 +6460,8 @@ dependencies = [
  "rand 0.4.6",
  "rescue_poseidon 0.4.1 (git+https://github.com/matter-labs/rescue-poseidon)",
  "serde",
- "sha2 0.10.8",
- "sha3 0.10.6",
  "smallvec",
  "zk_evm 1.3.3 (git+https://github.com/matter-labs/era-zk_evm.git?branch=v1.3.3)",
- "zkevm_opcode_defs 1.3.2",
 ]
 
 [[package]]
@@ -6462,6 +6470,27 @@ 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 = "system-constants-generator"
 version = "0.1.0"
@@ -6501,13 +6530,12 @@ dependencies = [
 
 [[package]]
 name = "tempfile"
-version = "3.6.0"
+version = "3.8.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "31c0432476357e58790aaa47a8efb0c5138f137343f3b5f23bd36a27e3b0a6d6"
+checksum = "cb94d2f3cc536af71caac6b6fcebf65860b347e7ce0cc9ebe8f70d3e521054ef"
 dependencies = [
- "autocfg 1.1.0",
  "cfg-if 1.0.0",
- "fastrand",
+ "fastrand 2.0.1",
  "redox_syscall 0.3.5",
  "rustix",
  "windows-sys 0.48.0",
@@ -6515,22 +6543,22 @@ dependencies = [
 
 [[package]]
 name = "termcolor"
-version = "1.2.0"
+version = "1.3.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "be55cf8942feac5c765c2c993422806843c9a9a45d4d5c407ad6dd2ea95eb9b6"
+checksum = "6093bad37da69aab9d123a8091e4be0aa4a03e4d601ec641c327398315f62b64"
 dependencies = [
  "winapi-util",
 ]
 
 [[package]]
 name = "test-log"
-version = "0.2.12"
+version = "0.2.13"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d9601d162c1d77e62c1ea0bc8116cd1caf143ce3af947536c3c9052a1677fe0c"
+checksum = "f66edd6b6cd810743c0c71e1d085e92b01ce6a72782032e3f794c8284fe4bcdd"
 dependencies = [
- "proc-macro2 1.0.66",
+ "proc-macro2 1.0.69",
  "quote 1.0.33",
- "syn 1.0.109",
+ "syn 2.0.38",
 ]
 
 [[package]]
@@ -6550,22 +6578,22 @@ checksum = "222a222a5bfe1bba4a77b45ec488a741b3cb8872e5e499451fd7d0129c9c7c3d"
 
 [[package]]
 name = "thiserror"
-version = "1.0.40"
+version = "1.0.50"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "978c9a314bd8dc99be594bc3c175faaa9794be04a5a5e153caba6915336cebac"
+checksum = "f9a7210f5c9a7156bb50aa36aed4c95afb51df0df00713949448cf9e97d382d2"
 dependencies = [
  "thiserror-impl",
 ]
 
 [[package]]
 name = "thiserror-impl"
-version = "1.0.40"
+version = "1.0.50"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f9456a42c5b0d803c8cd86e73dd7cc9edd429499f37a3550d286d5e86720569f"
+checksum = "266b2e40bc00e5a6c09c3584011e08b06f123c00362c92b975ba9843aaaa14b8"
 dependencies = [
- "proc-macro2 1.0.66",
+ "proc-macro2 1.0.69",
  "quote 1.0.33",
- "syn 2.0.27",
+ "syn 2.0.38",
 ]
 
 [[package]]
@@ -6600,11 +6628,13 @@ dependencies = [
 
 [[package]]
 name = "time"
-version = "0.3.22"
+version = "0.3.30"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ea9e1b3cf1243ae005d9e74085d4d542f3125458f3a81af210d901dcd7411efd"
+checksum = "c4a34ab300f2dee6e562c10a046fc05e358b29f9bf92277f30c3c8d82275f6f5"
 dependencies = [
+ "deranged",
  "itoa",
+ "powerfmt",
  "serde",
  "time-core",
  "time-macros",
@@ -6612,15 +6642,15 @@ dependencies = [
 
 [[package]]
 name = "time-core"
-version = "0.1.1"
+version = "0.1.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7300fbefb4dadc1af235a9cef3737cea692a9d97e1b9cbcd4ebdae6f8868e6fb"
+checksum = "ef927ca75afb808a4d64dd374f00a2adf8d0fcff8e7b184af886c3c87ec4a3f3"
 
 [[package]]
 name = "time-macros"
-version = "0.2.9"
+version = "0.2.15"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "372950940a5f07bf38dbe211d7283c9e6d7327df53794992d293e534c733d09b"
+checksum = "4ad70d68dba9e1f8aceda7aa6711965dfec1cac869f311a51bd08b3a2ccbce20"
 dependencies = [
  "time-core",
 ]
@@ -6670,19 +6700,19 @@ checksum = "1f3ccbac311fea05f86f61904b462b55fb3df8837a366dfc601a0161d0532f20"
 
 [[package]]
 name = "tokio"
-version = "1.28.2"
+version = "1.33.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "94d7b1cfd2aa4011f2de74c2c4c63665e27a71006b0a192dcd2710272e73dfa2"
+checksum = "4f38200e3ef7995e5ef13baec2f432a6da0aa9ac495b2c0e8f3b7eec2c92d653"
 dependencies = [
- "autocfg 1.1.0",
- "bytes 1.4.0",
+ "backtrace",
+ "bytes 1.5.0",
  "libc",
- "mio 0.8.8",
+ "mio 0.8.9",
  "num_cpus",
  "parking_lot 0.12.1",
  "pin-project-lite",
  "signal-hook-registry",
- "socket2",
+ "socket2 0.5.5",
  "tokio-macros",
  "windows-sys 0.48.0",
 ]
@@ -6693,9 +6723,9 @@ version = "2.1.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "630bdcf245f78637c13ec01ffae6187cca34625e8c63150d424b59e55af2675e"
 dependencies = [
- "proc-macro2 1.0.66",
+ "proc-macro2 1.0.69",
  "quote 1.0.33",
- "syn 2.0.27",
+ "syn 2.0.38",
 ]
 
 [[package]]
@@ -6735,7 +6765,7 @@ version = "0.6.10"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "36943ee01a6d67977dd3f84a5a1d2efeb4ada3a1ae771cadfaa535d9d9fc6507"
 dependencies = [
- "bytes 1.4.0",
+ "bytes 1.5.0",
  "futures-core",
  "futures-sink",
  "log",
@@ -6745,11 +6775,11 @@ dependencies = [
 
 [[package]]
 name = "tokio-util"
-version = "0.7.8"
+version = "0.7.9"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "806fe8c2c87eccc8b3267cbae29ed3ab2d0bd37fca70ab622e46aaa9375ddb7d"
+checksum = "1d68074620f57a0b21594d9735eb2e98ab38b17f80d3fcb189fca266771ca60d"
 dependencies = [
- "bytes 1.4.0",
+ "bytes 1.5.0",
  "futures-core",
  "futures-io",
  "futures-sink",
@@ -6769,9 +6799,9 @@ dependencies = [
 
 [[package]]
 name = "toml_datetime"
-version = "0.6.2"
+version = "0.6.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5a76a9312f5ba4c2dec6b9161fdf25d87ad8a09256ccea5a556fef03c706a10f"
+checksum = "3550f4e9685620ac18a50ed434eb3aec30db8ba93b0287467bca5826ea25baf1"
 
 [[package]]
 name = "toml_edit"
@@ -6780,17 +6810,17 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "5376256e44f2443f8896ac012507c19a012df0fe8758b55246ae51a2279db51f"
 dependencies = [
  "combine",
- "indexmap",
+ "indexmap 1.9.3",
  "itertools",
 ]
 
 [[package]]
 name = "toml_edit"
-version = "0.19.10"
+version = "0.19.15"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2380d56e8670370eee6566b0bfd4265f65b3f432e8c6d85623f728d4fa31f739"
+checksum = "1b5bb770da30e5cbfde35a2d7b9b8a2c4b8ef89548a7a6aeab5c9a576e3e7421"
 dependencies = [
- "indexmap",
+ "indexmap 2.0.2",
  "toml_datetime",
  "winnow",
 ]
@@ -6804,13 +6834,13 @@ dependencies = [
  "futures-core",
  "futures-util",
  "hdrhistogram",
- "indexmap",
+ "indexmap 1.9.3",
  "pin-project",
  "pin-project-lite",
  "rand 0.8.5",
  "slab",
  "tokio",
- "tokio-util 0.7.8",
+ "tokio-util 0.7.9",
  "tower-layer",
  "tower-service",
  "tracing",
@@ -6818,14 +6848,14 @@ dependencies = [
 
 [[package]]
 name = "tower-http"
-version = "0.4.1"
+version = "0.4.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a8bd22a874a2d0b70452d5597b12c537331d49060824a95f49f108994f94aa4c"
+checksum = "61c5bb1d698276a2443e5ecfabc1008bf15a36c12e6a7176e7bf089ea9131140"
 dependencies = [
  "async-compression",
- "base64 0.20.0",
- "bitflags 2.3.2",
- "bytes 1.4.0",
+ "base64 0.21.5",
+ "bitflags 2.4.1",
+ "bytes 1.5.0",
  "futures-core",
  "futures-util",
  "http",
@@ -6838,7 +6868,7 @@ dependencies = [
  "percent-encoding",
  "pin-project-lite",
  "tokio",
- "tokio-util 0.7.8",
+ "tokio-util 0.7.9",
  "tower",
  "tower-layer",
  "tower-service",
@@ -6860,11 +6890,10 @@ checksum = "b6bc1c9ce2b5135ac7f93c72918fc37feb872bdc6a5533a8b85eb4b86bfdae52"
 
 [[package]]
 name = "tracing"
-version = "0.1.37"
+version = "0.1.40"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8ce8c33a8d48bd45d624a6e523445fd21ec13d3653cd51f681abf67418f54eb8"
+checksum = "c3523ab5a71916ccf420eebdf5521fcef02141234bbc0b8a49f2fdc4544364ef"
 dependencies = [
- "cfg-if 1.0.0",
  "log",
  "pin-project-lite",
  "tracing-attributes",
@@ -6873,20 +6902,20 @@ dependencies = [
 
 [[package]]
 name = "tracing-attributes"
-version = "0.1.24"
+version = "0.1.27"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0f57e3ca2a01450b1a921183a9c9cbfda207fd822cef4ccb00a65402cbba7a74"
+checksum = "34704c8d6ebcbc939824180af020566b01a7c01f80641264eba0999f6c2b6be7"
 dependencies = [
- "proc-macro2 1.0.66",
+ "proc-macro2 1.0.69",
  "quote 1.0.33",
- "syn 2.0.27",
+ "syn 2.0.38",
 ]
 
 [[package]]
 name = "tracing-core"
-version = "0.1.31"
+version = "0.1.32"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0955b8137a1df6f1a2e9a37d8a6656291ff0297c1a97c24e0d8425fe2312f79a"
+checksum = "c06d3da6113f116aaee68e4d601191614c9053067f9ab7f6edbcb161237daa54"
 dependencies = [
  "once_cell",
  "valuable",
@@ -6894,12 +6923,12 @@ dependencies = [
 
 [[package]]
 name = "tracing-log"
-version = "0.1.3"
+version = "0.1.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "78ddad33d2d10b1ed7eb9d1f518a5674713876e97e5bb9b7345a7984fbb4f922"
+checksum = "f751112709b4e791d8ce53e32c4ed2d353565a795ce84da2285393f41557bdf2"
 dependencies = [
- "lazy_static",
  "log",
+ "once_cell",
  "tracing-core",
 ]
 
@@ -6949,15 +6978,15 @@ checksum = "3528ecfd12c466c6f163363caf2d02a71161dd5e1cc6ae7b34207ea2d42d81ed"
 
 [[package]]
 name = "typenum"
-version = "1.16.0"
+version = "1.17.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "497961ef93d974e23eb6f433eb5fe1b7930b659f06d12dec6fc44a8f554c0bba"
+checksum = "42ff0bf0c66b8238c6f3b578df37d0b7848e55df8577b3f74f92a69acceeb825"
 
 [[package]]
 name = "ucd-trie"
-version = "0.1.5"
+version = "0.1.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9e79c4d996edb816c91e4308506774452e55e95c3c9de07b6729e17e15a5ef81"
+checksum = "ed646292ffc8188ef8ea4d1e0e0150fb15a5c2e12ad9b8fc191ae7a8a7f3c4b9"
 
 [[package]]
 name = "uint"
@@ -6982,9 +7011,9 @@ dependencies = [
 
 [[package]]
 name = "unicase"
-version = "2.6.0"
+version = "2.7.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "50f37be617794602aabbeee0be4f259dc1778fabe05e2d67ee8f79326d5cb4f6"
+checksum = "f7d2d4dafb69621809a81864c9c1b864479e1235c0dd4e199924b9742439ed89"
 dependencies = [
  "version_check",
 ]
@@ -6997,9 +7026,9 @@ checksum = "92888ba5573ff080736b3648696b70cafad7d250551175acbaa4e0385b3e1460"
 
 [[package]]
 name = "unicode-ident"
-version = "1.0.9"
+version = "1.0.12"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b15811caf2415fb889178633e7724bad2509101cde276048e013b9def5e51fa0"
+checksum = "3354b9ac3fae1ff6755cb6db53683adb661634f67557942dea4facebec0fee4b"
 
 [[package]]
 name = "unicode-normalization"
@@ -7018,9 +7047,9 @@ checksum = "1dd624098567895118886609431a7c3b8f516e41d30e0643f03d94592a147e36"
 
 [[package]]
 name = "unicode-width"
-version = "0.1.10"
+version = "0.1.11"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c0edd1e5b14653f783770bce4a4dabb4a5108a5370a5f5d8cfe8710c361f6c8b"
+checksum = "e51733f11c9c4f72aa0c160008246859e340b00807569a0da0e7a1079b27ba85"
 
 [[package]]
 name = "unicode-xid"
@@ -7058,11 +7087,11 @@ checksum = "a156c684c91ea7d62626509bce3cb4e1d9ed5c4d978f7b4352658f96a4c26b4a"
 
 [[package]]
 name = "ureq"
-version = "2.7.0"
+version = "2.8.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d4b45063f47caea744e48f5baa99169bd8bd9b882d80a99941141327bbb00f99"
+checksum = "f5ccd538d4a604753ebc2f17cd9946e89b77bf87f6a8e2309667c6f2e87855e3"
 dependencies = [
- "base64 0.21.2",
+ "base64 0.21.5",
  "log",
  "native-tls",
  "once_cell",
@@ -7071,9 +7100,9 @@ dependencies = [
 
 [[package]]
 name = "url"
-version = "2.4.0"
+version = "2.4.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "50bff7831e19200a85b17131d085c25d7811bc4e186efdaf54bbd132994a88cb"
+checksum = "143b538f18257fac9cad154828a57c6bf5157e1aa604d4816b5995bf6de87ae5"
 dependencies = [
  "form_urlencoded",
  "idna",
@@ -7083,9 +7112,9 @@ dependencies = [
 
 [[package]]
 name = "urlencoding"
-version = "2.1.2"
+version = "2.1.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e8db7427f936968176eaa7cdf81b7f98b980b18495ec28f1b5791ac3bfe3eea9"
+checksum = "daf8dba3b7eb870caf1ddeed7bc9d2a049f3cfdfae7cb521b087cc33ae4c49da"
 
 [[package]]
 name = "utf8parse"
@@ -7095,9 +7124,9 @@ checksum = "711b9620af191e0cdc7468a8d14e709c3dcdb115b36f838e601583af800a370a"
 
 [[package]]
 name = "uuid"
-version = "1.3.4"
+version = "1.5.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0fa2982af2eec27de306107c027578ff7f423d65f7250e40ce0fea8f45248b81"
+checksum = "88ad59a7560b41a70d191093a945f0b87bc1deeda46fb237479708a1d6b6cdfc"
 dependencies = [
  "getrandom 0.2.10",
  "serde",
@@ -7168,9 +7197,9 @@ name = "vise-macros"
 version = "0.1.0"
 source = "git+https://github.com/matter-labs/vise.git?rev=dd05139b76ab0843443ab3ff730174942c825dae#dd05139b76ab0843443ab3ff730174942c825dae"
 dependencies = [
- "proc-macro2 1.0.66",
+ "proc-macro2 1.0.69",
  "quote 1.0.33",
- "syn 2.0.27",
+ "syn 2.0.38",
 ]
 
 [[package]]
@@ -7212,9 +7241,9 @@ dependencies = [
 
 [[package]]
 name = "walkdir"
-version = "2.3.3"
+version = "2.4.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "36df944cda56c7d8d8b7496af378e6b16de9284591917d307c9b4d313c44e698"
+checksum = "d71d857dc86794ca4c280d616f7da00d2dbfd8cd788846559a6813e6aa4b54ee"
 dependencies = [
  "same-file",
  "winapi-util",
@@ -7266,9 +7295,9 @@ dependencies = [
  "bumpalo",
  "log",
  "once_cell",
- "proc-macro2 1.0.66",
+ "proc-macro2 1.0.69",
  "quote 1.0.33",
- "syn 2.0.27",
+ "syn 2.0.38",
  "wasm-bindgen-shared",
 ]
 
@@ -7300,9 +7329,9 @@ version = "0.2.87"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "54681b18a46765f095758388f2d0cf16eb8d4169b639ab575a8f5693af210c7b"
 dependencies = [
- "proc-macro2 1.0.66",
+ "proc-macro2 1.0.69",
  "quote 1.0.33",
- "syn 2.0.27",
+ "syn 2.0.38",
  "wasm-bindgen-backend",
  "wasm-bindgen-shared",
 ]
@@ -7315,9 +7344,9 @@ checksum = "ca6ad05a4870b2bf5fe995117d3728437bd27d7cd5f06f13c17443ef369775a1"
 
 [[package]]
 name = "wasm-streams"
-version = "0.2.3"
+version = "0.3.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6bbae3363c08332cadccd13b67db371814cd214c2524020932f0804b8cf7c078"
+checksum = "b4609d447824375f43e1ffbc051b50ad8f4b3ae8219680c94452ea05eb240ac7"
 dependencies = [
  "futures-util",
  "js-sys",
@@ -7342,9 +7371,9 @@ version = "0.19.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "5388522c899d1e1c96a4c307e3797e0f697ba7c77dd8e0e625ecba9dd0342937"
 dependencies = [
- "arrayvec 0.7.3",
- "base64 0.21.2",
- "bytes 1.4.0",
+ "arrayvec 0.7.4",
+ "base64 0.21.5",
+ "bytes 1.5.0",
  "derive_more",
  "ethabi",
  "ethereum-types 0.14.1",
@@ -7367,39 +7396,26 @@ dependencies = [
  "url",
 ]
 
-[[package]]
-name = "webpki"
-version = "0.22.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "07ecc0cd7cac091bf682ec5efa18b1cff79d617b84181f38b3951dbe135f607f"
-dependencies = [
- "ring",
- "untrusted",
-]
-
 [[package]]
 name = "webpki-roots"
-version = "0.22.6"
+version = "0.24.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b6c71e40d7d2c34a5106301fb632274ca37242cd0c9d3e64dbece371a40a2d87"
+checksum = "b291546d5d9d1eab74f069c77749f2cb8504a12caa20f0f2de93ddbf6f411888"
 dependencies = [
- "webpki",
+ "rustls-webpki",
 ]
 
 [[package]]
 name = "webpki-roots"
-version = "0.24.0"
+version = "0.25.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b291546d5d9d1eab74f069c77749f2cb8504a12caa20f0f2de93ddbf6f411888"
-dependencies = [
- "rustls-webpki 0.101.6",
-]
+checksum = "14247bb57be4f377dfb94c72830b8ce8fc6beac03cf4bf7b9732eadd414123fc"
 
 [[package]]
 name = "whoami"
-version = "1.4.0"
+version = "1.4.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2c70234412ca409cc04e864e89523cb0fc37f5e1344ebed5a3ebf4192b6b9f68"
+checksum = "22fc3756b8a9133049b26c7f61ab35416c130e8c09b660f5b3958b446f52cc50"
 dependencies = [
  "wasm-bindgen",
  "web-sys",
@@ -7435,9 +7451,9 @@ checksum = "ac3b87c63620426dd9b991e5ce0329eff545bccbbb34f3be09ff6fb6ab51b7b6"
 
 [[package]]
 name = "winapi-util"
-version = "0.1.5"
+version = "0.1.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "70ec6ce85bb158151cae5e5c87f95a8e97d2c0c4b001223f33a334e3ce5de178"
+checksum = "f29e6f9198ba0d26b4c9f07dbe6f9ed633e1f3d5b8b414090084349e46a52596"
 dependencies = [
  "winapi 0.3.9",
 ]
@@ -7449,27 +7465,12 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f"
 
 [[package]]
-name = "windows"
-version = "0.48.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e686886bc078bc1b0b600cac0147aadb815089b6e4da64016cbd754b6342700f"
-dependencies = [
- "windows-targets 0.48.0",
-]
-
-[[package]]
-name = "windows-sys"
-version = "0.42.0"
+name = "windows-core"
+version = "0.51.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5a3e1820f08b8513f676f7ab6c1f99ff312fb97b553d30ff4dd86f9f15728aa7"
+checksum = "f1f8cf84f35d2db49a46868f947758c7a1138116f7fac3bc844f43ade1292e64"
 dependencies = [
- "windows_aarch64_gnullvm 0.42.2",
- "windows_aarch64_msvc 0.42.2",
- "windows_i686_gnu 0.42.2",
- "windows_i686_msvc 0.42.2",
- "windows_x86_64_gnu 0.42.2",
- "windows_x86_64_gnullvm 0.42.2",
- "windows_x86_64_msvc 0.42.2",
+ "windows-targets 0.48.5",
 ]
 
 [[package]]
@@ -7487,7 +7488,7 @@ version = "0.48.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "677d2418bec65e3338edb076e806bc1ec15693c5d0104683f2efe857f61056a9"
 dependencies = [
- "windows-targets 0.48.0",
+ "windows-targets 0.48.5",
 ]
 
 [[package]]
@@ -7507,17 +7508,17 @@ dependencies = [
 
 [[package]]
 name = "windows-targets"
-version = "0.48.0"
+version = "0.48.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7b1eb6f0cd7c80c79759c929114ef071b87354ce476d9d94271031c0497adfd5"
+checksum = "9a2fa6e2155d7247be68c096456083145c183cbbbc2764150dda45a87197940c"
 dependencies = [
- "windows_aarch64_gnullvm 0.48.0",
- "windows_aarch64_msvc 0.48.0",
- "windows_i686_gnu 0.48.0",
- "windows_i686_msvc 0.48.0",
- "windows_x86_64_gnu 0.48.0",
- "windows_x86_64_gnullvm 0.48.0",
- "windows_x86_64_msvc 0.48.0",
+ "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]]
@@ -7528,9 +7529,9 @@ checksum = "597a5118570b68bc08d8d59125332c54f1ba9d9adeedeef5b99b02ba2b0698f8"
 
 [[package]]
 name = "windows_aarch64_gnullvm"
-version = "0.48.0"
+version = "0.48.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "91ae572e1b79dba883e0d315474df7305d12f569b400fcf90581b06062f7e1bc"
+checksum = "2b38e32f0abccf9987a4e3079dfb67dcd799fb61361e53e2882c3cbaf0d905d8"
 
 [[package]]
 name = "windows_aarch64_msvc"
@@ -7540,9 +7541,9 @@ checksum = "e08e8864a60f06ef0d0ff4ba04124db8b0fb3be5776a5cd47641e942e58c4d43"
 
 [[package]]
 name = "windows_aarch64_msvc"
-version = "0.48.0"
+version = "0.48.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b2ef27e0d7bdfcfc7b868b317c1d32c641a6fe4629c171b8928c7b08d98d7cf3"
+checksum = "dc35310971f3b2dbbf3f0690a219f40e2d9afcf64f9ab7cc1be722937c26b4bc"
 
 [[package]]
 name = "windows_i686_gnu"
@@ -7552,9 +7553,9 @@ checksum = "c61d927d8da41da96a81f029489353e68739737d3beca43145c8afec9a31a84f"
 
 [[package]]
 name = "windows_i686_gnu"
-version = "0.48.0"
+version = "0.48.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "622a1962a7db830d6fd0a69683c80a18fda201879f0f447f065a3b7467daa241"
+checksum = "a75915e7def60c94dcef72200b9a8e58e5091744960da64ec734a6c6e9b3743e"
 
 [[package]]
 name = "windows_i686_msvc"
@@ -7564,9 +7565,9 @@ checksum = "44d840b6ec649f480a41c8d80f9c65108b92d89345dd94027bfe06ac444d1060"
 
 [[package]]
 name = "windows_i686_msvc"
-version = "0.48.0"
+version = "0.48.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4542c6e364ce21bf45d69fdd2a8e455fa38d316158cfd43b3ac1c5b1b19f8e00"
+checksum = "8f55c233f70c4b27f66c523580f78f1004e8b5a8b659e05a4eb49d4166cca406"
 
 [[package]]
 name = "windows_x86_64_gnu"
@@ -7576,9 +7577,9 @@ checksum = "8de912b8b8feb55c064867cf047dda097f92d51efad5b491dfb98f6bbb70cb36"
 
 [[package]]
 name = "windows_x86_64_gnu"
-version = "0.48.0"
+version = "0.48.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ca2b8a661f7628cbd23440e50b05d705db3686f894fc9580820623656af974b1"
+checksum = "53d40abd2583d23e4718fddf1ebec84dbff8381c07cae67ff7768bbf19c6718e"
 
 [[package]]
 name = "windows_x86_64_gnullvm"
@@ -7588,9 +7589,9 @@ checksum = "26d41b46a36d453748aedef1486d5c7a85db22e56aff34643984ea85514e94a3"
 
 [[package]]
 name = "windows_x86_64_gnullvm"
-version = "0.48.0"
+version = "0.48.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7896dbc1f41e08872e9d5e8f8baa8fdd2677f29468c4e156210174edc7f7b953"
+checksum = "0b7b52767868a23d5bab768e390dc5f5c55825b6d30b86c844ff2dc7414044cc"
 
 [[package]]
 name = "windows_x86_64_msvc"
@@ -7600,26 +7601,27 @@ checksum = "9aec5da331524158c6d1a4ac0ab1541149c0b9505fde06423b02f5ef0106b9f0"
 
 [[package]]
 name = "windows_x86_64_msvc"
-version = "0.48.0"
+version = "0.48.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1a515f5799fe4961cb532f983ce2b23082366b898e52ffbce459c86f67c8378a"
+checksum = "ed94fce61571a4006852b7389a063ab983c02eb1bb37b47f8272ce92d06d9538"
 
 [[package]]
 name = "winnow"
-version = "0.4.7"
+version = "0.5.17"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ca0ace3845f0d96209f0375e6d367e3eb87eb65d27d445bdc9f1843a26f39448"
+checksum = "a3b801d0e0a6726477cc207f60162da452f3a95adb368399bef20a946e06f65c"
 dependencies = [
  "memchr",
 ]
 
 [[package]]
 name = "winreg"
-version = "0.10.1"
+version = "0.50.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "80d0f4e272c85def139476380b12f9ac60926689dd2e01d4923222f40580869d"
+checksum = "524e57b2c537c0f9b1e69f1965311ec12182b4122e45035b1508cd24d2adadb1"
 dependencies = [
- "winapi 0.3.9",
+ "cfg-if 1.0.0",
+ "windows-sys 0.48.0",
 ]
 
 [[package]]
@@ -7656,6 +7658,26 @@ dependencies = [
  "linked-hash-map",
 ]
 
+[[package]]
+name = "zerocopy"
+version = "0.7.11"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "4c19fae0c8a9efc6a8281f2e623db8af1db9e57852e04cde3e754dd2dc29340f"
+dependencies = [
+ "zerocopy-derive",
+]
+
+[[package]]
+name = "zerocopy-derive"
+version = "0.7.11"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "fc56589e9ddd1f1c28d4b4b5c773ce232910a6bb67a70133d61c9e347585efe9"
+dependencies = [
+ "proc-macro2 1.0.69",
+ "quote 1.0.33",
+ "syn 2.0.38",
+]
+
 [[package]]
 name = "zeroize"
 version = "1.6.0"
@@ -7670,7 +7692,7 @@ dependencies = [
  "blake2 0.10.6 (git+https://github.com/RustCrypto/hashes.git?rev=1f727ce37ff40fa0cce84eb8543a45bdd3ca4a4e)",
  "k256",
  "lazy_static",
- "num 0.4.0",
+ "num 0.4.1",
  "serde",
  "serde_json",
  "sha2 0.10.6",
@@ -7686,7 +7708,7 @@ source = "git+https://github.com/matter-labs/era-zk_evm.git?tag=v1.3.3-rc2#fbee2
 dependencies = [
  "anyhow",
  "lazy_static",
- "num 0.4.0",
+ "num 0.4.1",
  "serde",
  "serde_json",
  "static_assertions",
@@ -7701,7 +7723,7 @@ source = "git+https://github.com/matter-labs/era-zk_evm.git?branch=v1.3.3#fbee20
 dependencies = [
  "anyhow",
  "lazy_static",
- "num 0.4.0",
+ "num 0.4.1",
  "serde",
  "serde_json",
  "static_assertions",
@@ -7716,7 +7738,7 @@ source = "git+https://github.com/matter-labs/era-zk_evm.git?branch=v1.4.0#dd76fc
 dependencies = [
  "anyhow",
  "lazy_static",
- "num 0.4.0",
+ "num 0.4.1",
  "serde",
  "serde_json",
  "static_assertions",
@@ -7740,12 +7762,12 @@ name = "zkevm-assembly"
 version = "1.3.2"
 source = "git+https://github.com/matter-labs/era-zkEVM-assembly.git?branch=v1.3.2#3c61d450cbe6548068be8f313ed02f1bd229a865"
 dependencies = [
- "env_logger",
+ "env_logger 0.9.3",
  "hex",
  "lazy_static",
  "log",
  "nom",
- "num-bigint 0.4.3",
+ "num-bigint 0.4.4",
  "num-traits",
  "sha3 0.10.8",
  "smallvec",
@@ -7759,7 +7781,7 @@ name = "zkevm_circuits"
 version = "1.4.0"
 source = "git+https://github.com/matter-labs/era-zkevm_circuits.git?branch=main#4fba537ccecc238e2da9c80844dc8c185e42466f"
 dependencies = [
- "arrayvec 0.7.3",
+ "arrayvec 0.7.4",
  "bincode",
  "boojum",
  "cs_derive 0.1.0 (git+https://github.com/matter-labs/era-boojum.git?branch=main)",
@@ -7790,7 +7812,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.3.2",
+ "bitflags 2.4.1",
  "blake2 0.10.6 (git+https://github.com/RustCrypto/hashes.git?rev=1f727ce37ff40fa0cce84eb8543a45bdd3ca4a4e)",
  "ethereum-types 0.14.1",
  "k256",
@@ -7802,16 +7824,16 @@ dependencies = [
 [[package]]
 name = "zkevm_test_harness"
 version = "1.3.3"
-source = "git+https://github.com/matter-labs/era-zkevm_test_harness.git?branch=v1.3.3#d26aa4133f2b5e114c0bf084b8c3f1eca9aa9929"
+source = "git+https://github.com/matter-labs/era-zkevm_test_harness.git?branch=v1.3.3#d52b56d6ba8196c8a3c74c4933654469e6f27a5a"
 dependencies = [
  "bincode",
  "circuit_testing",
  "codegen 0.2.0",
  "crossbeam 0.8.2",
  "derivative",
- "env_logger",
+ "env_logger 0.10.0",
  "hex",
- "num-bigint 0.4.3",
+ "num-bigint 0.4.4",
  "num-integer",
  "num-traits",
  "rayon",
@@ -7836,7 +7858,7 @@ dependencies = [
  "codegen 0.2.0",
  "crossbeam 0.8.2",
  "derivative",
- "env_logger",
+ "env_logger 0.10.0",
  "hex",
  "rand 0.4.6",
  "rayon",
@@ -8125,7 +8147,7 @@ name = "zksync_external_node"
 version = "0.1.0"
 dependencies = [
  "anyhow",
- "clap 4.3.4",
+ "clap 4.4.6",
  "envy",
  "futures 0.3.28",
  "prometheus_exporter",
@@ -8173,7 +8195,7 @@ name = "zksync_merkle_tree"
 version = "0.1.0"
 dependencies = [
  "assert_matches",
- "clap 4.3.4",
+ "clap 4.4.6",
  "insta",
  "leb128",
  "once_cell",
@@ -8257,7 +8279,7 @@ name = "zksync_server"
 version = "0.1.0"
 dependencies = [
  "anyhow",
- "clap 4.3.4",
+ "clap 4.4.6",
  "futures 0.3.28",
  "tikv-jemallocator",
  "tokio",
@@ -8352,6 +8374,7 @@ dependencies = [
  "thiserror",
  "tokio",
  "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",
  "zkevm_test_harness 1.3.3",
  "zksync_basic_types",
  "zksync_contracts",
@@ -8418,27 +8441,27 @@ dependencies = [
 
 [[package]]
 name = "zstd"
-version = "0.11.2+zstd.1.5.2"
+version = "0.12.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "20cc960326ece64f010d2d2107537f26dc589a6573a316bd5b1dba685fa5fde4"
+checksum = "1a27595e173641171fc74a1232b7b1c7a7cb6e18222c11e9dfb9888fa424c53c"
 dependencies = [
- "zstd-safe 5.0.2+zstd.1.5.2",
+ "zstd-safe 6.0.6",
 ]
 
 [[package]]
 name = "zstd"
-version = "0.12.3+zstd.1.5.2"
+version = "0.13.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "76eea132fb024e0e13fd9c2f5d5d595d8a967aa72382ac2f9d39fcc95afd0806"
+checksum = "bffb3309596d527cfcba7dfc6ed6052f1d39dfbd7c867aa2e865e4a449c10110"
 dependencies = [
- "zstd-safe 6.0.5+zstd.1.5.4",
+ "zstd-safe 7.0.0",
 ]
 
 [[package]]
 name = "zstd-safe"
-version = "5.0.2+zstd.1.5.2"
+version = "6.0.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1d2a5585e04f9eea4b2a3d1eca508c4dee9592a89ef6f450c11719da0726f4db"
+checksum = "ee98ffd0b48ee95e6c5168188e44a54550b1564d9d530ee21d5f0eaed1069581"
 dependencies = [
  "libc",
  "zstd-sys",
@@ -8446,21 +8469,19 @@ dependencies = [
 
 [[package]]
 name = "zstd-safe"
-version = "6.0.5+zstd.1.5.4"
+version = "7.0.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d56d9e60b4b1758206c238a10165fbcae3ca37b01744e394c463463f6529d23b"
+checksum = "43747c7422e2924c11144d5229878b98180ef8b06cca4ab5af37afc8a8d8ea3e"
 dependencies = [
- "libc",
  "zstd-sys",
 ]
 
 [[package]]
 name = "zstd-sys"
-version = "2.0.8+zstd.1.5.5"
+version = "2.0.9+zstd.1.5.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5556e6ee25d32df2586c098bbfa278803692a20d0ab9565e049480d52707ec8c"
+checksum = "9e16efa8a874a0481a574084d34cc26fdb3b99627480f785888deb6386506656"
 dependencies = [
  "cc",
- "libc",
  "pkg-config",
 ]
diff --git a/contracts b/contracts
index f06a58360a2b..5ca368a43775 160000
--- a/contracts
+++ b/contracts
@@ -1 +1 @@
-Subproject commit f06a58360a2b8e7129f64413998767ac169d1efd
+Subproject commit 5ca368a4377568b003c585dcd105265fd693f1d7
diff --git a/core/CHANGELOG.md b/core/CHANGELOG.md
index 63abd7235972..274842c6223d 100644
--- a/core/CHANGELOG.md
+++ b/core/CHANGELOG.md
@@ -1,5 +1,29 @@
 # Changelog
 
+## [17.1.0](https://github.com/matter-labs/zksync-era/compare/core-v16.2.0...core-v17.1.0) (2023-11-03)
+
+
+### ⚠ BREAKING CHANGES
+
+* Update to protocol version 17 ([#384](https://github.com/matter-labs/zksync-era/issues/384))
+
+### Features
+
+* **en:** Cache blocks in `fetch_l2_block` ([#403](https://github.com/matter-labs/zksync-era/issues/403)) ([b94c845](https://github.com/matter-labs/zksync-era/commit/b94c8450a4b4905a7db8967bf42d37493cf31e0b))
+* Port boojum eth-sender changes ([#293](https://github.com/matter-labs/zksync-era/issues/293)) ([8027326](https://github.com/matter-labs/zksync-era/commit/80273264a9512bc1e6f1d1f4372107f9167260b1))
+* **state-keeper:** Disable some seal criteria for boojum ([#390](https://github.com/matter-labs/zksync-era/issues/390)) ([2343532](https://github.com/matter-labs/zksync-era/commit/2343532cd48bcc07ec939a25c205d521955dd05a))
+* Update to protocol version 17 ([#384](https://github.com/matter-labs/zksync-era/issues/384)) ([ba271a5](https://github.com/matter-labs/zksync-era/commit/ba271a5f34d64d04c0135b8811685b80f26a8c32))
+* **vm:** Make calculation for pubdata a bit more percise ([#392](https://github.com/matter-labs/zksync-era/issues/392)) ([6d0e61c](https://github.com/matter-labs/zksync-era/commit/6d0e61cba86d61b68f3657852283dd99d2b6530f))
+
+
+### Bug Fixes
+
+* bump zksolc from yanked version to 1.3.16 ([#348](https://github.com/matter-labs/zksync-era/issues/348)) ([c32b88f](https://github.com/matter-labs/zksync-era/commit/c32b88fe8fe7e8892c857b8fc36037ecd0892fa1))
+* **db-index:** Add missing index from FRI prover jobs ([#334](https://github.com/matter-labs/zksync-era/issues/334)) ([730447f](https://github.com/matter-labs/zksync-era/commit/730447f90efb2478097f06c2ed5d965ac65b7874))
+* **db-query:** use join instead of nested query for FRI prover extracting ([#364](https://github.com/matter-labs/zksync-era/issues/364)) ([f9cc831](https://github.com/matter-labs/zksync-era/commit/f9cc831ddc96467395a48a8ba2e6238c0fcb7341))
+* **db-query:** use nested query for requeuing FRI prover jobs ([#399](https://github.com/matter-labs/zksync-era/issues/399)) ([3890542](https://github.com/matter-labs/zksync-era/commit/3890542c8e736a313306391259b9b356d00e2ef9))
+* incorrect directory of intrinsic.rs generated.  ([#332](https://github.com/matter-labs/zksync-era/issues/332)) ([#336](https://github.com/matter-labs/zksync-era/issues/336)) ([eefaad0](https://github.com/matter-labs/zksync-era/commit/eefaad0e7e7766a269ee9022b3758be4ee32f1a1))
+
 ## [16.2.0](https://github.com/matter-labs/zksync-era/compare/core-v16.1.0...core-v16.2.0) (2023-10-26)
 
 
diff --git a/core/bin/system-constants-generator/src/utils.rs b/core/bin/system-constants-generator/src/utils.rs
index 6f66693f9a17..fc576ff44eec 100644
--- a/core/bin/system-constants-generator/src/utils.rs
+++ b/core/bin/system-constants-generator/src/utils.rs
@@ -1,28 +1,28 @@
-use multivm::interface::dyn_tracers::vm_1_3_3::DynTracer;
-use multivm::interface::tracer::VmExecutionStopReason;
+use once_cell::sync::Lazy;
+use std::cell::RefCell;
+use std::rc::Rc;
+
 use multivm::interface::{
-    L1BatchEnv, L2BlockEnv, SystemEnv, TxExecutionMode, VmExecutionMode, VmInterface,
+    dyn_tracers::vm_1_4_0::DynTracer, tracer::VmExecutionStopReason, L1BatchEnv, L2BlockEnv,
+    SystemEnv, TxExecutionMode, VmExecutionMode, VmInterface,
 };
 use multivm::vm_latest::{
     constants::{BLOCK_GAS_LIMIT, BOOTLOADER_HEAP_PAGE},
     BootloaderState, HistoryEnabled, HistoryMode, SimpleMemory, ToTracerPointer, Vm, VmTracer,
     ZkSyncVmState,
 };
-use once_cell::sync::Lazy;
-use std::cell::RefCell;
-use std::rc::Rc;
 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::legacy_miniblock_hash;
 use zksync_types::{
-    ethabi::Token, fee::Fee, l1::L1Tx, l2::L2Tx, utils::storage_key_for_eth_balance, AccountTreeId,
-    Address, Execute, L1BatchNumber, L1TxCommonData, L2ChainId, MiniblockNumber, Nonce,
-    ProtocolVersionId, StorageKey, Timestamp, Transaction, BOOTLOADER_ADDRESS, H256,
-    SYSTEM_CONTEXT_ADDRESS, SYSTEM_CONTEXT_GAS_PRICE_POSITION, SYSTEM_CONTEXT_TX_ORIGIN_POSITION,
-    U256, ZKPORTER_IS_AVAILABLE,
+    block::legacy_miniblock_hash, ethabi::Token, fee::Fee, l1::L1Tx, l2::L2Tx,
+    utils::storage_key_for_eth_balance, AccountTreeId, Address, Execute, L1BatchNumber,
+    L1TxCommonData, L2ChainId, MiniblockNumber, Nonce, ProtocolVersionId, StorageKey, Timestamp,
+    Transaction, BOOTLOADER_ADDRESS, H256, SYSTEM_CONTEXT_ADDRESS,
+    SYSTEM_CONTEXT_GAS_PRICE_POSITION, SYSTEM_CONTEXT_TX_ORIGIN_POSITION, U256,
+    ZKPORTER_IS_AVAILABLE,
 };
 use zksync_utils::{bytecode::hash_bytecode, bytes_to_be_words, u256_to_h256};
 
diff --git a/core/bin/verification_key_generator_and_server/data/verification_3_key.json b/core/bin/verification_key_generator_and_server/data/verification_3_key.json
index efc3726eccd1..613c65dec32a 100644
--- a/core/bin/verification_key_generator_and_server/data/verification_3_key.json
+++ b/core/bin/verification_key_generator_and_server/data/verification_3_key.json
@@ -6,121 +6,121 @@
   "gate_setup_commitments": [
     {
       "x": [
-        974750104498669965,
-        8834694375170731028,
-        17769568165179068263,
-        1849964290686413257
+        4247884029119603815,
+        14048318895702359089,
+        1617022869923646571,
+        1004300266779052296
       ],
       "y": [
-        2843958502709968021,
-        14935491193053445350,
-        17474331455917570677,
-        3480256926594645294
+        17868528514201987465,
+        4244261302597587354,
+        10221573892940475912,
+        2482382880446840010
       ],
       "infinity": false
     },
     {
       "x": [
-        12247266302470255326,
-        5464334033464606744,
-        14546720066962635103,
-        3390803970213094244
+        6238506840459074871,
+        18254983327500098151,
+        12976360180164130634,
+        1219856697105853614
       ],
       "y": [
-        1712883459777313087,
-        8894684513803091578,
-        7336029034040207862,
-        1084942733964754038
+        1359994609126438238,
+        17827470346804056210,
+        16773833510918183872,
+        2604619773311417557
       ],
       "infinity": false
     },
     {
       "x": [
-        11977576082511042092,
-        13911318721427630536,
-        319094179978428102,
-        953394664847088490
+        5480908979724966765,
+        3393255975447524652,
+        10371160681199271551,
+        3483125449532424455
       ],
       "y": [
-        5661602966428088380,
-        18066888770140331931,
-        10148625466830766086,
-        532999801462127665
+        6910224697959110691,
+        8190986918875328214,
+        18233342390114194740,
+        371038657258361111
       ],
       "infinity": false
     },
     {
       "x": [
-        10638316621700142822,
-        6209825954391834011,
-        6018402549491433521,
-        2545954919587131385
+        1589636458242554884,
+        17321835409586313003,
+        13993520794641679178,
+        1266542986497561712
       ],
       "y": [
-        3871396302214628234,
-        10421121582832311901,
-        3487262368594849688,
-        47097530491220969
+        5397891169353072140,
+        5878548729835574296,
+        15706893227817678651,
+        1769961527856953483
       ],
       "infinity": false
     },
     {
       "x": [
-        5177078736350587057,
-        913561536392131154,
-        5845225668116211782,
-        1148177573394811202
+        17541435070606794744,
+        2655627213950653916,
+        11216216944579921605,
+        1313780180047509779
       ],
       "y": [
-        8211065483139055749,
-        11150796128594731149,
-        12060516803886544192,
-        1369115203017663219
+        16950319453735037870,
+        1632204383055288188,
+        15201163922365522932,
+        2864472556240937346
       ],
       "infinity": false
     },
     {
       "x": [
-        13164869081104983842,
-        8055457852373227775,
-        14586708642322040767,
-        1635508642571745116
+        11997977223945303553,
+        14325590013978700522,
+        15557533141347230729,
+        3289139360100222484
       ],
       "y": [
-        13200963466266892674,
-        5743120645853669652,
-        13845956436885115425,
-        190245686570654182
+        2276406350677881932,
+        12276125258173429823,
+        6135372778488654786,
+        2960027660870022236
       ],
       "infinity": false
     },
     {
       "x": [
-        14509622964666644543,
-        14326815147327339718,
-        14403865749203816615,
-        3250250446651605086
+        8889079782908651911,
+        9444258938063781000,
+        6152157289837951831,
+        2046144251434758098
       ],
       "y": [
-        16982880826411734238,
-        7223038929743846372,
-        13243677057981888895,
-        3343376109946605946
+        3506685845878604982,
+        480610274681523215,
+        17898829927408725055,
+        478373452366390807
       ],
       "infinity": false
     },
     {
       "x": [
-        2186705028467599783,
-        10754157155083578321,
-        9835223072941921904,
-        622934131449235283
+        9543795530837745598,
+        5641706788025454992,
+        2058665597673045347,
+        3199980849578540913
       ],
       "y": [
-        18146384691082289702,
-        3710418457832183420,
-        9065618198278602094,
-        1385809660894704773
+        2134420461745303677,
+        11079036403297001210,
+        13973590059437528369,
+        2236186172656440899
       ],
       "infinity": false
     }
@@ -128,31 +128,31 @@
   "gate_selectors_commitments": [
     {
       "x": [
-        17931943108498820694,
-        4676695383650659094,
-        9553383984112211657,
-        2582659305204352628
+        17082763384512425754,
+        5415974525679408765,
+        2982831717715582652,
+        2185533346241584143
       ],
       "y": [
-        12954711565738560879,
-        8077826911980788091,
-        11395265968148743331,
-        2855607571527172113
+        889517497459248510,
+        11305258809453581163,
+        14785916458686019285,
+        712045239932611417
       ],
       "infinity": false
     },
     {
       "x": [
-        1579731699170899555,
-        2930979681521170129,
-        14423227389748779725,
-        3843483067412713
+        1486326951928055275,
+        17648143945822975405,
+        8789056175543467342,
+        1582641302957127155
       ],
       "y": [
-        12757858203360676100,
-        11658617912640524507,
-        18404463112235833117,
-        216398038700598122
+        16130216435506275947,
+        186882025793811656,
+        5333388052689527168,
+        2555185016165074595
       ],
       "infinity": false
     }
@@ -160,78 +160,78 @@
   "permutation_commitments": [
     {
       "x": [
-        17803109611249396349,
-        11283859494780689211,
-        13999735262776985506,
-        1616317395767274315
+        6775436174991417687,
+        1962133343483010121,
+        3639644700285584252,
+        2751431324201714590
       ],
       "y": [
-        4702080082438660327,
-        10318021266807502248,
-        1343468927015043909,
-        1458947702127238817
+        16721581791017871189,
+        2572212631009994187,
+        12263629829130796245,
+        1194783809693078725
       ],
       "infinity": false
     },
     {
       "x": [
-        13991248091180946539,
-        9572452770464844385,
-        7281256466642465445,
-        1589821161594539260
+        9781583375044732502,
+        17099127122236789849,
+        15683598159868779227,
+        2137916464125382410
       ],
       "y": [
-        16330872592308522669,
-        11643961078499332590,
-        7621286777424912214,
-        1961788650881680195
+        11971077938028623721,
+        14460546631248863771,
+        3674726360546135290,
+        2587006282919627488
       ],
       "infinity": false
     },
     {
       "x": [
-        14854997120241085994,
-        893859077870132655,
-        10853933192917459827,
-        2671373989840251193
+        2258960665841769264,
+        11476106728738999555,
+        2154715457718708453,
+        1652460267728538717
       ],
       "y": [
-        11492939649862087988,
-        1925620351626108277,
-        12007636802682139817,
-        1315346956977275889
+        591013691648424928,
+        2747643213972148016,
+        4382285331965077793,
+        700518369290275435
       ],
       "infinity": false
     },
     {
       "x": [
-        13343929807426311972,
-        3234215523073799496,
-        4658804614957804350,
-        123243726695066707
+        17029386353507514799,
+        12736838109975824615,
+        17948233540620781856,
+        1661567367117856229
       ],
       "y": [
-        14958243475655956241,
-        4034118281425140294,
-        1019154098165161379,
-        2657524750158613958
+        5088293739561490025,
+        257269786506894093,
+        7029871828271960168,
+        2982592857123453815
       ],
       "infinity": false
     }
   ],
-  "total_lookup_entries_length": 15208907,
+  "total_lookup_entries_length": 15390957,
   "lookup_selector_commitment": {
     "x": [
-      3869759959209659371,
-      17545310949245876386,
-      6597968549104995840,
-      1547642766729861753
+      3143229288506876352,
+      14398478555351850494,
+      17971061391349533728,
+      2397240458539623423
     ],
     "y": [
-      5629222579571396955,
-      16315207580711001852,
-      15947168783307514478,
-      2534006098464270073
+      2507720097747632492,
+      4897824016944146490,
+      8535810669426357324,
+      2617442440174156771
     ],
     "infinity": false
   },
@@ -299,16 +299,16 @@
   ],
   "lookup_table_type_commitment": {
     "x": [
-      6380759427317126685,
-      6672737265924091686,
-      14552369645196037262,
-      1668823783737500912
+      7406705046881629689,
+      13550366909312172285,
+      11707241152492715411,
+      1951231993396003315
     ],
     "y": [
-      4951884449279236371,
-      16324193898368483526,
-      10792452284404778772,
-      929770155761471462
+      649840467305243342,
+      10916062129580101841,
+      7643158916474300887,
+      1216418901317802861
     ],
     "infinity": false
   },
diff --git a/core/bin/zksync_server/src/main.rs b/core/bin/zksync_server/src/main.rs
index 01ad9f04c4f3..4a0bff0cd442 100644
--- a/core/bin/zksync_server/src/main.rs
+++ b/core/bin/zksync_server/src/main.rs
@@ -4,7 +4,7 @@ use clap::Parser;
 use std::{str::FromStr, time::Duration};
 use zksync_config::configs::chain::NetworkConfig;
 
-use zksync_config::{ContractsConfig, ETHSenderConfig};
+use zksync_config::{ContractsConfig, ETHClientConfig, ETHSenderConfig};
 use zksync_core::{
     genesis_init, initialize_components, is_genesis_needed, setup_sigint_handler, Component,
     Components,
@@ -80,7 +80,8 @@ async fn main() -> anyhow::Result<()> {
         let network = NetworkConfig::from_env().context("NetworkConfig")?;
         let eth_sender = ETHSenderConfig::from_env().context("ETHSenderConfig")?;
         let contracts = ContractsConfig::from_env().context("ContractsConfig")?;
-        genesis_init(&eth_sender, &network, &contracts)
+        let eth_client = ETHClientConfig::from_env().context("EthClientConfig")?;
+        genesis_init(&eth_sender, &network, &contracts, &eth_client.web3_url)
             .await
             .context("genesis_init")?;
         if opt.genesis {
diff --git a/core/lib/commitment_utils/src/lib.rs b/core/lib/commitment_utils/src/lib.rs
index 49b8ee7ef50d..b8f8784832eb 100644
--- a/core/lib/commitment_utils/src/lib.rs
+++ b/core/lib/commitment_utils/src/lib.rs
@@ -9,26 +9,18 @@ pub fn events_queue_commitment(
     events_queue: &Vec<LogQuery>,
     protocol_version: ProtocolVersionId,
 ) -> Option<H256> {
-    match protocol_version {
-        id if id.is_pre_boojum() => None,
-        ProtocolVersionId::Version17 => Some(H256(events_queue_commitment_fixed(events_queue))),
-        id => unimplemented!("events_queue_commitment is not implemented for {id:?}"),
-    }
+    (!protocol_version.is_pre_boojum()).then(|| H256(events_queue_commitment_fixed(events_queue)))
 }
 
 pub fn bootloader_initial_content_commitment(
     initial_bootloader_contents: &[(usize, U256)],
     protocol_version: ProtocolVersionId,
 ) -> Option<H256> {
-    match protocol_version {
-        id if id.is_pre_boojum() => None,
-        ProtocolVersionId::Version17 => {
-            let full_bootloader_memory =
-                expand_memory_contents(initial_bootloader_contents, USED_BOOTLOADER_MEMORY_BYTES);
-            Some(H256(initial_heap_content_commitment_fixed(
-                &full_bootloader_memory,
-            )))
-        }
-        id => unimplemented!("events_queue_commitment is not implemented for {id:?}"),
-    }
+    (!protocol_version.is_pre_boojum()).then(|| {
+        let full_bootloader_memory =
+            expand_memory_contents(initial_bootloader_contents, USED_BOOTLOADER_MEMORY_BYTES);
+        H256(initial_heap_content_commitment_fixed(
+            &full_bootloader_memory,
+        ))
+    })
 }
diff --git a/core/lib/config/src/configs/contracts.rs b/core/lib/config/src/configs/contracts.rs
index 21559ba2adb2..5980a165cfed 100644
--- a/core/lib/config/src/configs/contracts.rs
+++ b/core/lib/config/src/configs/contracts.rs
@@ -5,13 +5,20 @@ use zksync_basic_types::{Address, H256};
 // Local uses
 use super::envy_load;
 
+#[derive(Debug, Deserialize, Clone, PartialEq)]
+#[serde(rename_all = "lowercase")]
+pub enum ProverAtGenesis {
+    Fri,
+    Old,
+}
+
 /// Data about deployed contracts.
 #[derive(Debug, Deserialize, Clone, PartialEq)]
 pub struct ContractsConfig {
+    pub governance_addr: Address,
     pub mailbox_facet_addr: Address,
     pub executor_facet_addr: Address,
-    pub governance_facet_addr: Address,
-    pub diamond_cut_facet_addr: Address,
+    pub admin_facet_addr: Address,
     pub getters_facet_addr: Address,
     pub verifier_addr: Address,
     pub diamond_init_addr: Address,
@@ -34,7 +41,7 @@ pub struct ContractsConfig {
     pub fri_recursion_scheduler_level_vk_hash: H256,
     pub fri_recursion_node_level_vk_hash: H256,
     pub fri_recursion_leaf_level_vk_hash: H256,
-    pub governance_addr: Option<Address>,
+    pub prover_at_genesis: ProverAtGenesis,
     pub snark_wrapper_vk_hash: H256,
 }
 
@@ -53,10 +60,10 @@ mod tests {
 
     fn expected_config() -> ContractsConfig {
         ContractsConfig {
+            governance_addr: addr("d8dA6BF26964aF9D7eEd9e03E53415D37aA96045"),
             mailbox_facet_addr: addr("0f6Fa881EF414Fc6E818180657c2d5CD7Ac6cCAd"),
             executor_facet_addr: addr("18B631537801963A964211C0E86645c1aBfbB2d3"),
-            governance_facet_addr: addr("1e12b20BE86bEc3A0aC95aA52ade345cB9AE7a32"),
-            diamond_cut_facet_addr: addr("8656770FA78c830456B00B4fFCeE6b1De0e1b888"),
+            admin_facet_addr: addr("1e12b20BE86bEc3A0aC95aA52ade345cB9AE7a32"),
             getters_facet_addr: addr("8656770FA78c830456B00B4fFCeE6b1De0e1b888"),
             verifier_addr: addr("34782eE00206EAB6478F2692caa800e4A581687b"),
             diamond_init_addr: addr("FFC35A5e767BE36057c34586303498e3de7C62Ba"),
@@ -95,7 +102,7 @@ mod tests {
             fri_recursion_leaf_level_vk_hash: hash(
                 "0x72167c43a46cf38875b267d67716edc4563861364a3c03ab7aee73498421e828",
             ),
-            governance_addr: None,
+            prover_at_genesis: ProverAtGenesis::Fri,
             snark_wrapper_vk_hash: hash(
                 "0x4be443afd605a782b6e56d199df2460a025c81b3dea144e135bece83612563f2",
             ),
@@ -106,10 +113,10 @@ mod tests {
     fn from_env() {
         let mut lock = MUTEX.lock();
         let config = r#"
+CONTRACTS_GOVERNANCE_ADDR="0xd8dA6BF26964aF9D7eEd9e03E53415D37aA96045"
 CONTRACTS_MAILBOX_FACET_ADDR="0x0f6Fa881EF414Fc6E818180657c2d5CD7Ac6cCAd"
 CONTRACTS_EXECUTOR_FACET_ADDR="0x18B631537801963A964211C0E86645c1aBfbB2d3"
-CONTRACTS_GOVERNANCE_FACET_ADDR="0x1e12b20BE86bEc3A0aC95aA52ade345cB9AE7a32"
-CONTRACTS_DIAMOND_CUT_FACET_ADDR="0x8656770FA78c830456B00B4fFCeE6b1De0e1b888"
+CONTRACTS_ADMIN_FACET_ADDR="0x1e12b20BE86bEc3A0aC95aA52ade345cB9AE7a32"
 CONTRACTS_GETTERS_FACET_ADDR="0x8656770FA78c830456B00B4fFCeE6b1De0e1b888"
 CONTRACTS_VERIFIER_ADDR="0x34782eE00206EAB6478F2692caa800e4A581687b"
 CONTRACTS_DIAMOND_INIT_ADDR="0xFFC35A5e767BE36057c34586303498e3de7C62Ba"
@@ -132,6 +139,7 @@ CONTRACTS_L1_MULTICALL3_ADDR="0xcA11bde05977b3631167028862bE2a173976CA11"
 CONTRACTS_FRI_RECURSION_SCHEDULER_LEVEL_VK_HASH="0x201d4c7d8e781d51a3bbd451a43a8f45240bb765b565ae6ce69192d918c3563d"
 CONTRACTS_FRI_RECURSION_NODE_LEVEL_VK_HASH="0x5a3ef282b21e12fe1f4438e5bb158fc5060b160559c5158c6389d62d9fe3d080"
 CONTRACTS_FRI_RECURSION_LEAF_LEVEL_VK_HASH="0x72167c43a46cf38875b267d67716edc4563861364a3c03ab7aee73498421e828"
+CONTRACTS_PROVER_AT_GENESIS="fri"
 CONTRACTS_SNARK_WRAPPER_VK_HASH="0x4be443afd605a782b6e56d199df2460a025c81b3dea144e135bece83612563f2"
         "#;
         lock.set_env(config);
diff --git a/core/lib/constants/src/contracts.rs b/core/lib/constants/src/contracts.rs
index 33b735c8a2d7..d74c0e0319a7 100644
--- a/core/lib/constants/src/contracts.rs
+++ b/core/lib/constants/src/contracts.rs
@@ -73,7 +73,7 @@ pub const EVENT_WRITER_ADDRESS: Address = H160([
     0x00, 0x00, 0x80, 0x0d,
 ]);
 
-pub const BYTECODE_COMPRESSOR_ADDRESS: Address = H160([
+pub const COMPRESSOR_ADDRESS: Address = H160([
     0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
     0x00, 0x00, 0x80, 0x0e,
 ]);
diff --git a/core/lib/constants/src/ethereum.rs b/core/lib/constants/src/ethereum.rs
index 15187892ae86..13cdd32d5c1a 100644
--- a/core/lib/constants/src/ethereum.rs
+++ b/core/lib/constants/src/ethereum.rs
@@ -10,8 +10,10 @@ pub static ETHEREUM_ADDRESS: Address = Address::zero();
 /// to be published inside the body of transaction (i.e. excluding of factory deps).
 pub const GUARANTEED_PUBDATA_PER_L1_BATCH: u64 = 4000;
 
-/// The maximum number of pubdata per L1 batch.
-pub const MAX_PUBDATA_PER_L1_BATCH: u64 = 120000;
+/// The maximum number of pubdata per L1 batch. This limit is due to the fact that the Ethereum
+/// nodes do not accept transactions that have more than 128kb of pubdata.
+/// The 18kb margin is left in case of any inpreciseness of the pubdata calculation.
+pub const MAX_PUBDATA_PER_L1_BATCH: u64 = 110000;
 
 // TODO: import from zkevm_opcode_defs once VM1.3 is supported
 pub const MAX_L2_TX_GAS_LIMIT: u64 = 80000000;
diff --git a/core/lib/contracts/src/lib.rs b/core/lib/contracts/src/lib.rs
index a64aef1c9168..01dce6a98f9f 100644
--- a/core/lib/contracts/src/lib.rs
+++ b/core/lib/contracts/src/lib.rs
@@ -81,8 +81,8 @@ pub fn read_contract_abi(path: impl AsRef<Path>) -> String {
         .to_string()
 }
 
-pub fn governance_contract() -> Option<Contract> {
-    load_contract_if_present(GOVERNANCE_CONTRACT_FILE)
+pub fn governance_contract() -> Contract {
+    load_contract_if_present(GOVERNANCE_CONTRACT_FILE).expect("Governance contract not found")
 }
 
 pub fn zksync_contract() -> Contract {
@@ -359,6 +359,11 @@ impl BaseSystemContracts {
         BaseSystemContracts::load_with_bootloader(bootloader_bytecode)
     }
 
+    pub fn playground_post_boojum() -> Self {
+        let bootloader_bytecode = read_zbin_bytecode("etc/multivm_bootloaders/vm_boojum_integration/playground_batch.yul/playground_batch.yul.zbin");
+        BaseSystemContracts::load_with_bootloader(bootloader_bytecode)
+    }
+
     /// BaseSystemContracts with playground bootloader - used for handling 'eth_calls'.
     pub fn estimate_gas() -> Self {
         let bootloader_bytecode = read_bootloader_code("fee_estimate");
@@ -386,6 +391,13 @@ impl BaseSystemContracts {
         BaseSystemContracts::load_with_bootloader(bootloader_bytecode)
     }
 
+    pub fn estimate_gas_post_boojum() -> Self {
+        let bootloader_bytecode = read_zbin_bytecode(
+            "etc/multivm_bootloaders/vm_boojum_integration/fee_estimate.yul/fee_estimate.yul.zbin",
+        );
+        BaseSystemContracts::load_with_bootloader(bootloader_bytecode)
+    }
+
     pub fn hashes(&self) -> BaseSystemContractsHashes {
         BaseSystemContractsHashes {
             bootloader: self.bootloader.hash,
@@ -704,3 +716,175 @@ pub static PRE_BOOJUM_EXECUTE_FUNCTION: Lazy<Function> = Lazy::new(|| {
     }"#;
     serde_json::from_str(abi).unwrap()
 });
+
+pub static PRE_BOOJUM_GET_VK_FUNCTION: Lazy<Function> = Lazy::new(|| {
+    let abi = r#"{
+      "inputs": [],
+      "name": "get_verification_key",
+      "outputs": [
+        {
+          "components": [
+            {
+              "internalType": "uint256",
+              "name": "domain_size",
+              "type": "uint256"
+            },
+            {
+              "internalType": "uint256",
+              "name": "num_inputs",
+              "type": "uint256"
+            },
+            {
+              "components": [
+                {
+                  "internalType": "uint256",
+                  "name": "value",
+                  "type": "uint256"
+                }
+              ],
+              "internalType": "struct PairingsBn254.Fr",
+              "name": "omega",
+              "type": "tuple"
+            },
+            {
+              "components": [
+                {
+                  "internalType": "uint256",
+                  "name": "X",
+                  "type": "uint256"
+                },
+                {
+                  "internalType": "uint256",
+                  "name": "Y",
+                  "type": "uint256"
+                }
+              ],
+              "internalType": "struct PairingsBn254.G1Point[2]",
+              "name": "gate_selectors_commitments",
+              "type": "tuple[2]"
+            },
+            {
+              "components": [
+                {
+                  "internalType": "uint256",
+                  "name": "X",
+                  "type": "uint256"
+                },
+                {
+                  "internalType": "uint256",
+                  "name": "Y",
+                  "type": "uint256"
+                }
+              ],
+              "internalType": "struct PairingsBn254.G1Point[8]",
+              "name": "gate_setup_commitments",
+              "type": "tuple[8]"
+            },
+            {
+              "components": [
+                {
+                  "internalType": "uint256",
+                  "name": "X",
+                  "type": "uint256"
+                },
+                {
+                  "internalType": "uint256",
+                  "name": "Y",
+                  "type": "uint256"
+                }
+              ],
+              "internalType": "struct PairingsBn254.G1Point[4]",
+              "name": "permutation_commitments",
+              "type": "tuple[4]"
+            },
+            {
+              "components": [
+                {
+                  "internalType": "uint256",
+                  "name": "X",
+                  "type": "uint256"
+                },
+                {
+                  "internalType": "uint256",
+                  "name": "Y",
+                  "type": "uint256"
+                }
+              ],
+              "internalType": "struct PairingsBn254.G1Point",
+              "name": "lookup_selector_commitment",
+              "type": "tuple"
+            },
+            {
+              "components": [
+                {
+                  "internalType": "uint256",
+                  "name": "X",
+                  "type": "uint256"
+                },
+                {
+                  "internalType": "uint256",
+                  "name": "Y",
+                  "type": "uint256"
+                }
+              ],
+              "internalType": "struct PairingsBn254.G1Point[4]",
+              "name": "lookup_tables_commitments",
+              "type": "tuple[4]"
+            },
+            {
+              "components": [
+                {
+                  "internalType": "uint256",
+                  "name": "X",
+                  "type": "uint256"
+                },
+                {
+                  "internalType": "uint256",
+                  "name": "Y",
+                  "type": "uint256"
+                }
+              ],
+              "internalType": "struct PairingsBn254.G1Point",
+              "name": "lookup_table_type_commitment",
+              "type": "tuple"
+            },
+            {
+              "components": [
+                {
+                  "internalType": "uint256",
+                  "name": "value",
+                  "type": "uint256"
+                }
+              ],
+              "internalType": "struct PairingsBn254.Fr[3]",
+              "name": "non_residues",
+              "type": "tuple[3]"
+            },
+            {
+              "components": [
+                {
+                  "internalType": "uint256[2]",
+                  "name": "X",
+                  "type": "uint256[2]"
+                },
+                {
+                  "internalType": "uint256[2]",
+                  "name": "Y",
+                  "type": "uint256[2]"
+                }
+              ],
+              "internalType": "struct PairingsBn254.G2Point[2]",
+              "name": "g2_elements",
+              "type": "tuple[2]"
+            }
+          ],
+          "internalType": "struct VerificationKey",
+          "name": "vk",
+          "type": "tuple"
+        }
+      ],
+      "stateMutability": "pure",
+      "type": "function"
+    }"#;
+    serde_json::from_str(abi).unwrap()
+});
diff --git a/core/lib/dal/sqlx-data.json b/core/lib/dal/sqlx-data.json
index 9791a87a9c37..f784c84dbb81 100644
--- a/core/lib/dal/sqlx-data.json
+++ b/core/lib/dal/sqlx-data.json
@@ -692,6 +692,257 @@
     },
     "query": "SELECT l1_address FROM tokens WHERE market_volume > $1"
   },
+  "16bca6f4258ff3db90a26a8550c5fc35e666fb698960486528fceba3e452fd62": {
+    "describe": {
+      "columns": [
+        {
+          "name": "number",
+          "ordinal": 0,
+          "type_info": "Int8"
+        },
+        {
+          "name": "timestamp",
+          "ordinal": 1,
+          "type_info": "Int8"
+        },
+        {
+          "name": "is_finished",
+          "ordinal": 2,
+          "type_info": "Bool"
+        },
+        {
+          "name": "l1_tx_count",
+          "ordinal": 3,
+          "type_info": "Int4"
+        },
+        {
+          "name": "l2_tx_count",
+          "ordinal": 4,
+          "type_info": "Int4"
+        },
+        {
+          "name": "fee_account_address",
+          "ordinal": 5,
+          "type_info": "Bytea"
+        },
+        {
+          "name": "bloom",
+          "ordinal": 6,
+          "type_info": "Bytea"
+        },
+        {
+          "name": "priority_ops_onchain_data",
+          "ordinal": 7,
+          "type_info": "ByteaArray"
+        },
+        {
+          "name": "hash",
+          "ordinal": 8,
+          "type_info": "Bytea"
+        },
+        {
+          "name": "parent_hash",
+          "ordinal": 9,
+          "type_info": "Bytea"
+        },
+        {
+          "name": "commitment",
+          "ordinal": 10,
+          "type_info": "Bytea"
+        },
+        {
+          "name": "compressed_write_logs",
+          "ordinal": 11,
+          "type_info": "Bytea"
+        },
+        {
+          "name": "compressed_contracts",
+          "ordinal": 12,
+          "type_info": "Bytea"
+        },
+        {
+          "name": "eth_prove_tx_id",
+          "ordinal": 13,
+          "type_info": "Int4"
+        },
+        {
+          "name": "eth_commit_tx_id",
+          "ordinal": 14,
+          "type_info": "Int4"
+        },
+        {
+          "name": "eth_execute_tx_id",
+          "ordinal": 15,
+          "type_info": "Int4"
+        },
+        {
+          "name": "merkle_root_hash",
+          "ordinal": 16,
+          "type_info": "Bytea"
+        },
+        {
+          "name": "l2_to_l1_logs",
+          "ordinal": 17,
+          "type_info": "ByteaArray"
+        },
+        {
+          "name": "l2_to_l1_messages",
+          "ordinal": 18,
+          "type_info": "ByteaArray"
+        },
+        {
+          "name": "used_contract_hashes",
+          "ordinal": 19,
+          "type_info": "Jsonb"
+        },
+        {
+          "name": "compressed_initial_writes",
+          "ordinal": 20,
+          "type_info": "Bytea"
+        },
+        {
+          "name": "compressed_repeated_writes",
+          "ordinal": 21,
+          "type_info": "Bytea"
+        },
+        {
+          "name": "l2_l1_compressed_messages",
+          "ordinal": 22,
+          "type_info": "Bytea"
+        },
+        {
+          "name": "l2_l1_merkle_root",
+          "ordinal": 23,
+          "type_info": "Bytea"
+        },
+        {
+          "name": "l1_gas_price",
+          "ordinal": 24,
+          "type_info": "Int8"
+        },
+        {
+          "name": "l2_fair_gas_price",
+          "ordinal": 25,
+          "type_info": "Int8"
+        },
+        {
+          "name": "rollup_last_leaf_index",
+          "ordinal": 26,
+          "type_info": "Int8"
+        },
+        {
+          "name": "zkporter_is_available",
+          "ordinal": 27,
+          "type_info": "Bool"
+        },
+        {
+          "name": "bootloader_code_hash",
+          "ordinal": 28,
+          "type_info": "Bytea"
+        },
+        {
+          "name": "default_aa_code_hash",
+          "ordinal": 29,
+          "type_info": "Bytea"
+        },
+        {
+          "name": "base_fee_per_gas",
+          "ordinal": 30,
+          "type_info": "Numeric"
+        },
+        {
+          "name": "aux_data_hash",
+          "ordinal": 31,
+          "type_info": "Bytea"
+        },
+        {
+          "name": "pass_through_data_hash",
+          "ordinal": 32,
+          "type_info": "Bytea"
+        },
+        {
+          "name": "meta_parameters_hash",
+          "ordinal": 33,
+          "type_info": "Bytea"
+        },
+        {
+          "name": "protocol_version",
+          "ordinal": 34,
+          "type_info": "Int4"
+        },
+        {
+          "name": "compressed_state_diffs",
+          "ordinal": 35,
+          "type_info": "Bytea"
+        },
+        {
+          "name": "system_logs",
+          "ordinal": 36,
+          "type_info": "ByteaArray"
+        },
+        {
+          "name": "events_queue_commitment",
+          "ordinal": 37,
+          "type_info": "Bytea"
+        },
+        {
+          "name": "bootloader_initial_content_commitment",
+          "ordinal": 38,
+          "type_info": "Bytea"
+        }
+      ],
+      "nullable": [
+        false,
+        false,
+        false,
+        false,
+        false,
+        false,
+        false,
+        false,
+        true,
+        true,
+        true,
+        true,
+        true,
+        true,
+        true,
+        true,
+        true,
+        false,
+        false,
+        false,
+        true,
+        true,
+        true,
+        true,
+        false,
+        false,
+        true,
+        true,
+        true,
+        true,
+        false,
+        true,
+        true,
+        true,
+        true,
+        true,
+        false,
+        true,
+        true
+      ],
+      "parameters": {
+        "Left": [
+          "Bytea",
+          "Bytea",
+          "Int4",
+          "Int8"
+        ]
+      }
+    },
+    "query": "SELECT number, l1_batches.timestamp, is_finished, l1_tx_count, l2_tx_count, fee_account_address, bloom, priority_ops_onchain_data, hash, parent_hash, commitment, compressed_write_logs, compressed_contracts, eth_prove_tx_id, eth_commit_tx_id, eth_execute_tx_id, merkle_root_hash, l2_to_l1_logs, l2_to_l1_messages, used_contract_hashes, compressed_initial_writes, compressed_repeated_writes, l2_l1_compressed_messages, l2_l1_merkle_root, l1_gas_price, l2_fair_gas_price, rollup_last_leaf_index, zkporter_is_available, l1_batches.bootloader_code_hash, l1_batches.default_aa_code_hash, base_fee_per_gas, aux_data_hash, pass_through_data_hash, meta_parameters_hash, protocol_version, compressed_state_diffs, system_logs, events_queue_commitment, bootloader_initial_content_commitment FROM l1_batches LEFT JOIN commitments ON commitments.l1_batch_number = l1_batches.number JOIN protocol_versions ON protocol_versions.id = l1_batches.protocol_version WHERE eth_commit_tx_id IS NULL AND number != 0 AND protocol_versions.bootloader_code_hash = $1 AND protocol_versions.default_account_code_hash = $2 AND commitment IS NOT NULL AND (protocol_versions.id = $3 OR protocol_versions.upgrade_tx_hash IS NULL) AND events_queue_commitment IS NOT NULL AND bootloader_initial_content_commitment IS NOT NULL ORDER BY number LIMIT $4"
+  },
   "17a42a97e87a675bd465103ebedc63d6d091e5bb093c7905de70aed3dc71d823": {
     "describe": {
       "columns": [],
@@ -2957,6 +3208,39 @@
     },
     "query": "SELECT * FROM protocol_versions ORDER BY id DESC LIMIT 1"
   },
+  "3665394a2f91f1a07c2c517ae9e75434f9ec12ed4debf370662b8104e015c75f": {
+    "describe": {
+      "columns": [
+        {
+          "name": "id",
+          "ordinal": 0,
+          "type_info": "Int8"
+        },
+        {
+          "name": "status",
+          "ordinal": 1,
+          "type_info": "Text"
+        },
+        {
+          "name": "attempts",
+          "ordinal": 2,
+          "type_info": "Int2"
+        }
+      ],
+      "nullable": [
+        false,
+        false,
+        false
+      ],
+      "parameters": {
+        "Left": [
+          "Interval",
+          "Int2"
+        ]
+      }
+    },
+    "query": "\n                UPDATE prover_jobs_fri\n                SET status = 'queued', attempts = attempts + 1, updated_at = now(), processing_started_at = now()\n                WHERE id in (\n                    SELECT id\n                    FROM prover_jobs_fri\n                    WHERE (status = 'in_progress' AND  processing_started_at <= now() - $1::interval AND attempts < $2)\n                    OR (status = 'in_gpu_proof' AND  processing_started_at <= now() - $1::interval AND attempts < $2)\n                    OR (status = 'failed' AND attempts < $2)\n                    FOR UPDATE SKIP LOCKED\n                )\n                RETURNING id, status, attempts\n                "
+  },
   "36c483775b604324eacd7e5aac591b927cc32abb89fe1b0c5cf4b0383e9bd443": {
     "describe": {
       "columns": [
@@ -6386,39 +6670,6 @@
     },
     "query": "\n                    SELECT id, circuit_input_blob_url FROM prover_jobs\n                    WHERE status='successful' AND is_blob_cleaned=FALSE\n                    AND circuit_input_blob_url is NOT NULL\n                    AND updated_at < NOW() - INTERVAL '30 days'\n                    LIMIT $1;\n                "
   },
-  "892ad2bed255401e020b4cf89c9e43e32c333dc6627e1e2d2535e13b73d1c508": {
-    "describe": {
-      "columns": [
-        {
-          "name": "id",
-          "ordinal": 0,
-          "type_info": "Int8"
-        },
-        {
-          "name": "status",
-          "ordinal": 1,
-          "type_info": "Text"
-        },
-        {
-          "name": "attempts",
-          "ordinal": 2,
-          "type_info": "Int2"
-        }
-      ],
-      "nullable": [
-        false,
-        false,
-        false
-      ],
-      "parameters": {
-        "Left": [
-          "Interval",
-          "Int2"
-        ]
-      }
-    },
-    "query": "\n                UPDATE prover_jobs_fri\n                SET status = 'queued', attempts = attempts + 1, updated_at = now(), processing_started_at = now()\n                WHERE (status = 'in_progress' AND  processing_started_at <= now() - $1::interval AND attempts < $2)\n                OR (status = 'in_gpu_proof' AND  processing_started_at <= now() - $1::interval AND attempts < $2)\n                OR (status = 'failed' AND attempts < $2)\n                RETURNING id, status, attempts\n                "
-  },
   "8996a1794585dfe0f9c16a11e113831a63d5d944bc8061d7caa25ea33f12b19d": {
     "describe": {
       "columns": [
diff --git a/core/lib/dal/src/blocks_dal.rs b/core/lib/dal/src/blocks_dal.rs
index bec95eb4df9b..35f56fa901cc 100644
--- a/core/lib/dal/src/blocks_dal.rs
+++ b/core/lib/dal/src/blocks_dal.rs
@@ -352,12 +352,12 @@ impl BlocksDal<'_, '_> {
         let l2_to_l1_logs: Vec<_> = header
             .l2_to_l1_logs
             .iter()
-            .map(|log| log.to_bytes().to_vec())
+            .map(|log| log.0.to_bytes().to_vec())
             .collect();
         let system_logs = header
             .system_logs
             .iter()
-            .map(|log| log.to_bytes().to_vec())
+            .map(|log| log.0.to_bytes().to_vec())
             .collect::<Vec<Vec<u8>>>();
 
         // Serialization should always succeed.
@@ -994,6 +994,52 @@ impl BlocksDal<'_, '_> {
         })
     }
 
+    pub async fn pre_boojum_get_ready_for_commit_l1_batches(
+        &mut self,
+        limit: usize,
+        bootloader_hash: H256,
+        default_aa_hash: H256,
+        protocol_version_id: ProtocolVersionId,
+    ) -> anyhow::Result<Vec<L1BatchWithMetadata>> {
+        let raw_batches = sqlx::query_as!(
+            StorageL1Batch,
+            "SELECT number, l1_batches.timestamp, is_finished, l1_tx_count, l2_tx_count, fee_account_address, \
+                bloom, priority_ops_onchain_data, hash, parent_hash, commitment, compressed_write_logs, \
+                compressed_contracts, eth_prove_tx_id, eth_commit_tx_id, eth_execute_tx_id, \
+                merkle_root_hash, l2_to_l1_logs, l2_to_l1_messages, \
+                used_contract_hashes, compressed_initial_writes, compressed_repeated_writes, \
+                l2_l1_compressed_messages, l2_l1_merkle_root, l1_gas_price, l2_fair_gas_price, \
+                rollup_last_leaf_index, zkporter_is_available, l1_batches.bootloader_code_hash, \
+                l1_batches.default_aa_code_hash, base_fee_per_gas, aux_data_hash, pass_through_data_hash, \
+                meta_parameters_hash, protocol_version, compressed_state_diffs, \
+                system_logs, events_queue_commitment, bootloader_initial_content_commitment \
+            FROM l1_batches \
+            LEFT JOIN commitments ON commitments.l1_batch_number = l1_batches.number \
+            JOIN protocol_versions ON protocol_versions.id = l1_batches.protocol_version \
+            WHERE eth_commit_tx_id IS NULL \
+                AND number != 0 \
+                AND protocol_versions.bootloader_code_hash = $1 AND protocol_versions.default_account_code_hash = $2 \
+                AND commitment IS NOT NULL \
+                AND (protocol_versions.id = $3 OR protocol_versions.upgrade_tx_hash IS NULL) \
+            ORDER BY number LIMIT $4",
+            bootloader_hash.as_bytes(),
+            default_aa_hash.as_bytes(),
+            protocol_version_id as i32,
+            limit as i64,
+        )
+            .instrument("get_ready_for_commit_l1_batches")
+            .with_arg("limit", &limit)
+            .with_arg("bootloader_hash", &bootloader_hash)
+            .with_arg("default_aa_hash", &default_aa_hash)
+            .with_arg("protocol_version_id", &protocol_version_id)
+            .fetch_all(self.storage.conn())
+            .await?;
+
+        self.map_l1_batches(raw_batches)
+            .await
+            .context("map_l1_batches()")
+    }
+
     pub async fn get_ready_for_commit_l1_batches(
         &mut self,
         limit: usize,
@@ -1021,6 +1067,7 @@ impl BlocksDal<'_, '_> {
                 AND protocol_versions.bootloader_code_hash = $1 AND protocol_versions.default_account_code_hash = $2 \
                 AND commitment IS NOT NULL \
                 AND (protocol_versions.id = $3 OR protocol_versions.upgrade_tx_hash IS NULL) \
+                AND events_queue_commitment IS NOT NULL AND bootloader_initial_content_commitment IS NOT NULL \
             ORDER BY number LIMIT $4",
             bootloader_hash.as_bytes(),
             default_aa_hash.as_bytes(),
@@ -1494,7 +1541,10 @@ impl BlocksDal<'_, '_> {
 #[cfg(test)]
 mod tests {
     use zksync_contracts::BaseSystemContractsHashes;
-    use zksync_types::{l2_to_l1_log::L2ToL1Log, Address, ProtocolVersion, ProtocolVersionId};
+    use zksync_types::{
+        l2_to_l1_log::{L2ToL1Log, UserL2ToL1Log},
+        Address, ProtocolVersion, ProtocolVersionId,
+    };
 
     use super::*;
     use crate::ConnectionPool;
@@ -1523,14 +1573,14 @@ mod tests {
         );
         header.l1_tx_count = 3;
         header.l2_tx_count = 5;
-        header.l2_to_l1_logs.push(L2ToL1Log {
+        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]);
 
diff --git a/core/lib/dal/src/events_dal.rs b/core/lib/dal/src/events_dal.rs
index 2702099e5810..6355deaf29ab 100644
--- a/core/lib/dal/src/events_dal.rs
+++ b/core/lib/dal/src/events_dal.rs
@@ -4,7 +4,9 @@ use std::fmt;
 
 use crate::{models::storage_event::StorageL2ToL1Log, SqlxError, StorageProcessor};
 use zksync_types::{
-    l2_to_l1_log::L2ToL1Log, tx::IncludedTxLocation, MiniblockNumber, VmEvent, H256,
+    l2_to_l1_log::{L2ToL1Log, UserL2ToL1Log},
+    tx::IncludedTxLocation,
+    MiniblockNumber, VmEvent, H256,
 };
 
 /// Wrapper around an optional event topic allowing to hex-format it for `COPY` instructions.
@@ -99,12 +101,12 @@ impl EventsDal<'_, '_> {
         .unwrap();
     }
 
-    /// Saves L2-to-L1 logs from a miniblock. Logs must be ordered by transaction location
+    /// Saves user L2-to-L1 logs from a miniblock. Logs must be ordered by transaction location
     /// and within each transaction.
-    pub async fn save_l2_to_l1_logs(
+    pub async fn save_user_l2_to_l1_logs(
         &mut self,
         block_number: MiniblockNumber,
-        all_block_l2_to_l1_logs: &[(IncludedTxLocation, Vec<&L2ToL1Log>)],
+        all_block_l2_to_l1_logs: &[(IncludedTxLocation, Vec<&UserL2ToL1Log>)],
     ) {
         let mut copy = self
             .storage
@@ -139,7 +141,7 @@ impl EventsDal<'_, '_> {
                     sender,
                     key,
                     value,
-                } = log;
+                } = log.0;
 
                 write_str!(
                     &mut buffer,
@@ -273,15 +275,15 @@ mod tests {
         }
     }
 
-    fn create_l2_to_l1_log(tx_number_in_block: u16, index: u8) -> L2ToL1Log {
-        L2ToL1Log {
+    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]
@@ -324,7 +326,7 @@ mod tests {
             (second_location, second_logs.iter().collect()),
         ];
         conn.events_dal()
-            .save_l2_to_l1_logs(MiniblockNumber(1), &all_logs)
+            .save_user_l2_to_l1_logs(MiniblockNumber(1), &all_logs)
             .await;
 
         let logs = conn
@@ -338,9 +340,9 @@ mod tests {
             assert_eq!(log.log_index_in_tx as usize, i);
         }
         for (log, expected_log) in logs.iter().zip(&first_logs) {
-            assert_eq!(log.key, expected_log.key.as_bytes());
-            assert_eq!(log.value, expected_log.value.as_bytes());
-            assert_eq!(log.sender, expected_log.sender.as_bytes());
+            assert_eq!(log.key, expected_log.0.key.as_bytes());
+            assert_eq!(log.value, expected_log.0.value.as_bytes());
+            assert_eq!(log.sender, expected_log.0.sender.as_bytes());
         }
 
         let logs = conn
@@ -354,9 +356,9 @@ mod tests {
             assert_eq!(log.log_index_in_tx as usize, i);
         }
         for (log, expected_log) in logs.iter().zip(&second_logs) {
-            assert_eq!(log.key, expected_log.key.as_bytes());
-            assert_eq!(log.value, expected_log.value.as_bytes());
-            assert_eq!(log.sender, expected_log.sender.as_bytes());
+            assert_eq!(log.key, expected_log.0.key.as_bytes());
+            assert_eq!(log.value, expected_log.0.value.as_bytes());
+            assert_eq!(log.sender, expected_log.0.sender.as_bytes());
         }
     }
 }
diff --git a/core/lib/dal/src/fri_prover_dal.rs b/core/lib/dal/src/fri_prover_dal.rs
index 0af004c7697c..09fa5ca3b41e 100644
--- a/core/lib/dal/src/fri_prover_dal.rs
+++ b/core/lib/dal/src/fri_prover_dal.rs
@@ -214,9 +214,14 @@ impl FriProverDal<'_, '_> {
                 "
                 UPDATE prover_jobs_fri
                 SET status = 'queued', attempts = attempts + 1, updated_at = now(), processing_started_at = now()
-                WHERE (status = 'in_progress' AND  processing_started_at <= now() - $1::interval AND attempts < $2)
-                OR (status = 'in_gpu_proof' AND  processing_started_at <= now() - $1::interval AND attempts < $2)
-                OR (status = 'failed' AND attempts < $2)
+                WHERE id in (
+                    SELECT id
+                    FROM prover_jobs_fri
+                    WHERE (status = 'in_progress' AND  processing_started_at <= now() - $1::interval AND attempts < $2)
+                    OR (status = 'in_gpu_proof' AND  processing_started_at <= now() - $1::interval AND attempts < $2)
+                    OR (status = 'failed' AND attempts < $2)
+                    FOR UPDATE SKIP LOCKED
+                )
                 RETURNING id, status, attempts
                 ",
                 &processing_timeout,
diff --git a/core/lib/dal/src/models/storage_block.rs b/core/lib/dal/src/models/storage_block.rs
index 35a7873b5627..390bd3b2fd87 100644
--- a/core/lib/dal/src/models/storage_block.rs
+++ b/core/lib/dal/src/models/storage_block.rs
@@ -13,7 +13,7 @@ use zksync_types::{
     api,
     block::{L1BatchHeader, MiniblockHeader},
     commitment::{L1BatchMetaParameters, L1BatchMetadata},
-    l2_to_l1_log::L2ToL1Log,
+    l2_to_l1_log::{L2ToL1Log, SystemL2ToL1Log, UserL2ToL1Log},
     Address, L1BatchNumber, MiniblockNumber, H2048, H256,
 };
 
@@ -61,11 +61,8 @@ impl From<StorageL1BatchHeader> for L1BatchHeader {
             .map(|raw_data| raw_data.into())
             .collect();
 
-        let system_logs: Vec<_> = l1_batch
-            .system_logs
-            .into_iter()
-            .map(|raw_log| L2ToL1Log::from_slice(&raw_log))
-            .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);
 
         L1BatchHeader {
             number: L1BatchNumber(l1_batch.number as u32),
@@ -75,7 +72,7 @@ impl From<StorageL1BatchHeader> for L1BatchHeader {
             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: convert_l2_to_l1_logs(l1_batch.l2_to_l1_logs),
+            l2_to_l1_logs: user_l2_to_l1_logs.into_iter().map(UserL2ToL1Log).collect(),
             l2_to_l1_messages: l1_batch.l2_to_l1_messages,
 
             bloom: H2048::from_slice(&l1_batch.bloom),
@@ -91,7 +88,7 @@ impl From<StorageL1BatchHeader> for L1BatchHeader {
             ),
             l1_gas_price: l1_batch.l1_gas_price as u64,
             l2_fair_gas_price: l1_batch.l2_fair_gas_price as u64,
-            system_logs,
+            system_logs: system_logs.into_iter().map(SystemL2ToL1Log).collect(),
             protocol_version: l1_batch
                 .protocol_version
                 .map(|v| (v as u16).try_into().unwrap()),
@@ -183,11 +180,8 @@ impl From<StorageL1Batch> for L1BatchHeader {
             .map(Vec::into)
             .collect();
 
-        let system_logs: Vec<_> = l1_batch
-            .system_logs
-            .into_iter()
-            .map(|raw_log| L2ToL1Log::from_slice(&raw_log))
-            .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);
 
         L1BatchHeader {
             number: L1BatchNumber(l1_batch.number as u32),
@@ -197,7 +191,7 @@ impl From<StorageL1Batch> for L1BatchHeader {
             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: convert_l2_to_l1_logs(l1_batch.l2_to_l1_logs),
+            l2_to_l1_logs: user_l2_to_l1_logs.into_iter().map(UserL2ToL1Log).collect(),
             l2_to_l1_messages: l1_batch.l2_to_l1_messages,
 
             bloom: H2048::from_slice(&l1_batch.bloom),
@@ -213,7 +207,7 @@ impl From<StorageL1Batch> for L1BatchHeader {
             ),
             l1_gas_price: l1_batch.l1_gas_price as u64,
             l2_fair_gas_price: l1_batch.l2_fair_gas_price as u64,
-            system_logs,
+            system_logs: system_logs.into_iter().map(SystemL2ToL1Log).collect(),
             protocol_version: l1_batch
                 .protocol_version
                 .map(|v| (v as u16).try_into().unwrap()),
diff --git a/core/lib/mini_merkle_tree/src/lib.rs b/core/lib/mini_merkle_tree/src/lib.rs
index 18bb343bc701..4eced5a93c0d 100644
--- a/core/lib/mini_merkle_tree/src/lib.rs
+++ b/core/lib/mini_merkle_tree/src/lib.rs
@@ -7,7 +7,7 @@
 
 use once_cell::sync::Lazy;
 
-use std::{fmt, iter};
+use std::{fmt, iter, str::FromStr};
 
 #[cfg(test)]
 mod tests;
@@ -87,10 +87,12 @@ impl<'a, const LEAF_SIZE: usize> MiniMerkleTree<'a, LEAF_SIZE> {
     }
 
     /// Returns the root hash of this tree.
+    /// # Panics
+    /// Will panic if the constant below is invalid.
     pub fn merkle_root(self) -> H256 {
         if self.hashes.is_empty() {
-            // TODO (SMA-184): change constant to the real root hash of empty merkle tree.
-            H256::zero()
+            H256::from_str("fef7bd9f889811e59e4076a0174087135f080177302763019adaf531257e3a87")
+                .unwrap()
         } else {
             self.compute_merkle_root_and_path(0, None)
         }
diff --git a/core/lib/multivm/Cargo.toml b/core/lib/multivm/Cargo.toml
index 3f0dee89f424..8b69af498a05 100644
--- a/core/lib/multivm/Cargo.toml
+++ b/core/lib/multivm/Cargo.toml
@@ -10,6 +10,7 @@ keywords = ["blockchain", "zksync"]
 categories = ["cryptography"]
 
 [dependencies]
+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_3_3 = { package = "zk_evm", git = "https://github.com/matter-labs/era-zk_evm.git", tag= "v1.3.3-rc2" }
 zk_evm_1_3_1 = { package = "zk_evm", git = "https://github.com/matter-labs/era-zk_evm.git", tag= "v1.3.1-rc2" }
 
diff --git a/core/lib/multivm/src/dispatch_vm_macro.rs b/core/lib/multivm/src/dispatch_vm_macro.rs
index 6292cb4fea12..2f6f2ac87490 100644
--- a/core/lib/multivm/src/dispatch_vm_macro.rs
+++ b/core/lib/multivm/src/dispatch_vm_macro.rs
@@ -7,6 +7,7 @@ macro_rules! dispatch_vm {
             VmInstance::Vm1_3_2(vm) => vm.$function($($params)*),
             VmInstance::VmVirtualBlocks(vm) => vm.$function($($params)*),
             VmInstance::VmVirtualBlocksRefundsEnhancement(vm) => vm.$function($($params)*),
+            VmInstance::VmBoojumIntegration(vm) => vm.$function($($params)*),
         }
     };
 }
diff --git a/core/lib/multivm/src/glue/history_mode.rs b/core/lib/multivm/src/glue/history_mode.rs
index 66a0c15e6688..ca56836d8e82 100644
--- a/core/lib/multivm/src/glue/history_mode.rs
+++ b/core/lib/multivm/src/glue/history_mode.rs
@@ -6,11 +6,13 @@ pub trait HistoryMode:
     + GlueInto<Self::Vm1_3_2Mode>
     + GlueInto<Self::VmVirtualBlocksMode>
     + GlueInto<Self::VmVirtualBlocksRefundsEnhancement>
+    + GlueInto<Self::VmBoojumIntegration>
 {
     type VmM6Mode: crate::vm_m6::HistoryMode;
     type Vm1_3_2Mode: crate::vm_1_3_2::HistoryMode;
     type VmVirtualBlocksMode: crate::vm_virtual_blocks::HistoryMode;
-    type VmVirtualBlocksRefundsEnhancement: crate::vm_latest::HistoryMode;
+    type VmVirtualBlocksRefundsEnhancement: crate::vm_refunds_enhancement::HistoryMode;
+    type VmBoojumIntegration: crate::vm_latest::HistoryMode;
 }
 
 impl GlueFrom<crate::vm_latest::HistoryEnabled> for crate::vm_m6::HistoryEnabled {
@@ -31,6 +33,12 @@ impl GlueFrom<crate::vm_latest::HistoryEnabled> for crate::vm_virtual_blocks::Hi
     }
 }
 
+impl GlueFrom<crate::vm_latest::HistoryEnabled> for crate::vm_refunds_enhancement::HistoryEnabled {
+    fn glue_from(_: crate::vm_latest::HistoryEnabled) -> Self {
+        Self
+    }
+}
+
 impl GlueFrom<crate::vm_latest::HistoryDisabled> for crate::vm_m6::HistoryDisabled {
     fn glue_from(_: crate::vm_latest::HistoryDisabled) -> Self {
         Self
@@ -49,16 +57,26 @@ impl GlueFrom<crate::vm_latest::HistoryDisabled> for crate::vm_virtual_blocks::H
     }
 }
 
+impl GlueFrom<crate::vm_latest::HistoryDisabled>
+    for crate::vm_refunds_enhancement::HistoryDisabled
+{
+    fn glue_from(_: crate::vm_latest::HistoryDisabled) -> Self {
+        Self
+    }
+}
+
 impl HistoryMode for crate::vm_latest::HistoryEnabled {
     type VmM6Mode = crate::vm_m6::HistoryEnabled;
     type Vm1_3_2Mode = crate::vm_1_3_2::HistoryEnabled;
     type VmVirtualBlocksMode = crate::vm_virtual_blocks::HistoryEnabled;
-    type VmVirtualBlocksRefundsEnhancement = crate::vm_latest::HistoryEnabled;
+    type VmVirtualBlocksRefundsEnhancement = crate::vm_refunds_enhancement::HistoryEnabled;
+    type VmBoojumIntegration = crate::vm_latest::HistoryEnabled;
 }
 
 impl HistoryMode for crate::vm_latest::HistoryDisabled {
     type VmM6Mode = crate::vm_m6::HistoryDisabled;
     type Vm1_3_2Mode = crate::vm_1_3_2::HistoryDisabled;
     type VmVirtualBlocksMode = crate::vm_virtual_blocks::HistoryDisabled;
-    type VmVirtualBlocksRefundsEnhancement = crate::vm_latest::HistoryDisabled;
+    type VmVirtualBlocksRefundsEnhancement = crate::vm_refunds_enhancement::HistoryDisabled;
+    type VmBoojumIntegration = crate::vm_latest::HistoryDisabled;
 }
diff --git a/core/lib/multivm/src/glue/tracers/mod.rs b/core/lib/multivm/src/glue/tracers/mod.rs
index 60cc1905fe27..b9c0e083b84c 100644
--- a/core/lib/multivm/src/glue/tracers/mod.rs
+++ b/core/lib/multivm/src/glue/tracers/mod.rs
@@ -36,7 +36,7 @@ use zksync_state::WriteStorage;
 pub type MultiVmTracerPointer<S, H> = Box<dyn MultivmTracer<S, H>>;
 
 pub trait MultivmTracer<S: WriteStorage, H: HistoryMode>:
-    IntoLatestTracer<S, H> + IntoVmVirtualBlocksTracer<S, H>
+    IntoLatestTracer<S, H> + IntoVmVirtualBlocksTracer<S, H> + IntoVmRefundsEnhancementTracer<S, H>
 {
     fn into_tracer_pointer(self) -> MultiVmTracerPointer<S, H>
     where
@@ -47,7 +47,7 @@ pub trait MultivmTracer<S: WriteStorage, H: HistoryMode>:
 }
 
 pub trait IntoLatestTracer<S: WriteStorage, H: HistoryMode> {
-    fn latest(&self) -> crate::vm_latest::TracerPointer<S, H::VmVirtualBlocksRefundsEnhancement>;
+    fn latest(&self) -> crate::vm_latest::TracerPointer<S, H::VmBoojumIntegration>;
 }
 
 pub trait IntoVmVirtualBlocksTracer<S: WriteStorage, H: HistoryMode> {
@@ -56,13 +56,19 @@ pub trait IntoVmVirtualBlocksTracer<S: WriteStorage, H: HistoryMode> {
     ) -> crate::vm_virtual_blocks::TracerPointer<S, H::VmVirtualBlocksMode>;
 }
 
+pub trait IntoVmRefundsEnhancementTracer<S: WriteStorage, H: HistoryMode> {
+    fn vm_refunds_enhancement(
+        &self,
+    ) -> Box<dyn crate::vm_refunds_enhancement::VmTracer<S, H::VmVirtualBlocksRefundsEnhancement>>;
+}
+
 impl<S, T, H> IntoLatestTracer<S, H> for T
 where
     S: WriteStorage,
     H: HistoryMode,
-    T: crate::vm_latest::VmTracer<S, H::VmVirtualBlocksRefundsEnhancement> + Clone + 'static,
+    T: crate::vm_latest::VmTracer<S, H::VmBoojumIntegration> + Clone + 'static,
 {
-    fn latest(&self) -> crate::vm_latest::TracerPointer<S, H::VmVirtualBlocksRefundsEnhancement> {
+    fn latest(&self) -> crate::vm_latest::TracerPointer<S, H::VmBoojumIntegration> {
         Box::new(self.clone())
     }
 }
@@ -80,10 +86,28 @@ where
     }
 }
 
+impl<S, T, H> IntoVmRefundsEnhancementTracer<S, H> for T
+where
+    S: WriteStorage,
+    H: HistoryMode,
+    T: crate::vm_refunds_enhancement::VmTracer<S, H::VmVirtualBlocksRefundsEnhancement>
+        + Clone
+        + 'static,
+{
+    fn vm_refunds_enhancement(
+        &self,
+    ) -> Box<dyn crate::vm_refunds_enhancement::VmTracer<S, H::VmVirtualBlocksRefundsEnhancement>>
+    {
+        Box::new(self.clone())
+    }
+}
+
 impl<S, H, T> MultivmTracer<S, H> for T
 where
     S: WriteStorage,
     H: HistoryMode,
-    T: IntoLatestTracer<S, H> + IntoVmVirtualBlocksTracer<S, H>,
+    T: IntoLatestTracer<S, H>
+        + IntoVmVirtualBlocksTracer<S, H>
+        + IntoVmRefundsEnhancementTracer<S, H>,
 {
 }
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 41b4c15a5476..827ac7fe82a2 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
@@ -1,9 +1,10 @@
+use zksync_types::l2_to_l1_log::UserL2ToL1Log;
+
 use crate::glue::{GlueFrom, GlueInto};
 use crate::interface::{
-    CurrentExecutionState, ExecutionResult, Refunds, VmExecutionResultAndLogs,
-    VmExecutionStatistics,
+    types::outputs::VmExecutionLogs, CurrentExecutionState, ExecutionResult, Refunds,
+    VmExecutionResultAndLogs, VmExecutionStatistics,
 };
-use zksync_types::tx::tx_execution_info::VmExecutionLogs;
 
 // Note: In version after vm VmVirtualBlocks the bootloader memory knowledge is encapsulated into the VM.
 // But before it was a part of a public API.
@@ -15,12 +16,7 @@ impl GlueFrom<crate::vm_m5::vm_instance::VmBlockResult> for crate::interface::Fi
         crate::interface::FinishedL1Batch {
             block_tip_execution_result: VmExecutionResultAndLogs {
                 result: value.block_tip_result.revert_reason.glue_into(),
-                logs: VmExecutionLogs {
-                    events: value.block_tip_result.logs.events.clone(),
-                    l2_to_l1_logs: value.block_tip_result.logs.l2_to_l1_logs.clone(),
-                    storage_logs: value.block_tip_result.logs.storage_logs.clone(),
-                    total_log_queries_count: value.block_tip_result.logs.total_log_queries_count,
-                },
+                logs: value.block_tip_result.logs.clone(),
                 statistics: VmExecutionStatistics {
                     contracts_used: value.block_tip_result.contracts_used,
                     cycles_used: value.block_tip_result.cycles_used,
@@ -35,9 +31,16 @@ impl GlueFrom<crate::vm_m5::vm_instance::VmBlockResult> for crate::interface::Fi
                 events: value.full_result.events,
                 storage_log_queries: value.full_result.storage_log_queries,
                 used_contract_hashes: value.full_result.used_contract_hashes,
-                l2_to_l1_logs: value.full_result.l2_to_l1_logs,
+                user_l2_to_l1_logs: value
+                    .full_result
+                    .l2_to_l1_logs
+                    .into_iter()
+                    .map(UserL2ToL1Log)
+                    .collect(),
+                system_logs: vec![],
                 total_log_queries: value.full_result.total_log_queries,
                 cycles_used: value.full_result.cycles_used,
+                deduplicated_events_logs: vec![],
                 storage_refunds: Vec::new(),
             },
             final_bootloader_memory: None,
@@ -50,12 +53,7 @@ impl GlueFrom<crate::vm_m6::vm_instance::VmBlockResult> for crate::interface::Fi
         crate::interface::FinishedL1Batch {
             block_tip_execution_result: VmExecutionResultAndLogs {
                 result: value.block_tip_result.revert_reason.glue_into(),
-                logs: VmExecutionLogs {
-                    events: value.block_tip_result.logs.events,
-                    l2_to_l1_logs: value.block_tip_result.logs.l2_to_l1_logs,
-                    storage_logs: value.block_tip_result.logs.storage_logs,
-                    total_log_queries_count: value.block_tip_result.logs.total_log_queries_count,
-                },
+                logs: value.block_tip_result.logs.clone(),
                 statistics: VmExecutionStatistics {
                     contracts_used: value.block_tip_result.contracts_used,
                     cycles_used: value.block_tip_result.cycles_used,
@@ -70,9 +68,16 @@ impl GlueFrom<crate::vm_m6::vm_instance::VmBlockResult> for crate::interface::Fi
                 events: value.full_result.events,
                 storage_log_queries: value.full_result.storage_log_queries,
                 used_contract_hashes: value.full_result.used_contract_hashes,
-                l2_to_l1_logs: value.full_result.l2_to_l1_logs,
+                user_l2_to_l1_logs: value
+                    .full_result
+                    .l2_to_l1_logs
+                    .into_iter()
+                    .map(UserL2ToL1Log)
+                    .collect(),
+                system_logs: vec![],
                 total_log_queries: value.full_result.total_log_queries,
                 cycles_used: value.full_result.cycles_used,
+                deduplicated_events_logs: vec![],
                 storage_refunds: Vec::new(),
             },
             final_bootloader_memory: None,
@@ -87,7 +92,8 @@ impl GlueFrom<crate::vm_1_3_2::vm_instance::VmBlockResult> for crate::interface:
                 result: value.block_tip_result.revert_reason.glue_into(),
                 logs: VmExecutionLogs {
                     events: value.block_tip_result.logs.events,
-                    l2_to_l1_logs: value.block_tip_result.logs.l2_to_l1_logs,
+                    user_l2_to_l1_logs: value.block_tip_result.logs.user_l2_to_l1_logs.clone(),
+                    system_l2_to_l1_logs: value.block_tip_result.logs.system_l2_to_l1_logs.clone(),
                     storage_logs: value.block_tip_result.logs.storage_logs,
                     total_log_queries_count: value.block_tip_result.logs.total_log_queries_count,
                 },
@@ -105,9 +111,16 @@ impl GlueFrom<crate::vm_1_3_2::vm_instance::VmBlockResult> for crate::interface:
                 events: value.full_result.events,
                 storage_log_queries: value.full_result.storage_log_queries,
                 used_contract_hashes: value.full_result.used_contract_hashes,
-                l2_to_l1_logs: value.full_result.l2_to_l1_logs,
+                user_l2_to_l1_logs: value
+                    .full_result
+                    .l2_to_l1_logs
+                    .into_iter()
+                    .map(UserL2ToL1Log)
+                    .collect(),
+                system_logs: vec![],
                 total_log_queries: value.full_result.total_log_queries,
                 cycles_used: value.full_result.cycles_used,
+                deduplicated_events_logs: vec![],
                 storage_refunds: Vec::new(),
             },
             final_bootloader_memory: None,
@@ -133,7 +146,13 @@ impl GlueFrom<crate::vm_1_3_2::vm_instance::VmBlockResult>
             result,
             logs: VmExecutionLogs {
                 events: value.full_result.events,
-                l2_to_l1_logs: value.full_result.l2_to_l1_logs,
+                user_l2_to_l1_logs: value
+                    .full_result
+                    .l2_to_l1_logs
+                    .into_iter()
+                    .map(UserL2ToL1Log)
+                    .collect(),
+                system_l2_to_l1_logs: vec![],
                 storage_logs: value.full_result.storage_log_queries,
                 total_log_queries_count: value.full_result.total_log_queries,
             },
@@ -166,12 +185,7 @@ impl GlueFrom<crate::vm_m5::vm_instance::VmBlockResult>
 
         VmExecutionResultAndLogs {
             result,
-            logs: VmExecutionLogs {
-                events: value.full_result.events,
-                l2_to_l1_logs: value.full_result.l2_to_l1_logs,
-                storage_logs: value.full_result.storage_log_queries,
-                total_log_queries_count: value.full_result.total_log_queries,
-            },
+            logs: value.block_tip_result.logs.clone(),
             statistics: VmExecutionStatistics {
                 contracts_used: value.full_result.contracts_used,
                 cycles_used: value.full_result.cycles_used,
@@ -203,7 +217,13 @@ impl GlueFrom<crate::vm_m6::vm_instance::VmBlockResult>
             result,
             logs: VmExecutionLogs {
                 events: value.full_result.events,
-                l2_to_l1_logs: value.full_result.l2_to_l1_logs,
+                user_l2_to_l1_logs: value
+                    .full_result
+                    .l2_to_l1_logs
+                    .into_iter()
+                    .map(UserL2ToL1Log)
+                    .collect(),
+                system_l2_to_l1_logs: vec![],
                 storage_logs: value.full_result.storage_log_queries,
                 total_log_queries_count: value.full_result.total_log_queries,
             },
diff --git a/core/lib/multivm/src/glue/types/vm/vm_partial_execution_result.rs b/core/lib/multivm/src/glue/types/vm/vm_partial_execution_result.rs
index df764779fa57..4de727a04c10 100644
--- a/core/lib/multivm/src/glue/types/vm/vm_partial_execution_result.rs
+++ b/core/lib/multivm/src/glue/types/vm/vm_partial_execution_result.rs
@@ -1,5 +1,4 @@
 use crate::glue::{GlueFrom, GlueInto};
-use zksync_types::tx::tx_execution_info::VmExecutionLogs;
 
 impl GlueFrom<crate::vm_m5::vm_instance::VmPartialExecutionResult>
     for crate::interface::VmExecutionResultAndLogs
@@ -7,12 +6,7 @@ impl GlueFrom<crate::vm_m5::vm_instance::VmPartialExecutionResult>
     fn glue_from(value: crate::vm_m5::vm_instance::VmPartialExecutionResult) -> Self {
         Self {
             result: value.revert_reason.glue_into(),
-            logs: VmExecutionLogs {
-                events: value.logs.events.clone(),
-                l2_to_l1_logs: value.logs.l2_to_l1_logs.clone(),
-                storage_logs: value.logs.storage_logs.clone(),
-                total_log_queries_count: value.logs.total_log_queries_count,
-            },
+            logs: value.logs.clone(),
             statistics: crate::interface::VmExecutionStatistics {
                 contracts_used: value.contracts_used,
                 cycles_used: value.cycles_used,
@@ -37,12 +31,7 @@ impl GlueFrom<crate::vm_m6::vm_instance::VmPartialExecutionResult>
     fn glue_from(value: crate::vm_m6::vm_instance::VmPartialExecutionResult) -> Self {
         Self {
             result: value.revert_reason.glue_into(),
-            logs: VmExecutionLogs {
-                events: value.logs.events.clone(),
-                l2_to_l1_logs: value.logs.l2_to_l1_logs.clone(),
-                storage_logs: value.logs.storage_logs.clone(),
-                total_log_queries_count: value.logs.total_log_queries_count,
-            },
+            logs: value.logs.clone(),
             statistics: crate::interface::VmExecutionStatistics {
                 contracts_used: value.contracts_used,
                 cycles_used: value.cycles_used,
@@ -65,12 +54,7 @@ impl GlueFrom<crate::vm_1_3_2::vm_instance::VmPartialExecutionResult>
     fn glue_from(value: crate::vm_1_3_2::vm_instance::VmPartialExecutionResult) -> Self {
         Self {
             result: value.revert_reason.glue_into(),
-            logs: VmExecutionLogs {
-                events: value.logs.events.clone(),
-                l2_to_l1_logs: value.logs.l2_to_l1_logs.clone(),
-                storage_logs: value.logs.storage_logs.clone(),
-                total_log_queries_count: value.logs.total_log_queries_count,
-            },
+            logs: value.logs.clone(),
             statistics: crate::interface::VmExecutionStatistics {
                 contracts_used: value.contracts_used,
                 cycles_used: value.cycles_used,
diff --git a/core/lib/multivm/src/interface/traits/tracers/dyn_tracers/mod.rs b/core/lib/multivm/src/interface/traits/tracers/dyn_tracers/mod.rs
index b34df6bfa2a3..bc34775e6133 100644
--- a/core/lib/multivm/src/interface/traits/tracers/dyn_tracers/mod.rs
+++ b/core/lib/multivm/src/interface/traits/tracers/dyn_tracers/mod.rs
@@ -1 +1,2 @@
 pub mod vm_1_3_3;
+pub mod vm_1_4_0;
diff --git a/core/lib/multivm/src/interface/traits/tracers/dyn_tracers/vm_1_4_0.rs b/core/lib/multivm/src/interface/traits/tracers/dyn_tracers/vm_1_4_0.rs
new file mode 100644
index 000000000000..61d7831393d2
--- /dev/null
+++ b/core/lib/multivm/src/interface/traits/tracers/dyn_tracers/vm_1_4_0.rs
@@ -0,0 +1,33 @@
+use zk_evm_1_4_0::abstractions::Memory;
+use zk_evm_1_4_0::tracing::{
+    AfterDecodingData, AfterExecutionData, BeforeExecutionData, VmLocalStateData,
+};
+use zksync_state::StoragePtr;
+
+/// Version of zk_evm_1_3_3::Tracer suitable for dynamic dispatch.
+pub trait DynTracer<S, M: Memory> {
+    fn before_decoding(&mut self, _state: VmLocalStateData<'_>, _memory: &M) {}
+    fn after_decoding(
+        &mut self,
+        _state: VmLocalStateData<'_>,
+        _data: AfterDecodingData,
+        _memory: &M,
+    ) {
+    }
+    fn before_execution(
+        &mut self,
+        _state: VmLocalStateData<'_>,
+        _data: BeforeExecutionData,
+        _memory: &M,
+        _storage: StoragePtr<S>,
+    ) {
+    }
+    fn after_execution(
+        &mut self,
+        _state: VmLocalStateData<'_>,
+        _data: AfterExecutionData,
+        _memory: &M,
+        _storage: StoragePtr<S>,
+    ) {
+    }
+}
diff --git a/core/lib/multivm/src/interface/types/errors/bootloader_error.rs b/core/lib/multivm/src/interface/types/errors/bootloader_error.rs
index 07ed0899b220..0f0e14408669 100644
--- a/core/lib/multivm/src/interface/types/errors/bootloader_error.rs
+++ b/core/lib/multivm/src/interface/types/errors/bootloader_error.rs
@@ -27,7 +27,10 @@ pub(crate) enum BootloaderErrorCode {
     MintEtherFailed,
     FailedToAppendTransactionToL2Block,
     FailedToSetL2Block,
-    FailedToPublishBlockDataToL1,
+    FailedToPublishTimestampDataToL1,
+    L1MessengerPublishingFailed,
+    L1MessengerLogSendingFailed,
+    FailedToCallSystemContext,
     Unknown,
 }
 
@@ -60,7 +63,10 @@ impl From<u8> for BootloaderErrorCode {
             23 => BootloaderErrorCode::MintEtherFailed,
             24 => BootloaderErrorCode::FailedToAppendTransactionToL2Block,
             25 => BootloaderErrorCode::FailedToSetL2Block,
-            26 => BootloaderErrorCode::FailedToPublishBlockDataToL1,
+            26 => BootloaderErrorCode::FailedToPublishTimestampDataToL1,
+            27 => BootloaderErrorCode::L1MessengerPublishingFailed,
+            28 => BootloaderErrorCode::L1MessengerLogSendingFailed,
+            29 => BootloaderErrorCode::FailedToCallSystemContext,
             _ => BootloaderErrorCode::Unknown,
         }
     }
diff --git a/core/lib/multivm/src/interface/types/errors/tx_revert_reason.rs b/core/lib/multivm/src/interface/types/errors/tx_revert_reason.rs
index 27a5610f0e0d..f92a913fb8b9 100644
--- a/core/lib/multivm/src/interface/types/errors/tx_revert_reason.rs
+++ b/core/lib/multivm/src/interface/types/errors/tx_revert_reason.rs
@@ -109,6 +109,15 @@ impl TxRevertReason {
             BootloaderErrorCode::PaymasterReturnedInvalidMagic => {
                 Self::Halt(Halt::ValidationFailed(VmRevertReason::General { msg: String::from("Paymaster validation returned invalid magic value. Please refer to the documentation of the paymaster for more details"), data: vec![] }))
             }
+            BootloaderErrorCode::L1MessengerLogSendingFailed => {
+                Self::Halt(Halt::UnexpectedVMBehavior(format!("Failed to send log via L1Messenger for: {}", revert_reason)))
+            },
+            BootloaderErrorCode::L1MessengerPublishingFailed => {
+                Self::Halt(Halt::UnexpectedVMBehavior(format!("Failed to publish pubdata via L1Messenger for: {}", revert_reason)))
+            },
+            BootloaderErrorCode::FailedToCallSystemContext => {
+                Self::Halt(Halt::UnexpectedVMBehavior(format!("Failed to call system context contract: {}", revert_reason)))
+            },
             BootloaderErrorCode::Unknown => Self::Halt(Halt::UnexpectedVMBehavior(format!(
                 "Unsupported error code: {}. Revert reason: {}",
                 error_code[0], revert_reason
@@ -121,8 +130,8 @@ impl TxRevertReason {
                 Self::Halt(Halt::FailedToSetL2Block(format!("{}", revert_reason)))
 
             }
-            BootloaderErrorCode::FailedToPublishBlockDataToL1 => {
-                Self::Halt(Halt::UnexpectedVMBehavior(format!("Failed to publish block data to L1: {}", revert_reason)))
+            BootloaderErrorCode::FailedToPublishTimestampDataToL1 => {
+                Self::Halt(Halt::UnexpectedVMBehavior(format!("Failed to publish timestamp data to L1: {}", revert_reason)))
             }
         }
     }
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 dfbcd23be0bb..3181a94a9da6 100644
--- a/core/lib/multivm/src/interface/types/outputs/execution_result.rs
+++ b/core/lib/multivm/src/interface/types/outputs/execution_result.rs
@@ -1,9 +1,9 @@
 use crate::interface::{Halt, VmExecutionStatistics, VmRevertReason};
 use zksync_system_constants::PUBLISH_BYTECODE_OVERHEAD;
 use zksync_types::event::{extract_long_l2_to_l1_messages, extract_published_bytecodes};
-use zksync_types::tx::tx_execution_info::VmExecutionLogs;
+use zksync_types::l2_to_l1_log::{SystemL2ToL1Log, UserL2ToL1Log};
 use zksync_types::tx::ExecutionMetrics;
-use zksync_types::Transaction;
+use zksync_types::{StorageLogQuery, Transaction, VmEvent};
 use zksync_utils::bytecode::bytecode_len_in_bytes;
 
 /// Refunds produced for the user.
@@ -13,6 +13,25 @@ pub struct Refunds {
     pub operator_suggested_refund: u32,
 }
 
+/// Events/storage logs/l2->l1 logs created within transaction execution.
+#[derive(Debug, Clone, Default, PartialEq)]
+pub struct VmExecutionLogs {
+    pub storage_logs: Vec<StorageLogQuery>,
+    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.
+    pub user_l2_to_l1_logs: Vec<UserL2ToL1Log>,
+    pub system_l2_to_l1_logs: Vec<SystemL2ToL1Log>,
+    // This field moved to statistics, but we need to keep it for backward compatibility
+    pub total_log_queries_count: usize,
+}
+
+impl VmExecutionLogs {
+    pub fn total_l2_to_l1_logs_count(&self) -> usize {
+        self.user_l2_to_l1_logs.len() + self.system_l2_to_l1_logs.len()
+    }
+}
+
 /// Result and logs of the VM execution.
 #[derive(Debug, Clone)]
 pub struct VmExecutionResultAndLogs {
@@ -70,7 +89,7 @@ impl VmExecutionResultAndLogs {
             gas_used: self.statistics.gas_used as usize,
             published_bytecode_bytes,
             l2_l1_long_messages,
-            l2_l1_logs: self.logs.l2_to_l1_logs.len(),
+            l2_to_l1_logs: self.logs.total_l2_to_l1_logs_count(),
             contracts_used: self.statistics.contracts_used,
             contracts_deployed,
             vm_events: self.logs.events.len(),
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 128db82ba22d..066de92ffbe6 100644
--- a/core/lib/multivm/src/interface/types/outputs/execution_state.rs
+++ b/core/lib/multivm/src/interface/types/outputs/execution_state.rs
@@ -1,5 +1,5 @@
-use zksync_types::l2_to_l1_log::L2ToL1Log;
-use zksync_types::{StorageLogQuery, VmEvent, U256};
+use zksync_types::l2_to_l1_log::{SystemL2ToL1Log, UserL2ToL1Log};
+use zksync_types::{LogQuery, StorageLogQuery, VmEvent, U256};
 
 /// State of the VM since the start of the batch execution.
 #[derive(Debug, Clone, PartialEq)]
@@ -11,11 +11,18 @@ pub struct CurrentExecutionState {
     /// Hashes of the contracts used by the VM.
     pub used_contract_hashes: Vec<U256>,
     /// L2 to L1 logs produced by the VM.
-    pub l2_to_l1_logs: Vec<L2ToL1Log>,
+    pub system_logs: Vec<SystemL2ToL1Log>,
+    /// L2 to L1 logs produced by the L1Messeger.
+    /// 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.
+    pub user_l2_to_l1_logs: Vec<UserL2ToL1Log>,
     /// Number of log queries produced by the VM. Including l2_to_l1 logs, storage logs and events.
     pub total_log_queries: usize,
     /// Number of cycles used by the VM.
     pub cycles_used: u32,
+    /// Sorted & deduplicated events logs for batch. Note, that this is a more "low-level" representation of
+    /// the `events` field of this struct TODO(PLA-649): refactor to remove duplication of data.
+    pub deduplicated_events_logs: Vec<LogQuery>,
     /// Refunds returned by `StorageOracle`.
     pub storage_refunds: Vec<u32>,
 }
diff --git a/core/lib/multivm/src/interface/types/outputs/mod.rs b/core/lib/multivm/src/interface/types/outputs/mod.rs
index 8aa029cb53fa..39fed3ad9cb8 100644
--- a/core/lib/multivm/src/interface/types/outputs/mod.rs
+++ b/core/lib/multivm/src/interface/types/outputs/mod.rs
@@ -4,6 +4,7 @@ mod finished_l1batch;
 mod l2_block;
 mod statistic;
 
+pub use execution_result::VmExecutionLogs;
 pub use execution_result::{ExecutionResult, Refunds, VmExecutionResultAndLogs};
 pub use execution_state::{BootloaderMemory, CurrentExecutionState};
 pub use finished_l1batch::FinishedL1Batch;
diff --git a/core/lib/multivm/src/lib.rs b/core/lib/multivm/src/lib.rs
index 3d48f54efb02..e57106c624d9 100644
--- a/core/lib/multivm/src/lib.rs
+++ b/core/lib/multivm/src/lib.rs
@@ -25,4 +25,5 @@ pub use versions::vm_1_3_2;
 pub use versions::vm_latest;
 pub use versions::vm_m5;
 pub use versions::vm_m6;
+pub use versions::vm_refunds_enhancement;
 pub use versions::vm_virtual_blocks;
diff --git a/core/lib/multivm/src/tracers/call_tracer/mod.rs b/core/lib/multivm/src/tracers/call_tracer/mod.rs
index 6694dd760d52..90343a53bf66 100644
--- a/core/lib/multivm/src/tracers/call_tracer/mod.rs
+++ b/core/lib/multivm/src/tracers/call_tracer/mod.rs
@@ -3,6 +3,7 @@ use std::sync::Arc;
 use zksync_types::vm_trace::Call;
 
 pub mod vm_latest;
+pub mod vm_refunds_enhancement;
 pub mod vm_virtual_blocks;
 
 #[derive(Debug, Clone)]
diff --git a/core/lib/multivm/src/tracers/call_tracer/vm_latest/mod.rs b/core/lib/multivm/src/tracers/call_tracer/vm_latest/mod.rs
index 25bca6cd084f..2b6fc144bd4d 100644
--- a/core/lib/multivm/src/tracers/call_tracer/vm_latest/mod.rs
+++ b/core/lib/multivm/src/tracers/call_tracer/vm_latest/mod.rs
@@ -1,12 +1,9 @@
-use crate::interface::tracer::VmExecutionStopReason;
-use crate::interface::{traits::tracers::dyn_tracers::vm_1_3_3::DynTracer, VmRevertReason};
-use crate::tracers::call_tracer::{CallTracer, FarcallAndNearCallCount};
-use crate::vm_latest::VmTracer;
-use crate::vm_latest::{BootloaderState, HistoryMode, SimpleMemory, ZkSyncVmState};
-use zk_evm_1_3_3::tracing::{AfterExecutionData, VmLocalStateData};
-use zk_evm_1_3_3::zkevm_opcode_defs::{
-    FarCallABI, FatPointer, Opcode, RetOpcode, CALL_IMPLICIT_CALLDATA_FAT_PTR_REGISTER,
-    RET_IMPLICIT_RETURNDATA_PARAMS_REGISTER,
+use zk_evm_1_4_0::{
+    tracing::{AfterExecutionData, VmLocalStateData},
+    zkevm_opcode_defs::{
+        FarCallABI, FatPointer, Opcode, RetOpcode, CALL_IMPLICIT_CALLDATA_FAT_PTR_REGISTER,
+        RET_IMPLICIT_RETURNDATA_PARAMS_REGISTER,
+    },
 };
 use zksync_state::{StoragePtr, WriteStorage};
 use zksync_system_constants::CONTRACT_DEPLOYER_ADDRESS;
@@ -14,6 +11,13 @@ use zksync_types::vm_trace::{Call, CallType};
 use zksync_types::FarCallOpcode;
 use zksync_types::U256;
 
+use crate::interface::{
+    tracer::VmExecutionStopReason, traits::tracers::dyn_tracers::vm_1_4_0::DynTracer,
+    VmRevertReason,
+};
+use crate::tracers::call_tracer::{CallTracer, FarcallAndNearCallCount};
+use crate::vm_latest::{BootloaderState, HistoryMode, SimpleMemory, VmTracer, ZkSyncVmState};
+
 impl<S, H: HistoryMode> DynTracer<S, SimpleMemory<H>> for CallTracer {
     fn after_execution(
         &mut self,
diff --git a/core/lib/multivm/src/tracers/call_tracer/vm_refunds_enhancement/mod.rs b/core/lib/multivm/src/tracers/call_tracer/vm_refunds_enhancement/mod.rs
new file mode 100644
index 000000000000..43dd363dcea6
--- /dev/null
+++ b/core/lib/multivm/src/tracers/call_tracer/vm_refunds_enhancement/mod.rs
@@ -0,0 +1,211 @@
+use zk_evm_1_3_3::{
+    tracing::{AfterExecutionData, VmLocalStateData},
+    zkevm_opcode_defs::{
+        FarCallABI, FatPointer, Opcode, RetOpcode, CALL_IMPLICIT_CALLDATA_FAT_PTR_REGISTER,
+        RET_IMPLICIT_RETURNDATA_PARAMS_REGISTER,
+    },
+};
+use zksync_state::{StoragePtr, WriteStorage};
+use zksync_system_constants::CONTRACT_DEPLOYER_ADDRESS;
+use zksync_types::vm_trace::{Call, CallType};
+use zksync_types::FarCallOpcode;
+use zksync_types::U256;
+
+use crate::interface::{
+    tracer::VmExecutionStopReason, traits::tracers::dyn_tracers::vm_1_3_3::DynTracer,
+    VmRevertReason,
+};
+use crate::tracers::call_tracer::{CallTracer, FarcallAndNearCallCount};
+use crate::vm_refunds_enhancement::{
+    BootloaderState, HistoryMode, SimpleMemory, VmTracer, ZkSyncVmState,
+};
+
+impl<S, H: HistoryMode> DynTracer<S, SimpleMemory<H>> for CallTracer {
+    fn after_execution(
+        &mut self,
+        state: VmLocalStateData<'_>,
+        data: AfterExecutionData,
+        memory: &SimpleMemory<H>,
+        _storage: StoragePtr<S>,
+    ) {
+        match data.opcode.variant.opcode {
+            Opcode::NearCall(_) => {
+                if let Some(last) = self.stack.last_mut() {
+                    last.near_calls_after += 1;
+                }
+            }
+            Opcode::FarCall(far_call) => {
+                // We use parent gas for properly calculating gas used in the trace.
+                let current_ergs = state.vm_local_state.callstack.current.ergs_remaining;
+                let parent_gas = state
+                    .vm_local_state
+                    .callstack
+                    .inner
+                    .last()
+                    .map(|call| call.ergs_remaining + current_ergs)
+                    .unwrap_or(current_ergs);
+
+                let mut current_call = Call {
+                    r#type: CallType::Call(far_call),
+                    gas: 0,
+                    parent_gas,
+                    ..Default::default()
+                };
+
+                self.handle_far_call_op_code_refunds_enhancement(state, memory, &mut current_call);
+                self.stack.push(FarcallAndNearCallCount {
+                    farcall: current_call,
+                    near_calls_after: 0,
+                });
+            }
+            Opcode::Ret(ret_code) => {
+                self.handle_ret_op_code_refunds_enhancement(state, memory, ret_code);
+            }
+            _ => {}
+        };
+    }
+}
+
+impl<S: WriteStorage, H: HistoryMode> VmTracer<S, H> for CallTracer {
+    fn after_vm_execution(
+        &mut self,
+        _state: &mut ZkSyncVmState<S, H>,
+        _bootloader_state: &BootloaderState,
+        _stop_reason: VmExecutionStopReason,
+    ) {
+        self.store_result()
+    }
+}
+
+impl CallTracer {
+    fn handle_far_call_op_code_refunds_enhancement<H: HistoryMode>(
+        &mut self,
+        state: VmLocalStateData<'_>,
+        memory: &SimpleMemory<H>,
+        current_call: &mut Call,
+    ) {
+        let current = state.vm_local_state.callstack.current;
+        // All calls from the actual users are mimic calls,
+        // so we need to check that the previous call was to the deployer.
+        // Actually it's a call of the constructor.
+        // And at this stage caller is user and callee is deployed contract.
+        let call_type = if let CallType::Call(far_call) = current_call.r#type {
+            if matches!(far_call, FarCallOpcode::Mimic) {
+                let previous_caller = state
+                    .vm_local_state
+                    .callstack
+                    .inner
+                    .last()
+                    .map(|call| call.this_address)
+                    // Actually it's safe to just unwrap here, because we have at least one call in the stack
+                    // But i want to be sure that we will not have any problems in the future
+                    .unwrap_or(current.this_address);
+                if previous_caller == CONTRACT_DEPLOYER_ADDRESS {
+                    CallType::Create
+                } else {
+                    CallType::Call(far_call)
+                }
+            } else {
+                CallType::Call(far_call)
+            }
+        } else {
+            unreachable!()
+        };
+        let calldata = if current.code_page.0 == 0 || current.ergs_remaining == 0 {
+            vec![]
+        } else {
+            let packed_abi =
+                state.vm_local_state.registers[CALL_IMPLICIT_CALLDATA_FAT_PTR_REGISTER as usize];
+            assert!(packed_abi.is_pointer);
+            let far_call_abi = FarCallABI::from_u256(packed_abi.value);
+            memory.read_unaligned_bytes(
+                far_call_abi.memory_quasi_fat_pointer.memory_page as usize,
+                far_call_abi.memory_quasi_fat_pointer.start as usize,
+                far_call_abi.memory_quasi_fat_pointer.length as usize,
+            )
+        };
+
+        current_call.input = calldata;
+        current_call.r#type = call_type;
+        current_call.from = current.msg_sender;
+        current_call.to = current.this_address;
+        current_call.value = U256::from(current.context_u128_value);
+        current_call.gas = current.ergs_remaining;
+    }
+
+    fn save_output_refunds_enhancement<H: HistoryMode>(
+        &mut self,
+        state: VmLocalStateData<'_>,
+        memory: &SimpleMemory<H>,
+        ret_opcode: RetOpcode,
+        current_call: &mut Call,
+    ) {
+        let fat_data_pointer =
+            state.vm_local_state.registers[RET_IMPLICIT_RETURNDATA_PARAMS_REGISTER as usize];
+
+        // if fat_data_pointer is not a pointer then there is no output
+        let output = if fat_data_pointer.is_pointer {
+            let fat_data_pointer = FatPointer::from_u256(fat_data_pointer.value);
+            if !fat_data_pointer.is_trivial() {
+                Some(memory.read_unaligned_bytes(
+                    fat_data_pointer.memory_page as usize,
+                    fat_data_pointer.start as usize,
+                    fat_data_pointer.length as usize,
+                ))
+            } else {
+                None
+            }
+        } else {
+            None
+        };
+
+        match ret_opcode {
+            RetOpcode::Ok => {
+                current_call.output = output.unwrap_or_default();
+            }
+            RetOpcode::Revert => {
+                if let Some(output) = output {
+                    current_call.revert_reason =
+                        Some(VmRevertReason::from(output.as_slice()).to_string());
+                } else {
+                    current_call.revert_reason = Some("Unknown revert reason".to_string());
+                }
+            }
+            RetOpcode::Panic => {
+                current_call.error = Some("Panic".to_string());
+            }
+        }
+    }
+
+    fn handle_ret_op_code_refunds_enhancement<H: HistoryMode>(
+        &mut self,
+        state: VmLocalStateData<'_>,
+        memory: &SimpleMemory<H>,
+        ret_opcode: RetOpcode,
+    ) {
+        let Some(mut current_call) = self.stack.pop() else {
+            return;
+        };
+
+        if current_call.near_calls_after > 0 {
+            current_call.near_calls_after -= 1;
+            self.stack.push(current_call);
+            return;
+        }
+
+        current_call.farcall.gas_used = current_call
+            .farcall
+            .parent_gas
+            .saturating_sub(state.vm_local_state.callstack.current.ergs_remaining);
+
+        self.save_output_refunds_enhancement(state, memory, ret_opcode, &mut current_call.farcall);
+
+        // If there is a parent call, push the current call to it
+        // Otherwise, push the current call to the stack, because it's the top level call
+        if let Some(parent_call) = self.stack.last_mut() {
+            parent_call.farcall.calls.push(current_call.farcall);
+        } else {
+            self.stack.push(current_call);
+        }
+    }
+}
diff --git a/core/lib/multivm/src/tracers/call_tracer/vm_virtual_blocks/mod.rs b/core/lib/multivm/src/tracers/call_tracer/vm_virtual_blocks/mod.rs
index 1e4e45cb77e3..c78593b40e7d 100644
--- a/core/lib/multivm/src/tracers/call_tracer/vm_virtual_blocks/mod.rs
+++ b/core/lib/multivm/src/tracers/call_tracer/vm_virtual_blocks/mod.rs
@@ -1,10 +1,3 @@
-use crate::interface::dyn_tracers::vm_1_3_3::DynTracer;
-use crate::interface::{VmExecutionResultAndLogs, VmRevertReason};
-use crate::tracers::call_tracer::{CallTracer, FarcallAndNearCallCount};
-use crate::vm_virtual_blocks::{
-    ExecutionEndTracer, ExecutionProcessing, HistoryMode, SimpleMemory, VmTracer,
-};
-
 use zk_evm_1_3_3::tracing::{AfterExecutionData, VmLocalStateData};
 use zk_evm_1_3_3::zkevm_opcode_defs::{
     FarCallABI, FatPointer, Opcode, RetOpcode, CALL_IMPLICIT_CALLDATA_FAT_PTR_REGISTER,
@@ -16,6 +9,14 @@ use zksync_types::vm_trace::{Call, CallType};
 use zksync_types::FarCallOpcode;
 use zksync_types::U256;
 
+use crate::interface::{
+    dyn_tracers::vm_1_3_3::DynTracer, VmExecutionResultAndLogs, VmRevertReason,
+};
+use crate::tracers::call_tracer::{CallTracer, FarcallAndNearCallCount};
+use crate::vm_virtual_blocks::{
+    ExecutionEndTracer, ExecutionProcessing, HistoryMode, SimpleMemory, VmTracer,
+};
+
 impl<S, H: HistoryMode> DynTracer<S, SimpleMemory<H>> for CallTracer {
     fn after_execution(
         &mut self,
diff --git a/core/lib/multivm/src/tracers/multivm_dispatcher.rs b/core/lib/multivm/src/tracers/multivm_dispatcher.rs
index 196128d6a1c7..a603bd5093be 100644
--- a/core/lib/multivm/src/tracers/multivm_dispatcher.rs
+++ b/core/lib/multivm/src/tracers/multivm_dispatcher.rs
@@ -30,13 +30,27 @@ impl<S: WriteStorage, H: HistoryMode> Default for TracerDispatcher<S, H> {
 }
 
 impl<S: WriteStorage, H: HistoryMode> From<TracerDispatcher<S, H>>
-    for crate::vm_latest::TracerDispatcher<S, H::VmVirtualBlocksRefundsEnhancement>
+    for crate::vm_latest::TracerDispatcher<S, H::VmBoojumIntegration>
 {
     fn from(value: TracerDispatcher<S, H>) -> Self {
         Self::new(value.tracers.into_iter().map(|x| x.latest()).collect())
     }
 }
 
+impl<S: WriteStorage, H: HistoryMode> From<TracerDispatcher<S, H>>
+    for crate::vm_refunds_enhancement::TracerDispatcher<S, H::VmVirtualBlocksRefundsEnhancement>
+{
+    fn from(value: TracerDispatcher<S, H>) -> Self {
+        Self::new(
+            value
+                .tracers
+                .into_iter()
+                .map(|x| x.vm_refunds_enhancement())
+                .collect(),
+        )
+    }
+}
+
 impl<S: WriteStorage, H: HistoryMode> From<TracerDispatcher<S, H>>
     for crate::vm_virtual_blocks::TracerDispatcher<S, H::VmVirtualBlocksMode>
 {
diff --git a/core/lib/multivm/src/tracers/storage_invocation/mod.rs b/core/lib/multivm/src/tracers/storage_invocation/mod.rs
index f27b646a95f4..3816d2a07a14 100644
--- a/core/lib/multivm/src/tracers/storage_invocation/mod.rs
+++ b/core/lib/multivm/src/tracers/storage_invocation/mod.rs
@@ -1,4 +1,5 @@
 pub mod vm_latest;
+pub mod vm_refunds_enhancement;
 pub mod vm_virtual_blocks;
 
 /// Tracer responsible for calculating the number of storage invocations and
diff --git a/core/lib/multivm/src/tracers/storage_invocation/vm_latest/mod.rs b/core/lib/multivm/src/tracers/storage_invocation/vm_latest/mod.rs
index 2e64cbe0879c..0490ec34107c 100644
--- a/core/lib/multivm/src/tracers/storage_invocation/vm_latest/mod.rs
+++ b/core/lib/multivm/src/tracers/storage_invocation/vm_latest/mod.rs
@@ -1,8 +1,10 @@
-use crate::interface::tracer::{TracerExecutionStatus, TracerExecutionStopReason};
-use crate::interface::{traits::tracers::dyn_tracers::vm_1_3_3::DynTracer, Halt};
+use crate::interface::{
+    tracer::{TracerExecutionStatus, TracerExecutionStopReason},
+    traits::tracers::dyn_tracers::vm_1_4_0::DynTracer,
+    Halt,
+};
 use crate::tracers::storage_invocation::StorageInvocations;
-use crate::vm_latest::VmTracer;
-use crate::vm_latest::{BootloaderState, HistoryMode, SimpleMemory, ZkSyncVmState};
+use crate::vm_latest::{BootloaderState, HistoryMode, SimpleMemory, VmTracer, ZkSyncVmState};
 use zksync_state::WriteStorage;
 
 impl<S, H: HistoryMode> DynTracer<S, SimpleMemory<H>> for StorageInvocations {}
diff --git a/core/lib/multivm/src/tracers/storage_invocation/vm_refunds_enhancement/mod.rs b/core/lib/multivm/src/tracers/storage_invocation/vm_refunds_enhancement/mod.rs
new file mode 100644
index 000000000000..fe4fc33418db
--- /dev/null
+++ b/core/lib/multivm/src/tracers/storage_invocation/vm_refunds_enhancement/mod.rs
@@ -0,0 +1,30 @@
+use crate::interface::tracer::{TracerExecutionStatus, TracerExecutionStopReason};
+use crate::interface::{traits::tracers::dyn_tracers::vm_1_3_3::DynTracer, Halt};
+use crate::tracers::storage_invocation::StorageInvocations;
+use crate::vm_refunds_enhancement::VmTracer;
+use crate::vm_refunds_enhancement::{BootloaderState, HistoryMode, SimpleMemory, ZkSyncVmState};
+use zksync_state::WriteStorage;
+
+impl<S, H: HistoryMode> DynTracer<S, SimpleMemory<H>> for StorageInvocations {}
+
+impl<S: WriteStorage, H: HistoryMode> VmTracer<S, H> for StorageInvocations {
+    fn finish_cycle(
+        &mut self,
+        state: &mut ZkSyncVmState<S, H>,
+        _bootloader_state: &mut BootloaderState,
+    ) -> TracerExecutionStatus {
+        let current = state
+            .storage
+            .storage
+            .get_ptr()
+            .borrow()
+            .missed_storage_invocations();
+
+        if current >= self.limit {
+            return TracerExecutionStatus::Stop(TracerExecutionStopReason::Abort(
+                Halt::TracerCustom("Storage invocations limit reached".to_string()),
+            ));
+        }
+        TracerExecutionStatus::Continue
+    }
+}
diff --git a/core/lib/multivm/src/tracers/validator/mod.rs b/core/lib/multivm/src/tracers/validator/mod.rs
index 88e76f854db8..26d3b0ad926c 100644
--- a/core/lib/multivm/src/tracers/validator/mod.rs
+++ b/core/lib/multivm/src/tracers/validator/mod.rs
@@ -1,5 +1,6 @@
 mod types;
 mod vm_latest;
+mod vm_refunds_enhancement;
 mod vm_virtual_blocks;
 
 use std::sync::Arc;
diff --git a/core/lib/multivm/src/tracers/validator/vm_latest/mod.rs b/core/lib/multivm/src/tracers/validator/vm_latest/mod.rs
index 2d04098253ca..4d5ff43ec470 100644
--- a/core/lib/multivm/src/tracers/validator/vm_latest/mod.rs
+++ b/core/lib/multivm/src/tracers/validator/vm_latest/mod.rs
@@ -1,4 +1,4 @@
-use zk_evm_1_3_3::{
+use zk_evm_1_4_0::{
     tracing::{BeforeExecutionData, VmLocalStateData},
     zkevm_opcode_defs::{ContextOpcode, FarCallABI, LogOpcode, Opcode},
 };
@@ -15,23 +15,25 @@ use zksync_utils::{h256_to_account_address, u256_to_account_address, u256_to_h25
 use crate::vm_latest::tracers::utils::{
     computational_gas_price, get_calldata_page_via_abi, print_debug_if_needed, VmHook,
 };
-use crate::vm_latest::SimpleMemory;
-use crate::vm_latest::VmTracer;
 
-use crate::interface::traits::tracers::dyn_tracers::vm_1_3_3::DynTracer;
-use crate::interface::types::tracer::{TracerExecutionStatus, TracerExecutionStopReason};
-use crate::interface::Halt;
-use crate::tracers::validator::types::{NewTrustedValidationItems, ValidationTracerMode};
-use crate::tracers::validator::{ValidationRoundResult, ValidationTracer};
+use crate::interface::{
+    traits::tracers::dyn_tracers::vm_1_4_0::DynTracer,
+    types::tracer::{TracerExecutionStatus, TracerExecutionStopReason},
+    Halt,
+};
+use crate::tracers::validator::{
+    types::{NewTrustedValidationItems, ValidationTracerMode},
+    {ValidationRoundResult, ValidationTracer},
+};
 
-use crate::vm_latest::{BootloaderState, ZkSyncVmState};
+use crate::vm_latest::{BootloaderState, SimpleMemory, VmTracer, ZkSyncVmState};
 
 impl<H: HistoryMode> ValidationTracer<H> {
     fn check_user_restrictions_vm_latest<S: WriteStorage>(
         &mut self,
         state: VmLocalStateData<'_>,
         data: BeforeExecutionData,
-        memory: &SimpleMemory<H::VmVirtualBlocksRefundsEnhancement>,
+        memory: &SimpleMemory<H::VmBoojumIntegration>,
         storage: StoragePtr<S>,
     ) -> ValidationRoundResult {
         if self.computational_gas_used > self.computational_gas_limit {
@@ -125,14 +127,14 @@ impl<H: HistoryMode> ValidationTracer<H> {
     }
 }
 
-impl<S: WriteStorage, H: HistoryMode>
-    DynTracer<S, SimpleMemory<H::VmVirtualBlocksRefundsEnhancement>> for ValidationTracer<H>
+impl<S: WriteStorage, H: HistoryMode> DynTracer<S, SimpleMemory<H::VmBoojumIntegration>>
+    for ValidationTracer<H>
 {
     fn before_execution(
         &mut self,
         state: VmLocalStateData<'_>,
         data: BeforeExecutionData,
-        memory: &SimpleMemory<H::VmVirtualBlocksRefundsEnhancement>,
+        memory: &SimpleMemory<H::VmBoojumIntegration>,
         storage: StoragePtr<S>,
     ) {
         // For now, we support only validations for users.
@@ -180,12 +182,10 @@ impl<S: WriteStorage, H: HistoryMode>
     }
 }
 
-impl<S: WriteStorage, H: HistoryMode> VmTracer<S, H::VmVirtualBlocksRefundsEnhancement>
-    for ValidationTracer<H>
-{
+impl<S: WriteStorage, H: HistoryMode> VmTracer<S, H::VmBoojumIntegration> for ValidationTracer<H> {
     fn finish_cycle(
         &mut self,
-        _state: &mut ZkSyncVmState<S, H::VmVirtualBlocksRefundsEnhancement>,
+        _state: &mut ZkSyncVmState<S, H::VmBoojumIntegration>,
         _bootloader_state: &mut BootloaderState,
     ) -> TracerExecutionStatus {
         if self.should_stop_execution {
diff --git a/core/lib/multivm/src/tracers/validator/vm_refunds_enhancement/mod.rs b/core/lib/multivm/src/tracers/validator/vm_refunds_enhancement/mod.rs
new file mode 100644
index 000000000000..ec4e95e56301
--- /dev/null
+++ b/core/lib/multivm/src/tracers/validator/vm_refunds_enhancement/mod.rs
@@ -0,0 +1,204 @@
+use zk_evm_1_3_3::{
+    tracing::{BeforeExecutionData, VmLocalStateData},
+    zkevm_opcode_defs::{ContextOpcode, FarCallABI, LogOpcode, Opcode},
+};
+
+use zksync_state::{StoragePtr, WriteStorage};
+use zksync_system_constants::KECCAK256_PRECOMPILE_ADDRESS;
+
+use crate::HistoryMode;
+use zksync_types::{
+    get_code_key, vm_trace::ViolatedValidationRule, AccountTreeId, StorageKey, H256,
+};
+use zksync_utils::{h256_to_account_address, u256_to_account_address, u256_to_h256};
+
+use crate::interface::{
+    traits::tracers::dyn_tracers::vm_1_3_3::DynTracer,
+    types::tracer::{TracerExecutionStatus, TracerExecutionStopReason},
+    Halt,
+};
+use crate::tracers::validator::{
+    types::{NewTrustedValidationItems, ValidationTracerMode},
+    {ValidationRoundResult, ValidationTracer},
+};
+
+use crate::vm_refunds_enhancement::{
+    tracers::utils::{
+        computational_gas_price, get_calldata_page_via_abi, print_debug_if_needed, VmHook,
+    },
+    BootloaderState, SimpleMemory, VmTracer, ZkSyncVmState,
+};
+
+impl<H: HistoryMode> ValidationTracer<H> {
+    fn check_user_restrictions_vm_refunds_enhancement<S: WriteStorage>(
+        &mut self,
+        state: VmLocalStateData<'_>,
+        data: BeforeExecutionData,
+        memory: &SimpleMemory<H::VmVirtualBlocksRefundsEnhancement>,
+        storage: StoragePtr<S>,
+    ) -> ValidationRoundResult {
+        if self.computational_gas_used > self.computational_gas_limit {
+            return Err(ViolatedValidationRule::TookTooManyComputationalGas(
+                self.computational_gas_limit,
+            ));
+        }
+
+        let opcode_variant = data.opcode.variant;
+        match opcode_variant.opcode {
+            Opcode::FarCall(_) => {
+                let packed_abi = data.src0_value.value;
+                let call_destination_value = data.src1_value.value;
+
+                let called_address = u256_to_account_address(&call_destination_value);
+                let far_call_abi = FarCallABI::from_u256(packed_abi);
+
+                if called_address == KECCAK256_PRECOMPILE_ADDRESS
+                    && far_call_abi.memory_quasi_fat_pointer.length == 64
+                {
+                    let calldata_page = get_calldata_page_via_abi(
+                        &far_call_abi,
+                        state.vm_local_state.callstack.current.base_memory_page,
+                    );
+                    let calldata = memory.read_unaligned_bytes(
+                        calldata_page as usize,
+                        far_call_abi.memory_quasi_fat_pointer.start as usize,
+                        64,
+                    );
+
+                    let slot_to_add =
+                        self.slot_to_add_from_keccak_call(&calldata, self.user_address);
+
+                    if let Some(slot) = slot_to_add {
+                        return Ok(NewTrustedValidationItems {
+                            new_allowed_slots: vec![slot],
+                            ..Default::default()
+                        });
+                    }
+                } else if called_address != self.user_address {
+                    let code_key = get_code_key(&called_address);
+                    let code = storage.borrow_mut().read_value(&code_key);
+
+                    if code == H256::zero() {
+                        // The users are not allowed to call contracts with no code
+                        return Err(ViolatedValidationRule::CalledContractWithNoCode(
+                            called_address,
+                        ));
+                    }
+                }
+            }
+            Opcode::Context(context) => {
+                match context {
+                    ContextOpcode::Meta => {
+                        return Err(ViolatedValidationRule::TouchedUnallowedContext);
+                    }
+                    ContextOpcode::ErgsLeft => {
+                        // TODO (SMA-1168): implement the correct restrictions for the gas left opcode.
+                    }
+                    _ => {}
+                }
+            }
+            Opcode::Log(LogOpcode::StorageRead) => {
+                let key = data.src0_value.value;
+                let this_address = state.vm_local_state.callstack.current.this_address;
+                let msg_sender = state.vm_local_state.callstack.current.msg_sender;
+
+                if !self.is_allowed_storage_read(storage.clone(), this_address, key, msg_sender) {
+                    return Err(ViolatedValidationRule::TouchedUnallowedStorageSlots(
+                        this_address,
+                        key,
+                    ));
+                }
+
+                if self.trusted_address_slots.contains(&(this_address, key)) {
+                    let storage_key =
+                        StorageKey::new(AccountTreeId::new(this_address), u256_to_h256(key));
+
+                    let value = storage.borrow_mut().read_value(&storage_key);
+
+                    return Ok(NewTrustedValidationItems {
+                        new_trusted_addresses: vec![h256_to_account_address(&value)],
+                        ..Default::default()
+                    });
+                }
+            }
+            _ => {}
+        }
+
+        Ok(Default::default())
+    }
+}
+
+impl<S: WriteStorage, H: HistoryMode>
+    DynTracer<S, SimpleMemory<H::VmVirtualBlocksRefundsEnhancement>> for ValidationTracer<H>
+{
+    fn before_execution(
+        &mut self,
+        state: VmLocalStateData<'_>,
+        data: BeforeExecutionData,
+        memory: &SimpleMemory<H::VmVirtualBlocksRefundsEnhancement>,
+        storage: StoragePtr<S>,
+    ) {
+        // For now, we support only validations for users.
+        if let ValidationTracerMode::UserTxValidation = self.validation_mode {
+            self.computational_gas_used = self
+                .computational_gas_used
+                .saturating_add(computational_gas_price(state, &data));
+
+            let validation_round_result =
+                self.check_user_restrictions_vm_refunds_enhancement(state, data, memory, storage);
+            self.process_validation_round_result(validation_round_result);
+        }
+
+        let hook = VmHook::from_opcode_memory(&state, &data);
+        print_debug_if_needed(&hook, &state, memory);
+
+        let current_mode = self.validation_mode;
+        match (current_mode, hook) {
+            (ValidationTracerMode::NoValidation, VmHook::AccountValidationEntered) => {
+                // Account validation can be entered when there is no prior validation (i.e. "nested" validations are not allowed)
+                self.validation_mode = ValidationTracerMode::UserTxValidation;
+            }
+            (ValidationTracerMode::NoValidation, VmHook::PaymasterValidationEntered) => {
+                // Paymaster validation can be entered when there is no prior validation (i.e. "nested" validations are not allowed)
+                self.validation_mode = ValidationTracerMode::PaymasterTxValidation;
+            }
+            (_, VmHook::AccountValidationEntered | VmHook::PaymasterValidationEntered) => {
+                panic!(
+                    "Unallowed transition inside the validation tracer. Mode: {:#?}, hook: {:#?}",
+                    self.validation_mode, hook
+                );
+            }
+            (_, VmHook::NoValidationEntered) => {
+                // Validation can be always turned off
+                self.validation_mode = ValidationTracerMode::NoValidation;
+            }
+            (_, VmHook::ValidationStepEndeded) => {
+                // The validation step has ended.
+                self.should_stop_execution = true;
+            }
+            (_, _) => {
+                // The hook is not relevant to the validation tracer. Ignore.
+            }
+        }
+    }
+}
+
+impl<S: WriteStorage, H: HistoryMode> VmTracer<S, H::VmVirtualBlocksRefundsEnhancement>
+    for ValidationTracer<H>
+{
+    fn finish_cycle(
+        &mut self,
+        _state: &mut ZkSyncVmState<S, H::VmVirtualBlocksRefundsEnhancement>,
+        _bootloader_state: &mut BootloaderState,
+    ) -> TracerExecutionStatus {
+        if self.should_stop_execution {
+            return TracerExecutionStatus::Stop(TracerExecutionStopReason::Finish);
+        }
+        if let Some(result) = self.result.get() {
+            return TracerExecutionStatus::Stop(TracerExecutionStopReason::Abort(
+                Halt::TracerCustom(format!("Validation error: {:#?}", result)),
+            ));
+        }
+        TracerExecutionStatus::Continue
+    }
+}
diff --git a/core/lib/multivm/src/versions/mod.rs b/core/lib/multivm/src/versions/mod.rs
index cbb918d1a831..71379f6df5c4 100644
--- a/core/lib/multivm/src/versions/mod.rs
+++ b/core/lib/multivm/src/versions/mod.rs
@@ -2,4 +2,5 @@ pub mod vm_1_3_2;
 pub mod vm_latest;
 pub mod vm_m5;
 pub mod vm_m6;
+pub mod vm_refunds_enhancement;
 pub mod vm_virtual_blocks;
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 916ffe5f8fa3..ce87b8580df3 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
@@ -8,7 +8,7 @@ use std::any::Any;
 use std::collections::HashSet;
 
 use zksync_state::{StoragePtr, WriteStorage};
-use zksync_types::l2_to_l1_log::L2ToL1Log;
+use zksync_types::l2_to_l1_log::{L2ToL1Log, UserL2ToL1Log};
 use zksync_types::Transaction;
 use zksync_utils::bytecode::{hash_bytecode, CompressedBytecodeInfo};
 use zksync_utils::{h256_to_u256, u256_to_h256};
@@ -112,13 +112,15 @@ impl<S: WriteStorage, H: HistoryMode> VmInterface<S, H> for Vm<S, H> {
             .collect();
         let l2_to_l1_logs = l1_messages
             .into_iter()
-            .map(|m| L2ToL1Log {
-                shard_id: m.shard_id,
-                is_service: m.is_first,
-                tx_number_in_block: m.tx_number_in_block,
-                sender: m.address,
-                key: u256_to_h256(m.key),
-                value: u256_to_h256(m.value),
+            .map(|m| {
+                UserL2ToL1Log(L2ToL1Log {
+                    shard_id: m.shard_id,
+                    is_service: m.is_first,
+                    tx_number_in_block: m.tx_number_in_block,
+                    sender: m.address,
+                    key: u256_to_h256(m.key),
+                    value: u256_to_h256(m.value),
+                })
             })
             .collect();
         let total_log_queries = self.vm.state.event_sink.get_log_queries()
@@ -144,10 +146,12 @@ impl<S: WriteStorage, H: HistoryMode> VmInterface<S, H> for Vm<S, H> {
             events,
             storage_log_queries: self.vm.state.storage.get_final_log_queries(),
             used_contract_hashes,
-            l2_to_l1_logs,
+            user_l2_to_l1_logs: l2_to_l1_logs,
+            system_logs: vec![],
             total_log_queries,
             cycles_used: self.vm.state.local_state.monotonic_cycle_counter,
             // It's not applicable for vm 1.3.2
+            deduplicated_events_logs: vec![],
             storage_refunds: vec![],
         }
     }
diff --git a/core/lib/multivm/src/versions/vm_1_3_2/vm_instance.rs b/core/lib/multivm/src/versions/vm_1_3_2/vm_instance.rs
index 37e0097e59d6..4646081f18ed 100644
--- a/core/lib/multivm/src/versions/vm_1_3_2/vm_instance.rs
+++ b/core/lib/multivm/src/versions/vm_1_3_2/vm_instance.rs
@@ -10,11 +10,12 @@ use zk_evm_1_3_3::zkevm_opcode_defs::decoding::{
 use zk_evm_1_3_3::zkevm_opcode_defs::definitions::RET_IMPLICIT_RETURNDATA_PARAMS_REGISTER;
 use zksync_state::WriteStorage;
 use zksync_system_constants::MAX_TXS_IN_BLOCK;
-use zksync_types::l2_to_l1_log::L2ToL1Log;
-use zksync_types::tx::tx_execution_info::{TxExecutionStatus, VmExecutionLogs};
+use zksync_types::l2_to_l1_log::{L2ToL1Log, UserL2ToL1Log};
+use zksync_types::tx::tx_execution_info::TxExecutionStatus;
 use zksync_types::vm_trace::{Call, VmExecutionTrace, VmTrace};
 use zksync_types::{L1BatchNumber, StorageLogQuery, VmEvent, U256};
 
+use crate::interface::types::outputs::VmExecutionLogs;
 use crate::vm_1_3_2::bootloader_state::BootloaderState;
 use crate::vm_1_3_2::errors::{TxRevertReason, VmRevertReason, VmRevertReasonParsingResult};
 use crate::vm_1_3_2::event_sink::InMemoryEventSink;
@@ -427,10 +428,11 @@ impl<H: HistoryMode, S: WriteStorage> VmInstance<S, H> {
         VmExecutionLogs {
             storage_logs,
             events,
-            l2_to_l1_logs,
+            user_l2_to_l1_logs: l2_to_l1_logs.into_iter().map(UserL2ToL1Log).collect(),
             total_log_queries_count: storage_logs_count
                 + log_queries.len()
                 + precompile_calls_count,
+            system_l2_to_l1_logs: vec![],
         }
     }
 
diff --git a/core/lib/multivm/src/versions/vm_latest/bootloader_state/snapshot.rs b/core/lib/multivm/src/versions/vm_latest/bootloader_state/snapshot.rs
index e417a3b9ee69..683fc28a69e9 100644
--- a/core/lib/multivm/src/versions/vm_latest/bootloader_state/snapshot.rs
+++ b/core/lib/multivm/src/versions/vm_latest/bootloader_state/snapshot.rs
@@ -12,6 +12,8 @@ pub(crate) struct BootloaderStateSnapshot {
     pub(crate) compressed_bytecodes_encoding: usize,
     /// Current offset of the free space in the bootloader memory.
     pub(crate) free_tx_offset: usize,
+    /// Whether the pubdata information has been provided already
+    pub(crate) is_pubdata_information_provided: bool,
 }
 
 #[derive(Debug, Clone)]
diff --git a/core/lib/multivm/src/versions/vm_latest/bootloader_state/state.rs b/core/lib/multivm/src/versions/vm_latest/bootloader_state/state.rs
index 7e8c5d04623e..b4641d9bc649 100644
--- a/core/lib/multivm/src/versions/vm_latest/bootloader_state/state.rs
+++ b/core/lib/multivm/src/versions/vm_latest/bootloader_state/state.rs
@@ -1,17 +1,20 @@
 use crate::vm_latest::bootloader_state::l2_block::BootloaderL2Block;
 use crate::vm_latest::bootloader_state::snapshot::BootloaderStateSnapshot;
 use crate::vm_latest::bootloader_state::utils::{apply_l2_block, apply_tx_to_memory};
+use once_cell::sync::OnceCell;
 use std::cmp::Ordering;
 use zksync_types::{L2ChainId, U256};
 use zksync_utils::bytecode::CompressedBytecodeInfo;
 
 use crate::interface::{BootloaderMemory, L2BlockEnv, TxExecutionMode};
+use crate::vm_latest::types::internals::pubdata::PubdataInput;
 use crate::vm_latest::{
     constants::TX_DESCRIPTION_OFFSET, types::internals::TransactionData,
     utils::l2_blocks::assert_next_block,
 };
 
 use super::tx::BootloaderTx;
+use super::utils::apply_pubdata_to_memory;
 /// Intermediate bootloader-related VM state.
 ///
 /// Required to process transactions one by one (since we intercept the VM execution to execute
@@ -37,6 +40,8 @@ pub struct BootloaderState {
     execution_mode: TxExecutionMode,
     /// Current offset of the free space in the bootloader memory.
     free_tx_offset: usize,
+    /// Information about the the pubdata that will be needed to supply to the L1Messenger
+    pubdata_information: OnceCell<PubdataInput>,
 }
 
 impl BootloaderState {
@@ -53,6 +58,7 @@ impl BootloaderState {
             initial_memory,
             execution_mode,
             free_tx_offset: 0,
+            pubdata_information: Default::default(),
         }
     }
 
@@ -64,6 +70,12 @@ impl BootloaderState {
         tx.refund = refund;
     }
 
+    pub(crate) fn set_pubdata_input(&mut self, info: PubdataInput) {
+        self.pubdata_information
+            .set(info)
+            .expect("Pubdata information is already set");
+    }
+
     pub(crate) fn start_new_l2_block(&mut self, l2_block: L2BlockEnv) {
         let last_block = self.last_l2_block();
         assert!(
@@ -151,6 +163,14 @@ impl BootloaderState {
                 apply_l2_block(&mut initial_memory, l2_block, tx_index)
             }
         }
+
+        let pubdata_information = self
+            .pubdata_information
+            .clone()
+            .into_inner()
+            .expect("Empty pubdata information");
+
+        apply_pubdata_to_memory(&mut initial_memory, pubdata_information);
         initial_memory
     }
 
@@ -235,6 +255,7 @@ impl BootloaderState {
             last_l2_block: self.last_l2_block().make_snapshot(),
             compressed_bytecodes_encoding: self.compressed_bytecodes_encoding,
             free_tx_offset: self.free_tx_offset,
+            is_pubdata_information_provided: self.pubdata_information.get().is_some(),
         }
     }
 
@@ -249,5 +270,17 @@ impl BootloaderState {
         }
         self.last_mut_l2_block()
             .apply_snapshot(snapshot.last_l2_block);
+
+        if !snapshot.is_pubdata_information_provided {
+            self.pubdata_information = Default::default();
+        } else {
+            // Under the correct usage of the snapshots of the bootloader state,
+            // this assertion should never fail, i.e. since the pubdata information
+            // can be set only once. However, we have this assertion just in case.
+            assert!(
+                self.pubdata_information.get().is_some(),
+                "Snapshot with no pubdata can not rollback to snapshot with one"
+            );
+        }
     }
 }
diff --git a/core/lib/multivm/src/versions/vm_latest/bootloader_state/utils.rs b/core/lib/multivm/src/versions/vm_latest/bootloader_state/utils.rs
index 086403c2f2af..78b98f0a4046 100644
--- a/core/lib/multivm/src/versions/vm_latest/bootloader_state/utils.rs
+++ b/core/lib/multivm/src/versions/vm_latest/bootloader_state/utils.rs
@@ -6,9 +6,11 @@ use crate::interface::{BootloaderMemory, TxExecutionMode};
 use crate::vm_latest::bootloader_state::l2_block::BootloaderL2Block;
 use crate::vm_latest::constants::{
     BOOTLOADER_TX_DESCRIPTION_OFFSET, BOOTLOADER_TX_DESCRIPTION_SIZE, COMPRESSED_BYTECODES_OFFSET,
+    OPERATOR_PROVIDED_L1_MESSENGER_PUBDATA_OFFSET, OPERATOR_PROVIDED_L1_MESSENGER_PUBDATA_SLOTS,
     OPERATOR_REFUNDS_OFFSET, TX_DESCRIPTION_OFFSET, TX_OPERATOR_L2_BLOCK_INFO_OFFSET,
     TX_OPERATOR_SLOTS_PER_L2_BLOCK_INFO, TX_OVERHEAD_OFFSET, TX_TRUSTED_GAS_LIMIT_OFFSET,
 };
+use crate::vm_latest::types::internals::pubdata::PubdataInput;
 
 use super::tx::BootloaderTx;
 
@@ -110,6 +112,33 @@ pub(crate) fn apply_l2_block(
     ])
 }
 
+pub(crate) fn apply_pubdata_to_memory(
+    memory: &mut BootloaderMemory,
+    pubdata_information: PubdataInput,
+) {
+    // Skipping two slots as they will be filled by the bootloader itself:
+    // - One slot is for the selector of the call to the L1Messenger.
+    // - The other slot is for the 0x20 offset for the calldata.
+    let l1_messenger_pubdata_start_slot = OPERATOR_PROVIDED_L1_MESSENGER_PUBDATA_OFFSET + 2;
+
+    let pubdata = pubdata_information.build_pubdata();
+
+    assert!(
+        pubdata.len() / 32 <= OPERATOR_PROVIDED_L1_MESSENGER_PUBDATA_SLOTS - 2,
+        "The encoded pubdata is too big"
+    );
+
+    pubdata
+        .chunks(32)
+        .enumerate()
+        .for_each(|(slot_offset, value)| {
+            memory.push((
+                l1_messenger_pubdata_start_slot + slot_offset,
+                U256::from(value),
+            ))
+        });
+}
+
 /// Forms a word that contains meta information for the transaction execution.
 ///
 /// # Current layout
diff --git a/core/lib/multivm/src/versions/vm_latest/constants.rs b/core/lib/multivm/src/versions/vm_latest/constants.rs
index fe251ba87902..c67156681a0b 100644
--- a/core/lib/multivm/src/versions/vm_latest/constants.rs
+++ b/core/lib/multivm/src/versions/vm_latest/constants.rs
@@ -1,11 +1,11 @@
-use zk_evm_1_3_3::aux_structures::MemoryPage;
+use zk_evm_1_4_0::aux_structures::MemoryPage;
 
 use zksync_system_constants::{
     L1_GAS_PER_PUBDATA_BYTE, MAX_L2_TX_GAS_LIMIT, MAX_NEW_FACTORY_DEPS, MAX_TXS_IN_BLOCK,
     USED_BOOTLOADER_MEMORY_WORDS,
 };
 
-pub use zk_evm_1_3_3::zkevm_opcode_defs::system_params::{
+pub use zk_evm_1_4_0::zkevm_opcode_defs::system_params::{
     ERGS_PER_CIRCUIT, INITIAL_STORAGE_WRITE_PUBDATA_BYTES, MAX_PUBDATA_PER_BLOCK,
 };
 
@@ -50,8 +50,25 @@ pub(crate) const TX_TRUSTED_GAS_LIMIT_SLOTS: usize = MAX_TXS_IN_BLOCK;
 
 pub(crate) const COMPRESSED_BYTECODES_SLOTS: usize = 32768;
 
-pub(crate) const BOOTLOADER_TX_DESCRIPTION_OFFSET: usize =
+pub(crate) const PRIORITY_TXS_L1_DATA_OFFSET: usize =
     COMPRESSED_BYTECODES_OFFSET + COMPRESSED_BYTECODES_SLOTS;
+pub(crate) const PRIORITY_TXS_L1_DATA_SLOTS: usize = 2;
+
+pub const OPERATOR_PROVIDED_L1_MESSENGER_PUBDATA_OFFSET: usize =
+    PRIORITY_TXS_L1_DATA_OFFSET + PRIORITY_TXS_L1_DATA_SLOTS;
+
+/// One of "worst case" scenarios for the number of state diffs in a batch is when 120kb of pubdata is spent
+/// on repeated writes, that are all zeroed out. In this case, the number of diffs is 120k / 5 = 24k. This means that they will have
+/// accommodate 6528000 bytes of calldata for the uncompressed state diffs. Adding 120k on top leaves us with
+/// roughly 6650000 bytes needed for calldata. 207813 slots are needed to accomodate this amount of data.
+/// We round up to 208000 slots just in case.
+///
+/// In theory though much more calldata could be used (if for instance 1 byte is used for enum index). It is the responsibility of the
+/// operator to ensure that it can form the correct calldata for the L1Messenger.
+pub(crate) const OPERATOR_PROVIDED_L1_MESSENGER_PUBDATA_SLOTS: usize = 208000;
+
+pub(crate) const BOOTLOADER_TX_DESCRIPTION_OFFSET: usize =
+    OPERATOR_PROVIDED_L1_MESSENGER_PUBDATA_OFFSET + OPERATOR_PROVIDED_L1_MESSENGER_PUBDATA_SLOTS;
 
 /// The size of the bootloader memory dedicated to the encodings of transactions
 pub const BOOTLOADER_TX_ENCODING_SPACE: u32 =
@@ -93,7 +110,7 @@ pub const RESULT_SUCCESS_FIRST_SLOT: u32 =
 /// Note that this value doesn't correspond to the gas limit of any particular transaction
 /// (except for the fact that, of course, gas limit for each transaction should be <= `BLOCK_GAS_LIMIT`).
 pub const BLOCK_GAS_LIMIT: u32 =
-    zk_evm_1_3_3::zkevm_opcode_defs::system_params::VM_INITIAL_FRAME_ERGS;
+    zk_evm_1_4_0::zkevm_opcode_defs::system_params::VM_INITIAL_FRAME_ERGS;
 
 /// 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;
diff --git a/core/lib/multivm/src/versions/vm_latest/implementation/execution.rs b/core/lib/multivm/src/versions/vm_latest/implementation/execution.rs
index ed7965c01fd5..1b3197f57b92 100644
--- a/core/lib/multivm/src/versions/vm_latest/implementation/execution.rs
+++ b/core/lib/multivm/src/versions/vm_latest/implementation/execution.rs
@@ -1,19 +1,21 @@
 use crate::HistoryMode;
-use zk_evm_1_3_3::aux_structures::Timestamp;
+use zk_evm_1_4_0::aux_structures::Timestamp;
 use zksync_state::WriteStorage;
 
-use crate::interface::tracer::VmExecutionStopReason;
-use crate::interface::types::tracer::TracerExecutionStatus;
-use crate::interface::{VmExecutionMode, VmExecutionResultAndLogs};
-use crate::vm_latest::old_vm::utils::{vm_may_have_ended_inner, VmExecutionResult};
-use crate::vm_latest::tracers::dispatcher::TracerDispatcher;
-use crate::vm_latest::tracers::{DefaultExecutionTracer, RefundsTracer};
-use crate::vm_latest::vm::Vm;
+use crate::interface::{
+    types::tracer::{TracerExecutionStatus, VmExecutionStopReason},
+    VmExecutionMode, VmExecutionResultAndLogs,
+};
+use crate::vm_latest::{
+    old_vm::utils::{vm_may_have_ended_inner, VmExecutionResult},
+    tracers::{dispatcher::TracerDispatcher, DefaultExecutionTracer, PubdataTracer, RefundsTracer},
+    vm::Vm,
+};
 
 impl<S: WriteStorage, H: HistoryMode> Vm<S, H> {
     pub(crate) fn inspect_inner(
         &mut self,
-        dispatcher: TracerDispatcher<S, H::VmVirtualBlocksRefundsEnhancement>,
+        dispatcher: TracerDispatcher<S, H::VmBoojumIntegration>,
         execution_mode: VmExecutionMode,
     ) -> VmExecutionResultAndLogs {
         let mut enable_refund_tracer = false;
@@ -22,6 +24,7 @@ impl<S: WriteStorage, H: HistoryMode> Vm<S, H> {
             self.bootloader_state.move_tx_to_execute_pointer();
             enable_refund_tracer = true;
         }
+
         let (_, result) =
             self.inspect_and_collect_results(dispatcher, execution_mode, enable_refund_tracer);
         result
@@ -31,19 +34,20 @@ impl<S: WriteStorage, H: HistoryMode> Vm<S, H> {
     /// Collect the result from the default tracers.
     fn inspect_and_collect_results(
         &mut self,
-        dispatcher: TracerDispatcher<S, H::VmVirtualBlocksRefundsEnhancement>,
+        dispatcher: TracerDispatcher<S, H::VmBoojumIntegration>,
         execution_mode: VmExecutionMode,
         with_refund_tracer: bool,
     ) -> (VmExecutionStopReason, VmExecutionResultAndLogs) {
         let refund_tracers =
             with_refund_tracer.then_some(RefundsTracer::new(self.batch_env.clone()));
-        let mut tx_tracer: DefaultExecutionTracer<S, H::VmVirtualBlocksRefundsEnhancement> =
+        let mut tx_tracer: DefaultExecutionTracer<S, H::VmBoojumIntegration> =
             DefaultExecutionTracer::new(
                 self.system_env.default_validation_computational_gas_limit,
                 execution_mode,
                 dispatcher,
                 self.storage.clone(),
                 refund_tracers,
+                Some(PubdataTracer::new(self.batch_env.clone(), execution_mode)),
             );
 
         let timestamp_initial = Timestamp(self.state.local_state.timestamp);
@@ -88,7 +92,7 @@ impl<S: WriteStorage, H: HistoryMode> Vm<S, H> {
     /// Execute vm with given tracers until the stop reason is reached.
     fn execute_with_default_tracer(
         &mut self,
-        tracer: &mut DefaultExecutionTracer<S, H::VmVirtualBlocksRefundsEnhancement>,
+        tracer: &mut DefaultExecutionTracer<S, H::VmBoojumIntegration>,
     ) -> VmExecutionStopReason {
         tracer.initialize_tracer(&mut self.state);
         let result = loop {
diff --git a/core/lib/multivm/src/versions/vm_latest/implementation/gas.rs b/core/lib/multivm/src/versions/vm_latest/implementation/gas.rs
index 9f494179c0ea..c970cd4e5d24 100644
--- a/core/lib/multivm/src/versions/vm_latest/implementation/gas.rs
+++ b/core/lib/multivm/src/versions/vm_latest/implementation/gas.rs
@@ -19,7 +19,7 @@ impl<S: WriteStorage, H: HistoryMode> Vm<S, H> {
 
     pub(crate) fn calculate_computational_gas_used(
         &self,
-        tracer: &DefaultExecutionTracer<S, H::VmVirtualBlocksRefundsEnhancement>,
+        tracer: &DefaultExecutionTracer<S, H::VmBoojumIntegration>,
         gas_remaining_before: u32,
         spent_pubdata_counter_before: u32,
     ) -> u32 {
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 bacc82779b16..c468cf87817c 100644
--- a/core/lib/multivm/src/versions/vm_latest/implementation/logs.rs
+++ b/core/lib/multivm/src/versions/vm_latest/implementation/logs.rs
@@ -1,13 +1,15 @@
-use zk_evm_1_3_3::aux_structures::Timestamp;
+use zk_evm_1_4_0::aux_structures::Timestamp;
 use zksync_state::WriteStorage;
+use zksync_types::event::extract_l2tol1logs_from_l1_messenger;
 
 use crate::HistoryMode;
-use zksync_types::l2_to_l1_log::L2ToL1Log;
-use zksync_types::tx::tx_execution_info::VmExecutionLogs;
+use zksync_types::l2_to_l1_log::{L2ToL1Log, SystemL2ToL1Log, UserL2ToL1Log};
 use zksync_types::VmEvent;
 
-use crate::vm_latest::old_vm::events::merge_events;
+use crate::interface::types::outputs::VmExecutionLogs;
+
 use crate::vm_latest::old_vm::utils::precompile_calls_count_after_timestamp;
+use crate::vm_latest::utils::logs;
 use crate::vm_latest::vm::Vm;
 
 impl<S: WriteStorage, H: HistoryMode> Vm<S, H> {
@@ -24,8 +26,8 @@ impl<S: WriteStorage, H: HistoryMode> Vm<S, H> {
             .collect();
         let storage_logs_count = storage_logs.len();
 
-        let (events, l2_to_l1_logs) =
-            self.collect_events_and_l1_logs_after_timestamp(from_timestamp);
+        let (events, system_l2_to_l1_logs) =
+            self.collect_events_and_l1_system_logs_after_timestamp(from_timestamp);
 
         let log_queries = self
             .state
@@ -37,28 +39,34 @@ impl<S: WriteStorage, H: HistoryMode> Vm<S, H> {
             from_timestamp,
         );
 
+        let user_logs = extract_l2tol1logs_from_l1_messenger(&events);
+
         let total_log_queries_count =
             storage_logs_count + log_queries.len() + precompile_calls_count;
+
         VmExecutionLogs {
             storage_logs,
             events,
-            l2_to_l1_logs,
+            user_l2_to_l1_logs: user_logs
+                .into_iter()
+                .map(|log| UserL2ToL1Log(log.into()))
+                .collect(),
+            system_l2_to_l1_logs: system_l2_to_l1_logs
+                .into_iter()
+                .map(SystemL2ToL1Log)
+                .collect(),
             total_log_queries_count,
         }
     }
 
-    pub(crate) fn collect_events_and_l1_logs_after_timestamp(
+    pub(crate) fn collect_events_and_l1_system_logs_after_timestamp(
         &self,
         from_timestamp: Timestamp,
     ) -> (Vec<VmEvent>, Vec<L2ToL1Log>) {
-        let (raw_events, l1_messages) = self
-            .state
-            .event_sink
-            .get_events_and_l2_l1_logs_after_timestamp(from_timestamp);
-        let events = merge_events(raw_events)
-            .into_iter()
-            .map(|e| e.into_vm_event(self.batch_env.number))
-            .collect();
-        (events, l1_messages.into_iter().map(Into::into).collect())
+        logs::collect_events_and_l1_system_logs_after_timestamp(
+            &self.state,
+            &self.batch_env,
+            from_timestamp,
+        )
     }
 }
diff --git a/core/lib/multivm/src/versions/vm_latest/implementation/snapshots.rs b/core/lib/multivm/src/versions/vm_latest/implementation/snapshots.rs
index 97dfea7c998a..99d41a2aec6f 100644
--- a/core/lib/multivm/src/versions/vm_latest/implementation/snapshots.rs
+++ b/core/lib/multivm/src/versions/vm_latest/implementation/snapshots.rs
@@ -2,7 +2,7 @@ use vise::{Buckets, EncodeLabelSet, EncodeLabelValue, Family, Histogram, Metrics
 
 use std::time::Duration;
 
-use zk_evm_1_3_3::aux_structures::Timestamp;
+use zk_evm_1_4_0::aux_structures::Timestamp;
 use zksync_state::WriteStorage;
 
 use crate::vm_latest::{
diff --git a/core/lib/multivm/src/versions/vm_latest/implementation/statistics.rs b/core/lib/multivm/src/versions/vm_latest/implementation/statistics.rs
index 65a364d560f2..ddbc7aec2f73 100644
--- a/core/lib/multivm/src/versions/vm_latest/implementation/statistics.rs
+++ b/core/lib/multivm/src/versions/vm_latest/implementation/statistics.rs
@@ -1,4 +1,4 @@
-use zk_evm_1_3_3::aux_structures::Timestamp;
+use zk_evm_1_4_0::aux_structures::Timestamp;
 use zksync_state::WriteStorage;
 
 use crate::HistoryMode;
@@ -18,7 +18,7 @@ impl<S: WriteStorage, H: HistoryMode> Vm<S, H> {
         &self,
         timestamp_initial: Timestamp,
         cycles_initial: u32,
-        tracer: &DefaultExecutionTracer<S, H::VmVirtualBlocksRefundsEnhancement>,
+        tracer: &DefaultExecutionTracer<S, H::VmBoojumIntegration>,
         gas_remaining_before: u32,
         gas_remaining_after: u32,
         spent_pubdata_counter_before: u32,
diff --git a/core/lib/multivm/src/versions/vm_latest/implementation/tx.rs b/core/lib/multivm/src/versions/vm_latest/implementation/tx.rs
index 5f57b1eb965a..6def1da0f5d7 100644
--- a/core/lib/multivm/src/versions/vm_latest/implementation/tx.rs
+++ b/core/lib/multivm/src/versions/vm_latest/implementation/tx.rs
@@ -1,7 +1,7 @@
 use crate::vm_latest::constants::BOOTLOADER_HEAP_PAGE;
 use crate::vm_latest::implementation::bytecode::{bytecode_to_factory_dep, compress_bytecodes};
 use crate::HistoryMode;
-use zk_evm_1_3_3::aux_structures::Timestamp;
+use zk_evm_1_4_0::aux_structures::Timestamp;
 use zksync_state::WriteStorage;
 use zksync_types::l1::is_l1_tx_type;
 use zksync_types::Transaction;
diff --git a/core/lib/multivm/src/versions/vm_latest/mod.rs b/core/lib/multivm/src/versions/vm_latest/mod.rs
index d33cad28d5f1..49cd7111f6f3 100644
--- a/core/lib/multivm/src/versions/vm_latest/mod.rs
+++ b/core/lib/multivm/src/versions/vm_latest/mod.rs
@@ -10,10 +10,17 @@ pub use tracers::{
     traits::{ToTracerPointer, TracerPointer, VmTracer},
 };
 
+pub use crate::interface::types::{
+    inputs::{L1BatchEnv, L2BlockEnv, SystemEnv, TxExecutionMode, VmExecutionMode},
+    outputs::{
+        BootloaderMemory, CurrentExecutionState, ExecutionResult, FinishedL1Batch, L2Block,
+        Refunds, VmExecutionLogs, VmExecutionResultAndLogs, VmExecutionStatistics, VmMemoryMetrics,
+    },
+};
+pub use types::internals::ZkSyncVmState;
 pub use utils::transaction_encoding::TransactionVmExt;
 
 pub use bootloader_state::BootloaderState;
-pub use types::internals::ZkSyncVmState;
 
 pub use vm::Vm;
 
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 25b33ce87c39..4174d9f4f170 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
@@ -2,8 +2,9 @@ use crate::vm_latest::old_vm::{
     history_recorder::{AppDataFrameManagerWithHistory, HistoryEnabled, HistoryMode},
     oracles::OracleWithHistory,
 };
+use itertools::Itertools;
 use std::collections::HashMap;
-use zk_evm_1_3_3::{
+use zk_evm_1_4_0::{
     abstractions::EventSink,
     aux_structures::{LogQuery, Timestamp},
     reference_impls::event_sink::EventMessage,
@@ -11,6 +12,7 @@ use zk_evm_1_3_3::{
         BOOTLOADER_FORMAL_ADDRESS, EVENT_AUX_BYTE, L1_MESSAGE_AUX_BYTE,
     },
 };
+use zksync_types::U256;
 
 #[derive(Debug, Clone, PartialEq, Default)]
 pub struct InMemoryEventSink<H: HistoryMode> {
@@ -37,7 +39,9 @@ impl<H: HistoryMode> InMemoryEventSink<H> {
         let history = self.frames_stack.forward().current_frame();
 
         let (events, l1_messages) = Self::events_and_l1_messages_from_history(history);
-        (history.iter().map(|x| **x).collect(), events, l1_messages)
+        let events_logs = Self::events_logs_from_history(history);
+
+        (events_logs, events, l1_messages)
     }
 
     pub fn get_log_queries(&self) -> usize {
@@ -63,6 +67,92 @@ impl<H: HistoryMode> InMemoryEventSink<H> {
         Self::events_and_l1_messages_from_history(self.log_queries_after_timestamp(from_timestamp))
     }
 
+    fn events_logs_from_history(history: &[Box<LogQuery>]) -> Vec<LogQuery> {
+        // Filter out all the L2->L1 logs and leave only events
+        let mut events = history
+            .iter()
+            .filter_map(|log_query| (log_query.aux_byte == EVENT_AUX_BYTE).then_some(**log_query))
+            .collect_vec();
+
+        // Sort the events by timestamp and rollback flag, basically ensuring that
+        // if an event has been rolled back, the original event and its rollback will be put together
+        events.sort_by_key(|log| (log.timestamp, log.rollback));
+
+        let mut stack = Vec::<LogQuery>::new();
+        let mut net_history = vec![];
+        for el in events.iter() {
+            assert_eq!(el.shard_id, 0, "only rollup shard is supported");
+            if stack.is_empty() {
+                assert!(!el.rollback);
+                stack.push(*el);
+            } else {
+                // we can always pop as it's either one to add to queue, or discard
+                let previous = stack.pop().unwrap();
+                if previous.timestamp == el.timestamp {
+                    // Only rollback can have the same timestamp, so here we do nothing and simply
+                    // double check the invariants
+                    assert!(!previous.rollback);
+                    assert!(el.rollback);
+                    assert!(previous.rw_flag);
+                    assert!(el.rw_flag);
+                    assert_eq!(previous.tx_number_in_block, el.tx_number_in_block);
+                    assert_eq!(previous.shard_id, el.shard_id);
+                    assert_eq!(previous.address, el.address);
+                    assert_eq!(previous.key, el.key);
+                    assert_eq!(previous.written_value, el.written_value);
+                    assert_eq!(previous.is_service, el.is_service);
+                    continue;
+                } else {
+                    // The event on the stack has not been rolled back. It must be a different event,
+                    // with a different timestamp.
+                    assert!(!el.rollback);
+                    stack.push(*el);
+
+                    // cleanup some fields
+                    // flags are conventions
+                    let sorted_log_query = LogQuery {
+                        timestamp: Timestamp(0),
+                        tx_number_in_block: previous.tx_number_in_block,
+                        aux_byte: 0,
+                        shard_id: previous.shard_id,
+                        address: previous.address,
+                        key: previous.key,
+                        read_value: U256::zero(),
+                        written_value: previous.written_value,
+                        rw_flag: false,
+                        rollback: false,
+                        is_service: previous.is_service,
+                    };
+
+                    net_history.push(sorted_log_query);
+                }
+            }
+        }
+
+        // In case the stack is non-empty, then the last element of it has not been rolled back.
+        if let Some(previous) = stack.pop() {
+            // cleanup some fields
+            // flags are conventions
+            let sorted_log_query = LogQuery {
+                timestamp: Timestamp(0),
+                tx_number_in_block: previous.tx_number_in_block,
+                aux_byte: 0,
+                shard_id: previous.shard_id,
+                address: previous.address,
+                key: previous.key,
+                read_value: U256::zero(),
+                written_value: previous.written_value,
+                rw_flag: false,
+                rollback: false,
+                is_service: previous.is_service,
+            };
+
+            net_history.push(sorted_log_query);
+        }
+
+        net_history
+    }
+
     fn events_and_l1_messages_from_history(
         history: &[Box<LogQuery>],
     ) -> (Vec<EventMessage>, Vec<EventMessage>) {
diff --git a/core/lib/multivm/src/versions/vm_latest/old_vm/events.rs b/core/lib/multivm/src/versions/vm_latest/old_vm/events.rs
index de918e069141..eed8fee4ac86 100644
--- a/core/lib/multivm/src/versions/vm_latest/old_vm/events.rs
+++ b/core/lib/multivm/src/versions/vm_latest/old_vm/events.rs
@@ -1,4 +1,4 @@
-use zk_evm_1_3_3::{ethereum_types::Address, reference_impls::event_sink::EventMessage};
+use zk_evm_1_4_0::{ethereum_types::Address, reference_impls::event_sink::EventMessage};
 use zksync_types::{L1BatchNumber, VmEvent, EVENT_WRITER_ADDRESS, H256};
 use zksync_utils::{be_chunks_to_h256_words, h256_to_account_address};
 
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 bbffd5b4d876..7c0490044d6c 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
@@ -1,6 +1,6 @@
 use std::{collections::HashMap, fmt::Debug, hash::Hash};
 
-use zk_evm_1_3_3::{
+use zk_evm_1_4_0::{
     aux_structures::Timestamp,
     vm_state::PrimitiveValue,
     zkevm_opcode_defs::{self},
@@ -773,7 +773,7 @@ impl<S: WriteStorage, H: HistoryMode> HistoryRecorder<StorageWrapper<S>, H> {
 mod tests {
     use crate::vm_latest::old_vm::history_recorder::{HistoryRecorder, MemoryWrapper};
     use crate::vm_latest::HistoryDisabled;
-    use zk_evm_1_3_3::{aux_structures::Timestamp, vm_state::PrimitiveValue};
+    use zk_evm_1_4_0::{aux_structures::Timestamp, vm_state::PrimitiveValue};
     use zksync_types::U256;
 
     #[test]
diff --git a/core/lib/multivm/src/versions/vm_latest/old_vm/memory.rs b/core/lib/multivm/src/versions/vm_latest/old_vm/memory.rs
index 2ed85f6a87fb..5694a725d932 100644
--- a/core/lib/multivm/src/versions/vm_latest/old_vm/memory.rs
+++ b/core/lib/multivm/src/versions/vm_latest/old_vm/memory.rs
@@ -1,7 +1,7 @@
-use zk_evm_1_3_3::abstractions::{Memory, MemoryType};
-use zk_evm_1_3_3::aux_structures::{MemoryPage, MemoryQuery, Timestamp};
-use zk_evm_1_3_3::vm_state::PrimitiveValue;
-use zk_evm_1_3_3::zkevm_opcode_defs::FatPointer;
+use zk_evm_1_4_0::abstractions::{Memory, MemoryType};
+use zk_evm_1_4_0::aux_structures::{MemoryPage, MemoryQuery, Timestamp};
+use zk_evm_1_4_0::vm_state::PrimitiveValue;
+use zk_evm_1_4_0::zkevm_opcode_defs::FatPointer;
 use zksync_types::U256;
 
 use crate::vm_latest::old_vm::history_recorder::{
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 f98abd729088..fe5416cd1201 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
@@ -5,9 +5,9 @@ use crate::vm_latest::old_vm::history_recorder::{
     HistoryEnabled, HistoryMode, HistoryRecorder, WithHistory,
 };
 
-use zk_evm_1_3_3::abstractions::MemoryType;
-use zk_evm_1_3_3::aux_structures::Timestamp;
-use zk_evm_1_3_3::{
+use zk_evm_1_4_0::abstractions::MemoryType;
+use zk_evm_1_4_0::aux_structures::Timestamp;
+use zk_evm_1_4_0::{
     abstractions::{DecommittmentProcessor, Memory},
     aux_structures::{DecommittmentQuery, MemoryIndex, MemoryLocation, MemoryPage, MemoryQuery},
 };
@@ -173,7 +173,7 @@ impl<S: ReadStorage + Debug, const B: bool, H: HistoryMode> DecommittmentProcess
         memory: &mut M,
     ) -> Result<
         (
-            zk_evm_1_3_3::aux_structures::DecommittmentQuery,
+            zk_evm_1_4_0::aux_structures::DecommittmentQuery,
             Option<Vec<U256>>,
         ),
         anyhow::Error,
diff --git a/core/lib/multivm/src/versions/vm_latest/old_vm/oracles/mod.rs b/core/lib/multivm/src/versions/vm_latest/old_vm/oracles/mod.rs
index f9d35c2567b4..3f8d2d0f1383 100644
--- a/core/lib/multivm/src/versions/vm_latest/old_vm/oracles/mod.rs
+++ b/core/lib/multivm/src/versions/vm_latest/old_vm/oracles/mod.rs
@@ -1,4 +1,4 @@
-use zk_evm_1_3_3::aux_structures::Timestamp;
+use zk_evm_1_4_0::aux_structures::Timestamp;
 
 pub(crate) mod decommitter;
 pub(crate) mod precompile;
diff --git a/core/lib/multivm/src/versions/vm_latest/old_vm/oracles/precompile.rs b/core/lib/multivm/src/versions/vm_latest/old_vm/oracles/precompile.rs
index 5566595108be..ed3621fc4975 100644
--- a/core/lib/multivm/src/versions/vm_latest/old_vm/oracles/precompile.rs
+++ b/core/lib/multivm/src/versions/vm_latest/old_vm/oracles/precompile.rs
@@ -1,9 +1,9 @@
-use zk_evm_1_3_3::{
+use zk_evm_1_4_0::{
     abstractions::Memory,
     abstractions::PrecompileCyclesWitness,
     abstractions::PrecompilesProcessor,
     aux_structures::{LogQuery, MemoryQuery, Timestamp},
-    precompiles::DefaultPrecompilesProcessor,
+    zk_evm_abstractions::precompiles::DefaultPrecompilesProcessor,
 };
 
 use crate::vm_latest::old_vm::history_recorder::{HistoryEnabled, HistoryMode, HistoryRecorder};
diff --git a/core/lib/multivm/src/versions/vm_latest/old_vm/oracles/storage.rs b/core/lib/multivm/src/versions/vm_latest/old_vm/oracles/storage.rs
index 14a03f864266..2b779e39f338 100644
--- a/core/lib/multivm/src/versions/vm_latest/old_vm/oracles/storage.rs
+++ b/core/lib/multivm/src/versions/vm_latest/old_vm/oracles/storage.rs
@@ -5,9 +5,9 @@ use crate::vm_latest::old_vm::history_recorder::{
     HistoryRecorder, StorageWrapper, WithHistory,
 };
 
-use zk_evm_1_3_3::abstractions::RefundedAmounts;
-use zk_evm_1_3_3::zkevm_opcode_defs::system_params::INITIAL_STORAGE_WRITE_PUBDATA_BYTES;
-use zk_evm_1_3_3::{
+use zk_evm_1_4_0::abstractions::RefundedAmounts;
+use zk_evm_1_4_0::zkevm_opcode_defs::system_params::INITIAL_STORAGE_WRITE_PUBDATA_BYTES;
+use zk_evm_1_4_0::{
     abstractions::{RefundType, Storage as VmStorageOracle},
     aux_structures::{LogQuery, Timestamp},
 };
@@ -331,8 +331,8 @@ fn get_pubdata_price_bytes(_query: &LogQuery, is_initial: bool) -> u32 {
     // TODO (SMA-1702): take into account the content of the log query, i.e. values that contain mostly zeroes
     // should cost less.
     if is_initial {
-        zk_evm_1_3_3::zkevm_opcode_defs::system_params::INITIAL_STORAGE_WRITE_PUBDATA_BYTES as u32
+        zk_evm_1_4_0::zkevm_opcode_defs::system_params::INITIAL_STORAGE_WRITE_PUBDATA_BYTES as u32
     } else {
-        zk_evm_1_3_3::zkevm_opcode_defs::system_params::REPEATED_STORAGE_WRITE_PUBDATA_BYTES as u32
+        zk_evm_1_4_0::zkevm_opcode_defs::system_params::REPEATED_STORAGE_WRITE_PUBDATA_BYTES as u32
     }
 }
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 80156707ae9d..afaa19cac870 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
@@ -3,11 +3,11 @@ use crate::vm_latest::old_vm::memory::SimpleMemory;
 use crate::vm_latest::types::internals::ZkSyncVmState;
 use crate::vm_latest::HistoryMode;
 
-use zk_evm_1_3_3::zkevm_opcode_defs::decoding::{
+use zk_evm_1_4_0::zkevm_opcode_defs::decoding::{
     AllowedPcOrImm, EncodingModeProduction, VmEncodingMode,
 };
-use zk_evm_1_3_3::zkevm_opcode_defs::RET_IMPLICIT_RETURNDATA_PARAMS_REGISTER;
-use zk_evm_1_3_3::{
+use zk_evm_1_4_0::zkevm_opcode_defs::RET_IMPLICIT_RETURNDATA_PARAMS_REGISTER;
+use zk_evm_1_4_0::{
     aux_structures::{MemoryPage, Timestamp},
     vm_state::PrimitiveValue,
     zkevm_opcode_defs::FatPointer,
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 bcbce932cb47..beec2fa086fc 100644
--- a/core/lib/multivm/src/versions/vm_latest/oracles/storage.rs
+++ b/core/lib/multivm/src/versions/vm_latest/oracles/storage.rs
@@ -6,15 +6,17 @@ use crate::vm_latest::old_vm::history_recorder::{
 };
 use crate::vm_latest::old_vm::oracles::OracleWithHistory;
 
-use zk_evm_1_3_3::abstractions::RefundedAmounts;
-use zk_evm_1_3_3::zkevm_opcode_defs::system_params::INITIAL_STORAGE_WRITE_PUBDATA_BYTES;
-use zk_evm_1_3_3::{
+use zk_evm_1_4_0::abstractions::RefundedAmounts;
+use zk_evm_1_4_0::zkevm_opcode_defs::system_params::INITIAL_STORAGE_WRITE_PUBDATA_BYTES;
+use zk_evm_1_4_0::{
     abstractions::{RefundType, Storage as VmStorageOracle},
     aux_structures::{LogQuery, Timestamp},
 };
 
 use zksync_state::{StoragePtr, WriteStorage};
 use zksync_types::utils::storage_key_for_eth_balance;
+use zksync_types::writes::compression::compress_with_best_strategy;
+use zksync_types::writes::{BYTES_PER_DERIVED_KEY, BYTES_PER_ENUMERATION_INDEX};
 use zksync_types::{
     AccountTreeId, Address, StorageKey, StorageLogQuery, StorageLogQueryType, BOOTLOADER_ADDRESS,
     U256,
@@ -94,12 +96,24 @@ impl<S: WriteStorage, H: HistoryMode> StorageOracle<S, H> {
             || *key == storage_key_for_eth_balance(&BOOTLOADER_ADDRESS)
     }
 
+    fn get_initial_value(&self, storage_key: &StorageKey) -> Option<U256> {
+        self.initial_values.inner().get(storage_key).copied()
+    }
+
+    fn set_initial_value(&mut self, storage_key: &StorageKey, value: U256, timestamp: Timestamp) {
+        if !self.initial_values.inner().contains_key(storage_key) {
+            self.initial_values.insert(*storage_key, value, timestamp);
+        }
+    }
+
     pub fn read_value(&mut self, mut query: LogQuery) -> LogQuery {
         let key = triplet_to_storage_key(query.shard_id, query.address, query.key);
         let current_value = self.storage.read_from_storage(&key);
 
         query.read_value = current_value;
 
+        self.set_initial_value(&key, current_value, query.timestamp);
+
         self.frames_stack.push_forward(
             Box::new(StorageLogQuery {
                 log_query: query,
@@ -111,7 +125,7 @@ impl<S: WriteStorage, H: HistoryMode> StorageOracle<S, H> {
         query
     }
 
-    pub fn write_value(&mut self, mut query: LogQuery) -> LogQuery {
+    pub fn write_value(&mut self, query: LogQuery) -> LogQuery {
         let key = triplet_to_storage_key(query.shard_id, query.address, query.key);
         let current_value =
             self.storage
@@ -124,12 +138,7 @@ impl<S: WriteStorage, H: HistoryMode> StorageOracle<S, H> {
             StorageLogQueryType::RepeatedWrite
         };
 
-        query.read_value = current_value;
-
-        if !self.initial_values.inner().contains_key(&key) {
-            self.initial_values
-                .insert(key, current_value, query.timestamp);
-        }
+        self.set_initial_value(&key, current_value, query.timestamp);
 
         let mut storage_log_query = StorageLogQuery {
             log_query: query,
@@ -207,7 +216,11 @@ impl<S: WriteStorage, H: HistoryMode> StorageOracle<S, H> {
     fn base_price_for_write_query(&self, query: &LogQuery) -> u32 {
         let storage_key = storage_key_of_log(query);
 
-        self.base_price_for_write(&storage_key, query.read_value, query.written_value)
+        let initial_value = self
+            .get_initial_value(&storage_key)
+            .unwrap_or(self.storage.read_from_storage(&storage_key));
+
+        self.base_price_for_write(&storage_key, initial_value, query.written_value)
     }
 
     pub(crate) fn base_price_for_write(
@@ -226,16 +239,22 @@ impl<S: WriteStorage, H: HistoryMode> StorageOracle<S, H> {
             .borrow_mut()
             .is_write_initial(storage_key);
 
-        get_pubdata_price_bytes(is_initial_write)
+        get_pubdata_price_bytes(prev_value, new_value, is_initial_write)
     }
 
     // Returns the price of the update in terms of pubdata bytes.
     // TODO (SMA-1701): update VM to accept gas instead of pubdata.
-    fn value_update_price(&self, query: &LogQuery) -> u32 {
+    fn value_update_price(&mut self, query: &LogQuery) -> u32 {
         let storage_key = storage_key_of_log(query);
 
         let base_cost = self.base_price_for_write_query(query);
 
+        let initial_value = self
+            .get_initial_value(&storage_key)
+            .unwrap_or(self.storage.read_from_storage(&storage_key));
+
+        self.set_initial_value(&storage_key, initial_value, query.timestamp);
+
         let already_paid = self.prepaid_for_write(&storage_key);
 
         if base_cost <= already_paid {
@@ -299,7 +318,7 @@ impl<S: WriteStorage, H: HistoryMode> VmStorageOracle for StorageOracle<S, H> {
     fn execute_partial_query(
         &mut self,
         _monotonic_cycle_counter: u32,
-        query: LogQuery,
+        mut query: LogQuery,
     ) -> LogQuery {
         // tracing::trace!(
         //     "execute partial query cyc {:?} addr {:?} key {:?}, rw {:?}, wr {:?}, tx {:?}",
@@ -314,6 +333,8 @@ impl<S: WriteStorage, H: HistoryMode> VmStorageOracle for StorageOracle<S, H> {
         if query.rw_flag {
             // The number of bytes that have been compensated by the user to perform this write
             let storage_key = storage_key_of_log(&query);
+            let read_value = self.storage.read_from_storage(&storage_key);
+            query.read_value = read_value;
 
             // 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);
@@ -342,7 +363,14 @@ impl<S: WriteStorage, H: HistoryMode> VmStorageOracle for StorageOracle<S, H> {
         _monotonic_cycle_counter: u32,
         partial_query: &LogQuery,
     ) -> RefundType {
-        let price_to_pay = self.value_update_price(partial_query);
+        let storage_key = storage_key_of_log(partial_query);
+        let mut partial_query = *partial_query;
+        let read_value = self.storage.read_from_storage(&storage_key);
+        partial_query.read_value = read_value;
+
+        let price_to_pay = self
+            .value_update_price(&partial_query)
+            .min(INITIAL_STORAGE_WRITE_PUBDATA_BYTES as u32);
 
         let refund = RefundType::RepeatedWrite(RefundedAmounts {
             ergs: 0,
@@ -409,18 +437,51 @@ impl<S: WriteStorage, H: HistoryMode> VmStorageOracle for StorageOracle<S, H> {
 
 /// Returns the number of bytes needed to publish a slot.
 // Since we need to publish the state diffs onchain, for each of the updated storage slot
-// we basically need to publish the following pair: (<storage_key, new_value>).
-// While new_value is always 32 bytes long, for key we use the following optimization:
+// we basically need to publish the following pair: (<storage_key, compressed_new_value>).
+// For key we use the following optimization:
 //   - The first time we publish it, we use 32 bytes.
 //         Then, we remember a 8-byte id for this slot and assign it to it. We call this initial write.
-//   - The second time we publish it, we will use this 8-byte instead of the 32 bytes of the entire key.
-//         So the total size of the publish pubdata is 40 bytes. We call this kind of write the repeated one
-fn get_pubdata_price_bytes(is_initial: bool) -> u32 {
+//   - The second time we publish it, we will use the 4/5 byte representation of this 8-byte instead of the 32
+//     bytes of the entire key.
+// For value compression, we use a metadata byte which holds the length of the value and the operation from the
+// previous state to the new state, and the compressed value. The maxiumum for this is 33 bytes.
+// Total bytes for initial writes then becomes 65 bytes and repeated writes becomes 38 bytes.
+fn get_pubdata_price_bytes(initial_value: U256, final_value: U256, is_initial: bool) -> u32 {
     // TODO (SMA-1702): take into account the content of the log query, i.e. values that contain mostly zeroes
     // should cost less.
+
+    let compressed_value_size =
+        compress_with_best_strategy(initial_value, final_value).len() as u32;
+
     if is_initial {
-        zk_evm_1_3_3::zkevm_opcode_defs::system_params::INITIAL_STORAGE_WRITE_PUBDATA_BYTES as u32
+        (BYTES_PER_DERIVED_KEY as u32) + compressed_value_size
     } else {
-        zk_evm_1_3_3::zkevm_opcode_defs::system_params::REPEATED_STORAGE_WRITE_PUBDATA_BYTES as u32
+        (BYTES_PER_ENUMERATION_INDEX as u32) + compressed_value_size
+    }
+}
+
+#[cfg(test)]
+mod tests {
+    use super::*;
+
+    #[test]
+    fn test_get_pubdata_price_bytes() {
+        let initial_value = U256::default();
+        let final_value = U256::from(92122);
+        let is_initial = true;
+
+        let compression_len = 4;
+
+        let initial_bytes_price = get_pubdata_price_bytes(initial_value, final_value, is_initial);
+        let repeated_bytes_price = get_pubdata_price_bytes(initial_value, final_value, !is_initial);
+
+        assert_eq!(
+            initial_bytes_price,
+            (compression_len + BYTES_PER_DERIVED_KEY as usize) as u32
+        );
+        assert_eq!(
+            repeated_bytes_price,
+            (compression_len + BYTES_PER_ENUMERATION_INDEX as usize) as u32
+        );
     }
 }
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 cd109397d4c4..5c1bdbad58af 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
@@ -1,5 +1,5 @@
 use zksync_system_constants::BOOTLOADER_ADDRESS;
-use zksync_types::l2_to_l1_log::L2ToL1Log;
+use zksync_types::l2_to_l1_log::{L2ToL1Log, UserL2ToL1Log};
 use zksync_types::storage_writes_deduplicator::StorageWritesDeduplicator;
 use zksync_types::{get_code_key, get_known_code_key, U256};
 use zksync_utils::u256_to_h256;
@@ -18,13 +18,17 @@ fn test_l1_tx_execution() {
     // Here instead of marking code hash via the bootloader means, we will be
     // using L1->L2 communication, the same it would likely be done during the priority mode.
 
-    // There are always at least 3 initial writes here, because we pay fees from l1:
+    // There are always at least 7 initial writes here, because we pay fees from l1:
     // - totalSupply of ETH token
     // - balance of the refund recipient
     // - balance of the bootloader
-    // - tx_rollout hash
+    // - tx_rolling hash
+    // - rolling hash of L2->L1 logs
+    // - transaction number in block counter
+    // - L2->L1 log counter in L1Messenger
 
-    let basic_initial_writes = 1;
+    // TODO(PLA-537): right now we are using 4 slots instead of 7 due to 0 fee for transaction.
+    let basic_initial_writes = 4;
 
     let mut vm = VmTesterBuilder::new(HistoryEnabled)
         .with_empty_in_memory_storage()
@@ -38,14 +42,17 @@ fn test_l1_tx_execution() {
     let deploy_tx = account.get_deploy_tx(&contract_code, None, TxType::L1 { serial_id: 1 });
     let tx_data: TransactionData = deploy_tx.tx.clone().into();
 
-    let required_l2_to_l1_logs = vec![L2ToL1Log {
+    let required_l2_to_l1_logs: Vec<_> = vec![L2ToL1Log {
         shard_id: 0,
         is_service: true,
         tx_number_in_block: 0,
         sender: BOOTLOADER_ADDRESS,
         key: tx_data.tx_hash(0.into()),
         value: u256_to_h256(U256::from(1u32)),
-    }];
+    }]
+    .into_iter()
+    .map(UserL2ToL1Log)
+    .collect();
 
     vm.vm.push_transaction(deploy_tx.tx.clone());
 
@@ -65,7 +72,7 @@ fn test_l1_tx_execution() {
 
     verify_required_storage(&vm.vm.state, expected_slots);
 
-    assert_eq!(res.logs.l2_to_l1_logs, required_l2_to_l1_logs);
+    assert_eq!(res.logs.user_l2_to_l1_logs, required_l2_to_l1_logs);
 
     let tx = account.get_test_contract_transaction(
         deploy_tx.address,
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 0ba9e31c02b6..fb13e99af8a0 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
@@ -14,7 +14,7 @@ use crate::vm_latest::tests::tester::VmTesterBuilder;
 use crate::vm_latest::utils::l2_blocks::get_l2_block_hash_key;
 use crate::vm_latest::{HistoryEnabled, Vm};
 use crate::HistoryMode;
-use zk_evm_1_3_3::aux_structures::Timestamp;
+use zk_evm_1_4_0::aux_structures::Timestamp;
 use zksync_state::{ReadStorage, WriteStorage};
 use zksync_system_constants::{
     CURRENT_VIRTUAL_BLOCK_INFO_POSITION, REQUIRED_L1_TO_L2_GAS_PER_PUBDATA_BYTE,
@@ -22,7 +22,7 @@ use zksync_system_constants::{
 use zksync_types::block::{pack_block_info, unpack_block_info};
 use zksync_types::{
     block::{legacy_miniblock_hash, miniblock_hash},
-    get_code_key, AccountTreeId, Execute, ExecuteTransactionCommon, L1BatchNumber, L1TxCommonData,
+    AccountTreeId, Execute, ExecuteTransactionCommon, L1BatchNumber, L1TxCommonData,
     MiniblockNumber, StorageKey, Transaction, H160, H256, SYSTEM_CONTEXT_ADDRESS,
     SYSTEM_CONTEXT_BLOCK_INFO_POSITION, SYSTEM_CONTEXT_CURRENT_L2_BLOCK_INFO_POSITION,
     SYSTEM_CONTEXT_CURRENT_TX_ROLLING_HASH_POSITION, U256,
@@ -407,72 +407,6 @@ fn test_l2_block_first_in_batch() {
     );
 }
 
-#[test]
-fn test_l2_block_upgrade() {
-    let mut vm = VmTesterBuilder::new(HistoryEnabled)
-        .with_empty_in_memory_storage()
-        .with_execution_mode(TxExecutionMode::VerifyExecute)
-        .with_random_rich_accounts(1)
-        .build();
-
-    vm.vm
-        .state
-        .storage
-        .storage
-        .get_ptr()
-        .borrow_mut()
-        .set_value(get_code_key(&SYSTEM_CONTEXT_ADDRESS), H256::default());
-
-    let l1_tx = get_l1_noop();
-    // Firstly we execute the first transaction
-    vm.vm.push_transaction(l1_tx);
-    let result = vm.vm.execute(VmExecutionMode::OneTx);
-    assert!(!result.result.is_failed(), "No revert reason expected");
-    let result = vm.vm.execute(VmExecutionMode::Batch);
-    assert!(!result.result.is_failed(), "No revert reason expected");
-}
-
-#[test]
-fn test_l2_block_upgrade_ending() {
-    let mut l1_batch = default_l1_batch(L1BatchNumber(1));
-    l1_batch.timestamp = 1;
-    let mut vm = VmTesterBuilder::new(HistoryEnabled)
-        .with_empty_in_memory_storage()
-        .with_execution_mode(TxExecutionMode::VerifyExecute)
-        .with_l1_batch_env(l1_batch.clone())
-        .with_random_rich_accounts(1)
-        .build();
-
-    let l1_tx = get_l1_noop();
-
-    let storage = vm.storage.clone();
-
-    storage
-        .borrow_mut()
-        .set_value(get_code_key(&SYSTEM_CONTEXT_ADDRESS), H256::default());
-
-    vm.vm.push_transaction(l1_tx.clone());
-    let result = vm.vm.execute(VmExecutionMode::OneTx);
-
-    assert!(!result.result.is_failed(), "No revert reason expected");
-
-    let virtual_block_info = storage.borrow_mut().read_value(&StorageKey::new(
-        AccountTreeId::new(SYSTEM_CONTEXT_ADDRESS),
-        CURRENT_VIRTUAL_BLOCK_INFO_POSITION,
-    ));
-
-    let (virtual_block_number, virtual_block_timestamp) =
-        unpack_block_info(h256_to_u256(virtual_block_info));
-
-    assert_eq!(virtual_block_number as u32, l1_batch.first_l2_block.number);
-    assert_eq!(virtual_block_timestamp, l1_batch.first_l2_block.timestamp);
-    vm.vm.push_transaction(l1_tx);
-    let result = vm.vm.execute(VmExecutionMode::OneTx);
-    assert!(!result.result.is_failed(), "No revert reason expected");
-    let result = vm.vm.execute(VmExecutionMode::Batch);
-    assert!(!result.result.is_failed(), "No revert reason expected");
-}
-
 fn set_manual_l2_block_info<S: WriteStorage, H: HistoryMode>(
     vm: &mut Vm<S, H>,
     tx_number: usize,
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 6f0dd7d53285..9d4afcdb3178 100644
--- a/core/lib/multivm/src/versions/vm_latest/tests/refunds.rs
+++ b/core/lib/multivm/src/versions/vm_latest/tests/refunds.rs
@@ -80,8 +80,13 @@ fn test_predetermined_refunded_gas() {
     );
 
     assert_eq!(
-        current_state_with_predefined_refunds.l2_to_l1_logs,
-        current_state_without_predefined_refunds.l2_to_l1_logs
+        current_state_with_predefined_refunds.user_l2_to_l1_logs,
+        current_state_without_predefined_refunds.user_l2_to_l1_logs
+    );
+
+    assert_eq!(
+        current_state_with_predefined_refunds.system_logs,
+        current_state_without_predefined_refunds.system_logs
     );
 
     assert_eq!(
@@ -128,8 +133,13 @@ fn test_predetermined_refunded_gas() {
     );
 
     assert_eq!(
-        current_state_with_changed_predefined_refunds.l2_to_l1_logs,
-        current_state_without_predefined_refunds.l2_to_l1_logs
+        current_state_with_changed_predefined_refunds.user_l2_to_l1_logs,
+        current_state_without_predefined_refunds.user_l2_to_l1_logs
+    );
+
+    assert_ne!(
+        current_state_with_changed_predefined_refunds.system_logs,
+        current_state_without_predefined_refunds.system_logs
     );
 
     assert_eq!(
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 611154beac58..2d73e1be51af 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
@@ -1,7 +1,7 @@
 use std::collections::HashMap;
 
-use zk_evm_1_3_3::aux_structures::Timestamp;
-use zk_evm_1_3_3::vm_state::VmLocalState;
+use zk_evm_1_4_0::aux_structures::Timestamp;
+use zk_evm_1_4_0::vm_state::VmLocalState;
 use zksync_state::WriteStorage;
 
 use zksync_types::{StorageKey, StorageLogQuery, StorageValue, U256};
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 34beafcd278f..65780114e9a0 100644
--- a/core/lib/multivm/src/versions/vm_latest/tests/upgrade.rs
+++ b/core/lib/multivm/src/versions/vm_latest/tests/upgrade.rs
@@ -1,4 +1,4 @@
-use zk_evm_1_3_3::aux_structures::Timestamp;
+use zk_evm_1_4_0::aux_structures::Timestamp;
 
 use zksync_types::{
     ethabi::Contract,
@@ -36,6 +36,10 @@ fn test_protocol_upgrade_is_first() {
         .build();
 
     let bytecode_hash = hash_bytecode(&read_test_contract());
+    vm.vm
+        .storage
+        .borrow_mut()
+        .set_value(get_known_code_key(&bytecode_hash), u256_to_h256(1.into()));
 
     // Here we just use some random transaction of protocol upgrade type:
     let protocol_upgrade_transaction = get_forced_deploy_tx(&[ForceDeployment {
@@ -51,6 +55,20 @@ fn test_protocol_upgrade_is_first() {
         input: vec![],
     }]);
 
+    // Another random upgrade transaction
+    let another_protocol_upgrade_transaction = get_forced_deploy_tx(&[ForceDeployment {
+        // The bytecode hash to put on an address
+        bytecode_hash,
+        // The address on which to deploy the bytecodehash to
+        address: H160::random(),
+        // Whether to run the constructor on the force deployment
+        call_constructor: false,
+        // The value with which to initialize a contract
+        value: U256::zero(),
+        // The constructor calldata
+        input: vec![],
+    }]);
+
     let normal_l1_transaction = vm.rich_accounts[0]
         .get_deploy_tx(&read_test_contract(), None, TxType::L1 { serial_id: 0 })
         .tx;
@@ -62,7 +80,7 @@ fn test_protocol_upgrade_is_first() {
     // Test 1: there must be only one system transaction in block
     vm.vm.push_transaction(protocol_upgrade_transaction.clone());
     vm.vm.push_transaction(normal_l1_transaction.clone());
-    vm.vm.push_transaction(protocol_upgrade_transaction.clone());
+    vm.vm.push_transaction(another_protocol_upgrade_transaction);
 
     vm.vm.execute(VmExecutionMode::OneTx);
     vm.vm.execute(VmExecutionMode::OneTx);
diff --git a/core/lib/multivm/src/versions/vm_latest/tracers/default_tracers.rs b/core/lib/multivm/src/versions/vm_latest/tracers/default_tracers.rs
index 28a611899ebb..80ceaa23c3e9 100644
--- a/core/lib/multivm/src/versions/vm_latest/tracers/default_tracers.rs
+++ b/core/lib/multivm/src/versions/vm_latest/tracers/default_tracers.rs
@@ -4,7 +4,7 @@ use std::marker::PhantomData;
 use crate::dispatch_tracers;
 use crate::interface::tracer::{TracerExecutionStopReason, VmExecutionStopReason};
 use crate::interface::{Halt, VmExecutionMode};
-use zk_evm_1_3_3::{
+use zk_evm_1_4_0::{
     tracing::{
         AfterDecodingData, AfterExecutionData, BeforeExecutionData, Tracer, VmLocalStateData,
     },
@@ -15,7 +15,7 @@ use zk_evm_1_3_3::{
 use zksync_state::{StoragePtr, WriteStorage};
 use zksync_types::Timestamp;
 
-use crate::interface::traits::tracers::dyn_tracers::vm_1_3_3::DynTracer;
+use crate::interface::traits::tracers::dyn_tracers::vm_1_4_0::DynTracer;
 use crate::interface::types::tracer::TracerExecutionStatus;
 use crate::vm_latest::bootloader_state::utils::apply_l2_block;
 use crate::vm_latest::bootloader_state::BootloaderState;
@@ -31,6 +31,8 @@ use crate::vm_latest::tracers::{RefundsTracer, ResultTracer};
 use crate::vm_latest::types::internals::ZkSyncVmState;
 use crate::vm_latest::VmTracer;
 
+use super::PubdataTracer;
+
 /// Default tracer for the VM. It manages the other tracers execution and stop the vm when needed.
 pub(crate) struct DefaultExecutionTracer<S: WriteStorage, H: HistoryMode> {
     tx_has_been_processed: bool,
@@ -48,6 +50,10 @@ pub(crate) struct DefaultExecutionTracer<S: WriteStorage, H: HistoryMode> {
     // ensures static dispatch, enhancing performance by avoiding dynamic dispatch overhead.
     // Additionally, being an internal tracer, it saves the results directly to VmResultAndLogs.
     pub(crate) refund_tracer: Option<RefundsTracer<S>>,
+    // The pubdata tracer is responsible for inserting the pubdata packing information into the bootloader
+    // memory at the end of the batch. Its separation from the custom tracer
+    // ensures static dispatch, enhancing performance by avoiding dynamic dispatch overhead.
+    pub(crate) pubdata_tracer: Option<PubdataTracer<H>>,
     pub(crate) dispatcher: TracerDispatcher<S, H>,
     ret_from_the_bootloader: Option<RetOpcode>,
     storage: StoragePtr<S>,
@@ -127,7 +133,7 @@ impl<S: WriteStorage, H: HistoryMode> Tracer for DefaultExecutionTracer<S, H> {
         memory: &Self::SupportedMemory,
     ) {
         if let VmExecutionMode::Bootloader = self.execution_mode {
-            let (next_opcode, _, _) = zk_evm_1_3_3::vm_state::read_and_decode(
+            let (next_opcode, _, _) = zk_evm_1_4_0::vm_state::read_and_decode(
                 state.vm_local_state,
                 memory,
                 &mut DummyTracer,
@@ -155,6 +161,7 @@ impl<S: WriteStorage, H: HistoryMode> DefaultExecutionTracer<S, H> {
         dispatcher: TracerDispatcher<S, H>,
         storage: StoragePtr<S>,
         refund_tracer: Option<RefundsTracer<S>>,
+        pubdata_tracer: Option<PubdataTracer<H>>,
     ) -> Self {
         Self {
             tx_has_been_processed: false,
@@ -167,6 +174,7 @@ impl<S: WriteStorage, H: HistoryMode> DefaultExecutionTracer<S, H> {
             result_tracer: ResultTracer::new(execution_mode),
             refund_tracer,
             dispatcher,
+            pubdata_tracer,
             ret_from_the_bootloader: None,
             storage,
             _phantom: Default::default(),
@@ -248,6 +256,11 @@ impl<S: WriteStorage, H: HistoryMode> DefaultExecutionTracer<S, H> {
             .dispatcher
             .finish_cycle(state, bootloader_state)
             .stricter(&result);
+        if let Some(pubdata_tracer) = &mut self.pubdata_tracer {
+            result = pubdata_tracer
+                .finish_cycle(state, bootloader_state)
+                .stricter(&result);
+        }
         result.stricter(&self.should_stop_execution())
     }
 
diff --git a/core/lib/multivm/src/versions/vm_latest/tracers/dispatcher.rs b/core/lib/multivm/src/versions/vm_latest/tracers/dispatcher.rs
index 3b956881baf1..b75277670dca 100644
--- a/core/lib/multivm/src/versions/vm_latest/tracers/dispatcher.rs
+++ b/core/lib/multivm/src/versions/vm_latest/tracers/dispatcher.rs
@@ -1,9 +1,9 @@
-use crate::interface::dyn_tracers::vm_1_3_3::DynTracer;
+use crate::interface::dyn_tracers::vm_1_4_0::DynTracer;
 use crate::interface::tracer::{TracerExecutionStatus, VmExecutionStopReason};
 use crate::vm_latest::{
     BootloaderState, HistoryMode, SimpleMemory, TracerPointer, VmTracer, ZkSyncVmState,
 };
-use zk_evm_1_3_3::tracing::{
+use zk_evm_1_4_0::tracing::{
     AfterDecodingData, AfterExecutionData, BeforeExecutionData, VmLocalStateData,
 };
 use zksync_state::{StoragePtr, WriteStorage};
diff --git a/core/lib/multivm/src/versions/vm_latest/tracers/mod.rs b/core/lib/multivm/src/versions/vm_latest/tracers/mod.rs
index eabb238d665f..9bba6a814431 100644
--- a/core/lib/multivm/src/versions/vm_latest/tracers/mod.rs
+++ b/core/lib/multivm/src/versions/vm_latest/tracers/mod.rs
@@ -1,8 +1,10 @@
 pub(crate) use default_tracers::DefaultExecutionTracer;
+pub(crate) use pubdata_tracer::PubdataTracer;
 pub(crate) use refunds::RefundsTracer;
 pub(crate) use result_tracer::ResultTracer;
 
 pub(crate) mod default_tracers;
+pub(crate) mod pubdata_tracer;
 pub(crate) mod refunds;
 pub(crate) mod result_tracer;
 
diff --git a/core/lib/multivm/src/versions/vm_latest/tracers/pubdata_tracer.rs b/core/lib/multivm/src/versions/vm_latest/tracers/pubdata_tracer.rs
new file mode 100644
index 000000000000..f01ee54048a5
--- /dev/null
+++ b/core/lib/multivm/src/versions/vm_latest/tracers/pubdata_tracer.rs
@@ -0,0 +1,211 @@
+use std::marker::PhantomData;
+use zk_evm_1_4_0::{
+    aux_structures::Timestamp,
+    tracing::{BeforeExecutionData, VmLocalStateData},
+};
+
+use zksync_state::{StoragePtr, WriteStorage};
+use zksync_types::{
+    event::{
+        extract_bytecode_publication_requests_from_l1_messenger,
+        extract_l2tol1logs_from_l1_messenger, extract_long_l2_to_l1_messages, L1MessengerL2ToL1Log,
+    },
+    writes::StateDiffRecord,
+    zkevm_test_harness::witness::sort_storage_access::sort_storage_access_queries,
+    AccountTreeId, StorageKey, L1_MESSENGER_ADDRESS,
+};
+use zksync_utils::u256_to_h256;
+use zksync_utils::{h256_to_u256, u256_to_bytes_be};
+
+use crate::vm_latest::{
+    old_vm::{history_recorder::HistoryMode, memory::SimpleMemory},
+    types::internals::pubdata::PubdataInput,
+};
+use crate::{vm_latest::constants::BOOTLOADER_HEAP_PAGE, vm_latest::StorageOracle};
+
+use crate::interface::dyn_tracers::vm_1_4_0::DynTracer;
+use crate::interface::tracer::{TracerExecutionStatus, TracerExecutionStopReason};
+use crate::interface::types::inputs::L1BatchEnv;
+use crate::vm_latest::tracers::{traits::VmTracer, utils::VmHook};
+use crate::vm_latest::types::internals::ZkSyncVmState;
+use crate::vm_latest::utils::logs::collect_events_and_l1_system_logs_after_timestamp;
+use crate::{
+    interface::VmExecutionMode,
+    vm_latest::bootloader_state::{utils::apply_pubdata_to_memory, BootloaderState},
+};
+
+/// Tracer responsible for collecting information about refunds.
+#[derive(Debug, Clone)]
+pub(crate) struct PubdataTracer<H: HistoryMode> {
+    l1_batch_env: L1BatchEnv,
+    pubdata_info_requested: bool,
+    execution_mode: VmExecutionMode,
+    _phantom_data: PhantomData<H>,
+}
+
+impl<H: HistoryMode> PubdataTracer<H> {
+    pub(crate) fn new(l1_batch_env: L1BatchEnv, execution_mode: VmExecutionMode) -> Self {
+        Self {
+            l1_batch_env,
+            pubdata_info_requested: false,
+            execution_mode,
+            _phantom_data: Default::default(),
+        }
+    }
+}
+
+impl<H: HistoryMode> PubdataTracer<H> {
+    // Packs part of L1 Messenger total pubdata that corresponds to
+    // L2toL1Logs sent in the block
+    fn get_total_user_logs<S: WriteStorage>(
+        &self,
+        state: &ZkSyncVmState<S, H>,
+    ) -> Vec<L1MessengerL2ToL1Log> {
+        let (all_generated_events, _) = collect_events_and_l1_system_logs_after_timestamp(
+            state,
+            &self.l1_batch_env,
+            Timestamp(0),
+        );
+        extract_l2tol1logs_from_l1_messenger(&all_generated_events)
+    }
+
+    // Packs part of L1 Messenger total pubdata that corresponds to
+    // Messages sent in the block
+    fn get_total_l1_messenger_messages<S: WriteStorage>(
+        &self,
+        state: &ZkSyncVmState<S, H>,
+    ) -> Vec<Vec<u8>> {
+        let (all_generated_events, _) = collect_events_and_l1_system_logs_after_timestamp(
+            state,
+            &self.l1_batch_env,
+            Timestamp(0),
+        );
+
+        extract_long_l2_to_l1_messages(&all_generated_events)
+    }
+
+    // Packs part of L1 Messenger total pubdata that corresponds to
+    // Bytecodes needed to be published on L1
+    fn get_total_published_bytecodes<S: WriteStorage>(
+        &self,
+        state: &ZkSyncVmState<S, H>,
+    ) -> Vec<Vec<u8>> {
+        let (all_generated_events, _) = collect_events_and_l1_system_logs_after_timestamp(
+            state,
+            &self.l1_batch_env,
+            Timestamp(0),
+        );
+
+        let bytecode_publication_requests =
+            extract_bytecode_publication_requests_from_l1_messenger(&all_generated_events);
+
+        bytecode_publication_requests
+            .iter()
+            .map(|bytecode_publication_request| {
+                state
+                    .decommittment_processor
+                    .known_bytecodes
+                    .inner()
+                    .get(&h256_to_u256(bytecode_publication_request.bytecode_hash))
+                    .unwrap()
+                    .iter()
+                    .flat_map(u256_to_bytes_be)
+                    .collect()
+            })
+            .collect()
+    }
+
+    // Packs part of L1Messenger total pubdata that corresponds to
+    // State diffs needed to be published on L1
+    fn get_state_diffs<S: WriteStorage>(storage: &StorageOracle<S, H>) -> Vec<StateDiffRecord> {
+        sort_storage_access_queries(
+            storage
+                .storage_log_queries_after_timestamp(Timestamp(0))
+                .iter()
+                .map(|log| &log.log_query),
+        )
+        .1
+        .into_iter()
+        .filter(|log| log.rw_flag)
+        .filter(|log| log.read_value != log.written_value)
+        .filter(|log| log.address != L1_MESSENGER_ADDRESS)
+        .map(|log| StateDiffRecord {
+            address: log.address,
+            key: log.key,
+            derived_key: log.derive_final_address(),
+            enumeration_index: storage
+                .storage
+                .get_ptr()
+                .borrow_mut()
+                .get_enumeration_index(&StorageKey::new(
+                    AccountTreeId::new(log.address),
+                    u256_to_h256(log.key),
+                ))
+                .unwrap_or_default(),
+            initial_value: log.read_value,
+            final_value: log.written_value,
+        })
+        .collect()
+    }
+
+    fn build_pubdata_input<S: WriteStorage>(&self, state: &ZkSyncVmState<S, H>) -> PubdataInput {
+        PubdataInput {
+            user_logs: self.get_total_user_logs(state),
+            l2_to_l1_messages: self.get_total_l1_messenger_messages(state),
+            published_bytecodes: self.get_total_published_bytecodes(state),
+            state_diffs: Self::get_state_diffs(&state.storage),
+        }
+    }
+}
+
+impl<S, H: HistoryMode> DynTracer<S, SimpleMemory<H>> for PubdataTracer<H> {
+    fn before_execution(
+        &mut self,
+        state: VmLocalStateData<'_>,
+        data: BeforeExecutionData,
+        _memory: &SimpleMemory<H>,
+        _storage: StoragePtr<S>,
+    ) {
+        let hook = VmHook::from_opcode_memory(&state, &data);
+        if let VmHook::PubdataRequested = hook {
+            self.pubdata_info_requested = true;
+        }
+    }
+}
+
+impl<S: WriteStorage, H: HistoryMode> VmTracer<S, H> for PubdataTracer<H> {
+    fn finish_cycle(
+        &mut self,
+        state: &mut ZkSyncVmState<S, H>,
+        bootloader_state: &mut BootloaderState,
+    ) -> TracerExecutionStatus {
+        if !matches!(self.execution_mode, VmExecutionMode::Batch) {
+            // We do not provide the pubdata when executing the block tip or a single transaction
+            if self.pubdata_info_requested {
+                return TracerExecutionStatus::Stop(TracerExecutionStopReason::Finish);
+            } else {
+                return TracerExecutionStatus::Continue;
+            }
+        }
+
+        if self.pubdata_info_requested {
+            let pubdata_input = self.build_pubdata_input(state);
+
+            // Save the pubdata for the future initial bootloader memory building
+            bootloader_state.set_pubdata_input(pubdata_input.clone());
+
+            // Apply the pubdata to the current memory
+            let mut memory_to_apply = vec![];
+            apply_pubdata_to_memory(&mut memory_to_apply, pubdata_input);
+            state.memory.populate_page(
+                BOOTLOADER_HEAP_PAGE as usize,
+                memory_to_apply,
+                Timestamp(state.local_state.timestamp),
+            );
+
+            self.pubdata_info_requested = false;
+        }
+
+        TracerExecutionStatus::Continue
+    }
+}
diff --git a/core/lib/multivm/src/versions/vm_latest/tracers/refunds.rs b/core/lib/multivm/src/versions/vm_latest/tracers/refunds.rs
index 61fd6126cb6c..6dd9c94328c4 100644
--- a/core/lib/multivm/src/versions/vm_latest/tracers/refunds.rs
+++ b/core/lib/multivm/src/versions/vm_latest/tracers/refunds.rs
@@ -1,10 +1,10 @@
 use std::marker::PhantomData;
 use vise::{Buckets, EncodeLabelSet, EncodeLabelValue, Family, Histogram, Metrics};
 
-use crate::interface::traits::tracers::dyn_tracers::vm_1_3_3::DynTracer;
+use crate::interface::traits::tracers::dyn_tracers::vm_1_4_0::DynTracer;
 use crate::interface::types::tracer::TracerExecutionStatus;
 use crate::interface::{L1BatchEnv, Refunds};
-use zk_evm_1_3_3::{
+use zk_evm_1_4_0::{
     aux_structures::Timestamp,
     tracing::{BeforeExecutionData, VmLocalStateData},
     vm_state::VmLocalState,
@@ -330,7 +330,7 @@ pub(crate) fn pubdata_published<S: WriteStorage, H: HistoryMode>(
         })
         .filter(|log| log.sender != SYSTEM_CONTEXT_ADDRESS)
         .count() as u32)
-        * zk_evm_1_3_3::zkevm_opcode_defs::system_params::L1_MESSAGE_PUBDATA_BYTES;
+        * zk_evm_1_4_0::zkevm_opcode_defs::system_params::L1_MESSAGE_PUBDATA_BYTES;
     let l2_l1_long_messages_bytes: u32 = extract_long_l2_to_l1_messages(&events)
         .iter()
         .map(|event| event.len() as u32)
diff --git a/core/lib/multivm/src/versions/vm_latest/tracers/result_tracer.rs b/core/lib/multivm/src/versions/vm_latest/tracers/result_tracer.rs
index 5765c0c9cc95..8d5fccaf1eac 100644
--- a/core/lib/multivm/src/versions/vm_latest/tracers/result_tracer.rs
+++ b/core/lib/multivm/src/versions/vm_latest/tracers/result_tracer.rs
@@ -1,5 +1,5 @@
 use std::marker::PhantomData;
-use zk_evm_1_3_3::{
+use zk_evm_1_4_0::{
     tracing::{AfterDecodingData, BeforeExecutionData, VmLocalStateData},
     vm_state::{ErrorFlags, VmLocalState},
     zkevm_opcode_defs::FatPointer,
@@ -7,7 +7,7 @@ use zk_evm_1_3_3::{
 use zksync_state::{StoragePtr, WriteStorage};
 
 use crate::interface::{
-    tracer::VmExecutionStopReason, traits::tracers::dyn_tracers::vm_1_3_3::DynTracer,
+    tracer::VmExecutionStopReason, traits::tracers::dyn_tracers::vm_1_4_0::DynTracer,
     types::tracer::TracerExecutionStopReason, ExecutionResult, Halt, TxRevertReason,
     VmExecutionMode, VmRevertReason,
 };
diff --git a/core/lib/multivm/src/versions/vm_latest/tracers/traits.rs b/core/lib/multivm/src/versions/vm_latest/tracers/traits.rs
index 5ec081931305..a3970541bac2 100644
--- a/core/lib/multivm/src/versions/vm_latest/tracers/traits.rs
+++ b/core/lib/multivm/src/versions/vm_latest/tracers/traits.rs
@@ -1,6 +1,5 @@
-use crate::interface::tracer::VmExecutionStopReason;
-use crate::interface::traits::tracers::dyn_tracers::vm_1_3_3::DynTracer;
-use crate::interface::types::tracer::TracerExecutionStatus;
+use crate::interface::dyn_tracers::vm_1_4_0::DynTracer;
+use crate::interface::tracer::{TracerExecutionStatus, VmExecutionStopReason};
 use zksync_state::WriteStorage;
 
 use crate::vm_latest::bootloader_state::BootloaderState;
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 2783f8e1fbc2..5b34eee4742a 100644
--- a/core/lib/multivm/src/versions/vm_latest/tracers/utils.rs
+++ b/core/lib/multivm/src/versions/vm_latest/tracers/utils.rs
@@ -1,6 +1,6 @@
-use zk_evm_1_3_3::aux_structures::MemoryPage;
-use zk_evm_1_3_3::zkevm_opcode_defs::{FarCallABI, FarCallForwardPageType};
-use zk_evm_1_3_3::{
+use zk_evm_1_4_0::aux_structures::MemoryPage;
+use zk_evm_1_4_0::zkevm_opcode_defs::{FarCallABI, FarCallForwardPageType};
+use zk_evm_1_4_0::{
     tracing::{BeforeExecutionData, VmLocalStateData},
     zkevm_opcode_defs::{FatPointer, LogOpcode, Opcode, UMAOpcode},
 };
@@ -34,6 +34,8 @@ pub(crate) enum VmHook {
     NotifyAboutRefund,
     ExecutionResult,
     FinalBatchInfo,
+    // Hook used to signal that the final pubdata for a batch is requested.
+    PubdataRequested,
 }
 
 impl VmHook {
@@ -72,6 +74,7 @@ impl VmHook {
             9 => Self::NotifyAboutRefund,
             10 => Self::ExecutionResult,
             11 => Self::FinalBatchInfo,
+            12 => Self::PubdataRequested,
             _ => panic!("Unknown hook: {}", value.as_u32()),
         }
     }
diff --git a/core/lib/multivm/src/versions/vm_latest/types/internals/mod.rs b/core/lib/multivm/src/versions/vm_latest/types/internals/mod.rs
index 601b7b8bd014..c189de7266d4 100644
--- a/core/lib/multivm/src/versions/vm_latest/types/internals/mod.rs
+++ b/core/lib/multivm/src/versions/vm_latest/types/internals/mod.rs
@@ -1,6 +1,7 @@
 pub(crate) use snapshot::VmSnapshot;
 pub(crate) use transaction_data::TransactionData;
 pub(crate) use vm_state::new_vm_state;
+pub(crate) mod pubdata;
 pub use vm_state::ZkSyncVmState;
 mod snapshot;
 mod transaction_data;
diff --git a/core/lib/multivm/src/versions/vm_latest/types/internals/pubdata.rs b/core/lib/multivm/src/versions/vm_latest/types/internals/pubdata.rs
new file mode 100644
index 000000000000..e246bceeac54
--- /dev/null
+++ b/core/lib/multivm/src/versions/vm_latest/types/internals/pubdata.rs
@@ -0,0 +1,133 @@
+use zksync_types::ethabi;
+use zksync_types::{
+    event::L1MessengerL2ToL1Log,
+    writes::{compress_state_diffs, StateDiffRecord},
+};
+
+/// Struct based on which the pubdata blob is formed
+#[derive(Debug, Clone, Default)]
+pub(crate) struct PubdataInput {
+    pub(crate) user_logs: Vec<L1MessengerL2ToL1Log>,
+    pub(crate) l2_to_l1_messages: Vec<Vec<u8>>,
+    pub(crate) published_bytecodes: Vec<Vec<u8>>,
+    pub(crate) state_diffs: Vec<StateDiffRecord>,
+}
+
+impl PubdataInput {
+    pub(crate) fn build_pubdata(self) -> Vec<u8> {
+        let mut l1_messenger_pubdata = vec![];
+
+        let PubdataInput {
+            user_logs,
+            l2_to_l1_messages,
+            published_bytecodes,
+            state_diffs,
+        } = self;
+
+        // Encoding user L2->L1 logs.
+        // Format: [(numberOfL2ToL1Logs as u32) || l2tol1logs[1] || ... || l2tol1logs[n]]
+        l1_messenger_pubdata.extend((user_logs.len() as u32).to_be_bytes());
+        for l2tol1log in user_logs {
+            l1_messenger_pubdata.extend(l2tol1log.packed_encoding());
+        }
+
+        // Encoding L2->L1 messages
+        // Format: [(numberOfMessages as u32) || (messages[1].len() as u32) || messages[1] || ... || (messages[n].len() as u32) || messages[n]]
+        l1_messenger_pubdata.extend((l2_to_l1_messages.len() as u32).to_be_bytes());
+        for message in l2_to_l1_messages {
+            l1_messenger_pubdata.extend((message.len() as u32).to_be_bytes());
+            l1_messenger_pubdata.extend(message);
+        }
+
+        // Encoding bytecodes
+        // Format: [(numberOfBytecodes as u32) || (bytecodes[1].len() as u32) || bytecodes[1] || ... || (bytecodes[n].len() as u32) || bytecodes[n]]
+        l1_messenger_pubdata.extend((published_bytecodes.len() as u32).to_be_bytes());
+        for bytecode in published_bytecodes {
+            l1_messenger_pubdata.extend((bytecode.len() as u32).to_be_bytes());
+            l1_messenger_pubdata.extend(bytecode);
+        }
+
+        // Encoding state diffs
+        // Format: [size of compressed state diffs u32 || compressed state diffs || (# state diffs: intial + repeated) as u32 || sorted state diffs by <index, address, key>]
+        let state_diffs_compressed = compress_state_diffs(state_diffs.clone());
+        l1_messenger_pubdata.extend(state_diffs_compressed);
+        l1_messenger_pubdata.extend((state_diffs.len() as u32).to_be_bytes());
+
+        for state_diff in state_diffs {
+            l1_messenger_pubdata.extend(state_diff.encode_padded());
+        }
+
+        // ABI-encoding the final pubdata
+        let l1_messenger_abi_encoded_pubdata =
+            ethabi::encode(&[ethabi::Token::Bytes(l1_messenger_pubdata)]);
+
+        assert!(
+            l1_messenger_abi_encoded_pubdata.len() % 32 == 0,
+            "abi encoded bytes array length should be divisible by 32"
+        );
+
+        // Need to skip first word as it represents array offset
+        // while bootloader expects only [len || data]
+        l1_messenger_abi_encoded_pubdata[32..].to_vec()
+    }
+}
+
+#[cfg(test)]
+mod tests {
+    use zksync_system_constants::{ACCOUNT_CODE_STORAGE_ADDRESS, BOOTLOADER_ADDRESS};
+    use zksync_utils::u256_to_h256;
+
+    use super::*;
+
+    #[test]
+    fn test_basic_pubdata_building() {
+        // Just using some constant addresses for tests
+        let addr1 = BOOTLOADER_ADDRESS;
+        let addr2 = ACCOUNT_CODE_STORAGE_ADDRESS;
+
+        let user_logs = vec![L1MessengerL2ToL1Log {
+            l2_shard_id: 0,
+            is_service: false,
+            tx_number_in_block: 0,
+            sender: addr1,
+            key: 1.into(),
+            value: 128.into(),
+        }];
+
+        let l2_to_l1_messages = vec![hex::decode("deadbeef").unwrap()];
+
+        let published_bytecodes = vec![hex::decode("aaaabbbb").unwrap()];
+
+        // For covering more cases, we have two state diffs:
+        // One with enumeration index present (and so it is a repeated write) and the one without it.
+        let state_diffs = vec![
+            StateDiffRecord {
+                address: addr2,
+                key: 155.into(),
+                derived_key: u256_to_h256(125.into()).0,
+                enumeration_index: 12,
+                initial_value: 11.into(),
+                final_value: 12.into(),
+            },
+            StateDiffRecord {
+                address: addr2,
+                key: 156.into(),
+                derived_key: u256_to_h256(126.into()).0,
+                enumeration_index: 0,
+                initial_value: 0.into(),
+                final_value: 14.into(),
+            },
+        ];
+
+        let input = PubdataInput {
+            user_logs,
+            l2_to_l1_messages,
+            published_bytecodes,
+            state_diffs,
+        };
+
+        let pubdata = input.build_pubdata();
+
+        assert_eq!(hex::encode(pubdata), "00000000000000000000000000000000000000000000000000000000000002c700000001000000000000000000000000000000000000000000008001000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000800000000100000004deadbeef0000000100000004aaaabbbb0100002a040001000000000000000000000000000000000000000000000000000000000000007e090e0000000c0901000000020000000000000000000000000000000000008002000000000000000000000000000000000000000000000000000000000000009b000000000000000000000000000000000000000000000000000000000000007d000000000000000c000000000000000000000000000000000000000000000000000000000000000b000000000000000000000000000000000000000000000000000000000000000c00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008002000000000000000000000000000000000000000000000000000000000000009c000000000000000000000000000000000000000000000000000000000000007e00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000e000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000");
+    }
+}
diff --git a/core/lib/multivm/src/versions/vm_latest/types/internals/snapshot.rs b/core/lib/multivm/src/versions/vm_latest/types/internals/snapshot.rs
index 7391be4e4d59..2a9368c37a39 100644
--- a/core/lib/multivm/src/versions/vm_latest/types/internals/snapshot.rs
+++ b/core/lib/multivm/src/versions/vm_latest/types/internals/snapshot.rs
@@ -1,4 +1,4 @@
-use zk_evm_1_3_3::vm_state::VmLocalState;
+use zk_evm_1_4_0::vm_state::VmLocalState;
 
 use crate::vm_latest::bootloader_state::BootloaderStateSnapshot;
 
diff --git a/core/lib/multivm/src/versions/vm_latest/types/internals/vm_state.rs b/core/lib/multivm/src/versions/vm_latest/types/internals/vm_state.rs
index 3462948e0100..0c519a324c0a 100644
--- a/core/lib/multivm/src/versions/vm_latest/types/internals/vm_state.rs
+++ b/core/lib/multivm/src/versions/vm_latest/types/internals/vm_state.rs
@@ -1,4 +1,4 @@
-use zk_evm_1_3_3::{
+use zk_evm_1_4_0::{
     aux_structures::MemoryPage,
     aux_structures::Timestamp,
     block_properties::BlockProperties,
@@ -11,7 +11,7 @@ use zk_evm_1_3_3::{
 };
 
 use crate::interface::{L1BatchEnv, L2Block, SystemEnv};
-use zk_evm_1_3_3::zkevm_opcode_defs::{
+use zk_evm_1_4_0::zkevm_opcode_defs::{
     BOOTLOADER_BASE_PAGE, BOOTLOADER_CODE_PAGE, STARTING_BASE_PAGE, STARTING_TIMESTAMP,
 };
 use zksync_state::{StoragePtr, WriteStorage};
diff --git a/core/lib/multivm/src/versions/vm_latest/utils/logs.rs b/core/lib/multivm/src/versions/vm_latest/utils/logs.rs
new file mode 100644
index 000000000000..a2b7f548684f
--- /dev/null
+++ b/core/lib/multivm/src/versions/vm_latest/utils/logs.rs
@@ -0,0 +1,22 @@
+use zksync_state::WriteStorage;
+use zksync_types::{l2_to_l1_log::L2ToL1Log, Timestamp, VmEvent};
+
+use crate::{
+    interface::L1BatchEnv, vm_latest::old_vm::events::merge_events,
+    vm_latest::old_vm::history_recorder::HistoryMode, vm_latest::types::internals::ZkSyncVmState,
+};
+
+pub(crate) fn collect_events_and_l1_system_logs_after_timestamp<S: WriteStorage, H: HistoryMode>(
+    vm_state: &ZkSyncVmState<S, H>,
+    batch_env: &L1BatchEnv,
+    from_timestamp: Timestamp,
+) -> (Vec<VmEvent>, Vec<L2ToL1Log>) {
+    let (raw_events, l1_messages) = vm_state
+        .event_sink
+        .get_events_and_l2_l1_logs_after_timestamp(from_timestamp);
+    let events = merge_events(raw_events)
+        .into_iter()
+        .map(|e| e.into_vm_event(batch_env.number))
+        .collect();
+    (events, l1_messages.into_iter().map(Into::into).collect())
+}
diff --git a/core/lib/multivm/src/versions/vm_latest/utils/mod.rs b/core/lib/multivm/src/versions/vm_latest/utils/mod.rs
index 15ffa92b5490..0fb803de5d4e 100644
--- a/core/lib/multivm/src/versions/vm_latest/utils/mod.rs
+++ b/core/lib/multivm/src/versions/vm_latest/utils/mod.rs
@@ -1,5 +1,6 @@
 /// Utility functions for the VM.
 pub mod fee;
 pub mod l2_blocks;
+pub(crate) mod logs;
 pub mod overhead;
 pub mod transaction_encoding;
diff --git a/core/lib/multivm/src/versions/vm_latest/utils/overhead.rs b/core/lib/multivm/src/versions/vm_latest/utils/overhead.rs
index 58506cb1d52d..2541c7d7037c 100644
--- a/core/lib/multivm/src/versions/vm_latest/utils/overhead.rs
+++ b/core/lib/multivm/src/versions/vm_latest/utils/overhead.rs
@@ -1,7 +1,7 @@
 use crate::vm_latest::constants::{
     BLOCK_OVERHEAD_GAS, BLOCK_OVERHEAD_PUBDATA, BOOTLOADER_TX_ENCODING_SPACE,
 };
-use zk_evm_1_3_3::zkevm_opcode_defs::system_params::MAX_TX_ERGS_LIMIT;
+use zk_evm_1_4_0::zkevm_opcode_defs::system_params::MAX_TX_ERGS_LIMIT;
 use zksync_system_constants::{MAX_L2_TX_GAS_LIMIT, MAX_TXS_IN_BLOCK};
 use zksync_types::l1::is_l1_tx_type;
 use zksync_types::U256;
diff --git a/core/lib/multivm/src/versions/vm_latest/vm.rs b/core/lib/multivm/src/versions/vm_latest/vm.rs
index 265d969c7e5b..b922a3dd6711 100644
--- a/core/lib/multivm/src/versions/vm_latest/vm.rs
+++ b/core/lib/multivm/src/versions/vm_latest/vm.rs
@@ -1,6 +1,7 @@
 use crate::HistoryMode;
 use zksync_state::{StoragePtr, WriteStorage};
-use zksync_types::Transaction;
+use zksync_types::l2_to_l1_log::{SystemL2ToL1Log, UserL2ToL1Log};
+use zksync_types::{event::extract_l2tol1logs_from_l1_messenger, Transaction};
 use zksync_utils::bytecode::CompressedBytecodeInfo;
 
 use crate::vm_latest::old_vm::events::merge_events;
@@ -22,7 +23,7 @@ use crate::vm_latest::types::internals::{new_vm_state, VmSnapshot, ZkSyncVmState
 pub struct Vm<S: WriteStorage, H: HistoryMode> {
     pub(crate) bootloader_state: BootloaderState,
     // Current state and oracles of virtual machine
-    pub(crate) state: ZkSyncVmState<S, H::VmVirtualBlocksRefundsEnhancement>,
+    pub(crate) state: ZkSyncVmState<S, H::VmBoojumIntegration>,
     pub(crate) storage: StoragePtr<S>,
     pub(crate) system_env: SystemEnv,
     pub(crate) batch_env: L1BatchEnv,
@@ -33,7 +34,7 @@ pub struct Vm<S: WriteStorage, H: HistoryMode> {
 
 /// Public interface for VM
 impl<S: WriteStorage, H: HistoryMode> VmInterface<S, H> for Vm<S, H> {
-    type TracerDispatcher = TracerDispatcher<S, H::VmVirtualBlocksRefundsEnhancement>;
+    type TracerDispatcher = TracerDispatcher<S, H::VmBoojumIntegration>;
 
     fn new(batch_env: L1BatchEnv, system_env: SystemEnv, storage: StoragePtr<S>) -> Self {
         let (state, bootloader_state) = new_vm_state(storage.clone(), &system_env, &batch_env);
@@ -80,12 +81,17 @@ impl<S: WriteStorage, H: HistoryMode> VmInterface<S, H> for Vm<S, H> {
     /// This method should be used only after the batch execution.
     /// Otherwise it can panic.
     fn get_current_execution_state(&self) -> CurrentExecutionState {
-        let (_full_history, raw_events, l1_messages) = self.state.event_sink.flatten();
-        let events = merge_events(raw_events)
+        let (deduplicated_events_logs, raw_events, l1_messages) = self.state.event_sink.flatten();
+        let events: Vec<_> = merge_events(raw_events)
             .into_iter()
             .map(|e| e.into_vm_event(self.batch_env.number))
             .collect();
-        let l2_to_l1_logs = l1_messages.into_iter().map(|log| log.into()).collect();
+
+        let user_l2_to_l1_logs = extract_l2tol1logs_from_l1_messenger(&events);
+        let system_logs = l1_messages
+            .into_iter()
+            .map(|log| SystemL2ToL1Log(log.into()))
+            .collect();
         let total_log_queries = self.state.event_sink.get_log_queries()
             + self
                 .state
@@ -98,9 +104,14 @@ impl<S: WriteStorage, H: HistoryMode> VmInterface<S, H> for Vm<S, H> {
             events,
             storage_log_queries: self.state.storage.get_final_log_queries(),
             used_contract_hashes: self.get_used_contracts(),
-            l2_to_l1_logs,
+            user_l2_to_l1_logs: user_l2_to_l1_logs
+                .into_iter()
+                .map(|log| UserL2ToL1Log(log.into()))
+                .collect(),
+            system_logs,
             total_log_queries,
             cycles_used: self.state.local_state.monotonic_cycle_counter,
+            deduplicated_events_logs,
             storage_refunds: self.state.storage.returned_refunds.inner().clone(),
         }
     }
diff --git a/core/lib/multivm/src/versions/vm_m5/vm.rs b/core/lib/multivm/src/versions/vm_m5/vm.rs
index 01fbaf9ddbb8..1553f6541dc8 100644
--- a/core/lib/multivm/src/versions/vm_m5/vm.rs
+++ b/core/lib/multivm/src/versions/vm_m5/vm.rs
@@ -6,7 +6,7 @@ use crate::interface::{
 use std::any::Any;
 
 use zksync_state::StoragePtr;
-use zksync_types::l2_to_l1_log::L2ToL1Log;
+use zksync_types::l2_to_l1_log::{L2ToL1Log, UserL2ToL1Log};
 use zksync_types::{Transaction, VmVersion};
 use zksync_utils::bytecode::CompressedBytecodeInfo;
 use zksync_utils::{h256_to_u256, u256_to_h256};
@@ -127,13 +127,15 @@ impl<S: Storage, H: HistoryMode> VmInterface<S, H> for Vm<S, H> {
             .collect();
         let l2_to_l1_logs = l1_messages
             .into_iter()
-            .map(|m| L2ToL1Log {
-                shard_id: m.shard_id,
-                is_service: m.is_first,
-                tx_number_in_block: m.tx_number_in_block,
-                sender: m.address,
-                key: u256_to_h256(m.key),
-                value: u256_to_h256(m.value),
+            .map(|m| {
+                UserL2ToL1Log(L2ToL1Log {
+                    shard_id: m.shard_id,
+                    is_service: m.is_first,
+                    tx_number_in_block: m.tx_number_in_block,
+                    sender: m.address,
+                    key: u256_to_h256(m.key),
+                    value: u256_to_h256(m.value),
+                })
             })
             .collect();
         let total_log_queries = self.vm.state.event_sink.get_log_queries()
@@ -159,10 +161,12 @@ impl<S: Storage, H: HistoryMode> VmInterface<S, H> for Vm<S, H> {
             events,
             storage_log_queries: self.vm.get_final_log_queries(),
             used_contract_hashes,
-            l2_to_l1_logs,
+            system_logs: vec![],
+            user_l2_to_l1_logs: l2_to_l1_logs,
             total_log_queries,
             cycles_used: self.vm.state.local_state.monotonic_cycle_counter,
             // It's not applicable for vm5
+            deduplicated_events_logs: vec![],
             storage_refunds: vec![],
         }
     }
diff --git a/core/lib/multivm/src/versions/vm_m5/vm_instance.rs b/core/lib/multivm/src/versions/vm_m5/vm_instance.rs
index 16b068f9eb23..1df40c8a0b86 100644
--- a/core/lib/multivm/src/versions/vm_m5/vm_instance.rs
+++ b/core/lib/multivm/src/versions/vm_m5/vm_instance.rs
@@ -11,11 +11,12 @@ use zk_evm_1_3_1::zkevm_opcode_defs::definitions::RET_IMPLICIT_RETURNDATA_PARAMS
 use zksync_system_constants::MAX_TXS_IN_BLOCK;
 
 use crate::glue::GlueInto;
-use zksync_types::l2_to_l1_log::L2ToL1Log;
-use zksync_types::tx::tx_execution_info::{TxExecutionStatus, VmExecutionLogs};
+use zksync_types::l2_to_l1_log::{L2ToL1Log, UserL2ToL1Log};
+use zksync_types::tx::tx_execution_info::TxExecutionStatus;
 use zksync_types::vm_trace::VmExecutionTrace;
 use zksync_types::{L1BatchNumber, StorageLogQuery, VmEvent, U256};
 
+use crate::interface::types::outputs::VmExecutionLogs;
 use crate::vm_m5::bootloader_state::BootloaderState;
 use crate::vm_m5::errors::{TxRevertReason, VmRevertReason, VmRevertReasonParsingResult};
 use crate::vm_m5::event_sink::InMemoryEventSink;
@@ -499,7 +500,8 @@ impl<S: Storage> VmInstance<S> {
         VmExecutionLogs {
             storage_logs,
             events,
-            l2_to_l1_logs,
+            user_l2_to_l1_logs: l2_to_l1_logs.into_iter().map(UserL2ToL1Log).collect(),
+            system_l2_to_l1_logs: vec![],
             total_log_queries_count: storage_logs_count
                 + log_queries.len()
                 + precompile_calls_count,
diff --git a/core/lib/multivm/src/versions/vm_m6/vm.rs b/core/lib/multivm/src/versions/vm_m6/vm.rs
index 57eb258e5efe..3a9a0a39cbca 100644
--- a/core/lib/multivm/src/versions/vm_m6/vm.rs
+++ b/core/lib/multivm/src/versions/vm_m6/vm.rs
@@ -8,7 +8,7 @@ use std::any::Any;
 use std::collections::HashSet;
 
 use zksync_state::StoragePtr;
-use zksync_types::l2_to_l1_log::L2ToL1Log;
+use zksync_types::l2_to_l1_log::{L2ToL1Log, UserL2ToL1Log};
 use zksync_types::{Transaction, VmVersion};
 use zksync_utils::bytecode::{hash_bytecode, CompressedBytecodeInfo};
 use zksync_utils::{h256_to_u256, u256_to_h256};
@@ -131,13 +131,15 @@ impl<S: Storage, H: HistoryMode> VmInterface<S, H> for Vm<S, H> {
             .collect();
         let l2_to_l1_logs = l1_messages
             .into_iter()
-            .map(|m| L2ToL1Log {
-                shard_id: m.shard_id,
-                is_service: m.is_first,
-                tx_number_in_block: m.tx_number_in_block,
-                sender: m.address,
-                key: u256_to_h256(m.key),
-                value: u256_to_h256(m.value),
+            .map(|m| {
+                UserL2ToL1Log(L2ToL1Log {
+                    shard_id: m.shard_id,
+                    is_service: m.is_first,
+                    tx_number_in_block: m.tx_number_in_block,
+                    sender: m.address,
+                    key: u256_to_h256(m.key),
+                    value: u256_to_h256(m.value),
+                })
             })
             .collect();
         let total_log_queries = self.vm.state.event_sink.get_log_queries()
@@ -163,11 +165,13 @@ impl<S: Storage, H: HistoryMode> VmInterface<S, H> for Vm<S, H> {
             events,
             storage_log_queries: self.vm.get_final_log_queries(),
             used_contract_hashes,
-            l2_to_l1_logs,
+            system_logs: vec![],
             total_log_queries,
             cycles_used: self.vm.state.local_state.monotonic_cycle_counter,
             // It's not applicable for vm6
+            deduplicated_events_logs: vec![],
             storage_refunds: vec![],
+            user_l2_to_l1_logs: l2_to_l1_logs,
         }
     }
 
diff --git a/core/lib/multivm/src/versions/vm_m6/vm_instance.rs b/core/lib/multivm/src/versions/vm_m6/vm_instance.rs
index 8eeee85be634..ab30377f2b80 100644
--- a/core/lib/multivm/src/versions/vm_m6/vm_instance.rs
+++ b/core/lib/multivm/src/versions/vm_m6/vm_instance.rs
@@ -10,11 +10,12 @@ use zk_evm_1_3_1::zkevm_opcode_defs::decoding::{
 };
 use zk_evm_1_3_1::zkevm_opcode_defs::definitions::RET_IMPLICIT_RETURNDATA_PARAMS_REGISTER;
 use zksync_system_constants::MAX_TXS_IN_BLOCK;
-use zksync_types::l2_to_l1_log::L2ToL1Log;
-use zksync_types::tx::tx_execution_info::{TxExecutionStatus, VmExecutionLogs};
+use zksync_types::l2_to_l1_log::{L2ToL1Log, UserL2ToL1Log};
+use zksync_types::tx::tx_execution_info::TxExecutionStatus;
 use zksync_types::vm_trace::{Call, VmExecutionTrace, VmTrace};
 use zksync_types::{L1BatchNumber, StorageLogQuery, VmEvent, U256};
 
+use crate::interface::types::outputs::VmExecutionLogs;
 use crate::vm_m6::bootloader_state::BootloaderState;
 use crate::vm_m6::errors::{TxRevertReason, VmRevertReason, VmRevertReasonParsingResult};
 use crate::vm_m6::event_sink::InMemoryEventSink;
@@ -446,7 +447,8 @@ impl<H: HistoryMode, S: Storage> VmInstance<S, H> {
         VmExecutionLogs {
             storage_logs,
             events,
-            l2_to_l1_logs,
+            user_l2_to_l1_logs: l2_to_l1_logs.into_iter().map(UserL2ToL1Log).collect(),
+            system_l2_to_l1_logs: vec![],
             total_log_queries_count: storage_logs_count
                 + log_queries.len()
                 + precompile_calls_count,
diff --git a/core/lib/multivm/src/versions/vm_refunds_enhancement/README.md b/core/lib/multivm/src/versions/vm_refunds_enhancement/README.md
new file mode 100644
index 000000000000..d515df0dfc60
--- /dev/null
+++ b/core/lib/multivm/src/versions/vm_refunds_enhancement/README.md
@@ -0,0 +1,44 @@
+# VM Crate
+
+This crate contains code that interacts with the VM (Virtual Machine). The VM itself is in a separate repository
+[era-zk_evm][zk_evm_repo_ext].
+
+## VM Dependencies
+
+The VM relies on several subcomponents or traits, such as Memory and Storage. These traits are defined in the `zk_evm`
+repository, while their implementations can be found in this crate, such as the storage implementation in
+`oracles/storage.rs` and the Memory implementation in `memory.rs`.
+
+Many of these implementations also support easy rollbacks and history, which is useful when creating a block with
+multiple transactions and needing to return the VM to a previous state if a transaction doesn't fit.
+
+## Running the VM
+
+To interact with the VM, you must initialize it with `L1BatchEnv`, which represents the initial parameters of the batch,
+`SystemEnv`, that represents the system parameters, and a reference to the Storage. To execute a transaction, you have
+to push the transaction into the bootloader memory and call the `execute_next_transaction` method.
+
+### Tracers
+
+The VM implementation allows for the addition of `Tracers`, which are activated before and after each instruction. This
+provides a more in-depth look into the VM, collecting detailed debugging information and logs. More details can be found
+in the `tracer/` directory.
+
+This VM also supports custom tracers. You can call the `inspect_next_transaction` method with a custom tracer and
+receive the result of the execution.
+
+### Bootloader
+
+In the context of zkEVM, we usually think about transactions. However, from the VM's perspective, it runs a single
+program called the bootloader, which internally processes multiple transactions.
+
+### Rollbacks
+
+The `VMInstance` in `vm.rs` allows for easy rollbacks. You can save the current state at any moment by calling
+`make_snapshot()` and return to that state using `rollback_to_the_latest_snapshot()`.
+
+This rollback affects all subcomponents, such as memory, storage, and events, and is mainly used if a transaction
+doesn't fit in a block.
+
+[zk_evm_repo]: https://github.com/matter-labs/zk_evm 'internal zk EVM repo'
+[zk_evm_repo_ext]: https://github.com/matter-labs/era-zk_evm 'external zk EVM repo'
diff --git a/core/lib/multivm/src/versions/vm_refunds_enhancement/bootloader_state/l2_block.rs b/core/lib/multivm/src/versions/vm_refunds_enhancement/bootloader_state/l2_block.rs
new file mode 100644
index 000000000000..56b5b1b6b39e
--- /dev/null
+++ b/core/lib/multivm/src/versions/vm_refunds_enhancement/bootloader_state/l2_block.rs
@@ -0,0 +1,83 @@
+use std::cmp::Ordering;
+use zksync_types::{MiniblockNumber, H256};
+use zksync_utils::concat_and_hash;
+
+use crate::interface::{L2Block, L2BlockEnv};
+use crate::vm_refunds_enhancement::bootloader_state::snapshot::L2BlockSnapshot;
+use crate::vm_refunds_enhancement::bootloader_state::tx::BootloaderTx;
+use crate::vm_refunds_enhancement::utils::l2_blocks::l2_block_hash;
+
+const EMPTY_TXS_ROLLING_HASH: H256 = H256::zero();
+
+#[derive(Debug, Clone)]
+pub(crate) struct BootloaderL2Block {
+    pub(crate) number: u32,
+    pub(crate) timestamp: u64,
+    pub(crate) txs_rolling_hash: H256, // The rolling hash of all the transactions in the miniblock
+    pub(crate) prev_block_hash: H256,
+    // Number of the first l2 block tx in l1 batch
+    pub(crate) first_tx_index: usize,
+    pub(crate) max_virtual_blocks_to_create: u32,
+    pub(super) txs: Vec<BootloaderTx>,
+}
+
+impl BootloaderL2Block {
+    pub(crate) fn new(l2_block: L2BlockEnv, first_tx_place: usize) -> Self {
+        Self {
+            number: l2_block.number,
+            timestamp: l2_block.timestamp,
+            txs_rolling_hash: EMPTY_TXS_ROLLING_HASH,
+            prev_block_hash: l2_block.prev_block_hash,
+            first_tx_index: first_tx_place,
+            max_virtual_blocks_to_create: l2_block.max_virtual_blocks_to_create,
+            txs: vec![],
+        }
+    }
+
+    pub(super) fn push_tx(&mut self, tx: BootloaderTx) {
+        self.update_rolling_hash(tx.hash);
+        self.txs.push(tx)
+    }
+
+    pub(crate) fn get_hash(&self) -> H256 {
+        l2_block_hash(
+            MiniblockNumber(self.number),
+            self.timestamp,
+            self.prev_block_hash,
+            self.txs_rolling_hash,
+        )
+    }
+
+    fn update_rolling_hash(&mut self, tx_hash: H256) {
+        self.txs_rolling_hash = concat_and_hash(self.txs_rolling_hash, tx_hash)
+    }
+
+    pub(crate) fn interim_version(&self) -> BootloaderL2Block {
+        let mut interim = self.clone();
+        interim.max_virtual_blocks_to_create = 0;
+        interim
+    }
+
+    pub(crate) fn make_snapshot(&self) -> L2BlockSnapshot {
+        L2BlockSnapshot {
+            txs_rolling_hash: self.txs_rolling_hash,
+            txs_len: self.txs.len(),
+        }
+    }
+
+    pub(crate) fn apply_snapshot(&mut self, snapshot: L2BlockSnapshot) {
+        self.txs_rolling_hash = snapshot.txs_rolling_hash;
+        match self.txs.len().cmp(&snapshot.txs_len) {
+            Ordering::Greater => self.txs.truncate(snapshot.txs_len),
+            Ordering::Less => panic!("Applying snapshot from future is not supported"),
+            Ordering::Equal => {}
+        }
+    }
+    pub(crate) fn l2_block(&self) -> L2Block {
+        L2Block {
+            number: self.number,
+            timestamp: self.timestamp,
+            hash: self.get_hash(),
+        }
+    }
+}
diff --git a/core/lib/multivm/src/versions/vm_refunds_enhancement/bootloader_state/mod.rs b/core/lib/multivm/src/versions/vm_refunds_enhancement/bootloader_state/mod.rs
new file mode 100644
index 000000000000..73830de2759b
--- /dev/null
+++ b/core/lib/multivm/src/versions/vm_refunds_enhancement/bootloader_state/mod.rs
@@ -0,0 +1,8 @@
+mod l2_block;
+mod snapshot;
+mod state;
+mod tx;
+
+pub(crate) mod utils;
+pub(crate) use snapshot::BootloaderStateSnapshot;
+pub use state::BootloaderState;
diff --git a/core/lib/multivm/src/versions/vm_refunds_enhancement/bootloader_state/snapshot.rs b/core/lib/multivm/src/versions/vm_refunds_enhancement/bootloader_state/snapshot.rs
new file mode 100644
index 000000000000..e417a3b9ee69
--- /dev/null
+++ b/core/lib/multivm/src/versions/vm_refunds_enhancement/bootloader_state/snapshot.rs
@@ -0,0 +1,23 @@
+use zksync_types::H256;
+
+#[derive(Debug, Clone)]
+pub(crate) struct BootloaderStateSnapshot {
+    /// ID of the next transaction to be executed.
+    pub(crate) tx_to_execute: usize,
+    /// Stored l2 blocks in bootloader memory
+    pub(crate) l2_blocks_len: usize,
+    /// Snapshot of the last l2 block. Only this block could be changed during the rollback
+    pub(crate) last_l2_block: L2BlockSnapshot,
+    /// The number of 32-byte words spent on the already included compressed bytecodes.
+    pub(crate) compressed_bytecodes_encoding: usize,
+    /// Current offset of the free space in the bootloader memory.
+    pub(crate) free_tx_offset: usize,
+}
+
+#[derive(Debug, Clone)]
+pub(crate) struct L2BlockSnapshot {
+    /// The rolling hash of all the transactions in the miniblock
+    pub(crate) txs_rolling_hash: H256,
+    /// The number of transactions in the last l2 block
+    pub(crate) txs_len: usize,
+}
diff --git a/core/lib/multivm/src/versions/vm_refunds_enhancement/bootloader_state/state.rs b/core/lib/multivm/src/versions/vm_refunds_enhancement/bootloader_state/state.rs
new file mode 100644
index 000000000000..4c8d48bc1a7f
--- /dev/null
+++ b/core/lib/multivm/src/versions/vm_refunds_enhancement/bootloader_state/state.rs
@@ -0,0 +1,253 @@
+use crate::vm_refunds_enhancement::bootloader_state::l2_block::BootloaderL2Block;
+use crate::vm_refunds_enhancement::bootloader_state::snapshot::BootloaderStateSnapshot;
+use crate::vm_refunds_enhancement::bootloader_state::utils::{apply_l2_block, apply_tx_to_memory};
+use std::cmp::Ordering;
+use zksync_types::{L2ChainId, U256};
+use zksync_utils::bytecode::CompressedBytecodeInfo;
+
+use crate::interface::{BootloaderMemory, L2BlockEnv, TxExecutionMode};
+use crate::vm_refunds_enhancement::{
+    constants::TX_DESCRIPTION_OFFSET, types::internals::TransactionData,
+    utils::l2_blocks::assert_next_block,
+};
+
+use super::tx::BootloaderTx;
+/// Intermediate bootloader-related VM state.
+///
+/// Required to process transactions one by one (since we intercept the VM execution to execute
+/// transactions and add new ones to the memory on the fly).
+/// Keeps tracking everything related to the bootloader memory and can restore the whole memory.
+///
+///
+/// Serves two purposes:
+/// - Tracks where next tx should be pushed to in the bootloader memory.
+/// - Tracks which transaction should be executed next.
+#[derive(Debug, Clone)]
+pub struct BootloaderState {
+    /// ID of the next transaction to be executed.
+    /// See the structure doc-comment for a better explanation of purpose.
+    tx_to_execute: usize,
+    /// Stored txs in bootloader memory
+    l2_blocks: Vec<BootloaderL2Block>,
+    /// The number of 32-byte words spent on the already included compressed bytecodes.
+    compressed_bytecodes_encoding: usize,
+    /// Initial memory of bootloader
+    initial_memory: BootloaderMemory,
+    /// Mode of txs for execution, it can be changed once per vm lunch
+    execution_mode: TxExecutionMode,
+    /// Current offset of the free space in the bootloader memory.
+    free_tx_offset: usize,
+}
+
+impl BootloaderState {
+    pub(crate) fn new(
+        execution_mode: TxExecutionMode,
+        initial_memory: BootloaderMemory,
+        first_l2_block: L2BlockEnv,
+    ) -> Self {
+        let l2_block = BootloaderL2Block::new(first_l2_block, 0);
+        Self {
+            tx_to_execute: 0,
+            compressed_bytecodes_encoding: 0,
+            l2_blocks: vec![l2_block],
+            initial_memory,
+            execution_mode,
+            free_tx_offset: 0,
+        }
+    }
+
+    pub(crate) fn set_refund_for_current_tx(&mut self, refund: u32) {
+        let current_tx = self.current_tx();
+        // We can't set the refund for the latest tx or using the latest l2_block for fining tx
+        // Because we can fill the whole batch first and then execute txs one by one
+        let tx = self.find_tx_mut(current_tx);
+        tx.refund = refund;
+    }
+
+    pub(crate) fn start_new_l2_block(&mut self, l2_block: L2BlockEnv) {
+        let last_block = self.last_l2_block();
+        assert!(
+            !last_block.txs.is_empty(),
+            "Can not create new miniblocks on top of empty ones"
+        );
+        assert_next_block(&last_block.l2_block(), &l2_block);
+        self.push_l2_block(l2_block);
+    }
+
+    /// This method bypass sanity checks and should be used carefully.
+    pub(crate) fn push_l2_block(&mut self, l2_block: L2BlockEnv) {
+        self.l2_blocks
+            .push(BootloaderL2Block::new(l2_block, self.free_tx_index()))
+    }
+
+    pub(crate) fn push_tx(
+        &mut self,
+        tx: TransactionData,
+        predefined_overhead: u32,
+        predefined_refund: u32,
+        compressed_bytecodes: Vec<CompressedBytecodeInfo>,
+        trusted_ergs_limit: U256,
+        chain_id: L2ChainId,
+    ) -> BootloaderMemory {
+        let tx_offset = self.free_tx_offset();
+        let bootloader_tx = BootloaderTx::new(
+            tx,
+            predefined_refund,
+            predefined_overhead,
+            trusted_ergs_limit,
+            compressed_bytecodes,
+            tx_offset,
+            chain_id,
+        );
+
+        let mut memory = vec![];
+        let compressed_bytecode_size = apply_tx_to_memory(
+            &mut memory,
+            &bootloader_tx,
+            self.last_l2_block(),
+            self.free_tx_index(),
+            self.free_tx_offset(),
+            self.compressed_bytecodes_encoding,
+            self.execution_mode,
+            self.last_l2_block().txs.is_empty(),
+        );
+        self.compressed_bytecodes_encoding += compressed_bytecode_size;
+        self.free_tx_offset = tx_offset + bootloader_tx.encoded_len();
+        self.last_mut_l2_block().push_tx(bootloader_tx);
+        memory
+    }
+
+    pub(crate) fn last_l2_block(&self) -> &BootloaderL2Block {
+        self.l2_blocks.last().unwrap()
+    }
+
+    fn last_mut_l2_block(&mut self) -> &mut BootloaderL2Block {
+        self.l2_blocks.last_mut().unwrap()
+    }
+
+    /// Apply all bootloader transaction to the initial memory
+    pub(crate) fn bootloader_memory(&self) -> BootloaderMemory {
+        let mut initial_memory = self.initial_memory.clone();
+        let mut offset = 0;
+        let mut compressed_bytecodes_offset = 0;
+        let mut tx_index = 0;
+        for l2_block in &self.l2_blocks {
+            for (num, tx) in l2_block.txs.iter().enumerate() {
+                let compressed_bytecodes_size = apply_tx_to_memory(
+                    &mut initial_memory,
+                    tx,
+                    l2_block,
+                    tx_index,
+                    offset,
+                    compressed_bytecodes_offset,
+                    self.execution_mode,
+                    num == 0,
+                );
+                offset += tx.encoded_len();
+                compressed_bytecodes_offset += compressed_bytecodes_size;
+                tx_index += 1;
+            }
+            if l2_block.txs.is_empty() {
+                apply_l2_block(&mut initial_memory, l2_block, tx_index)
+            }
+        }
+        initial_memory
+    }
+
+    fn free_tx_offset(&self) -> usize {
+        self.free_tx_offset
+    }
+
+    pub(crate) fn free_tx_index(&self) -> usize {
+        let l2_block = self.last_l2_block();
+        l2_block.first_tx_index + l2_block.txs.len()
+    }
+
+    pub(crate) fn get_last_tx_compressed_bytecodes(&self) -> Vec<CompressedBytecodeInfo> {
+        if let Some(tx) = self.last_l2_block().txs.last() {
+            tx.compressed_bytecodes.clone()
+        } else {
+            vec![]
+        }
+    }
+
+    /// Returns the id of current tx
+    pub(crate) fn current_tx(&self) -> usize {
+        self.tx_to_execute
+            .checked_sub(1)
+            .expect("There are no current tx to execute")
+    }
+
+    /// Returns the ID of the next transaction to be executed and increments the local transaction counter.
+    pub(crate) fn move_tx_to_execute_pointer(&mut self) -> usize {
+        assert!(
+            self.tx_to_execute < self.free_tx_index(),
+            "Attempt to execute tx that was not pushed to memory. Tx ID: {}, txs in bootloader: {}",
+            self.tx_to_execute,
+            self.free_tx_index()
+        );
+
+        let old = self.tx_to_execute;
+        self.tx_to_execute += 1;
+        old
+    }
+
+    /// Get offset of tx description
+    pub(crate) fn get_tx_description_offset(&self, tx_index: usize) -> usize {
+        TX_DESCRIPTION_OFFSET + self.find_tx(tx_index).offset
+    }
+
+    pub(crate) fn insert_fictive_l2_block(&mut self) -> &BootloaderL2Block {
+        let block = self.last_l2_block();
+        if !block.txs.is_empty() {
+            self.start_new_l2_block(L2BlockEnv {
+                timestamp: block.timestamp + 1,
+                number: block.number + 1,
+                prev_block_hash: block.get_hash(),
+                max_virtual_blocks_to_create: 1,
+            });
+        }
+        self.last_l2_block()
+    }
+
+    fn find_tx(&self, tx_index: usize) -> &BootloaderTx {
+        for block in self.l2_blocks.iter().rev() {
+            if tx_index >= block.first_tx_index {
+                return &block.txs[tx_index - block.first_tx_index];
+            }
+        }
+        panic!("The tx with this index must exist")
+    }
+
+    fn find_tx_mut(&mut self, tx_index: usize) -> &mut BootloaderTx {
+        for block in self.l2_blocks.iter_mut().rev() {
+            if tx_index >= block.first_tx_index {
+                return &mut block.txs[tx_index - block.first_tx_index];
+            }
+        }
+        panic!("The tx with this index must exist")
+    }
+
+    pub(crate) fn get_snapshot(&self) -> BootloaderStateSnapshot {
+        BootloaderStateSnapshot {
+            tx_to_execute: self.tx_to_execute,
+            l2_blocks_len: self.l2_blocks.len(),
+            last_l2_block: self.last_l2_block().make_snapshot(),
+            compressed_bytecodes_encoding: self.compressed_bytecodes_encoding,
+            free_tx_offset: self.free_tx_offset,
+        }
+    }
+
+    pub(crate) fn apply_snapshot(&mut self, snapshot: BootloaderStateSnapshot) {
+        self.tx_to_execute = snapshot.tx_to_execute;
+        self.compressed_bytecodes_encoding = snapshot.compressed_bytecodes_encoding;
+        self.free_tx_offset = snapshot.free_tx_offset;
+        match self.l2_blocks.len().cmp(&snapshot.l2_blocks_len) {
+            Ordering::Greater => self.l2_blocks.truncate(snapshot.l2_blocks_len),
+            Ordering::Less => panic!("Applying snapshot from future is not supported"),
+            Ordering::Equal => {}
+        }
+        self.last_mut_l2_block()
+            .apply_snapshot(snapshot.last_l2_block);
+    }
+}
diff --git a/core/lib/multivm/src/versions/vm_refunds_enhancement/bootloader_state/tx.rs b/core/lib/multivm/src/versions/vm_refunds_enhancement/bootloader_state/tx.rs
new file mode 100644
index 000000000000..c1551dcf6cd4
--- /dev/null
+++ b/core/lib/multivm/src/versions/vm_refunds_enhancement/bootloader_state/tx.rs
@@ -0,0 +1,48 @@
+use crate::vm_refunds_enhancement::types::internals::TransactionData;
+use zksync_types::{L2ChainId, H256, U256};
+use zksync_utils::bytecode::CompressedBytecodeInfo;
+
+/// Information about tx necessary for execution in bootloader.
+#[derive(Debug, Clone)]
+pub(super) struct BootloaderTx {
+    pub(super) hash: H256,
+    /// Encoded transaction
+    pub(super) encoded: Vec<U256>,
+    /// Compressed bytecodes, which has been published during this transaction
+    pub(super) compressed_bytecodes: Vec<CompressedBytecodeInfo>,
+    /// Refunds for this transaction
+    pub(super) refund: u32,
+    /// Gas overhead
+    pub(super) gas_overhead: u32,
+    /// Gas Limit for this transaction. It can be different from the gaslimit inside the transaction
+    pub(super) trusted_gas_limit: U256,
+    /// Offset of the tx in bootloader memory
+    pub(super) offset: usize,
+}
+
+impl BootloaderTx {
+    pub(super) fn new(
+        tx: TransactionData,
+        predefined_refund: u32,
+        predefined_overhead: u32,
+        trusted_gas_limit: U256,
+        compressed_bytecodes: Vec<CompressedBytecodeInfo>,
+        offset: usize,
+        chain_id: L2ChainId,
+    ) -> Self {
+        let hash = tx.tx_hash(chain_id);
+        Self {
+            hash,
+            encoded: tx.into_tokens(),
+            compressed_bytecodes,
+            refund: predefined_refund,
+            gas_overhead: predefined_overhead,
+            trusted_gas_limit,
+            offset,
+        }
+    }
+
+    pub(super) fn encoded_len(&self) -> usize {
+        self.encoded.len()
+    }
+}
diff --git a/core/lib/multivm/src/versions/vm_refunds_enhancement/bootloader_state/utils.rs b/core/lib/multivm/src/versions/vm_refunds_enhancement/bootloader_state/utils.rs
new file mode 100644
index 000000000000..dbb3fa0dff24
--- /dev/null
+++ b/core/lib/multivm/src/versions/vm_refunds_enhancement/bootloader_state/utils.rs
@@ -0,0 +1,140 @@
+use zksync_types::U256;
+use zksync_utils::bytecode::CompressedBytecodeInfo;
+use zksync_utils::{bytes_to_be_words, h256_to_u256};
+
+use crate::interface::{BootloaderMemory, TxExecutionMode};
+use crate::vm_refunds_enhancement::bootloader_state::l2_block::BootloaderL2Block;
+use crate::vm_refunds_enhancement::constants::{
+    BOOTLOADER_TX_DESCRIPTION_OFFSET, BOOTLOADER_TX_DESCRIPTION_SIZE, COMPRESSED_BYTECODES_OFFSET,
+    OPERATOR_REFUNDS_OFFSET, TX_DESCRIPTION_OFFSET, TX_OPERATOR_L2_BLOCK_INFO_OFFSET,
+    TX_OPERATOR_SLOTS_PER_L2_BLOCK_INFO, TX_OVERHEAD_OFFSET, TX_TRUSTED_GAS_LIMIT_OFFSET,
+};
+
+use super::tx::BootloaderTx;
+
+pub(super) fn get_memory_for_compressed_bytecodes(
+    compressed_bytecodes: &[CompressedBytecodeInfo],
+) -> Vec<U256> {
+    let memory_addition: Vec<_> = compressed_bytecodes
+        .iter()
+        .flat_map(|x| x.encode_call())
+        .collect();
+
+    bytes_to_be_words(memory_addition)
+}
+
+#[allow(clippy::too_many_arguments)]
+pub(super) fn apply_tx_to_memory(
+    memory: &mut BootloaderMemory,
+    bootloader_tx: &BootloaderTx,
+    bootloader_l2_block: &BootloaderL2Block,
+    tx_index: usize,
+    tx_offset: usize,
+    compressed_bytecodes_size: usize,
+    execution_mode: TxExecutionMode,
+    start_new_l2_block: bool,
+) -> usize {
+    let bootloader_description_offset =
+        BOOTLOADER_TX_DESCRIPTION_OFFSET + BOOTLOADER_TX_DESCRIPTION_SIZE * tx_index;
+    let tx_description_offset = TX_DESCRIPTION_OFFSET + tx_offset;
+
+    memory.push((
+        bootloader_description_offset,
+        assemble_tx_meta(execution_mode, true),
+    ));
+
+    memory.push((
+        bootloader_description_offset + 1,
+        U256::from_big_endian(&(32 * tx_description_offset).to_be_bytes()),
+    ));
+
+    let refund_offset = OPERATOR_REFUNDS_OFFSET + tx_index;
+    memory.push((refund_offset, bootloader_tx.refund.into()));
+
+    let overhead_offset = TX_OVERHEAD_OFFSET + tx_index;
+    memory.push((overhead_offset, bootloader_tx.gas_overhead.into()));
+
+    let trusted_gas_limit_offset = TX_TRUSTED_GAS_LIMIT_OFFSET + tx_index;
+    memory.push((trusted_gas_limit_offset, bootloader_tx.trusted_gas_limit));
+
+    memory.extend(
+        (tx_description_offset..tx_description_offset + bootloader_tx.encoded_len())
+            .zip(bootloader_tx.encoded.clone()),
+    );
+
+    let bootloader_l2_block = if start_new_l2_block {
+        bootloader_l2_block.clone()
+    } else {
+        bootloader_l2_block.interim_version()
+    };
+    apply_l2_block(memory, &bootloader_l2_block, tx_index);
+
+    // Note, +1 is moving for poitner
+    let compressed_bytecodes_offset = COMPRESSED_BYTECODES_OFFSET + 1 + compressed_bytecodes_size;
+
+    let encoded_compressed_bytecodes =
+        get_memory_for_compressed_bytecodes(&bootloader_tx.compressed_bytecodes);
+    let compressed_bytecodes_encoding = encoded_compressed_bytecodes.len();
+
+    memory.extend(
+        (compressed_bytecodes_offset
+            ..compressed_bytecodes_offset + encoded_compressed_bytecodes.len())
+            .zip(encoded_compressed_bytecodes),
+    );
+    compressed_bytecodes_encoding
+}
+
+pub(crate) fn apply_l2_block(
+    memory: &mut BootloaderMemory,
+    bootloader_l2_block: &BootloaderL2Block,
+    txs_index: usize,
+) {
+    // Since L2 block infos start from the TX_OPERATOR_L2_BLOCK_INFO_OFFSET and each
+    // L2 block info takes TX_OPERATOR_SLOTS_PER_L2_BLOCK_INFO slots, the position where the L2 block info
+    // for this transaction needs to be written is:
+
+    let block_position =
+        TX_OPERATOR_L2_BLOCK_INFO_OFFSET + txs_index * TX_OPERATOR_SLOTS_PER_L2_BLOCK_INFO;
+
+    memory.extend(vec![
+        (block_position, bootloader_l2_block.number.into()),
+        (block_position + 1, bootloader_l2_block.timestamp.into()),
+        (
+            block_position + 2,
+            h256_to_u256(bootloader_l2_block.prev_block_hash),
+        ),
+        (
+            block_position + 3,
+            bootloader_l2_block.max_virtual_blocks_to_create.into(),
+        ),
+    ])
+}
+
+/// Forms a word that contains meta information for the transaction execution.
+///
+/// # Current layout
+///
+/// - 0 byte (MSB): server-side tx execution mode
+///     In the server, we may want to execute different parts of the transaction in the different context
+///     For example, when checking validity, we don't want to actually execute transaction and have side effects.
+///
+///     Possible values:
+///     - 0x00: validate & execute (normal mode)
+///     - 0x02: execute but DO NOT validate
+///
+/// - 31 byte (LSB): whether to execute transaction or not (at all).
+pub(super) fn assemble_tx_meta(execution_mode: TxExecutionMode, execute_tx: bool) -> U256 {
+    let mut output = [0u8; 32];
+
+    // Set 0 byte (execution mode)
+    output[0] = match execution_mode {
+        TxExecutionMode::VerifyExecute => 0x00,
+        TxExecutionMode::EstimateFee { .. } => 0x00,
+        TxExecutionMode::EthCall { .. } => 0x02,
+    };
+
+    // Set 31 byte (marker for tx execution)
+    output[31] = u8::from(execute_tx);
+
+    U256::from_big_endian(&output)
+}
diff --git a/core/lib/multivm/src/versions/vm_refunds_enhancement/constants.rs b/core/lib/multivm/src/versions/vm_refunds_enhancement/constants.rs
new file mode 100644
index 000000000000..ef3b09299fd5
--- /dev/null
+++ b/core/lib/multivm/src/versions/vm_refunds_enhancement/constants.rs
@@ -0,0 +1,112 @@
+use zk_evm_1_3_3::aux_structures::MemoryPage;
+
+use zksync_system_constants::{
+    L1_GAS_PER_PUBDATA_BYTE, MAX_L2_TX_GAS_LIMIT, MAX_NEW_FACTORY_DEPS, MAX_TXS_IN_BLOCK,
+    USED_BOOTLOADER_MEMORY_WORDS,
+};
+
+pub use zk_evm_1_3_3::zkevm_opcode_defs::system_params::{
+    ERGS_PER_CIRCUIT, INITIAL_STORAGE_WRITE_PUBDATA_BYTES, MAX_PUBDATA_PER_BLOCK,
+};
+
+use crate::vm_refunds_enhancement::old_vm::utils::heap_page_from_base;
+
+/// Max cycles for a single transaction.
+pub const MAX_CYCLES_FOR_TX: u32 = u32::MAX;
+
+/// The first 32 slots are reserved for debugging purposes
+pub(crate) const DEBUG_SLOTS_OFFSET: usize = 8;
+pub(crate) const DEBUG_FIRST_SLOTS: usize = 32;
+/// The next 33 slots are reserved for dealing with the paymaster context (1 slot for storing length + 32 slots for storing the actual context).
+pub(crate) const PAYMASTER_CONTEXT_SLOTS: usize = 32 + 1;
+/// The next PAYMASTER_CONTEXT_SLOTS + 7 slots free slots are needed before each tx, so that the
+/// postOp operation could be encoded correctly.
+pub(crate) const MAX_POSTOP_SLOTS: usize = PAYMASTER_CONTEXT_SLOTS + 7;
+
+/// Slots used to store the current L2 transaction's hash and the hash recommended
+/// to be used for signing the transaction's content.
+const CURRENT_L2_TX_HASHES_SLOTS: usize = 2;
+
+/// Slots used to store the calldata for the KnownCodesStorage to mark new factory
+/// dependencies as known ones. Besides the slots for the new factory dependencies themselves
+/// another 4 slots are needed for: selector, marker of whether the user should pay for the pubdata,
+/// the offset for the encoding of the array as well as the length of the array.
+const NEW_FACTORY_DEPS_RESERVED_SLOTS: usize = MAX_NEW_FACTORY_DEPS + 4;
+
+/// The operator can provide for each transaction the proposed minimal refund
+pub(crate) const OPERATOR_REFUNDS_SLOTS: usize = MAX_TXS_IN_BLOCK;
+
+pub(crate) const OPERATOR_REFUNDS_OFFSET: usize = DEBUG_SLOTS_OFFSET
+    + DEBUG_FIRST_SLOTS
+    + PAYMASTER_CONTEXT_SLOTS
+    + CURRENT_L2_TX_HASHES_SLOTS
+    + NEW_FACTORY_DEPS_RESERVED_SLOTS;
+
+pub(crate) const TX_OVERHEAD_OFFSET: usize = OPERATOR_REFUNDS_OFFSET + OPERATOR_REFUNDS_SLOTS;
+pub(crate) const TX_OVERHEAD_SLOTS: usize = MAX_TXS_IN_BLOCK;
+
+pub(crate) const TX_TRUSTED_GAS_LIMIT_OFFSET: usize = TX_OVERHEAD_OFFSET + TX_OVERHEAD_SLOTS;
+pub(crate) const TX_TRUSTED_GAS_LIMIT_SLOTS: usize = MAX_TXS_IN_BLOCK;
+
+pub(crate) const COMPRESSED_BYTECODES_SLOTS: usize = 32768;
+
+pub(crate) const BOOTLOADER_TX_DESCRIPTION_OFFSET: usize =
+    COMPRESSED_BYTECODES_OFFSET + COMPRESSED_BYTECODES_SLOTS;
+
+/// The size of the bootloader memory dedicated to the encodings of transactions
+pub const BOOTLOADER_TX_ENCODING_SPACE: u32 =
+    (USED_BOOTLOADER_MEMORY_WORDS - TX_DESCRIPTION_OFFSET - MAX_TXS_IN_BLOCK) as u32;
+
+// Size of the bootloader tx description in words
+pub(crate) const BOOTLOADER_TX_DESCRIPTION_SIZE: usize = 2;
+
+/// The actual descriptions of transactions should start after the minor descriptions and a MAX_POSTOP_SLOTS
+/// free slots to allow postOp encoding.
+pub(crate) const TX_DESCRIPTION_OFFSET: usize = BOOTLOADER_TX_DESCRIPTION_OFFSET
+    + BOOTLOADER_TX_DESCRIPTION_SIZE * MAX_TXS_IN_BLOCK
+    + MAX_POSTOP_SLOTS;
+
+pub(crate) const TX_GAS_LIMIT_OFFSET: usize = 4;
+
+const INITIAL_BASE_PAGE: u32 = 8;
+pub const BOOTLOADER_HEAP_PAGE: u32 = heap_page_from_base(MemoryPage(INITIAL_BASE_PAGE)).0;
+pub const BLOCK_OVERHEAD_GAS: u32 = 1200000;
+pub const BLOCK_OVERHEAD_L1_GAS: u32 = 1000000;
+pub const BLOCK_OVERHEAD_PUBDATA: u32 = BLOCK_OVERHEAD_L1_GAS / L1_GAS_PER_PUBDATA_BYTE;
+
+/// VM Hooks are used for communication between bootloader and tracers.
+/// The 'type'/'opcode' is put into VM_HOOK_POSITION slot,
+/// and VM_HOOKS_PARAMS_COUNT parameters (each 32 bytes) are put in the slots before.
+/// So the layout looks like this:
+/// [param 0][param 1][vmhook opcode]
+pub const VM_HOOK_POSITION: u32 = RESULT_SUCCESS_FIRST_SLOT - 1;
+pub const VM_HOOK_PARAMS_COUNT: u32 = 2;
+pub const VM_HOOK_PARAMS_START_POSITION: u32 = VM_HOOK_POSITION - VM_HOOK_PARAMS_COUNT;
+
+pub(crate) const MAX_MEM_SIZE_BYTES: u32 = 16777216; // 2^24
+
+/// Arbitrary space in memory closer to the end of the page
+pub const RESULT_SUCCESS_FIRST_SLOT: u32 =
+    (MAX_MEM_SIZE_BYTES - (MAX_TXS_IN_BLOCK as u32) * 32) / 32;
+
+/// How many gas bootloader is allowed to spend within one block.
+/// Note that this value doesn't correspond to the gas limit of any particular transaction
+/// (except for the fact that, of course, gas limit for each transaction should be <= `BLOCK_GAS_LIMIT`).
+pub const BLOCK_GAS_LIMIT: u32 =
+    zk_evm_1_3_3::zkevm_opcode_defs::system_params::VM_INITIAL_FRAME_ERGS;
+
+/// 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;
+
+/// ID of the transaction from L1
+pub const L1_TX_TYPE: u8 = 255;
+
+pub(crate) const TX_OPERATOR_L2_BLOCK_INFO_OFFSET: usize =
+    TX_TRUSTED_GAS_LIMIT_OFFSET + TX_TRUSTED_GAS_LIMIT_SLOTS;
+
+pub(crate) const TX_OPERATOR_SLOTS_PER_L2_BLOCK_INFO: usize = 4;
+pub(crate) const TX_OPERATOR_L2_BLOCK_INFO_SLOTS: usize =
+    (MAX_TXS_IN_BLOCK + 1) * TX_OPERATOR_SLOTS_PER_L2_BLOCK_INFO;
+
+pub(crate) const COMPRESSED_BYTECODES_OFFSET: usize =
+    TX_OPERATOR_L2_BLOCK_INFO_OFFSET + TX_OPERATOR_L2_BLOCK_INFO_SLOTS;
diff --git a/core/lib/multivm/src/versions/vm_refunds_enhancement/implementation/bytecode.rs b/core/lib/multivm/src/versions/vm_refunds_enhancement/implementation/bytecode.rs
new file mode 100644
index 000000000000..4b7e529fc5b0
--- /dev/null
+++ b/core/lib/multivm/src/versions/vm_refunds_enhancement/implementation/bytecode.rs
@@ -0,0 +1,59 @@
+use itertools::Itertools;
+
+use crate::interface::VmInterface;
+use crate::HistoryMode;
+use zksync_state::{StoragePtr, WriteStorage};
+use zksync_types::U256;
+use zksync_utils::bytecode::{compress_bytecode, hash_bytecode, CompressedBytecodeInfo};
+use zksync_utils::bytes_to_be_words;
+
+use crate::vm_refunds_enhancement::Vm;
+
+impl<S: WriteStorage, H: HistoryMode> Vm<S, H> {
+    /// Checks the last transaction has successfully published compressed bytecodes and returns `true` if there is at least one is still unknown.
+    pub(crate) fn has_unpublished_bytecodes(&mut self) -> bool {
+        self.get_last_tx_compressed_bytecodes().iter().any(|info| {
+            !self
+                .state
+                .storage
+                .storage
+                .get_ptr()
+                .borrow_mut()
+                .is_bytecode_known(&hash_bytecode(&info.original))
+        })
+    }
+}
+
+/// Converts bytecode to tokens and hashes it.
+pub(crate) fn bytecode_to_factory_dep(bytecode: Vec<u8>) -> (U256, Vec<U256>) {
+    let bytecode_hash = hash_bytecode(&bytecode);
+    let bytecode_hash = U256::from_big_endian(bytecode_hash.as_bytes());
+
+    let bytecode_words = bytes_to_be_words(bytecode);
+
+    (bytecode_hash, bytecode_words)
+}
+
+pub(crate) fn compress_bytecodes<S: WriteStorage>(
+    bytecodes: &[Vec<u8>],
+    storage: StoragePtr<S>,
+) -> Vec<CompressedBytecodeInfo> {
+    bytecodes
+        .iter()
+        .enumerate()
+        .sorted_by_key(|(_idx, dep)| *dep)
+        .dedup_by(|x, y| x.1 == y.1)
+        .filter(|(_idx, dep)| !storage.borrow_mut().is_bytecode_known(&hash_bytecode(dep)))
+        .sorted_by_key(|(idx, _dep)| *idx)
+        .filter_map(|(_idx, dep)| {
+            let compressed_bytecode = compress_bytecode(dep);
+
+            compressed_bytecode
+                .ok()
+                .map(|compressed| CompressedBytecodeInfo {
+                    original: dep.clone(),
+                    compressed,
+                })
+        })
+        .collect()
+}
diff --git a/core/lib/multivm/src/versions/vm_refunds_enhancement/implementation/execution.rs b/core/lib/multivm/src/versions/vm_refunds_enhancement/implementation/execution.rs
new file mode 100644
index 000000000000..9e55180d66f6
--- /dev/null
+++ b/core/lib/multivm/src/versions/vm_refunds_enhancement/implementation/execution.rs
@@ -0,0 +1,130 @@
+use crate::HistoryMode;
+use zk_evm_1_3_3::aux_structures::Timestamp;
+use zksync_state::WriteStorage;
+
+use crate::interface::tracer::{TracerExecutionStatus, VmExecutionStopReason};
+use crate::interface::{VmExecutionMode, VmExecutionResultAndLogs};
+use crate::vm_refunds_enhancement::old_vm::utils::{vm_may_have_ended_inner, VmExecutionResult};
+use crate::vm_refunds_enhancement::tracers::dispatcher::TracerDispatcher;
+use crate::vm_refunds_enhancement::tracers::{
+    traits::VmTracer, DefaultExecutionTracer, RefundsTracer,
+};
+use crate::vm_refunds_enhancement::vm::Vm;
+
+impl<S: WriteStorage, H: HistoryMode> Vm<S, H> {
+    pub(crate) fn inspect_inner(
+        &mut self,
+        dispatcher: TracerDispatcher<S, H::VmVirtualBlocksRefundsEnhancement>,
+        execution_mode: VmExecutionMode,
+    ) -> VmExecutionResultAndLogs {
+        let mut enable_refund_tracer = false;
+        if let VmExecutionMode::OneTx = execution_mode {
+            // Move the pointer to the next transaction
+            self.bootloader_state.move_tx_to_execute_pointer();
+            enable_refund_tracer = true;
+        }
+        let (_, result) =
+            self.inspect_and_collect_results(dispatcher, execution_mode, enable_refund_tracer);
+        result
+    }
+
+    /// Execute VM with given traces until the stop reason is reached.
+    /// Collect the result from the default tracers.
+    fn inspect_and_collect_results(
+        &mut self,
+        dispatcher: TracerDispatcher<S, H::VmVirtualBlocksRefundsEnhancement>,
+        execution_mode: VmExecutionMode,
+        with_refund_tracer: bool,
+    ) -> (VmExecutionStopReason, VmExecutionResultAndLogs) {
+        let refund_tracers =
+            with_refund_tracer.then_some(RefundsTracer::new(self.batch_env.clone()));
+        let mut tx_tracer: DefaultExecutionTracer<S, H::VmVirtualBlocksRefundsEnhancement> =
+            DefaultExecutionTracer::new(
+                self.system_env.default_validation_computational_gas_limit,
+                execution_mode,
+                dispatcher,
+                self.storage.clone(),
+                refund_tracers,
+            );
+
+        let timestamp_initial = Timestamp(self.state.local_state.timestamp);
+        let cycles_initial = self.state.local_state.monotonic_cycle_counter;
+        let gas_remaining_before = self.gas_remaining();
+        let spent_pubdata_counter_before = self.state.local_state.spent_pubdata_counter;
+
+        let stop_reason = self.execute_with_default_tracer(&mut tx_tracer);
+
+        let gas_remaining_after = self.gas_remaining();
+
+        let logs = self.collect_execution_logs_after_timestamp(timestamp_initial);
+
+        let (refunds, pubdata_published) = tx_tracer
+            .refund_tracer
+            .as_ref()
+            .map(|x| (x.get_refunds(), x.pubdata_published()))
+            .unwrap_or_default();
+
+        let statistics = self.get_statistics(
+            timestamp_initial,
+            cycles_initial,
+            &tx_tracer,
+            gas_remaining_before,
+            gas_remaining_after,
+            spent_pubdata_counter_before,
+            pubdata_published,
+            logs.total_log_queries_count,
+        );
+
+        let result = tx_tracer.result_tracer.into_result();
+
+        let result = VmExecutionResultAndLogs {
+            result,
+            logs,
+            statistics,
+            refunds,
+        };
+
+        (stop_reason, result)
+    }
+
+    /// Execute vm with given tracers until the stop reason is reached.
+    fn execute_with_default_tracer(
+        &mut self,
+        tracer: &mut DefaultExecutionTracer<S, H::VmVirtualBlocksRefundsEnhancement>,
+    ) -> VmExecutionStopReason {
+        tracer.initialize_tracer(&mut self.state);
+        let result = loop {
+            // Sanity check: we should never reach the maximum value, because then we won't be able to process the next cycle.
+            assert_ne!(
+                self.state.local_state.monotonic_cycle_counter,
+                u32::MAX,
+                "VM reached maximum possible amount of cycles. Vm state: {:?}",
+                self.state
+            );
+
+            self.state
+                .cycle(tracer)
+                .expect("Failed execution VM cycle.");
+
+            if let TracerExecutionStatus::Stop(reason) =
+                tracer.finish_cycle(&mut self.state, &mut self.bootloader_state)
+            {
+                break VmExecutionStopReason::TracerRequestedStop(reason);
+            }
+            if self.has_ended() {
+                break VmExecutionStopReason::VmFinished;
+            }
+        };
+        tracer.after_vm_execution(&mut self.state, &self.bootloader_state, result.clone());
+        result
+    }
+
+    fn has_ended(&self) -> bool {
+        match vm_may_have_ended_inner(&self.state) {
+            None | Some(VmExecutionResult::MostLikelyDidNotFinish(_, _)) => false,
+            Some(
+                VmExecutionResult::Ok(_) | VmExecutionResult::Revert(_) | VmExecutionResult::Panic,
+            ) => true,
+        }
+    }
+}
diff --git a/core/lib/multivm/src/versions/vm_refunds_enhancement/implementation/gas.rs b/core/lib/multivm/src/versions/vm_refunds_enhancement/implementation/gas.rs
new file mode 100644
index 000000000000..cce9bfad6999
--- /dev/null
+++ b/core/lib/multivm/src/versions/vm_refunds_enhancement/implementation/gas.rs
@@ -0,0 +1,42 @@
+use crate::HistoryMode;
+use zksync_state::WriteStorage;
+
+use crate::vm_refunds_enhancement::tracers::DefaultExecutionTracer;
+use crate::vm_refunds_enhancement::vm::Vm;
+
+impl<S: WriteStorage, H: HistoryMode> Vm<S, H> {
+    /// Returns the amount of gas remaining to the VM.
+    /// Note that this *does not* correspond to the gas limit of a transaction.
+    /// To calculate the amount of gas spent by transaction, you should call this method before and after
+    /// the execution, and subtract these values.
+    ///
+    /// Note: this method should only be called when either transaction is fully completed or VM completed
+    /// its execution. Remaining gas value is read from the current stack frame, so if you'll attempt to
+    /// read it during the transaction execution, you may receive invalid value.
+    pub(crate) fn gas_remaining(&self) -> u32 {
+        self.state.local_state.callstack.current.ergs_remaining
+    }
+
+    pub(crate) fn calculate_computational_gas_used(
+        &self,
+        tracer: &DefaultExecutionTracer<S, H::VmVirtualBlocksRefundsEnhancement>,
+        gas_remaining_before: u32,
+        spent_pubdata_counter_before: u32,
+    ) -> u32 {
+        let total_gas_used = gas_remaining_before
+            .checked_sub(self.gas_remaining())
+            .expect("underflow");
+        let gas_used_on_pubdata =
+            tracer.gas_spent_on_pubdata(&self.state.local_state) - spent_pubdata_counter_before;
+        total_gas_used
+            .checked_sub(gas_used_on_pubdata)
+            .unwrap_or_else(|| {
+                tracing::error!(
+                    "Gas used on pubdata is greater than total gas used. On pubdata: {}, total: {}",
+                    gas_used_on_pubdata,
+                    total_gas_used
+                );
+                0
+            })
+    }
+}
diff --git a/core/lib/multivm/src/versions/vm_refunds_enhancement/implementation/logs.rs b/core/lib/multivm/src/versions/vm_refunds_enhancement/implementation/logs.rs
new file mode 100644
index 000000000000..b8e8652f3012
--- /dev/null
+++ b/core/lib/multivm/src/versions/vm_refunds_enhancement/implementation/logs.rs
@@ -0,0 +1,65 @@
+use zk_evm_1_3_3::aux_structures::Timestamp;
+use zksync_state::WriteStorage;
+
+use crate::HistoryMode;
+use zksync_types::l2_to_l1_log::{L2ToL1Log, UserL2ToL1Log};
+use zksync_types::VmEvent;
+
+use crate::interface::types::outputs::VmExecutionLogs;
+use crate::vm_refunds_enhancement::old_vm::events::merge_events;
+use crate::vm_refunds_enhancement::old_vm::utils::precompile_calls_count_after_timestamp;
+use crate::vm_refunds_enhancement::vm::Vm;
+
+impl<S: WriteStorage, H: HistoryMode> Vm<S, H> {
+    pub(crate) fn collect_execution_logs_after_timestamp(
+        &self,
+        from_timestamp: Timestamp,
+    ) -> VmExecutionLogs {
+        let storage_logs: Vec<_> = self
+            .state
+            .storage
+            .storage_log_queries_after_timestamp(from_timestamp)
+            .iter()
+            .map(|log| **log)
+            .collect();
+        let storage_logs_count = storage_logs.len();
+
+        let (events, l2_to_l1_logs) =
+            self.collect_events_and_l1_logs_after_timestamp(from_timestamp);
+
+        let log_queries = self
+            .state
+            .event_sink
+            .log_queries_after_timestamp(from_timestamp);
+
+        let precompile_calls_count = precompile_calls_count_after_timestamp(
+            self.state.precompiles_processor.timestamp_history.inner(),
+            from_timestamp,
+        );
+
+        let total_log_queries_count =
+            storage_logs_count + log_queries.len() + precompile_calls_count;
+        VmExecutionLogs {
+            storage_logs,
+            events,
+            user_l2_to_l1_logs: l2_to_l1_logs.into_iter().map(UserL2ToL1Log).collect(),
+            system_l2_to_l1_logs: vec![],
+            total_log_queries_count,
+        }
+    }
+
+    pub(crate) fn collect_events_and_l1_logs_after_timestamp(
+        &self,
+        from_timestamp: Timestamp,
+    ) -> (Vec<VmEvent>, Vec<L2ToL1Log>) {
+        let (raw_events, l1_messages) = self
+            .state
+            .event_sink
+            .get_events_and_l2_l1_logs_after_timestamp(from_timestamp);
+        let events = merge_events(raw_events)
+            .into_iter()
+            .map(|e| e.into_vm_event(self.batch_env.number))
+            .collect();
+        (events, l1_messages.into_iter().map(Into::into).collect())
+    }
+}
diff --git a/core/lib/multivm/src/versions/vm_refunds_enhancement/implementation/mod.rs b/core/lib/multivm/src/versions/vm_refunds_enhancement/implementation/mod.rs
new file mode 100644
index 000000000000..161732cf0348
--- /dev/null
+++ b/core/lib/multivm/src/versions/vm_refunds_enhancement/implementation/mod.rs
@@ -0,0 +1,7 @@
+mod bytecode;
+mod execution;
+mod gas;
+mod logs;
+mod snapshots;
+mod statistics;
+mod tx;
diff --git a/core/lib/multivm/src/versions/vm_refunds_enhancement/implementation/snapshots.rs b/core/lib/multivm/src/versions/vm_refunds_enhancement/implementation/snapshots.rs
new file mode 100644
index 000000000000..972d50e5d76e
--- /dev/null
+++ b/core/lib/multivm/src/versions/vm_refunds_enhancement/implementation/snapshots.rs
@@ -0,0 +1,91 @@
+use vise::{Buckets, EncodeLabelSet, EncodeLabelValue, Family, Histogram, Metrics};
+
+use std::time::Duration;
+
+use crate::vm_latest::HistoryEnabled;
+use zk_evm_1_3_3::aux_structures::Timestamp;
+use zksync_state::WriteStorage;
+
+use crate::vm_refunds_enhancement::{
+    old_vm::oracles::OracleWithHistory, types::internals::VmSnapshot, vm::Vm,
+};
+
+#[derive(Debug, Clone, Copy, PartialEq, Eq, Hash, EncodeLabelSet, EncodeLabelValue)]
+#[metrics(label = "stage", rename_all = "snake_case")]
+enum RollbackStage {
+    DecommitmentProcessorRollback,
+    EventSinkRollback,
+    StorageRollback,
+    MemoryRollback,
+    PrecompilesProcessorRollback,
+    ApplyBootloaderSnapshot,
+}
+
+#[derive(Debug, Metrics)]
+#[metrics(prefix = "server_vm_refunds_enhancement")]
+struct VmMetrics {
+    #[metrics(buckets = Buckets::LATENCIES)]
+    rollback_time: Family<RollbackStage, Histogram<Duration>>,
+}
+
+#[vise::register]
+static METRICS: vise::Global<VmMetrics> = vise::Global::new();
+
+/// Implementation of VM related to rollbacks inside virtual machine
+impl<S: WriteStorage> Vm<S, HistoryEnabled> {
+    pub(crate) fn make_snapshot_inner(&mut self) {
+        self.snapshots.push(VmSnapshot {
+            // Vm local state contains O(1) various parameters (registers/etc).
+            // The only "expensive" copying here is copying of the callstack.
+            // It will take O(callstack_depth) to copy it.
+            // So it is generally recommended to get snapshots of the bootloader frame,
+            // where the depth is 1.
+            local_state: self.state.local_state.clone(),
+            bootloader_state: self.bootloader_state.get_snapshot(),
+        });
+    }
+
+    pub(crate) fn rollback_to_snapshot(&mut self, snapshot: VmSnapshot) {
+        let VmSnapshot {
+            local_state,
+            bootloader_state,
+        } = snapshot;
+
+        let stage_latency =
+            METRICS.rollback_time[&RollbackStage::DecommitmentProcessorRollback].start();
+        let timestamp = Timestamp(local_state.timestamp);
+        tracing::trace!("Rolling back decomitter");
+        self.state
+            .decommittment_processor
+            .rollback_to_timestamp(timestamp);
+        stage_latency.observe();
+
+        let stage_latency = METRICS.rollback_time[&RollbackStage::EventSinkRollback].start();
+        tracing::trace!("Rolling back event_sink");
+        self.state.event_sink.rollback_to_timestamp(timestamp);
+        stage_latency.observe();
+
+        let stage_latency = METRICS.rollback_time[&RollbackStage::StorageRollback].start();
+        tracing::trace!("Rolling back storage");
+        self.state.storage.rollback_to_timestamp(timestamp);
+        stage_latency.observe();
+
+        let stage_latency = METRICS.rollback_time[&RollbackStage::MemoryRollback].start();
+        tracing::trace!("Rolling back memory");
+        self.state.memory.rollback_to_timestamp(timestamp);
+        stage_latency.observe();
+
+        let stage_latency =
+            METRICS.rollback_time[&RollbackStage::PrecompilesProcessorRollback].start();
+        tracing::trace!("Rolling back precompiles_processor");
+        self.state
+            .precompiles_processor
+            .rollback_to_timestamp(timestamp);
+        stage_latency.observe();
+
+        self.state.local_state = local_state;
+        let stage_latency = METRICS.rollback_time[&RollbackStage::ApplyBootloaderSnapshot].start();
+        self.bootloader_state.apply_snapshot(bootloader_state);
+        stage_latency.observe();
+    }
+}
diff --git a/core/lib/multivm/src/versions/vm_refunds_enhancement/implementation/statistics.rs b/core/lib/multivm/src/versions/vm_refunds_enhancement/implementation/statistics.rs
new file mode 100644
index 000000000000..48bbd64ecf2e
--- /dev/null
+++ b/core/lib/multivm/src/versions/vm_refunds_enhancement/implementation/statistics.rs
@@ -0,0 +1,70 @@
+use zk_evm_1_3_3::aux_structures::Timestamp;
+use zksync_state::WriteStorage;
+
+use crate::HistoryMode;
+use zksync_types::U256;
+
+use crate::interface::{VmExecutionStatistics, VmMemoryMetrics};
+use crate::vm_refunds_enhancement::tracers::DefaultExecutionTracer;
+use crate::vm_refunds_enhancement::vm::Vm;
+
+/// Module responsible for observing the VM behavior, i.e. calculating the statistics of the VM runs
+/// or reporting the VM memory usage.
+
+impl<S: WriteStorage, H: HistoryMode> Vm<S, H> {
+    /// Get statistics about TX execution.
+    #[allow(clippy::too_many_arguments)]
+    pub(crate) fn get_statistics(
+        &self,
+        timestamp_initial: Timestamp,
+        cycles_initial: u32,
+        tracer: &DefaultExecutionTracer<S, H::VmVirtualBlocksRefundsEnhancement>,
+        gas_remaining_before: u32,
+        gas_remaining_after: u32,
+        spent_pubdata_counter_before: u32,
+        pubdata_published: u32,
+        total_log_queries_count: usize,
+    ) -> VmExecutionStatistics {
+        let computational_gas_used = self.calculate_computational_gas_used(
+            tracer,
+            gas_remaining_before,
+            spent_pubdata_counter_before,
+        );
+        VmExecutionStatistics {
+            contracts_used: self
+                .state
+                .decommittment_processor
+                .get_decommitted_bytecodes_after_timestamp(timestamp_initial),
+            cycles_used: self.state.local_state.monotonic_cycle_counter - cycles_initial,
+            gas_used: gas_remaining_before - gas_remaining_after,
+            computational_gas_used,
+            total_log_queries: total_log_queries_count,
+            pubdata_published,
+        }
+    }
+
+    /// Returns the hashes the bytecodes that have been decommitted by the decomittment processor.
+    pub(crate) fn get_used_contracts(&self) -> Vec<U256> {
+        self.state
+            .decommittment_processor
+            .decommitted_code_hashes
+            .inner()
+            .keys()
+            .cloned()
+            .collect()
+    }
+
+    /// Returns the info about all oracles' sizes.
+    pub(crate) fn record_vm_memory_metrics_inner(&self) -> VmMemoryMetrics {
+        VmMemoryMetrics {
+            event_sink_inner: self.state.event_sink.get_size(),
+            event_sink_history: self.state.event_sink.get_history_size(),
+            memory_inner: self.state.memory.get_size(),
+            memory_history: self.state.memory.get_history_size(),
+            decommittment_processor_inner: self.state.decommittment_processor.get_size(),
+            decommittment_processor_history: self.state.decommittment_processor.get_history_size(),
+            storage_inner: self.state.storage.get_size(),
+            storage_history: self.state.storage.get_history_size(),
+        }
+    }
+}
diff --git a/core/lib/multivm/src/versions/vm_refunds_enhancement/implementation/tx.rs b/core/lib/multivm/src/versions/vm_refunds_enhancement/implementation/tx.rs
new file mode 100644
index 000000000000..d6fd4858870d
--- /dev/null
+++ b/core/lib/multivm/src/versions/vm_refunds_enhancement/implementation/tx.rs
@@ -0,0 +1,67 @@
+use crate::vm_refunds_enhancement::constants::BOOTLOADER_HEAP_PAGE;
+use crate::vm_refunds_enhancement::implementation::bytecode::{
+    bytecode_to_factory_dep, compress_bytecodes,
+};
+use zk_evm_1_3_3::aux_structures::Timestamp;
+use zksync_state::WriteStorage;
+use zksync_types::l1::is_l1_tx_type;
+use zksync_types::Transaction;
+
+use crate::vm_refunds_enhancement::types::internals::TransactionData;
+use crate::vm_refunds_enhancement::vm::Vm;
+use crate::HistoryMode;
+
+impl<S: WriteStorage, H: HistoryMode> Vm<S, H> {
+    pub(crate) fn push_raw_transaction(
+        &mut self,
+        tx: TransactionData,
+        predefined_overhead: u32,
+        predefined_refund: u32,
+        with_compression: bool,
+    ) {
+        let timestamp = Timestamp(self.state.local_state.timestamp);
+        let codes_for_decommiter = tx
+            .factory_deps
+            .iter()
+            .map(|dep| bytecode_to_factory_dep(dep.clone()))
+            .collect();
+
+        let compressed_bytecodes = if is_l1_tx_type(tx.tx_type) || !with_compression {
+            // L1 transactions do not need compression
+            vec![]
+        } else {
+            compress_bytecodes(&tx.factory_deps, self.state.storage.storage.get_ptr())
+        };
+
+        self.state
+            .decommittment_processor
+            .populate(codes_for_decommiter, timestamp);
+
+        let trusted_ergs_limit =
+            tx.trusted_ergs_limit(self.batch_env.block_gas_price_per_pubdata());
+
+        let memory = self.bootloader_state.push_tx(
+            tx,
+            predefined_overhead,
+            predefined_refund,
+            compressed_bytecodes,
+            trusted_ergs_limit,
+            self.system_env.chain_id,
+        );
+
+        self.state
+            .memory
+            .populate_page(BOOTLOADER_HEAP_PAGE as usize, memory, timestamp);
+    }
+
+    pub(crate) fn push_transaction_with_compression(
+        &mut self,
+        tx: Transaction,
+        with_compression: bool,
+    ) {
+        let tx: TransactionData = tx.into();
+        let block_gas_per_pubdata_byte = self.batch_env.block_gas_price_per_pubdata();
+        let overhead = tx.overhead_gas(block_gas_per_pubdata_byte as u32);
+        self.push_raw_transaction(tx, overhead, 0, with_compression);
+    }
+}
diff --git a/core/lib/multivm/src/versions/vm_refunds_enhancement/mod.rs b/core/lib/multivm/src/versions/vm_refunds_enhancement/mod.rs
new file mode 100644
index 000000000000..89e7b21b984b
--- /dev/null
+++ b/core/lib/multivm/src/versions/vm_refunds_enhancement/mod.rs
@@ -0,0 +1,30 @@
+pub use old_vm::{
+    history_recorder::{HistoryDisabled, HistoryEnabled, HistoryMode},
+    memory::SimpleMemory,
+};
+
+pub use oracles::storage::StorageOracle;
+
+pub use tracers::dispatcher::TracerDispatcher;
+pub use tracers::traits::{TracerPointer, VmTracer};
+
+pub use utils::transaction_encoding::TransactionVmExt;
+
+pub use bootloader_state::BootloaderState;
+pub use types::internals::ZkSyncVmState;
+
+pub use vm::Vm;
+
+mod bootloader_state;
+mod implementation;
+mod old_vm;
+mod oracles;
+pub(crate) mod tracers;
+mod types;
+mod vm;
+
+pub mod constants;
+pub mod utils;
+
+// #[cfg(test)]
+// mod tests;
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
new file mode 100644
index 000000000000..adbee280a3db
--- /dev/null
+++ b/core/lib/multivm/src/versions/vm_refunds_enhancement/old_vm/event_sink.rs
@@ -0,0 +1,171 @@
+use crate::vm_refunds_enhancement::old_vm::{
+    history_recorder::{AppDataFrameManagerWithHistory, HistoryEnabled, HistoryMode},
+    oracles::OracleWithHistory,
+};
+use std::collections::HashMap;
+use zk_evm_1_3_3::{
+    abstractions::EventSink,
+    aux_structures::{LogQuery, Timestamp},
+    reference_impls::event_sink::EventMessage,
+    zkevm_opcode_defs::system_params::{
+        BOOTLOADER_FORMAL_ADDRESS, EVENT_AUX_BYTE, L1_MESSAGE_AUX_BYTE,
+    },
+};
+
+#[derive(Debug, Clone, PartialEq, Default)]
+pub struct InMemoryEventSink<H: HistoryMode> {
+    frames_stack: AppDataFrameManagerWithHistory<Box<LogQuery>, H>,
+}
+
+impl OracleWithHistory for InMemoryEventSink<HistoryEnabled> {
+    fn rollback_to_timestamp(&mut self, timestamp: Timestamp) {
+        self.frames_stack.rollback_to_timestamp(timestamp);
+    }
+}
+
+// as usual, if we rollback the current frame then we apply changes to storage immediately,
+// otherwise we carry rollbacks to the parent's frames
+
+impl<H: HistoryMode> InMemoryEventSink<H> {
+    pub fn flatten(&self) -> (Vec<LogQuery>, Vec<EventMessage>, Vec<EventMessage>) {
+        assert_eq!(
+            self.frames_stack.len(),
+            1,
+            "there must exist an initial keeper frame"
+        );
+        // we forget rollbacks as we have finished the execution and can just apply them
+        let history = self.frames_stack.forward().current_frame();
+
+        let (events, l1_messages) = Self::events_and_l1_messages_from_history(history);
+        (history.iter().map(|x| **x).collect(), events, l1_messages)
+    }
+
+    pub fn get_log_queries(&self) -> usize {
+        self.frames_stack.forward().current_frame().len()
+    }
+
+    /// Returns the log queries in the current frame where `log_query.timestamp >= from_timestamp`.
+    pub fn log_queries_after_timestamp(&self, from_timestamp: Timestamp) -> &[Box<LogQuery>] {
+        let events = self.frames_stack.forward().current_frame();
+
+        // Select all of the last elements where e.timestamp >= from_timestamp.
+        // Note, that using binary search here is dangerous, because the logs are not sorted by timestamp.
+        events
+            .rsplit(|e| e.timestamp < from_timestamp)
+            .next()
+            .unwrap_or(&[])
+    }
+
+    pub fn get_events_and_l2_l1_logs_after_timestamp(
+        &self,
+        from_timestamp: Timestamp,
+    ) -> (Vec<EventMessage>, Vec<EventMessage>) {
+        Self::events_and_l1_messages_from_history(self.log_queries_after_timestamp(from_timestamp))
+    }
+
+    fn events_and_l1_messages_from_history(
+        history: &[Box<LogQuery>],
+    ) -> (Vec<EventMessage>, Vec<EventMessage>) {
+        let mut tmp = HashMap::<u32, LogQuery>::with_capacity(history.len());
+
+        // note that we only use "forward" part and discard the rollbacks at the end,
+        // 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() {
+                assert!(el.rollback);
+                tmp.remove(&el.timestamp.0);
+            } else {
+                assert!(!el.rollback);
+                tmp.insert(el.timestamp.0, **el);
+            }
+        }
+
+        // naturally sorted by timestamp
+        let mut keys: Vec<_> = tmp.keys().cloned().collect();
+        keys.sort_unstable();
+
+        let mut events = vec![];
+        let mut l1_messages = vec![];
+
+        for k in keys.into_iter() {
+            let el = tmp.remove(&k).unwrap();
+            let LogQuery {
+                shard_id,
+                is_service,
+                tx_number_in_block,
+                address,
+                key,
+                written_value,
+                aux_byte,
+                ..
+            } = el;
+
+            let event = EventMessage {
+                shard_id,
+                is_first: is_service,
+                tx_number_in_block,
+                address,
+                key,
+                value: written_value,
+            };
+
+            if aux_byte == EVENT_AUX_BYTE {
+                events.push(event);
+            } else {
+                l1_messages.push(event);
+            }
+        }
+
+        (events, l1_messages)
+    }
+
+    pub(crate) fn get_size(&self) -> usize {
+        self.frames_stack.get_size()
+    }
+
+    pub fn get_history_size(&self) -> usize {
+        self.frames_stack.get_history_size()
+    }
+
+    pub fn delete_history(&mut self) {
+        self.frames_stack.delete_history();
+    }
+}
+
+impl<H: HistoryMode> EventSink for InMemoryEventSink<H> {
+    // when we enter a new frame we should remember all our current applications and rollbacks
+    // when we exit the current frame then if we did panic we should concatenate all current
+    // forward and rollback cases
+
+    fn add_partial_query(&mut self, _monotonic_cycle_counter: u32, mut query: LogQuery) {
+        assert!(query.rw_flag);
+        assert!(query.aux_byte == EVENT_AUX_BYTE || query.aux_byte == L1_MESSAGE_AUX_BYTE);
+        assert!(!query.rollback);
+
+        // just append to rollbacks and a full history
+
+        self.frames_stack
+            .push_forward(Box::new(query), query.timestamp);
+        // we do not need it explicitly here, but let's be consistent with circuit counterpart
+        query.rollback = true;
+        self.frames_stack
+            .push_rollback(Box::new(query), query.timestamp);
+    }
+
+    fn start_frame(&mut self, timestamp: Timestamp) {
+        self.frames_stack.push_frame(timestamp)
+    }
+
+    fn finish_frame(&mut self, panicked: bool, timestamp: Timestamp) {
+        // if we panic then we append forward and rollbacks to the forward of parent,
+        // otherwise we place rollbacks of child before rollbacks of the parent
+        if panicked {
+            self.frames_stack.move_rollback_to_forward(
+                |q| q.address != *BOOTLOADER_FORMAL_ADDRESS || q.aux_byte != EVENT_AUX_BYTE,
+                timestamp,
+            );
+        }
+        self.frames_stack.merge_frame(timestamp);
+    }
+}
diff --git a/core/lib/multivm/src/versions/vm_refunds_enhancement/old_vm/events.rs b/core/lib/multivm/src/versions/vm_refunds_enhancement/old_vm/events.rs
new file mode 100644
index 000000000000..de918e069141
--- /dev/null
+++ b/core/lib/multivm/src/versions/vm_refunds_enhancement/old_vm/events.rs
@@ -0,0 +1,146 @@
+use zk_evm_1_3_3::{ethereum_types::Address, reference_impls::event_sink::EventMessage};
+use zksync_types::{L1BatchNumber, VmEvent, EVENT_WRITER_ADDRESS, H256};
+use zksync_utils::{be_chunks_to_h256_words, h256_to_account_address};
+
+#[derive(Clone)]
+pub(crate) struct SolidityLikeEvent {
+    pub(crate) shard_id: u8,
+    pub(crate) tx_number_in_block: u16,
+    pub(crate) address: Address,
+    pub(crate) topics: Vec<[u8; 32]>,
+    pub(crate) data: Vec<u8>,
+}
+
+impl SolidityLikeEvent {
+    pub(crate) fn into_vm_event(self, block_number: L1BatchNumber) -> VmEvent {
+        VmEvent {
+            location: (block_number, self.tx_number_in_block as u32),
+            address: self.address,
+            indexed_topics: be_chunks_to_h256_words(self.topics),
+            value: self.data,
+        }
+    }
+}
+
+fn merge_events_inner(events: Vec<EventMessage>) -> Vec<SolidityLikeEvent> {
+    let mut result = vec![];
+    let mut current: Option<(usize, u32, SolidityLikeEvent)> = None;
+
+    for message in events.into_iter() {
+        if !message.is_first {
+            let EventMessage {
+                shard_id,
+                is_first: _,
+                tx_number_in_block,
+                address,
+                key,
+                value,
+            } = message;
+
+            if let Some((mut remaining_data_length, mut remaining_topics, mut event)) =
+                current.take()
+            {
+                if event.address != address
+                    || event.shard_id != shard_id
+                    || event.tx_number_in_block != tx_number_in_block
+                {
+                    continue;
+                }
+                let mut data_0 = [0u8; 32];
+                let mut data_1 = [0u8; 32];
+                key.to_big_endian(&mut data_0);
+                value.to_big_endian(&mut data_1);
+                for el in [data_0, data_1].iter() {
+                    if remaining_topics != 0 {
+                        event.topics.push(*el);
+                        remaining_topics -= 1;
+                    } else if remaining_data_length != 0 {
+                        if remaining_data_length >= 32 {
+                            event.data.extend_from_slice(el);
+                            remaining_data_length -= 32;
+                        } else {
+                            event.data.extend_from_slice(&el[..remaining_data_length]);
+                            remaining_data_length = 0;
+                        }
+                    }
+                }
+
+                if remaining_data_length != 0 || remaining_topics != 0 {
+                    current = Some((remaining_data_length, remaining_topics, event))
+                } else {
+                    result.push(event);
+                }
+            }
+        } else {
+            // start new one. First take the old one only if it's well formed
+            if let Some((remaining_data_length, remaining_topics, event)) = current.take() {
+                if remaining_data_length == 0 && remaining_topics == 0 {
+                    result.push(event);
+                }
+            }
+
+            let EventMessage {
+                shard_id,
+                is_first: _,
+                tx_number_in_block,
+                address,
+                key,
+                value,
+            } = message;
+            // split key as our internal marker. Ignore higher bits
+            let mut num_topics = key.0[0] as u32;
+            let mut data_length = (key.0[0] >> 32) as usize;
+            let mut buffer = [0u8; 32];
+            value.to_big_endian(&mut buffer);
+
+            let (topics, data) = if num_topics == 0 && data_length == 0 {
+                (vec![], vec![])
+            } else if num_topics == 0 {
+                data_length -= 32;
+                (vec![], buffer.to_vec())
+            } else {
+                num_topics -= 1;
+                (vec![buffer], vec![])
+            };
+
+            let new_event = SolidityLikeEvent {
+                shard_id,
+                tx_number_in_block,
+                address,
+                topics,
+                data,
+            };
+
+            current = Some((data_length, num_topics, new_event))
+        }
+    }
+
+    // add the last one
+    if let Some((remaining_data_length, remaining_topics, event)) = current.take() {
+        if remaining_data_length == 0 && remaining_topics == 0 {
+            result.push(event);
+        }
+    }
+
+    result
+}
+
+pub(crate) fn merge_events(events: Vec<EventMessage>) -> Vec<SolidityLikeEvent> {
+    let raw_events = merge_events_inner(events);
+
+    raw_events
+        .into_iter()
+        .filter(|e| e.address == EVENT_WRITER_ADDRESS)
+        .map(|event| {
+            // The events writer events where the first topic is the actual address of the event and the rest of the topics are real topics
+            let address = h256_to_account_address(&H256(event.topics[0]));
+            let topics = event.topics.into_iter().skip(1).collect();
+
+            SolidityLikeEvent {
+                topics,
+                address,
+                ..event
+            }
+        })
+        .collect()
+}
diff --git a/core/lib/multivm/src/versions/vm_refunds_enhancement/old_vm/history_recorder.rs b/core/lib/multivm/src/versions/vm_refunds_enhancement/old_vm/history_recorder.rs
new file mode 100644
index 000000000000..44d510b0075e
--- /dev/null
+++ b/core/lib/multivm/src/versions/vm_refunds_enhancement/old_vm/history_recorder.rs
@@ -0,0 +1,809 @@
+use std::{collections::HashMap, fmt::Debug, hash::Hash};
+
+use zk_evm_1_3_3::{
+    aux_structures::Timestamp,
+    vm_state::PrimitiveValue,
+    zkevm_opcode_defs::{self},
+};
+
+use zksync_state::{StoragePtr, WriteStorage};
+use zksync_types::{StorageKey, U256};
+use zksync_utils::{h256_to_u256, u256_to_h256};
+
+pub(crate) type MemoryWithHistory<H> = HistoryRecorder<MemoryWrapper, H>;
+pub(crate) type IntFrameManagerWithHistory<T, H> = HistoryRecorder<FramedStack<T>, H>;
+
+// Within the same cycle, timestamps in range timestamp..timestamp+TIME_DELTA_PER_CYCLE-1
+// can be used. This can sometimes violate monotonicity of the timestamp within the
+// same cycle, so it should be normalized.
+#[inline]
+fn normalize_timestamp(timestamp: Timestamp) -> Timestamp {
+    let timestamp = timestamp.0;
+
+    // Making sure it is divisible by TIME_DELTA_PER_CYCLE
+    Timestamp(timestamp - timestamp % zkevm_opcode_defs::TIME_DELTA_PER_CYCLE)
+}
+
+/// Accepts history item as its parameter and applies it.
+pub trait WithHistory {
+    type HistoryRecord;
+    type ReturnValue;
+
+    // Applies an action and returns the action that would
+    // rollback its effect as well as some returned value
+    fn apply_historic_record(
+        &mut self,
+        item: Self::HistoryRecord,
+    ) -> (Self::HistoryRecord, Self::ReturnValue);
+}
+
+type EventList<T> = Vec<(Timestamp, <T as WithHistory>::HistoryRecord)>;
+
+/// Controls if rolling back is possible or not.
+/// Either [HistoryEnabled] or [HistoryDisabled].
+pub trait HistoryMode: private::Sealed + Debug + Clone + Default {
+    type History<T: WithHistory>: Default;
+
+    fn clone_history<T: WithHistory>(history: &Self::History<T>) -> Self::History<T>
+    where
+        T::HistoryRecord: Clone;
+    fn mutate_history<T: WithHistory, F: FnOnce(&mut T, &mut EventList<T>)>(
+        recorder: &mut HistoryRecorder<T, Self>,
+        f: F,
+    );
+    fn borrow_history<T: WithHistory, F: FnOnce(&EventList<T>) -> R, R>(
+        recorder: &HistoryRecorder<T, Self>,
+        f: F,
+        default: R,
+    ) -> R;
+}
+
+mod private {
+    pub trait Sealed {}
+    impl Sealed for super::HistoryEnabled {}
+    impl Sealed for super::HistoryDisabled {}
+}
+
+// derives require that all type parameters implement the trait, which is why
+// HistoryEnabled/Disabled derive so many traits even though they mostly don't
+// exist at runtime.
+
+/// A data structure with this parameter can be rolled back.
+/// See also: [HistoryDisabled]
+#[derive(Debug, Clone, Default, PartialEq)]
+pub struct HistoryEnabled;
+
+/// A data structure with this parameter cannot be rolled back.
+/// It won't even have rollback methods.
+/// See also: [HistoryEnabled]
+#[derive(Debug, Clone, Default)]
+pub struct HistoryDisabled;
+
+impl HistoryMode for HistoryEnabled {
+    type History<T: WithHistory> = EventList<T>;
+
+    fn clone_history<T: WithHistory>(history: &Self::History<T>) -> Self::History<T>
+    where
+        T::HistoryRecord: Clone,
+    {
+        history.clone()
+    }
+    fn mutate_history<T: WithHistory, F: FnOnce(&mut T, &mut EventList<T>)>(
+        recorder: &mut HistoryRecorder<T, Self>,
+        f: F,
+    ) {
+        f(&mut recorder.inner, &mut recorder.history)
+    }
+    fn borrow_history<T: WithHistory, F: FnOnce(&EventList<T>) -> R, R>(
+        recorder: &HistoryRecorder<T, Self>,
+        f: F,
+        _: R,
+    ) -> R {
+        f(&recorder.history)
+    }
+}
+
+impl HistoryMode for HistoryDisabled {
+    type History<T: WithHistory> = ();
+
+    fn clone_history<T: WithHistory>(_: &Self::History<T>) -> Self::History<T> {}
+    fn mutate_history<T: WithHistory, F: FnOnce(&mut T, &mut EventList<T>)>(
+        _: &mut HistoryRecorder<T, Self>,
+        _: F,
+    ) {
+    }
+    fn borrow_history<T: WithHistory, F: FnOnce(&EventList<T>) -> R, R>(
+        _: &HistoryRecorder<T, Self>,
+        _: F,
+        default: R,
+    ) -> R {
+        default
+    }
+}
+
+/// A struct responsible for tracking history for
+/// a component that is passed as a generic parameter to it (`inner`).
+#[derive(Default)]
+pub struct HistoryRecorder<T: WithHistory, H: HistoryMode> {
+    inner: T,
+    history: H::History<T>,
+}
+
+impl<T: WithHistory + PartialEq, H: HistoryMode> PartialEq for HistoryRecorder<T, H>
+where
+    T::HistoryRecord: PartialEq,
+{
+    fn eq(&self, other: &Self) -> bool {
+        self.inner == other.inner
+            && self.borrow_history(|h1| other.borrow_history(|h2| h1 == h2, true), true)
+    }
+}
+
+impl<T: WithHistory + Debug, H: HistoryMode> Debug for HistoryRecorder<T, H>
+where
+    T::HistoryRecord: Debug,
+{
+    fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
+        let mut debug_struct = f.debug_struct("HistoryRecorder");
+        debug_struct.field("inner", &self.inner);
+        self.borrow_history(
+            |h| {
+                debug_struct.field("history", h);
+            },
+            (),
+        );
+        debug_struct.finish()
+    }
+}
+
+impl<T: WithHistory + Clone, H> Clone for HistoryRecorder<T, H>
+where
+    T::HistoryRecord: Clone,
+    H: HistoryMode,
+{
+    fn clone(&self) -> Self {
+        Self {
+            inner: self.inner.clone(),
+            history: H::clone_history(&self.history),
+        }
+    }
+}
+
+impl<T: WithHistory, H: HistoryMode> HistoryRecorder<T, H> {
+    pub fn from_inner(inner: T) -> Self {
+        Self {
+            inner,
+            history: Default::default(),
+        }
+    }
+
+    pub fn inner(&self) -> &T {
+        &self.inner
+    }
+
+    /// If history exists, modify it using `f`.
+    pub fn mutate_history<F: FnOnce(&mut T, &mut EventList<T>)>(&mut self, f: F) {
+        H::mutate_history(self, f);
+    }
+
+    /// If history exists, feed it into `f`. Otherwise return `default`.
+    pub fn borrow_history<F: FnOnce(&EventList<T>) -> R, R>(&self, f: F, default: R) -> R {
+        H::borrow_history(self, f, default)
+    }
+
+    pub fn apply_historic_record(
+        &mut self,
+        item: T::HistoryRecord,
+        timestamp: Timestamp,
+    ) -> T::ReturnValue {
+        let (reversed_item, return_value) = self.inner.apply_historic_record(item);
+
+        self.mutate_history(|_, history| {
+            let last_recorded_timestamp = history.last().map(|(t, _)| *t).unwrap_or(Timestamp(0));
+            let timestamp = normalize_timestamp(timestamp);
+            assert!(
+                last_recorded_timestamp <= timestamp,
+                "Timestamps are not monotonic"
+            );
+            history.push((timestamp, reversed_item));
+        });
+
+        return_value
+    }
+
+    /// Deletes all the history for its component, making
+    /// its current state irreversible
+    pub fn delete_history(&mut self) {
+        self.mutate_history(|_, h| h.clear())
+    }
+}
+
+impl<T: WithHistory> HistoryRecorder<T, HistoryEnabled> {
+    pub fn history(&self) -> &Vec<(Timestamp, T::HistoryRecord)> {
+        &self.history
+    }
+
+    pub(crate) fn rollback_to_timestamp(&mut self, timestamp: Timestamp) {
+        loop {
+            let should_undo = self
+                .history
+                .last()
+                .map(|(item_timestamp, _)| *item_timestamp >= timestamp)
+                .unwrap_or(false);
+            if !should_undo {
+                break;
+            }
+
+            let (_, item_to_apply) = self.history.pop().unwrap();
+            self.inner.apply_historic_record(item_to_apply);
+        }
+    }
+}
+
+#[derive(Debug, Clone, PartialEq)]
+pub enum VectorHistoryEvent<X> {
+    Push(X),
+    Pop,
+}
+
+impl<T: Copy> WithHistory for Vec<T> {
+    type HistoryRecord = VectorHistoryEvent<T>;
+    type ReturnValue = Option<T>;
+    fn apply_historic_record(
+        &mut self,
+        item: VectorHistoryEvent<T>,
+    ) -> (Self::HistoryRecord, Self::ReturnValue) {
+        match item {
+            VectorHistoryEvent::Pop => {
+                // Note, that here we assume that the users
+                // will check themselves whether this vector is empty
+                // prior to popping from it.
+                let poped_item = self.pop().unwrap();
+
+                (VectorHistoryEvent::Push(poped_item), Some(poped_item))
+            }
+            VectorHistoryEvent::Push(x) => {
+                self.push(x);
+
+                (VectorHistoryEvent::Pop, None)
+            }
+        }
+    }
+}
+
+impl<T: Copy, H: HistoryMode> HistoryRecorder<Vec<T>, H> {
+    pub fn push(&mut self, elem: T, timestamp: Timestamp) {
+        self.apply_historic_record(VectorHistoryEvent::Push(elem), timestamp);
+    }
+
+    pub fn pop(&mut self, timestamp: Timestamp) -> T {
+        self.apply_historic_record(VectorHistoryEvent::Pop, timestamp)
+            .unwrap()
+    }
+
+    pub fn len(&self) -> usize {
+        self.inner.len()
+    }
+
+    pub fn is_empty(&self) -> bool {
+        self.len() == 0
+    }
+}
+
+#[derive(Debug, Clone, PartialEq)]
+pub struct HashMapHistoryEvent<K, V> {
+    pub key: K,
+    pub value: Option<V>,
+}
+
+impl<K: Eq + Hash + Copy, V: Clone + Debug> WithHistory for HashMap<K, V> {
+    type HistoryRecord = HashMapHistoryEvent<K, V>;
+    type ReturnValue = Option<V>;
+    fn apply_historic_record(
+        &mut self,
+        item: Self::HistoryRecord,
+    ) -> (Self::HistoryRecord, Self::ReturnValue) {
+        let HashMapHistoryEvent { key, value } = item;
+
+        let prev_value = match value {
+            Some(x) => self.insert(key, x),
+            None => self.remove(&key),
+        };
+
+        (
+            HashMapHistoryEvent {
+                key,
+                value: prev_value.clone(),
+            },
+            prev_value,
+        )
+    }
+}
+
+impl<K: Eq + Hash + Copy, V: Clone + Debug, H: HistoryMode> HistoryRecorder<HashMap<K, V>, H> {
+    pub fn insert(&mut self, key: K, value: V, timestamp: Timestamp) -> Option<V> {
+        self.apply_historic_record(
+            HashMapHistoryEvent {
+                key,
+                value: Some(value),
+            },
+            timestamp,
+        )
+    }
+
+    pub(crate) fn remove(&mut self, key: K, timestamp: Timestamp) -> Option<V> {
+        self.apply_historic_record(HashMapHistoryEvent { key, value: None }, timestamp)
+    }
+}
+
+/// A stack of stacks. The inner stacks are called frames.
+///
+/// Does not support popping from the outer stack. Instead, the outer stack can
+/// push its topmost frame's contents onto the previous frame.
+#[derive(Debug, Clone, PartialEq)]
+pub struct FramedStack<T> {
+    data: Vec<T>,
+    frame_start_indices: Vec<usize>,
+}
+
+impl<T> Default for FramedStack<T> {
+    fn default() -> Self {
+        // We typically require at least the first frame to be there
+        // since the last user-provided frame might be reverted
+        Self {
+            data: vec![],
+            frame_start_indices: vec![0],
+        }
+    }
+}
+
+#[derive(Debug, Clone, PartialEq)]
+pub enum FramedStackEvent<T> {
+    Push(T),
+    Pop,
+    PushFrame(usize),
+    MergeFrame,
+}
+
+impl<T> WithHistory for FramedStack<T> {
+    type HistoryRecord = FramedStackEvent<T>;
+    type ReturnValue = ();
+
+    fn apply_historic_record(
+        &mut self,
+        item: Self::HistoryRecord,
+    ) -> (Self::HistoryRecord, Self::ReturnValue) {
+        use FramedStackEvent::*;
+        match item {
+            Push(x) => {
+                self.data.push(x);
+                (Pop, ())
+            }
+            Pop => {
+                let x = self.data.pop().unwrap();
+                (Push(x), ())
+            }
+            PushFrame(i) => {
+                self.frame_start_indices.push(i);
+                (MergeFrame, ())
+            }
+            MergeFrame => {
+                let pos = self.frame_start_indices.pop().unwrap();
+                (PushFrame(pos), ())
+            }
+        }
+    }
+}
+
+impl<T> FramedStack<T> {
+    fn push_frame(&self) -> FramedStackEvent<T> {
+        FramedStackEvent::PushFrame(self.data.len())
+    }
+
+    pub fn current_frame(&self) -> &[T] {
+        &self.data[*self.frame_start_indices.last().unwrap()..self.data.len()]
+    }
+
+    fn len(&self) -> usize {
+        self.frame_start_indices.len()
+    }
+
+    /// Returns the amount of memory taken up by the stored items
+    pub fn get_size(&self) -> usize {
+        self.data.len() * std::mem::size_of::<T>()
+    }
+}
+
+impl<T, H: HistoryMode> HistoryRecorder<FramedStack<T>, H> {
+    pub fn push_to_frame(&mut self, x: T, timestamp: Timestamp) {
+        self.apply_historic_record(FramedStackEvent::Push(x), timestamp);
+    }
+    pub fn clear_frame(&mut self, timestamp: Timestamp) {
+        let start = *self.inner.frame_start_indices.last().unwrap();
+        while self.inner.data.len() > start {
+            self.apply_historic_record(FramedStackEvent::Pop, timestamp);
+        }
+    }
+    pub fn extend_frame(&mut self, items: impl IntoIterator<Item = T>, timestamp: Timestamp) {
+        for x in items {
+            self.push_to_frame(x, timestamp);
+        }
+    }
+    pub fn push_frame(&mut self, timestamp: Timestamp) {
+        self.apply_historic_record(self.inner.push_frame(), timestamp);
+    }
+    pub fn merge_frame(&mut self, timestamp: Timestamp) {
+        self.apply_historic_record(FramedStackEvent::MergeFrame, timestamp);
+    }
+}
+
+#[derive(Debug, Clone, PartialEq)]
+pub(crate) struct AppDataFrameManagerWithHistory<T, H: HistoryMode> {
+    forward: HistoryRecorder<FramedStack<T>, H>,
+    rollback: HistoryRecorder<FramedStack<T>, H>,
+}
+
+impl<T, H: HistoryMode> Default for AppDataFrameManagerWithHistory<T, H> {
+    fn default() -> Self {
+        Self {
+            forward: Default::default(),
+            rollback: Default::default(),
+        }
+    }
+}
+
+impl<T, H: HistoryMode> AppDataFrameManagerWithHistory<T, H> {
+    pub(crate) fn delete_history(&mut self) {
+        self.forward.delete_history();
+        self.rollback.delete_history();
+    }
+
+    pub(crate) fn push_forward(&mut self, item: T, timestamp: Timestamp) {
+        self.forward.push_to_frame(item, timestamp);
+    }
+    pub(crate) fn push_rollback(&mut self, item: T, timestamp: Timestamp) {
+        self.rollback.push_to_frame(item, timestamp);
+    }
+    pub(crate) fn push_frame(&mut self, timestamp: Timestamp) {
+        self.forward.push_frame(timestamp);
+        self.rollback.push_frame(timestamp);
+    }
+    pub(crate) fn merge_frame(&mut self, timestamp: Timestamp) {
+        self.forward.merge_frame(timestamp);
+        self.rollback.merge_frame(timestamp);
+    }
+
+    pub(crate) fn len(&self) -> usize {
+        self.forward.inner.len()
+    }
+    pub(crate) fn forward(&self) -> &FramedStack<T> {
+        &self.forward.inner
+    }
+    pub(crate) fn rollback(&self) -> &FramedStack<T> {
+        &self.rollback.inner
+    }
+
+    /// Returns the amount of memory taken up by the stored items
+    pub(crate) fn get_size(&self) -> usize {
+        self.forward().get_size() + self.rollback().get_size()
+    }
+
+    pub(crate) fn get_history_size(&self) -> usize {
+        (self.forward.borrow_history(|h| h.len(), 0) + self.rollback.borrow_history(|h| h.len(), 0))
+            * std::mem::size_of::<<FramedStack<T> as WithHistory>::HistoryRecord>()
+    }
+}
+
+impl<T: Clone, H: HistoryMode> AppDataFrameManagerWithHistory<T, H> {
+    pub(crate) fn move_rollback_to_forward<F: Fn(&T) -> bool>(
+        &mut self,
+        filter: F,
+        timestamp: Timestamp,
+    ) {
+        for x in self.rollback.inner.current_frame().iter().rev() {
+            if filter(x) {
+                self.forward.push_to_frame(x.clone(), timestamp);
+            }
+        }
+        self.rollback.clear_frame(timestamp);
+    }
+}
+
+impl<T> AppDataFrameManagerWithHistory<T, HistoryEnabled> {
+    pub(crate) fn rollback_to_timestamp(&mut self, timestamp: Timestamp) {
+        self.forward.rollback_to_timestamp(timestamp);
+        self.rollback.rollback_to_timestamp(timestamp);
+    }
+}
+
+const PRIMITIVE_VALUE_EMPTY: PrimitiveValue = PrimitiveValue::empty();
+const PAGE_SUBDIVISION_LEN: usize = 64;
+
+#[derive(Debug, Default, Clone)]
+struct MemoryPage {
+    root: Vec<Option<Box<[PrimitiveValue; PAGE_SUBDIVISION_LEN]>>>,
+}
+
+impl MemoryPage {
+    fn get(&self, slot: usize) -> &PrimitiveValue {
+        self.root
+            .get(slot / PAGE_SUBDIVISION_LEN)
+            .and_then(|inner| inner.as_ref())
+            .map(|leaf| &leaf[slot % PAGE_SUBDIVISION_LEN])
+            .unwrap_or(&PRIMITIVE_VALUE_EMPTY)
+    }
+    fn set(&mut self, slot: usize, value: PrimitiveValue) -> PrimitiveValue {
+        let root_index = slot / PAGE_SUBDIVISION_LEN;
+        let leaf_index = slot % PAGE_SUBDIVISION_LEN;
+
+        if self.root.len() <= root_index {
+            self.root.resize_with(root_index + 1, || None);
+        }
+        let node = &mut self.root[root_index];
+
+        if let Some(leaf) = node {
+            let old = leaf[leaf_index];
+            leaf[leaf_index] = value;
+            old
+        } else {
+            let mut leaf = [PrimitiveValue::empty(); PAGE_SUBDIVISION_LEN];
+            leaf[leaf_index] = value;
+            self.root[root_index] = Some(Box::new(leaf));
+            PrimitiveValue::empty()
+        }
+    }
+
+    fn get_size(&self) -> usize {
+        self.root.iter().filter_map(|x| x.as_ref()).count()
+            * PAGE_SUBDIVISION_LEN
+            * std::mem::size_of::<PrimitiveValue>()
+    }
+}
+
+impl PartialEq for MemoryPage {
+    fn eq(&self, other: &Self) -> bool {
+        for slot in 0..self.root.len().max(other.root.len()) * PAGE_SUBDIVISION_LEN {
+            if self.get(slot) != other.get(slot) {
+                return false;
+            }
+        }
+        true
+    }
+}
+
+#[derive(Debug, Default, Clone)]
+pub struct MemoryWrapper {
+    memory: Vec<MemoryPage>,
+}
+
+impl PartialEq for MemoryWrapper {
+    fn eq(&self, other: &Self) -> bool {
+        let empty_page = MemoryPage::default();
+        let empty_pages = std::iter::repeat(&empty_page);
+        self.memory
+            .iter()
+            .chain(empty_pages.clone())
+            .zip(other.memory.iter().chain(empty_pages))
+            .take(self.memory.len().max(other.memory.len()))
+            .all(|(a, b)| a == b)
+    }
+}
+
+#[derive(Debug, Clone, PartialEq)]
+pub struct MemoryHistoryRecord {
+    pub page: usize,
+    pub slot: usize,
+    pub set_value: PrimitiveValue,
+}
+
+impl MemoryWrapper {
+    pub fn ensure_page_exists(&mut self, page: usize) {
+        if self.memory.len() <= page {
+            // We don't need to record such events in history
+            // because all these vectors will be empty
+            self.memory.resize_with(page + 1, MemoryPage::default);
+        }
+    }
+
+    pub fn dump_page_content_as_u256_words(
+        &self,
+        page_number: u32,
+        range: std::ops::Range<u32>,
+    ) -> Vec<PrimitiveValue> {
+        if let Some(page) = self.memory.get(page_number as usize) {
+            let mut result = vec![];
+            for i in range {
+                result.push(*page.get(i as usize));
+            }
+            result
+        } else {
+            vec![PrimitiveValue::empty(); range.len()]
+        }
+    }
+
+    pub fn read_slot(&self, page: usize, slot: usize) -> &PrimitiveValue {
+        self.memory
+            .get(page)
+            .map(|page| page.get(slot))
+            .unwrap_or(&PRIMITIVE_VALUE_EMPTY)
+    }
+
+    pub fn get_size(&self) -> usize {
+        self.memory.iter().map(|page| page.get_size()).sum()
+    }
+}
+
+impl WithHistory for MemoryWrapper {
+    type HistoryRecord = MemoryHistoryRecord;
+    type ReturnValue = PrimitiveValue;
+
+    fn apply_historic_record(
+        &mut self,
+        item: MemoryHistoryRecord,
+    ) -> (Self::HistoryRecord, Self::ReturnValue) {
+        let MemoryHistoryRecord {
+            page,
+            slot,
+            set_value,
+        } = item;
+
+        self.ensure_page_exists(page);
+        let page_handle = self.memory.get_mut(page).unwrap();
+        let prev_value = page_handle.set(slot, set_value);
+
+        let undo = MemoryHistoryRecord {
+            page,
+            slot,
+            set_value: prev_value,
+        };
+
+        (undo, prev_value)
+    }
+}
+
+impl<H: HistoryMode> HistoryRecorder<MemoryWrapper, H> {
+    pub fn write_to_memory(
+        &mut self,
+        page: usize,
+        slot: usize,
+        value: PrimitiveValue,
+        timestamp: Timestamp,
+    ) -> PrimitiveValue {
+        self.apply_historic_record(
+            MemoryHistoryRecord {
+                page,
+                slot,
+                set_value: value,
+            },
+            timestamp,
+        )
+    }
+
+    pub fn clear_page(&mut self, page: usize, timestamp: Timestamp) {
+        self.mutate_history(|inner, history| {
+            if let Some(page_handle) = inner.memory.get(page) {
+                for (i, x) in page_handle.root.iter().enumerate() {
+                    if let Some(slots) = x {
+                        for (j, value) in slots.iter().enumerate() {
+                            if *value != PrimitiveValue::empty() {
+                                history.push((
+                                    timestamp,
+                                    MemoryHistoryRecord {
+                                        page,
+                                        slot: PAGE_SUBDIVISION_LEN * i + j,
+                                        set_value: *value,
+                                    },
+                                ))
+                            }
+                        }
+                    }
+                }
+                inner.memory[page] = MemoryPage::default();
+            }
+        });
+    }
+}
+
+#[derive(Debug)]
+pub struct StorageWrapper<S> {
+    storage_ptr: StoragePtr<S>,
+}
+
+impl<S: WriteStorage> StorageWrapper<S> {
+    pub fn new(storage_ptr: StoragePtr<S>) -> Self {
+        Self { storage_ptr }
+    }
+
+    pub fn get_ptr(&self) -> StoragePtr<S> {
+        self.storage_ptr.clone()
+    }
+
+    pub fn read_from_storage(&self, key: &StorageKey) -> U256 {
+        h256_to_u256(self.storage_ptr.borrow_mut().read_value(key))
+    }
+}
+
+#[derive(Debug, Clone)]
+pub struct StorageHistoryRecord {
+    pub key: StorageKey,
+    pub value: U256,
+}
+
+impl<S: WriteStorage> WithHistory for StorageWrapper<S> {
+    type HistoryRecord = StorageHistoryRecord;
+    type ReturnValue = U256;
+
+    fn apply_historic_record(
+        &mut self,
+        item: Self::HistoryRecord,
+    ) -> (Self::HistoryRecord, Self::ReturnValue) {
+        let prev_value = h256_to_u256(
+            self.storage_ptr
+                .borrow_mut()
+                .set_value(item.key, u256_to_h256(item.value)),
+        );
+
+        let reverse_item = StorageHistoryRecord {
+            key: item.key,
+            value: prev_value,
+        };
+
+        (reverse_item, prev_value)
+    }
+}
+
+impl<S: WriteStorage, H: HistoryMode> HistoryRecorder<StorageWrapper<S>, H> {
+    pub fn read_from_storage(&self, key: &StorageKey) -> U256 {
+        self.inner.read_from_storage(key)
+    }
+
+    pub fn write_to_storage(&mut self, key: StorageKey, value: U256, timestamp: Timestamp) -> U256 {
+        self.apply_historic_record(StorageHistoryRecord { key, value }, timestamp)
+    }
+
+    /// Returns a pointer to the storage.
+    /// Note, that any changes done to the storage via this pointer
+    /// will NOT be recorded as its history.
+    pub fn get_ptr(&self) -> StoragePtr<S> {
+        self.inner.get_ptr()
+    }
+}
+
+#[cfg(test)]
+mod tests {
+    use crate::vm_refunds_enhancement::old_vm::history_recorder::{HistoryRecorder, MemoryWrapper};
+    use crate::vm_refunds_enhancement::HistoryDisabled;
+    use zk_evm_1_3_3::{aux_structures::Timestamp, vm_state::PrimitiveValue};
+    use zksync_types::U256;
+
+    #[test]
+    fn memory_equality() {
+        let mut a: HistoryRecorder<MemoryWrapper, HistoryDisabled> = Default::default();
+        let mut b = a.clone();
+        let nonzero = U256::from_dec_str("123").unwrap();
+        let different_value = U256::from_dec_str("1234").unwrap();
+
+        let write = |memory: &mut HistoryRecorder<MemoryWrapper, HistoryDisabled>, value| {
+            memory.write_to_memory(
+                17,
+                34,
+                PrimitiveValue {
+                    value,
+                    is_pointer: false,
+                },
+                Timestamp::empty(),
+            );
+        };
+
+        assert_eq!(a, b);
+
+        write(&mut b, nonzero);
+        assert_ne!(a, b);
+
+        write(&mut a, different_value);
+        assert_ne!(a, b);
+
+        write(&mut a, nonzero);
+        assert_eq!(a, b);
+    }
+}
diff --git a/core/lib/multivm/src/versions/vm_refunds_enhancement/old_vm/memory.rs b/core/lib/multivm/src/versions/vm_refunds_enhancement/old_vm/memory.rs
new file mode 100644
index 000000000000..1ef04da58cbe
--- /dev/null
+++ b/core/lib/multivm/src/versions/vm_refunds_enhancement/old_vm/memory.rs
@@ -0,0 +1,325 @@
+use zk_evm_1_3_3::abstractions::{Memory, MemoryType};
+use zk_evm_1_3_3::aux_structures::{MemoryPage, MemoryQuery, Timestamp};
+use zk_evm_1_3_3::vm_state::PrimitiveValue;
+use zk_evm_1_3_3::zkevm_opcode_defs::FatPointer;
+use zksync_types::U256;
+
+use crate::vm_refunds_enhancement::old_vm::history_recorder::{
+    FramedStack, HistoryEnabled, HistoryMode, IntFrameManagerWithHistory, MemoryWithHistory,
+    MemoryWrapper, WithHistory,
+};
+use crate::vm_refunds_enhancement::old_vm::oracles::OracleWithHistory;
+use crate::vm_refunds_enhancement::old_vm::utils::{
+    aux_heap_page_from_base, heap_page_from_base, stack_page_from_base,
+};
+
+#[derive(Debug, Clone, PartialEq)]
+pub struct SimpleMemory<H: HistoryMode> {
+    memory: MemoryWithHistory<H>,
+    observable_pages: IntFrameManagerWithHistory<u32, H>,
+}
+
+impl<H: HistoryMode> Default for SimpleMemory<H> {
+    fn default() -> Self {
+        let mut memory: MemoryWithHistory<H> = Default::default();
+        memory.mutate_history(|_, h| h.reserve(607));
+        Self {
+            memory,
+            observable_pages: Default::default(),
+        }
+    }
+}
+
+impl OracleWithHistory for SimpleMemory<HistoryEnabled> {
+    fn rollback_to_timestamp(&mut self, timestamp: Timestamp) {
+        self.memory.rollback_to_timestamp(timestamp);
+        self.observable_pages.rollback_to_timestamp(timestamp);
+    }
+}
+
+impl<H: HistoryMode> SimpleMemory<H> {
+    pub fn populate(&mut self, elements: Vec<(u32, Vec<U256>)>, timestamp: Timestamp) {
+        for (page, values) in elements.into_iter() {
+            for (i, value) in values.into_iter().enumerate() {
+                let value = PrimitiveValue {
+                    value,
+                    is_pointer: false,
+                };
+                self.memory
+                    .write_to_memory(page as usize, i, value, timestamp);
+            }
+        }
+    }
+
+    pub fn populate_page(
+        &mut self,
+        page: usize,
+        elements: Vec<(usize, U256)>,
+        timestamp: Timestamp,
+    ) {
+        elements.into_iter().for_each(|(offset, value)| {
+            let value = PrimitiveValue {
+                value,
+                is_pointer: false,
+            };
+
+            self.memory.write_to_memory(page, offset, value, timestamp);
+        });
+    }
+
+    pub fn dump_page_content_as_u256_words(
+        &self,
+        page: u32,
+        range: std::ops::Range<u32>,
+    ) -> Vec<U256> {
+        self.memory
+            .inner()
+            .dump_page_content_as_u256_words(page, range)
+            .into_iter()
+            .map(|v| v.value)
+            .collect()
+    }
+
+    pub fn read_slot(&self, page: usize, slot: usize) -> &PrimitiveValue {
+        self.memory.inner().read_slot(page, slot)
+    }
+
+    // This method should be used with relatively small lengths, since
+    // we don't heavily optimize here for cases with long lengths
+    pub fn read_unaligned_bytes(&self, page: usize, start: usize, length: usize) -> Vec<u8> {
+        if length == 0 {
+            return vec![];
+        }
+
+        let end = start + length - 1;
+
+        let mut current_word = start / 32;
+        let mut result = vec![];
+        while current_word * 32 <= end {
+            let word_value = self.read_slot(page, current_word).value;
+            let word_value = {
+                let mut bytes: Vec<u8> = vec![0u8; 32];
+                word_value.to_big_endian(&mut bytes);
+                bytes
+            };
+
+            result.extend(extract_needed_bytes_from_word(
+                word_value,
+                current_word,
+                start,
+                end,
+            ));
+
+            current_word += 1;
+        }
+
+        assert_eq!(result.len(), length);
+
+        result
+    }
+
+    pub(crate) fn get_size(&self) -> usize {
+        // Hashmap memory overhead is neglected.
+        let memory_size = self.memory.inner().get_size();
+        let observable_pages_size = self.observable_pages.inner().get_size();
+
+        memory_size + observable_pages_size
+    }
+
+    pub fn get_history_size(&self) -> usize {
+        let memory_size = self.memory.borrow_history(|h| h.len(), 0)
+            * std::mem::size_of::<<MemoryWrapper as WithHistory>::HistoryRecord>();
+        let observable_pages_size = self.observable_pages.borrow_history(|h| h.len(), 0)
+            * std::mem::size_of::<<FramedStack<u32> as WithHistory>::HistoryRecord>();
+
+        memory_size + observable_pages_size
+    }
+
+    pub fn delete_history(&mut self) {
+        self.memory.delete_history();
+        self.observable_pages.delete_history();
+    }
+}
+
+impl<H: HistoryMode> Memory for SimpleMemory<H> {
+    fn execute_partial_query(
+        &mut self,
+        _monotonic_cycle_counter: u32,
+        mut query: MemoryQuery,
+    ) -> MemoryQuery {
+        match query.location.memory_type {
+            MemoryType::Stack => {}
+            MemoryType::Heap | MemoryType::AuxHeap => {
+                // The following assertion works fine even when doing a read
+                // from heap through pointer, since `value_is_pointer` can only be set to
+                // `true` during memory writes.
+                assert!(
+                    !query.value_is_pointer,
+                    "Pointers can only be stored on stack"
+                );
+            }
+            MemoryType::FatPointer => {
+                assert!(!query.rw_flag);
+                assert!(
+                    !query.value_is_pointer,
+                    "Pointers can only be stored on stack"
+                );
+            }
+            MemoryType::Code => {
+                unreachable!("code should be through specialized query");
+            }
+        }
+
+        let page = query.location.page.0 as usize;
+        let slot = query.location.index.0 as usize;
+
+        if query.rw_flag {
+            self.memory.write_to_memory(
+                page,
+                slot,
+                PrimitiveValue {
+                    value: query.value,
+                    is_pointer: query.value_is_pointer,
+                },
+                query.timestamp,
+            );
+        } else {
+            let current_value = self.read_slot(page, slot);
+            query.value = current_value.value;
+            query.value_is_pointer = current_value.is_pointer;
+        }
+
+        query
+    }
+
+    fn specialized_code_query(
+        &mut self,
+        _monotonic_cycle_counter: u32,
+        mut query: MemoryQuery,
+    ) -> MemoryQuery {
+        assert_eq!(query.location.memory_type, MemoryType::Code);
+        assert!(
+            !query.value_is_pointer,
+            "Pointers are not used for decommmits"
+        );
+
+        let page = query.location.page.0 as usize;
+        let slot = query.location.index.0 as usize;
+
+        if query.rw_flag {
+            self.memory.write_to_memory(
+                page,
+                slot,
+                PrimitiveValue {
+                    value: query.value,
+                    is_pointer: query.value_is_pointer,
+                },
+                query.timestamp,
+            );
+        } else {
+            let current_value = self.read_slot(page, slot);
+            query.value = current_value.value;
+            query.value_is_pointer = current_value.is_pointer;
+        }
+
+        query
+    }
+
+    fn read_code_query(
+        &self,
+        _monotonic_cycle_counter: u32,
+        mut query: MemoryQuery,
+    ) -> MemoryQuery {
+        assert_eq!(query.location.memory_type, MemoryType::Code);
+        assert!(
+            !query.value_is_pointer,
+            "Pointers are not used for decommmits"
+        );
+        assert!(!query.rw_flag, "Only read queries can be processed");
+
+        let page = query.location.page.0 as usize;
+        let slot = query.location.index.0 as usize;
+
+        let current_value = self.read_slot(page, slot);
+        query.value = current_value.value;
+        query.value_is_pointer = current_value.is_pointer;
+
+        query
+    }
+
+    fn start_global_frame(
+        &mut self,
+        _current_base_page: MemoryPage,
+        new_base_page: MemoryPage,
+        calldata_fat_pointer: FatPointer,
+        timestamp: Timestamp,
+    ) {
+        // Besides the calldata page, we also formally include the current stack
+        // page, heap page and aux heap page.
+        // The code page will be always left observable, so we don't include it here.
+        self.observable_pages.push_frame(timestamp);
+        self.observable_pages.extend_frame(
+            vec![
+                calldata_fat_pointer.memory_page,
+                stack_page_from_base(new_base_page).0,
+                heap_page_from_base(new_base_page).0,
+                aux_heap_page_from_base(new_base_page).0,
+            ],
+            timestamp,
+        );
+    }
+
+    fn finish_global_frame(
+        &mut self,
+        base_page: MemoryPage,
+        returndata_fat_pointer: FatPointer,
+        timestamp: Timestamp,
+    ) {
+        // Safe to unwrap here, since `finish_global_frame` is never called with empty stack
+        let current_observable_pages = self.observable_pages.inner().current_frame();
+        let returndata_page = returndata_fat_pointer.memory_page;
+
+        for &page in current_observable_pages {
+            // If the page's number is greater than or equal to the base_page,
+            // it means that it was created by the internal calls of this contract.
+            // We need to add this check as the calldata pointer is also part of the
+            // observable pages.
+            if page >= base_page.0 && page != returndata_page {
+                self.memory.clear_page(page as usize, timestamp);
+            }
+        }
+
+        self.observable_pages.clear_frame(timestamp);
+        self.observable_pages.merge_frame(timestamp);
+
+        self.observable_pages
+            .push_to_frame(returndata_page, timestamp);
+    }
+}
+
+// It is expected that there is some intersection between [word_number*32..word_number*32+31] and [start, end]
+fn extract_needed_bytes_from_word(
+    word_value: Vec<u8>,
+    word_number: usize,
+    start: usize,
+    end: usize,
+) -> Vec<u8> {
+    let word_start = word_number * 32;
+    let word_end = word_start + 31; // Note, that at word_start + 32 a new word already starts
+
+    let intersection_left = std::cmp::max(word_start, start);
+    let intersection_right = std::cmp::min(word_end, end);
+
+    if intersection_right < intersection_left {
+        vec![]
+    } else {
+        let start_bytes = intersection_left - word_start;
+        let to_take = intersection_right - intersection_left + 1;
+
+        word_value
+            .into_iter()
+            .skip(start_bytes)
+            .take(to_take)
+            .collect()
+    }
+}
diff --git a/core/lib/multivm/src/versions/vm_refunds_enhancement/old_vm/mod.rs b/core/lib/multivm/src/versions/vm_refunds_enhancement/old_vm/mod.rs
new file mode 100644
index 000000000000..afade1984614
--- /dev/null
+++ b/core/lib/multivm/src/versions/vm_refunds_enhancement/old_vm/mod.rs
@@ -0,0 +1,8 @@
+/// This module contains the parts from old VM implementation, which were not changed during the vm implementation.
+/// It should be refactored and removed in the future.
+pub(crate) mod event_sink;
+pub(crate) mod events;
+pub(crate) mod history_recorder;
+pub(crate) mod memory;
+pub(crate) mod oracles;
+pub(crate) mod utils;
diff --git a/core/lib/multivm/src/versions/vm_refunds_enhancement/old_vm/oracles/decommitter.rs b/core/lib/multivm/src/versions/vm_refunds_enhancement/old_vm/oracles/decommitter.rs
new file mode 100644
index 000000000000..0f335cabf398
--- /dev/null
+++ b/core/lib/multivm/src/versions/vm_refunds_enhancement/old_vm/oracles/decommitter.rs
@@ -0,0 +1,240 @@
+use std::collections::HashMap;
+use std::fmt::Debug;
+
+use crate::vm_refunds_enhancement::old_vm::history_recorder::{
+    HistoryEnabled, HistoryMode, HistoryRecorder, WithHistory,
+};
+
+use zk_evm_1_3_3::abstractions::MemoryType;
+use zk_evm_1_3_3::aux_structures::Timestamp;
+use zk_evm_1_3_3::{
+    abstractions::{DecommittmentProcessor, Memory},
+    aux_structures::{DecommittmentQuery, MemoryIndex, MemoryLocation, MemoryPage, MemoryQuery},
+};
+
+use zksync_state::{ReadStorage, StoragePtr};
+use zksync_types::U256;
+use zksync_utils::bytecode::bytecode_len_in_words;
+use zksync_utils::{bytes_to_be_words, u256_to_h256};
+
+use super::OracleWithHistory;
+
+/// The main job of the DecommiterOracle is to implement the DecommittmentProcessor trait - that is
+/// used by the VM to 'load' bytecodes into memory.
+#[derive(Debug)]
+pub struct DecommitterOracle<const B: bool, S, H: HistoryMode> {
+    /// Pointer that enables to read contract bytecodes from the database.
+    storage: StoragePtr<S>,
+    /// The cache of bytecodes that the bootloader "knows", but that are not necessarily in the database.
+    /// And it is also used as a database cache.
+    pub known_bytecodes: HistoryRecorder<HashMap<U256, Vec<U256>>, H>,
+    /// 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>,
+    /// Stores history of decommitment requests.
+    decommitment_requests: HistoryRecorder<Vec<()>, H>,
+}
+
+impl<S: ReadStorage, const B: bool, H: HistoryMode> DecommitterOracle<B, S, H> {
+    pub fn new(storage: StoragePtr<S>) -> Self {
+        Self {
+            storage,
+            known_bytecodes: HistoryRecorder::default(),
+            decommitted_code_hashes: HistoryRecorder::default(),
+            decommitment_requests: HistoryRecorder::default(),
+        }
+    }
+
+    /// Gets the bytecode for a given hash (either from storage, or from 'known_bytecodes' that were populated by `populate` method).
+    /// Panics if bytecode doesn't exist.
+    pub fn get_bytecode(&mut self, hash: U256, timestamp: Timestamp) -> Vec<U256> {
+        let entry = self.known_bytecodes.inner().get(&hash);
+
+        match entry {
+            Some(x) => x.clone(),
+            None => {
+                // It is ok to panic here, since the decommitter is never called directly by
+                // the users and always called by the VM. VM will never let decommit the
+                // code hash which we didn't previously claim to know the preimage of.
+                let value = self
+                    .storage
+                    .borrow_mut()
+                    .load_factory_dep(u256_to_h256(hash))
+                    .expect("Trying to decode unexisting hash");
+
+                let value = bytes_to_be_words(value);
+                self.known_bytecodes.insert(hash, value.clone(), timestamp);
+                value
+            }
+        }
+    }
+
+    /// Adds additional bytecodes. They will take precendent over the bytecodes from storage.
+    pub fn populate(&mut self, bytecodes: Vec<(U256, Vec<U256>)>, timestamp: Timestamp) {
+        for (hash, bytecode) in bytecodes {
+            self.known_bytecodes.insert(hash, bytecode, timestamp);
+        }
+    }
+
+    pub fn get_used_bytecode_hashes(&self) -> Vec<U256> {
+        self.decommitted_code_hashes
+            .inner()
+            .iter()
+            .map(|item| *item.0)
+            .collect()
+    }
+
+    pub fn get_decommitted_bytecodes_after_timestamp(&self, timestamp: Timestamp) -> usize {
+        // Note, that here we rely on the fact that for each used bytecode
+        // there is one and only one corresponding event in the history of it.
+        self.decommitted_code_hashes
+            .history()
+            .iter()
+            .rev()
+            .take_while(|(t, _)| *t >= timestamp)
+            .count()
+    }
+
+    pub fn get_decommitted_code_hashes_with_history(
+        &self,
+    ) -> &HistoryRecorder<HashMap<U256, u32>, HistoryEnabled> {
+        &self.decommitted_code_hashes
+    }
+
+    /// Returns the storage handle. Used only in tests.
+    pub fn get_storage(&self) -> StoragePtr<S> {
+        self.storage.clone()
+    }
+
+    /// Measures the amount of memory used by this Oracle (used for metrics only).
+    pub(crate) fn get_size(&self) -> usize {
+        // Hashmap memory overhead is neglected.
+        let known_bytecodes_size = self
+            .known_bytecodes
+            .inner()
+            .iter()
+            .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)>();
+
+        known_bytecodes_size + decommitted_code_hashes_size
+    }
+
+    pub(crate) fn get_history_size(&self) -> usize {
+        let known_bytecodes_stack_size = self.known_bytecodes.borrow_history(|h| h.len(), 0)
+            * std::mem::size_of::<<HashMap<U256, Vec<U256>> as WithHistory>::HistoryRecord>();
+        let known_bytecodes_heap_size = self.known_bytecodes.borrow_history(
+            |h| {
+                h.iter()
+                    .map(|(_, event)| {
+                        if let Some(bytecode) = event.value.as_ref() {
+                            bytecode.len() * std::mem::size_of::<U256>()
+                        } else {
+                            0
+                        }
+                    })
+                    .sum::<usize>()
+            },
+            0,
+        );
+        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>();
+
+        known_bytecodes_stack_size + known_bytecodes_heap_size + decommitted_code_hashes_size
+    }
+
+    pub fn delete_history(&mut self) {
+        self.decommitted_code_hashes.delete_history();
+        self.known_bytecodes.delete_history();
+        self.decommitment_requests.delete_history();
+    }
+}
+
+impl<S, const B: bool> OracleWithHistory for DecommitterOracle<B, S, HistoryEnabled> {
+    fn rollback_to_timestamp(&mut self, timestamp: Timestamp) {
+        self.decommitted_code_hashes
+            .rollback_to_timestamp(timestamp);
+        self.known_bytecodes.rollback_to_timestamp(timestamp);
+        self.decommitment_requests.rollback_to_timestamp(timestamp);
+    }
+}
+
+impl<S: ReadStorage + Debug, const B: bool, H: HistoryMode> DecommittmentProcessor
+    for DecommitterOracle<B, S, H>
+{
+    /// Loads a given bytecode hash into memory (see trait description for more details).
+    fn decommit_into_memory<M: Memory>(
+        &mut self,
+        monotonic_cycle_counter: u32,
+        mut partial_query: DecommittmentQuery,
+        memory: &mut M,
+    ) -> Result<
+        (
+            zk_evm_1_3_3::aux_structures::DecommittmentQuery,
+            Option<Vec<U256>>,
+        ),
+        anyhow::Error,
+    > {
+        self.decommitment_requests.push((), partial_query.timestamp);
+        // First - check if we didn't fetch this bytecode in the past.
+        // If we did - we can just return the page that we used before (as the memory is read only).
+        if let Some(memory_page) = self
+            .decommitted_code_hashes
+            .inner()
+            .get(&partial_query.hash)
+            .copied()
+        {
+            partial_query.is_fresh = false;
+            partial_query.memory_page = MemoryPage(memory_page);
+            partial_query.decommitted_length =
+                bytecode_len_in_words(&u256_to_h256(partial_query.hash));
+
+            Ok((partial_query, None))
+        } else {
+            // We are fetching a fresh bytecode that we didn't read before.
+            let values = self.get_bytecode(partial_query.hash, partial_query.timestamp);
+            let page_to_use = partial_query.memory_page;
+            let timestamp = partial_query.timestamp;
+            partial_query.decommitted_length = values.len() as u16;
+            partial_query.is_fresh = true;
+
+            // Create a template query, that we'll use for writing into memory.
+            // value & index are set to 0 - as they will be updated in the inner loop below.
+            let mut tmp_q = MemoryQuery {
+                timestamp,
+                location: MemoryLocation {
+                    memory_type: MemoryType::Code,
+                    page: page_to_use,
+                    index: MemoryIndex(0),
+                },
+                value: U256::zero(),
+                value_is_pointer: false,
+                rw_flag: true,
+            };
+            self.decommitted_code_hashes
+                .insert(partial_query.hash, page_to_use.0, timestamp);
+
+            // Copy the bytecode (that is stored in 'values' Vec) into the memory page.
+            if B {
+                for (i, value) in values.iter().enumerate() {
+                    tmp_q.location.index = MemoryIndex(i as u32);
+                    tmp_q.value = *value;
+                    memory.specialized_code_query(monotonic_cycle_counter, tmp_q);
+                }
+                // If we're in the witness mode - we also have to return the values.
+                Ok((partial_query, Some(values)))
+            } else {
+                for (i, value) in values.into_iter().enumerate() {
+                    tmp_q.location.index = MemoryIndex(i as u32);
+                    tmp_q.value = value;
+                    memory.specialized_code_query(monotonic_cycle_counter, tmp_q);
+                }
+
+                Ok((partial_query, None))
+            }
+        }
+    }
+}
diff --git a/core/lib/multivm/src/versions/vm_refunds_enhancement/old_vm/oracles/mod.rs b/core/lib/multivm/src/versions/vm_refunds_enhancement/old_vm/oracles/mod.rs
new file mode 100644
index 000000000000..f9d35c2567b4
--- /dev/null
+++ b/core/lib/multivm/src/versions/vm_refunds_enhancement/old_vm/oracles/mod.rs
@@ -0,0 +1,8 @@
+use zk_evm_1_3_3::aux_structures::Timestamp;
+
+pub(crate) mod decommitter;
+pub(crate) mod precompile;
+
+pub(crate) trait OracleWithHistory {
+    fn rollback_to_timestamp(&mut self, timestamp: Timestamp);
+}
diff --git a/core/lib/multivm/src/versions/vm_refunds_enhancement/old_vm/oracles/precompile.rs b/core/lib/multivm/src/versions/vm_refunds_enhancement/old_vm/oracles/precompile.rs
new file mode 100644
index 000000000000..eb3f7b866b10
--- /dev/null
+++ b/core/lib/multivm/src/versions/vm_refunds_enhancement/old_vm/oracles/precompile.rs
@@ -0,0 +1,77 @@
+use zk_evm_1_3_3::{
+    abstractions::Memory,
+    abstractions::PrecompileCyclesWitness,
+    abstractions::PrecompilesProcessor,
+    aux_structures::{LogQuery, MemoryQuery, Timestamp},
+    precompiles::DefaultPrecompilesProcessor,
+};
+
+use crate::vm_refunds_enhancement::old_vm::history_recorder::{
+    HistoryEnabled, HistoryMode, HistoryRecorder,
+};
+
+use super::OracleWithHistory;
+
+/// Wrap of DefaultPrecompilesProcessor that store queue
+/// of timestamp when precompiles are called to be executed.
+/// Number of precompiles per block is strictly limited,
+/// saving timestamps allows us to check the exact number
+/// of log queries, that were used during the tx execution.
+#[derive(Debug, Clone)]
+pub struct PrecompilesProcessorWithHistory<const B: bool, H: HistoryMode> {
+    pub timestamp_history: HistoryRecorder<Vec<Timestamp>, H>,
+    pub default_precompiles_processor: DefaultPrecompilesProcessor<B>,
+}
+
+impl<const B: bool, H: HistoryMode> Default for PrecompilesProcessorWithHistory<B, H> {
+    fn default() -> Self {
+        Self {
+            timestamp_history: Default::default(),
+            default_precompiles_processor: DefaultPrecompilesProcessor,
+        }
+    }
+}
+
+impl<const B: bool> OracleWithHistory for PrecompilesProcessorWithHistory<B, HistoryEnabled> {
+    fn rollback_to_timestamp(&mut self, timestamp: Timestamp) {
+        self.timestamp_history.rollback_to_timestamp(timestamp);
+    }
+}
+
+impl<const B: bool, H: HistoryMode> PrecompilesProcessorWithHistory<B, H> {
+    pub fn get_timestamp_history(&self) -> &Vec<Timestamp> {
+        self.timestamp_history.inner()
+    }
+
+    pub fn delete_history(&mut self) {
+        self.timestamp_history.delete_history();
+    }
+}
+
+impl<const B: bool, H: HistoryMode> PrecompilesProcessor for PrecompilesProcessorWithHistory<B, H> {
+    fn start_frame(&mut self) {
+        self.default_precompiles_processor.start_frame();
+    }
+    fn execute_precompile<M: Memory>(
+        &mut self,
+        monotonic_cycle_counter: u32,
+        query: LogQuery,
+        memory: &mut M,
+    ) -> Option<(Vec<MemoryQuery>, Vec<MemoryQuery>, PrecompileCyclesWitness)> {
+        // In the next line we same `query.timestamp` as both
+        // an operation in the history of precompiles processor and
+        // the time when this operation occurred.
+        // While slightly weird, it is done for consistency with other oracles
+        // where operations and timestamp have different types.
+        self.timestamp_history
+            .push(query.timestamp, query.timestamp);
+        self.default_precompiles_processor.execute_precompile(
+            monotonic_cycle_counter,
+            query,
+            memory,
+        )
+    }
+    fn finish_frame(&mut self, _panicked: bool) {
+        self.default_precompiles_processor.finish_frame(_panicked);
+    }
+}
diff --git a/core/lib/multivm/src/versions/vm_refunds_enhancement/old_vm/oracles/storage.rs b/core/lib/multivm/src/versions/vm_refunds_enhancement/old_vm/oracles/storage.rs
new file mode 100644
index 000000000000..bf1871c9b682
--- /dev/null
+++ b/core/lib/multivm/src/versions/vm_refunds_enhancement/old_vm/oracles/storage.rs
@@ -0,0 +1,338 @@
+use std::collections::HashMap;
+
+use crate::vm_refunds_enhancement::old_vm::history_recorder::{
+    AppDataFrameManagerWithHistory, HashMapHistoryEvent, HistoryEnabled, HistoryMode,
+    HistoryRecorder, StorageWrapper, WithHistory,
+};
+
+use zk_evm_1_3_3::abstractions::RefundedAmounts;
+use zk_evm_1_3_3::zkevm_opcode_defs::system_params::INITIAL_STORAGE_WRITE_PUBDATA_BYTES;
+use zk_evm_1_3_3::{
+    abstractions::{RefundType, Storage as VmStorageOracle},
+    aux_structures::{LogQuery, Timestamp},
+};
+
+use zksync_state::{StoragePtr, WriteStorage};
+use zksync_types::utils::storage_key_for_eth_balance;
+use zksync_types::{
+    AccountTreeId, Address, StorageKey, StorageLogQuery, StorageLogQueryType, BOOTLOADER_ADDRESS,
+    U256,
+};
+use zksync_utils::u256_to_h256;
+
+use super::OracleWithHistory;
+
+// While the storage does not support different shards, it was decided to write the
+// code of the StorageOracle with the shard parameters in mind.
+pub(crate) fn triplet_to_storage_key(_shard_id: u8, address: Address, key: U256) -> StorageKey {
+    StorageKey::new(AccountTreeId::new(address), u256_to_h256(key))
+}
+
+pub(crate) fn storage_key_of_log(query: &LogQuery) -> StorageKey {
+    triplet_to_storage_key(query.shard_id, query.address, query.key)
+}
+
+#[derive(Debug)]
+pub struct StorageOracle<S: WriteStorage, H: HistoryMode> {
+    // Access to the persistent storage. Please note that it
+    // is used only for read access. All the actual writes happen
+    // after the execution ended.
+    pub(crate) storage: HistoryRecorder<StorageWrapper<S>, H>,
+
+    pub(crate) frames_stack: AppDataFrameManagerWithHistory<Box<StorageLogQuery>, H>,
+
+    // The changes that have been paid for in previous transactions.
+    // It is a mapping from storage key to the number of *bytes* that was paid by the user
+    // to cover this slot.
+    // `paid_changes` history is necessary
+    pub(crate) paid_changes: HistoryRecorder<HashMap<StorageKey, u32>, HistoryEnabled>,
+}
+
+impl<S: WriteStorage> OracleWithHistory for StorageOracle<S, HistoryEnabled> {
+    fn rollback_to_timestamp(&mut self, timestamp: Timestamp) {
+        self.frames_stack.rollback_to_timestamp(timestamp);
+        self.storage.rollback_to_timestamp(timestamp);
+        self.paid_changes.rollback_to_timestamp(timestamp);
+    }
+}
+
+impl<S: WriteStorage, H: HistoryMode> StorageOracle<S, H> {
+    pub fn new(storage: StoragePtr<S>) -> Self {
+        Self {
+            storage: HistoryRecorder::from_inner(StorageWrapper::new(storage)),
+            frames_stack: Default::default(),
+            paid_changes: Default::default(),
+        }
+    }
+
+    pub fn delete_history(&mut self) {
+        self.frames_stack.delete_history();
+        self.storage.delete_history();
+        self.paid_changes.delete_history();
+    }
+
+    fn is_storage_key_free(&self, key: &StorageKey) -> bool {
+        key.address() == &zksync_system_constants::SYSTEM_CONTEXT_ADDRESS
+            || *key == storage_key_for_eth_balance(&BOOTLOADER_ADDRESS)
+    }
+
+    pub fn read_value(&mut self, mut query: LogQuery) -> LogQuery {
+        let key = triplet_to_storage_key(query.shard_id, query.address, query.key);
+        let current_value = self.storage.read_from_storage(&key);
+
+        query.read_value = current_value;
+
+        self.frames_stack.push_forward(
+            Box::new(StorageLogQuery {
+                log_query: query,
+                log_type: StorageLogQueryType::Read,
+            }),
+            query.timestamp,
+        );
+
+        query
+    }
+
+    pub fn write_value(&mut self, mut query: LogQuery) -> LogQuery {
+        let key = triplet_to_storage_key(query.shard_id, query.address, query.key);
+        let current_value =
+            self.storage
+                .write_to_storage(key, query.written_value, query.timestamp);
+
+        let is_initial_write = self.storage.get_ptr().borrow_mut().is_write_initial(&key);
+        let log_query_type = if is_initial_write {
+            StorageLogQueryType::InitialWrite
+        } else {
+            StorageLogQueryType::RepeatedWrite
+        };
+
+        query.read_value = current_value;
+
+        let mut storage_log_query = StorageLogQuery {
+            log_query: query,
+            log_type: log_query_type,
+        };
+        self.frames_stack
+            .push_forward(Box::new(storage_log_query), query.timestamp);
+        storage_log_query.log_query.rollback = true;
+        self.frames_stack
+            .push_rollback(Box::new(storage_log_query), query.timestamp);
+        storage_log_query.log_query.rollback = false;
+
+        query
+    }
+
+    // Returns the amount of funds that has been already paid for writes into the storage slot
+    fn prepaid_for_write(&self, storage_key: &StorageKey) -> u32 {
+        self.paid_changes
+            .inner()
+            .get(storage_key)
+            .copied()
+            .unwrap_or_default()
+    }
+
+    pub(crate) fn base_price_for_write(&self, query: &LogQuery) -> u32 {
+        let storage_key = storage_key_of_log(query);
+
+        if self.is_storage_key_free(&storage_key) {
+            return 0;
+        }
+
+        let is_initial_write = self
+            .storage
+            .get_ptr()
+            .borrow_mut()
+            .is_write_initial(&storage_key);
+
+        get_pubdata_price_bytes(query, is_initial_write)
+    }
+
+    // Returns the price of the update in terms of pubdata bytes.
+    // TODO (SMA-1701): update VM to accept gas instead of pubdata.
+    fn value_update_price(&self, query: &LogQuery) -> u32 {
+        let storage_key = storage_key_of_log(query);
+
+        let base_cost = self.base_price_for_write(query);
+
+        let already_paid = self.prepaid_for_write(&storage_key);
+
+        if base_cost <= already_paid {
+            // Some other transaction has already paid for this slot, no need to pay anything
+            0u32
+        } else {
+            base_cost - already_paid
+        }
+    }
+
+    /// Returns storage log queries from current frame where `log.log_query.timestamp >= from_timestamp`.
+    pub(crate) fn storage_log_queries_after_timestamp(
+        &self,
+        from_timestamp: Timestamp,
+    ) -> &[Box<StorageLogQuery>] {
+        let logs = self.frames_stack.forward().current_frame();
+
+        // Select all of the last elements where l.log_query.timestamp >= from_timestamp.
+        // Note, that using binary search here is dangerous, because the logs are not sorted by timestamp.
+        logs.rsplit(|l| l.log_query.timestamp < from_timestamp)
+            .next()
+            .unwrap_or(&[])
+    }
+
+    pub(crate) fn get_final_log_queries(&self) -> Vec<StorageLogQuery> {
+        assert_eq!(
+            self.frames_stack.len(),
+            1,
+            "VM finished execution in unexpected state"
+        );
+
+        self.frames_stack
+            .forward()
+            .current_frame()
+            .iter()
+            .map(|x| **x)
+            .collect()
+    }
+
+    pub(crate) fn get_size(&self) -> usize {
+        let frames_stack_size = self.frames_stack.get_size();
+        let paid_changes_size =
+            self.paid_changes.inner().len() * std::mem::size_of::<(StorageKey, u32)>();
+
+        frames_stack_size + paid_changes_size
+    }
+
+    pub(crate) fn get_history_size(&self) -> usize {
+        let storage_size = self.storage.borrow_history(|h| h.len(), 0)
+            * std::mem::size_of::<<StorageWrapper<S> as WithHistory>::HistoryRecord>();
+        let frames_stack_size = self.frames_stack.get_history_size();
+        let paid_changes_size = self.paid_changes.borrow_history(|h| h.len(), 0)
+            * std::mem::size_of::<<HashMap<StorageKey, u32> as WithHistory>::HistoryRecord>();
+        storage_size + frames_stack_size + paid_changes_size
+    }
+}
+
+impl<S: WriteStorage, H: HistoryMode> VmStorageOracle for StorageOracle<S, H> {
+    // Perform a storage read/write access by taking an partially filled query
+    // and returning filled query and cold/warm marker for pricing purposes
+    fn execute_partial_query(
+        &mut self,
+        _monotonic_cycle_counter: u32,
+        query: LogQuery,
+    ) -> LogQuery {
+        // tracing::trace!(
+        //     "execute partial query cyc {:?} addr {:?} key {:?}, rw {:?}, wr {:?}, tx {:?}",
+        //     _monotonic_cycle_counter,
+        //     query.address,
+        //     query.key,
+        //     query.rw_flag,
+        //     query.written_value,
+        //     query.tx_number_in_block
+        // );
+        assert!(!query.rollback);
+        if query.rw_flag {
+            // The number of bytes that have been compensated by the user to perform this write
+            let storage_key = storage_key_of_log(&query);
+
+            // 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);
+            let prepaid = self.prepaid_for_write(&storage_key);
+
+            if to_pay_by_user > prepaid {
+                self.paid_changes.apply_historic_record(
+                    HashMapHistoryEvent {
+                        key: storage_key,
+                        value: Some(to_pay_by_user),
+                    },
+                    query.timestamp,
+                );
+            }
+            self.write_value(query)
+        } else {
+            self.read_value(query)
+        }
+    }
+
+    // We can return the size of the refund before each storage query.
+    // Note, that while the `RefundType` allows to provide refunds both in
+    // `ergs` and `pubdata`, only refunds in pubdata will be compensated for the users
+    fn estimate_refunds_for_write(
+        &mut self, // to avoid any hacks inside, like prefetch
+        _monotonic_cycle_counter: u32,
+        partial_query: &LogQuery,
+    ) -> RefundType {
+        let price_to_pay = self.value_update_price(partial_query);
+
+        RefundType::RepeatedWrite(RefundedAmounts {
+            ergs: 0,
+            // `INITIAL_STORAGE_WRITE_PUBDATA_BYTES` is the default amount of pubdata bytes the user pays for.
+            pubdata_bytes: (INITIAL_STORAGE_WRITE_PUBDATA_BYTES as u32) - price_to_pay,
+        })
+    }
+
+    // Indicate a start of execution frame for rollback purposes
+    fn start_frame(&mut self, timestamp: Timestamp) {
+        self.frames_stack.push_frame(timestamp);
+    }
+
+    // Indicate that execution frame went out from the scope, so we can
+    // log the history and either rollback immediately or keep records to rollback later
+    fn finish_frame(&mut self, timestamp: Timestamp, panicked: bool) {
+        // If we panic then we append forward and rollbacks to the forward of parent,
+        // otherwise we place rollbacks of child before rollbacks of the parent
+        if panicked {
+            // perform actual rollback
+            for query in self.frames_stack.rollback().current_frame().iter().rev() {
+                let read_value = match query.log_type {
+                    StorageLogQueryType::Read => {
+                        // Having Read logs in rollback is not possible
+                        tracing::warn!("Read log in rollback queue {:?}", query);
+                        continue;
+                    }
+                    StorageLogQueryType::InitialWrite | StorageLogQueryType::RepeatedWrite => {
+                        query.log_query.read_value
+                    }
+                };
+
+                let LogQuery { written_value, .. } = query.log_query;
+                let key = triplet_to_storage_key(
+                    query.log_query.shard_id,
+                    query.log_query.address,
+                    query.log_query.key,
+                );
+                let current_value = self.storage.write_to_storage(
+                    key,
+                    // NOTE, that since it is a rollback query,
+                    // the `read_value` is being set
+                    read_value, timestamp,
+                );
+
+                // Additional validation that the current value was correct
+                // Unwrap is safe because the return value from write_inner is the previous value in this leaf.
+                // It is impossible to set leaf value to `None`
+                assert_eq!(current_value, written_value);
+            }
+
+            self.frames_stack
+                .move_rollback_to_forward(|_| true, timestamp);
+        }
+        self.frames_stack.merge_frame(timestamp);
+    }
+}
+
+/// Returns the number of bytes needed to publish a slot.
+// Since we need to publish the state diffs onchain, for each of the updated storage slot
+// we basically need to publish the following pair: (<storage_key, new_value>).
+// While new_value is always 32 bytes long, for key we use the following optimization:
+//   - The first time we publish it, we use 32 bytes.
+//         Then, we remember a 8-byte id for this slot and assign it to it. We call this initial write.
+//   - The second time we publish it, we will use this 8-byte instead of the 32 bytes of the entire key.
+//         So the total size of the publish pubdata is 40 bytes. We call this kind of write the repeated one
+fn get_pubdata_price_bytes(_query: &LogQuery, is_initial: bool) -> u32 {
+    // TODO (SMA-1702): take into account the content of the log query, i.e. values that contain mostly zeroes
+    // should cost less.
+    if is_initial {
+        zk_evm_1_3_3::zkevm_opcode_defs::system_params::INITIAL_STORAGE_WRITE_PUBDATA_BYTES as u32
+    } else {
+        zk_evm_1_3_3::zkevm_opcode_defs::system_params::REPEATED_STORAGE_WRITE_PUBDATA_BYTES as u32
+    }
+}
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
new file mode 100644
index 000000000000..9b4aae851d2e
--- /dev/null
+++ b/core/lib/multivm/src/versions/vm_refunds_enhancement/old_vm/utils.rs
@@ -0,0 +1,224 @@
+use crate::vm_refunds_enhancement::old_vm::memory::SimpleMemory;
+
+use crate::vm_refunds_enhancement::types::internals::ZkSyncVmState;
+use crate::vm_refunds_enhancement::HistoryMode;
+
+use zk_evm_1_3_3::zkevm_opcode_defs::decoding::{
+    AllowedPcOrImm, EncodingModeProduction, VmEncodingMode,
+};
+use zk_evm_1_3_3::zkevm_opcode_defs::RET_IMPLICIT_RETURNDATA_PARAMS_REGISTER;
+use zk_evm_1_3_3::{
+    aux_structures::{MemoryPage, Timestamp},
+    vm_state::PrimitiveValue,
+    zkevm_opcode_defs::FatPointer,
+};
+use zksync_state::WriteStorage;
+use zksync_system_constants::L1_GAS_PER_PUBDATA_BYTE;
+
+use zksync_types::{Address, U256};
+
+#[derive(Debug, Clone)]
+pub(crate) enum VmExecutionResult {
+    Ok(Vec<u8>),
+    Revert(Vec<u8>),
+    Panic,
+    MostLikelyDidNotFinish(Address, u16),
+}
+
+pub(crate) const fn stack_page_from_base(base: MemoryPage) -> MemoryPage {
+    MemoryPage(base.0 + 1)
+}
+
+pub(crate) const fn heap_page_from_base(base: MemoryPage) -> MemoryPage {
+    MemoryPage(base.0 + 2)
+}
+
+pub(crate) const fn aux_heap_page_from_base(base: MemoryPage) -> MemoryPage {
+    MemoryPage(base.0 + 3)
+}
+
+pub(crate) trait FixedLengthIterator<'a, I: 'a, const N: usize>: Iterator<Item = I>
+where
+    Self: 'a,
+{
+    fn next(&mut self) -> Option<<Self as Iterator>::Item> {
+        <Self as Iterator>::next(self)
+    }
+}
+
+pub(crate) trait IntoFixedLengthByteIterator<const N: usize> {
+    type IntoIter: FixedLengthIterator<'static, u8, N>;
+    fn into_le_iter(self) -> Self::IntoIter;
+    fn into_be_iter(self) -> Self::IntoIter;
+}
+
+pub(crate) struct FixedBufferValueIterator<T, const N: usize> {
+    iter: std::array::IntoIter<T, N>,
+}
+
+impl<T: Clone, const N: usize> Iterator for FixedBufferValueIterator<T, N> {
+    type Item = T;
+    fn next(&mut self) -> Option<Self::Item> {
+        self.iter.next()
+    }
+}
+
+impl<T: Clone + 'static, const N: usize> FixedLengthIterator<'static, T, N>
+    for FixedBufferValueIterator<T, N>
+{
+}
+
+impl IntoFixedLengthByteIterator<32> for U256 {
+    type IntoIter = FixedBufferValueIterator<u8, 32>;
+    fn into_le_iter(self) -> Self::IntoIter {
+        let mut buffer = [0u8; 32];
+        self.to_little_endian(&mut buffer);
+
+        FixedBufferValueIterator {
+            iter: IntoIterator::into_iter(buffer),
+        }
+    }
+
+    fn into_be_iter(self) -> Self::IntoIter {
+        let mut buffer = [0u8; 32];
+        self.to_big_endian(&mut buffer);
+
+        FixedBufferValueIterator {
+            iter: IntoIterator::into_iter(buffer),
+        }
+    }
+}
+
+/// Receives sorted slice of timestamps.
+/// Returns count of timestamps that are greater than or equal to `from_timestamp`.
+/// Works in O(log(sorted_timestamps.len())).
+pub(crate) fn precompile_calls_count_after_timestamp(
+    sorted_timestamps: &[Timestamp],
+    from_timestamp: Timestamp,
+) -> usize {
+    sorted_timestamps.len() - sorted_timestamps.partition_point(|t| *t < from_timestamp)
+}
+
+pub(crate) fn eth_price_per_pubdata_byte(l1_gas_price: u64) -> u64 {
+    // This value will typically be a lot less than u64
+    // unless the gas price on L1 goes beyond tens of millions of gwei
+    l1_gas_price * (L1_GAS_PER_PUBDATA_BYTE as u64)
+}
+
+pub(crate) fn vm_may_have_ended_inner<S: WriteStorage, H: HistoryMode>(
+    vm: &ZkSyncVmState<S, H>,
+) -> Option<VmExecutionResult> {
+    let execution_has_ended = vm.execution_has_ended();
+
+    let r1 = vm.local_state.registers[RET_IMPLICIT_RETURNDATA_PARAMS_REGISTER as usize];
+    let current_address = vm.local_state.callstack.get_current_stack().this_address;
+
+    let outer_eh_location = <EncodingModeProduction as VmEncodingMode<8>>::PcOrImm::MAX.as_u64();
+    match (
+        execution_has_ended,
+        vm.local_state.callstack.get_current_stack().pc.as_u64(),
+    ) {
+        (true, 0) => {
+            let returndata = dump_memory_page_using_primitive_value(&vm.memory, r1);
+
+            Some(VmExecutionResult::Ok(returndata))
+        }
+        (false, _) => None,
+        (true, l) if l == outer_eh_location => {
+            // check r1,r2,r3
+            if vm.local_state.flags.overflow_or_less_than_flag {
+                Some(VmExecutionResult::Panic)
+            } else {
+                let returndata = dump_memory_page_using_primitive_value(&vm.memory, r1);
+                Some(VmExecutionResult::Revert(returndata))
+            }
+        }
+        (_, a) => Some(VmExecutionResult::MostLikelyDidNotFinish(
+            current_address,
+            a as u16,
+        )),
+    }
+}
+
+pub(crate) fn dump_memory_page_using_primitive_value<H: HistoryMode>(
+    memory: &SimpleMemory<H>,
+    ptr: PrimitiveValue,
+) -> Vec<u8> {
+    if !ptr.is_pointer {
+        return vec![];
+    }
+    let fat_ptr = FatPointer::from_u256(ptr.value);
+    dump_memory_page_using_fat_pointer(memory, fat_ptr)
+}
+
+pub(crate) fn dump_memory_page_using_fat_pointer<H: HistoryMode>(
+    memory: &SimpleMemory<H>,
+    fat_ptr: FatPointer,
+) -> Vec<u8> {
+    dump_memory_page_by_offset_and_length(
+        memory,
+        fat_ptr.memory_page,
+        (fat_ptr.start + fat_ptr.offset) as usize,
+        (fat_ptr.length - fat_ptr.offset) as usize,
+    )
+}
+
+pub(crate) fn dump_memory_page_by_offset_and_length<H: HistoryMode>(
+    memory: &SimpleMemory<H>,
+    page: u32,
+    offset: usize,
+    length: usize,
+) -> Vec<u8> {
+    assert!(offset < (1u32 << 24) as usize);
+    assert!(length < (1u32 << 24) as usize);
+    let mut dump = Vec::with_capacity(length);
+    if length == 0 {
+        return dump;
+    }
+
+    let first_word = offset / 32;
+    let end_byte = offset + length;
+    let mut last_word = end_byte / 32;
+    if end_byte % 32 != 0 {
+        last_word += 1;
+    }
+
+    let unalignment = offset % 32;
+
+    let page_part =
+        memory.dump_page_content_as_u256_words(page, (first_word as u32)..(last_word as u32));
+
+    let mut is_first = true;
+    let mut remaining = length;
+    for word in page_part.into_iter() {
+        let it = word.into_be_iter();
+        if is_first {
+            is_first = false;
+            let it = it.skip(unalignment);
+            for next in it {
+                if remaining > 0 {
+                    dump.push(next);
+                    remaining -= 1;
+                }
+            }
+        } else {
+            for next in it {
+                if remaining > 0 {
+                    dump.push(next);
+                    remaining -= 1;
+                }
+            }
+        }
+    }
+
+    assert_eq!(
+        dump.len(),
+        length,
+        "tried to dump with offset {}, length {}, got a bytestring of length {}",
+        offset,
+        length,
+        dump.len()
+    );
+
+    dump
+}
diff --git a/core/lib/multivm/src/versions/vm_refunds_enhancement/oracles/mod.rs b/core/lib/multivm/src/versions/vm_refunds_enhancement/oracles/mod.rs
new file mode 100644
index 000000000000..b21c842572fe
--- /dev/null
+++ b/core/lib/multivm/src/versions/vm_refunds_enhancement/oracles/mod.rs
@@ -0,0 +1 @@
+pub(crate) mod storage;
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
new file mode 100644
index 000000000000..e054cdbe2a6d
--- /dev/null
+++ b/core/lib/multivm/src/versions/vm_refunds_enhancement/oracles/storage.rs
@@ -0,0 +1,426 @@
+use std::collections::HashMap;
+
+use crate::vm_refunds_enhancement::old_vm::history_recorder::{
+    AppDataFrameManagerWithHistory, HashMapHistoryEvent, HistoryEnabled, HistoryMode,
+    HistoryRecorder, StorageWrapper, VectorHistoryEvent, WithHistory,
+};
+use crate::vm_refunds_enhancement::old_vm::oracles::OracleWithHistory;
+
+use zk_evm_1_3_3::abstractions::RefundedAmounts;
+use zk_evm_1_3_3::zkevm_opcode_defs::system_params::INITIAL_STORAGE_WRITE_PUBDATA_BYTES;
+use zk_evm_1_3_3::{
+    abstractions::{RefundType, Storage as VmStorageOracle},
+    aux_structures::{LogQuery, Timestamp},
+};
+
+use zksync_state::{StoragePtr, WriteStorage};
+use zksync_types::utils::storage_key_for_eth_balance;
+use zksync_types::{
+    AccountTreeId, Address, StorageKey, StorageLogQuery, StorageLogQueryType, BOOTLOADER_ADDRESS,
+    U256,
+};
+use zksync_utils::u256_to_h256;
+
+// While the storage does not support different shards, it was decided to write the
+// code of the StorageOracle with the shard parameters in mind.
+pub(crate) fn triplet_to_storage_key(_shard_id: u8, address: Address, key: U256) -> StorageKey {
+    StorageKey::new(AccountTreeId::new(address), u256_to_h256(key))
+}
+
+pub(crate) fn storage_key_of_log(query: &LogQuery) -> StorageKey {
+    triplet_to_storage_key(query.shard_id, query.address, query.key)
+}
+
+#[derive(Debug)]
+pub struct StorageOracle<S: WriteStorage, H: HistoryMode> {
+    // Access to the persistent storage. Please note that it
+    // is used only for read access. All the actual writes happen
+    // after the execution ended.
+    pub(crate) storage: HistoryRecorder<StorageWrapper<S>, H>,
+
+    pub(crate) frames_stack: AppDataFrameManagerWithHistory<Box<StorageLogQuery>, H>,
+
+    // The changes that have been paid for in previous transactions.
+    // It is a mapping from storage key to the number of *bytes* that was paid by the user
+    // to cover this slot.
+    pub(crate) pre_paid_changes: HistoryRecorder<HashMap<StorageKey, u32>, H>,
+
+    // The changes that have been paid for in the current transaction
+    pub(crate) paid_changes: HistoryRecorder<HashMap<StorageKey, u32>, H>,
+
+    // The map that contains all the first values read from storage for each slot.
+    // While formally it does not have to be rollbackable, we still do it to avoid memory bloat
+    // for unused slots.
+    pub(crate) initial_values: HistoryRecorder<HashMap<StorageKey, U256>, H>,
+
+    // Storage refunds that oracle has returned in `estimate_refunds_for_write`.
+    pub(crate) returned_refunds: HistoryRecorder<Vec<u32>, H>,
+}
+
+impl<S: WriteStorage> OracleWithHistory for StorageOracle<S, HistoryEnabled> {
+    fn rollback_to_timestamp(&mut self, timestamp: Timestamp) {
+        self.storage.rollback_to_timestamp(timestamp);
+        self.frames_stack.rollback_to_timestamp(timestamp);
+        self.pre_paid_changes.rollback_to_timestamp(timestamp);
+        self.paid_changes.rollback_to_timestamp(timestamp);
+        self.initial_values.rollback_to_timestamp(timestamp);
+        self.returned_refunds.rollback_to_timestamp(timestamp);
+    }
+}
+
+impl<S: WriteStorage, H: HistoryMode> StorageOracle<S, H> {
+    pub fn new(storage: StoragePtr<S>) -> Self {
+        Self {
+            storage: HistoryRecorder::from_inner(StorageWrapper::new(storage)),
+            frames_stack: Default::default(),
+            pre_paid_changes: Default::default(),
+            paid_changes: Default::default(),
+            initial_values: Default::default(),
+            returned_refunds: Default::default(),
+        }
+    }
+
+    pub fn delete_history(&mut self) {
+        self.storage.delete_history();
+        self.frames_stack.delete_history();
+        self.pre_paid_changes.delete_history();
+        self.paid_changes.delete_history();
+        self.initial_values.delete_history();
+        self.returned_refunds.delete_history();
+    }
+
+    fn is_storage_key_free(&self, key: &StorageKey) -> bool {
+        key.address() == &zksync_system_constants::SYSTEM_CONTEXT_ADDRESS
+            || *key == storage_key_for_eth_balance(&BOOTLOADER_ADDRESS)
+    }
+
+    pub fn read_value(&mut self, mut query: LogQuery) -> LogQuery {
+        let key = triplet_to_storage_key(query.shard_id, query.address, query.key);
+        let current_value = self.storage.read_from_storage(&key);
+
+        query.read_value = current_value;
+
+        self.frames_stack.push_forward(
+            Box::new(StorageLogQuery {
+                log_query: query,
+                log_type: StorageLogQueryType::Read,
+            }),
+            query.timestamp,
+        );
+
+        query
+    }
+
+    pub fn write_value(&mut self, mut query: LogQuery) -> LogQuery {
+        let key = triplet_to_storage_key(query.shard_id, query.address, query.key);
+        let current_value =
+            self.storage
+                .write_to_storage(key, query.written_value, query.timestamp);
+
+        let is_initial_write = self.storage.get_ptr().borrow_mut().is_write_initial(&key);
+        let log_query_type = if is_initial_write {
+            StorageLogQueryType::InitialWrite
+        } else {
+            StorageLogQueryType::RepeatedWrite
+        };
+
+        query.read_value = current_value;
+
+        if !self.initial_values.inner().contains_key(&key) {
+            self.initial_values
+                .insert(key, current_value, query.timestamp);
+        }
+
+        let mut storage_log_query = StorageLogQuery {
+            log_query: query,
+            log_type: log_query_type,
+        };
+        self.frames_stack
+            .push_forward(Box::new(storage_log_query), query.timestamp);
+        storage_log_query.log_query.rollback = true;
+        self.frames_stack
+            .push_rollback(Box::new(storage_log_query), query.timestamp);
+        storage_log_query.log_query.rollback = false;
+
+        query
+    }
+
+    // Returns the amount of funds that has been already paid for writes into the storage slot
+    fn prepaid_for_write(&self, storage_key: &StorageKey) -> u32 {
+        self.paid_changes
+            .inner()
+            .get(storage_key)
+            .copied()
+            .unwrap_or_else(|| {
+                self.pre_paid_changes
+                    .inner()
+                    .get(storage_key)
+                    .copied()
+                    .unwrap_or(0)
+            })
+    }
+
+    // Remembers the changes that have been paid for in the current transaction.
+    // It also returns how much pubdata did the user pay for and how much was actually published.
+    pub(crate) fn save_paid_changes(&mut self, timestamp: Timestamp) -> u32 {
+        let mut published = 0;
+
+        let modified_keys = self
+            .paid_changes
+            .inner()
+            .iter()
+            .map(|(k, v)| (*k, *v))
+            .collect::<Vec<_>>();
+
+        for (key, _) in modified_keys {
+            // It is expected that for each slot for which we have paid changes, there is some
+            // first slot value already read.
+            let first_slot_value = self.initial_values.inner().get(&key).copied().unwrap();
+
+            // This is the value has been written to the storage slot at the end.
+            let current_slot_value = self.storage.read_from_storage(&key);
+
+            let required_pubdata =
+                self.base_price_for_write(&key, first_slot_value, current_slot_value);
+
+            // We assume that "prepaid_for_slot" represents both the number of pubdata published and the number of bytes paid by the previous transactions
+            // as they should be identical.
+            let prepaid_for_slot = self
+                .pre_paid_changes
+                .inner()
+                .get(&key)
+                .copied()
+                .unwrap_or_default();
+
+            published += required_pubdata.saturating_sub(prepaid_for_slot);
+
+            // We remove the slot from the paid changes and move to the pre-paid changes as
+            // the transaction ends.
+            self.paid_changes.remove(key, timestamp);
+            self.pre_paid_changes
+                .insert(key, prepaid_for_slot.max(required_pubdata), timestamp);
+        }
+
+        published
+    }
+
+    fn base_price_for_write_query(&self, query: &LogQuery) -> u32 {
+        let storage_key = storage_key_of_log(query);
+
+        self.base_price_for_write(&storage_key, query.read_value, query.written_value)
+    }
+
+    pub(crate) fn base_price_for_write(
+        &self,
+        storage_key: &StorageKey,
+        prev_value: U256,
+        new_value: U256,
+    ) -> u32 {
+        if self.is_storage_key_free(storage_key) || prev_value == new_value {
+            return 0;
+        }
+
+        let is_initial_write = self
+            .storage
+            .get_ptr()
+            .borrow_mut()
+            .is_write_initial(storage_key);
+
+        get_pubdata_price_bytes(is_initial_write)
+    }
+
+    // Returns the price of the update in terms of pubdata bytes.
+    // TODO (SMA-1701): update VM to accept gas instead of pubdata.
+    fn value_update_price(&self, query: &LogQuery) -> u32 {
+        let storage_key = storage_key_of_log(query);
+
+        let base_cost = self.base_price_for_write_query(query);
+
+        let already_paid = self.prepaid_for_write(&storage_key);
+
+        if base_cost <= already_paid {
+            // Some other transaction has already paid for this slot, no need to pay anything
+            0u32
+        } else {
+            base_cost - already_paid
+        }
+    }
+
+    /// Returns storage log queries from current frame where `log.log_query.timestamp >= from_timestamp`.
+    pub(crate) fn storage_log_queries_after_timestamp(
+        &self,
+        from_timestamp: Timestamp,
+    ) -> &[Box<StorageLogQuery>] {
+        let logs = self.frames_stack.forward().current_frame();
+
+        // Select all of the last elements where l.log_query.timestamp >= from_timestamp.
+        // Note, that using binary search here is dangerous, because the logs are not sorted by timestamp.
+        logs.rsplit(|l| l.log_query.timestamp < from_timestamp)
+            .next()
+            .unwrap_or(&[])
+    }
+
+    pub(crate) fn get_final_log_queries(&self) -> Vec<StorageLogQuery> {
+        assert_eq!(
+            self.frames_stack.len(),
+            1,
+            "VM finished execution in unexpected state"
+        );
+
+        self.frames_stack
+            .forward()
+            .current_frame()
+            .iter()
+            .map(|x| **x)
+            .collect()
+    }
+
+    pub(crate) fn get_size(&self) -> usize {
+        let frames_stack_size = self.frames_stack.get_size();
+        let paid_changes_size =
+            self.paid_changes.inner().len() * std::mem::size_of::<(StorageKey, u32)>();
+
+        frames_stack_size + paid_changes_size
+    }
+
+    pub(crate) fn get_history_size(&self) -> usize {
+        let storage_size = self.storage.borrow_history(|h| h.len(), 0)
+            * std::mem::size_of::<<StorageWrapper<S> as WithHistory>::HistoryRecord>();
+        let frames_stack_size = self.frames_stack.get_history_size();
+        let paid_changes_size = self.paid_changes.borrow_history(|h| h.len(), 0)
+            * std::mem::size_of::<<HashMap<StorageKey, u32> as WithHistory>::HistoryRecord>();
+        storage_size + frames_stack_size + paid_changes_size
+    }
+}
+
+impl<S: WriteStorage, H: HistoryMode> VmStorageOracle for StorageOracle<S, H> {
+    // Perform a storage read/write access by taking an partially filled query
+    // and returning filled query and cold/warm marker for pricing purposes
+    fn execute_partial_query(
+        &mut self,
+        _monotonic_cycle_counter: u32,
+        query: LogQuery,
+    ) -> LogQuery {
+        // tracing::trace!(
+        //     "execute partial query cyc {:?} addr {:?} key {:?}, rw {:?}, wr {:?}, tx {:?}",
+        //     _monotonic_cycle_counter,
+        //     query.address,
+        //     query.key,
+        //     query.rw_flag,
+        //     query.written_value,
+        //     query.tx_number_in_block
+        // );
+        assert!(!query.rollback);
+        if query.rw_flag {
+            // The number of bytes that have been compensated by the user to perform this write
+            let storage_key = storage_key_of_log(&query);
+
+            // 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);
+
+            if to_pay_by_user > prepaid {
+                self.paid_changes.apply_historic_record(
+                    HashMapHistoryEvent {
+                        key: storage_key,
+                        value: Some(to_pay_by_user),
+                    },
+                    query.timestamp,
+                );
+            }
+            self.write_value(query)
+        } else {
+            self.read_value(query)
+        }
+    }
+
+    // We can return the size of the refund before each storage query.
+    // Note, that while the `RefundType` allows to provide refunds both in
+    // `ergs` and `pubdata`, only refunds in pubdata will be compensated for the users
+    fn estimate_refunds_for_write(
+        &mut self, // to avoid any hacks inside, like prefetch
+        _monotonic_cycle_counter: u32,
+        partial_query: &LogQuery,
+    ) -> RefundType {
+        let price_to_pay = self.value_update_price(partial_query);
+
+        let refund = RefundType::RepeatedWrite(RefundedAmounts {
+            ergs: 0,
+            // `INITIAL_STORAGE_WRITE_PUBDATA_BYTES` is the default amount of pubdata bytes the user pays for.
+            pubdata_bytes: (INITIAL_STORAGE_WRITE_PUBDATA_BYTES as u32) - price_to_pay,
+        });
+        self.returned_refunds.apply_historic_record(
+            VectorHistoryEvent::Push(refund.pubdata_refund()),
+            partial_query.timestamp,
+        );
+
+        refund
+    }
+
+    // Indicate a start of execution frame for rollback purposes
+    fn start_frame(&mut self, timestamp: Timestamp) {
+        self.frames_stack.push_frame(timestamp);
+    }
+
+    // Indicate that execution frame went out from the scope, so we can
+    // log the history and either rollback immediately or keep records to rollback later
+    fn finish_frame(&mut self, timestamp: Timestamp, panicked: bool) {
+        // If we panic then we append forward and rollbacks to the forward of parent,
+        // otherwise we place rollbacks of child before rollbacks of the parent
+        if panicked {
+            // perform actual rollback
+            for query in self.frames_stack.rollback().current_frame().iter().rev() {
+                let read_value = match query.log_type {
+                    StorageLogQueryType::Read => {
+                        // Having Read logs in rollback is not possible
+                        tracing::warn!("Read log in rollback queue {:?}", query);
+                        continue;
+                    }
+                    StorageLogQueryType::InitialWrite | StorageLogQueryType::RepeatedWrite => {
+                        query.log_query.read_value
+                    }
+                };
+
+                let LogQuery { written_value, .. } = query.log_query;
+                let key = triplet_to_storage_key(
+                    query.log_query.shard_id,
+                    query.log_query.address,
+                    query.log_query.key,
+                );
+                let current_value = self.storage.write_to_storage(
+                    key,
+                    // NOTE, that since it is a rollback query,
+                    // the `read_value` is being set
+                    read_value, timestamp,
+                );
+
+                // Additional validation that the current value was correct
+                // Unwrap is safe because the return value from write_inner is the previous value in this leaf.
+                // It is impossible to set leaf value to `None`
+                assert_eq!(current_value, written_value);
+            }
+
+            self.frames_stack
+                .move_rollback_to_forward(|_| true, timestamp);
+        }
+        self.frames_stack.merge_frame(timestamp);
+    }
+}
+
+/// Returns the number of bytes needed to publish a slot.
+// Since we need to publish the state diffs onchain, for each of the updated storage slot
+// we basically need to publish the following pair: (<storage_key, new_value>).
+// While new_value is always 32 bytes long, for key we use the following optimization:
+//   - The first time we publish it, we use 32 bytes.
+//         Then, we remember a 8-byte id for this slot and assign it to it. We call this initial write.
+//   - The second time we publish it, we will use this 8-byte instead of the 32 bytes of the entire key.
+//         So the total size of the publish pubdata is 40 bytes. We call this kind of write the repeated one
+fn get_pubdata_price_bytes(is_initial: bool) -> u32 {
+    // TODO (SMA-1702): take into account the content of the log query, i.e. values that contain mostly zeroes
+    // should cost less.
+    if is_initial {
+        zk_evm_1_3_3::zkevm_opcode_defs::system_params::INITIAL_STORAGE_WRITE_PUBDATA_BYTES as u32
+    } else {
+        zk_evm_1_3_3::zkevm_opcode_defs::system_params::REPEATED_STORAGE_WRITE_PUBDATA_BYTES as u32
+    }
+}
diff --git a/core/lib/multivm/src/versions/vm_refunds_enhancement/tests/bootloader.rs b/core/lib/multivm/src/versions/vm_refunds_enhancement/tests/bootloader.rs
new file mode 100644
index 000000000000..bfa439106eaa
--- /dev/null
+++ b/core/lib/multivm/src/versions/vm_refunds_enhancement/tests/bootloader.rs
@@ -0,0 +1,54 @@
+use zksync_types::U256;
+
+use crate::interface::{Halt, TxExecutionMode, VmExecutionMode};
+use crate::vm_refunds_enhancement::constants::BOOTLOADER_HEAP_PAGE;
+use crate::vm_refunds_enhancement::tests::tester::VmTesterBuilder;
+use crate::vm_refunds_enhancement::tests::utils::{
+    get_bootloader, verify_required_memory, BASE_SYSTEM_CONTRACTS,
+};
+
+use crate::interface::ExecutionResult;
+use crate::vm_refunds_enhancement::HistoryEnabled;
+
+#[test]
+fn test_dummy_bootloader() {
+    let mut base_system_contracts = BASE_SYSTEM_CONTRACTS.clone();
+    base_system_contracts.bootloader = get_bootloader("dummy");
+
+    let mut vm = VmTesterBuilder::new(HistoryEnabled)
+        .with_empty_in_memory_storage()
+        .with_base_system_smart_contracts(base_system_contracts)
+        .with_execution_mode(TxExecutionMode::VerifyExecute)
+        .build();
+
+    let result = vm.vm.execute(VmExecutionMode::Batch);
+    assert!(!result.result.is_failed());
+
+    let correct_first_cell = U256::from_str_radix("123123123", 16).unwrap();
+    verify_required_memory(
+        &vm.vm.state,
+        vec![(correct_first_cell, BOOTLOADER_HEAP_PAGE, 0)],
+    );
+}
+
+#[test]
+fn test_bootloader_out_of_gas() {
+    let mut base_system_contracts = BASE_SYSTEM_CONTRACTS.clone();
+    base_system_contracts.bootloader = get_bootloader("dummy");
+
+    let mut vm = VmTesterBuilder::new(HistoryEnabled)
+        .with_empty_in_memory_storage()
+        .with_base_system_smart_contracts(base_system_contracts)
+        .with_gas_limit(10)
+        .with_execution_mode(TxExecutionMode::VerifyExecute)
+        .build();
+
+    let res = vm.vm.execute(VmExecutionMode::Batch);
+
+    assert!(matches!(
+        res.result,
+        ExecutionResult::Halt {
+            reason: Halt::BootloaderOutOfGas
+        }
+    ));
+}
diff --git a/core/lib/multivm/src/versions/vm_refunds_enhancement/tests/bytecode_publishing.rs b/core/lib/multivm/src/versions/vm_refunds_enhancement/tests/bytecode_publishing.rs
new file mode 100644
index 000000000000..b2c126dea00e
--- /dev/null
+++ b/core/lib/multivm/src/versions/vm_refunds_enhancement/tests/bytecode_publishing.rs
@@ -0,0 +1,37 @@
+use zksync_types::event::extract_long_l2_to_l1_messages;
+use zksync_utils::bytecode::compress_bytecode;
+
+use crate::interface::{TxExecutionMode, VmExecutionMode};
+use crate::vm_refunds_enhancement::tests::tester::{DeployContractsTx, TxType, VmTesterBuilder};
+use crate::vm_refunds_enhancement::tests::utils::read_test_contract;
+use crate::vm_refunds_enhancement::HistoryEnabled;
+
+#[test]
+fn test_bytecode_publishing() {
+    // In this test, we aim to ensure that the contents of the compressed bytecodes
+    // are included as part of the L2->L1 long messages
+    let mut vm = VmTesterBuilder::new(HistoryEnabled)
+        .with_empty_in_memory_storage()
+        .with_execution_mode(TxExecutionMode::VerifyExecute)
+        .with_random_rich_accounts(1)
+        .build();
+
+    let counter = read_test_contract();
+    let account = &mut vm.rich_accounts[0];
+
+    let compressed_bytecode = compress_bytecode(&counter).unwrap();
+
+    let DeployContractsTx { tx, .. } = account.get_deploy_tx(&counter, None, TxType::L2);
+    vm.vm.push_transaction(tx);
+    let result = vm.vm.execute(VmExecutionMode::OneTx);
+    assert!(!result.result.is_failed(), "Transaction wasn't successful");
+
+    vm.vm.execute(VmExecutionMode::Batch);
+
+    let state = vm.vm.get_current_execution_state();
+    let long_messages = extract_long_l2_to_l1_messages(&state.events);
+    assert!(
+        long_messages.contains(&compressed_bytecode),
+        "Bytecode not published"
+    );
+}
diff --git a/core/lib/multivm/src/versions/vm_refunds_enhancement/tests/call_tracer.rs b/core/lib/multivm/src/versions/vm_refunds_enhancement/tests/call_tracer.rs
new file mode 100644
index 000000000000..fb2d3389407d
--- /dev/null
+++ b/core/lib/multivm/src/versions/vm_refunds_enhancement/tests/call_tracer.rs
@@ -0,0 +1,87 @@
+use crate::interface::{TxExecutionMode, VmExecutionMode};
+use crate::vm_refunds_enhancement::constants::BLOCK_GAS_LIMIT;
+use crate::vm_refunds_enhancement::tests::tester::VmTesterBuilder;
+use crate::vm_refunds_enhancement::tests::utils::{read_max_depth_contract, read_test_contract};
+use crate::vm_refunds_enhancement::{CallTracer, HistoryEnabled};
+use once_cell::sync::OnceCell;
+use std::sync::Arc;
+use zksync_types::{Address, Execute};
+
+// This test is ultra slow, so it's ignored by default.
+#[test]
+#[ignore]
+fn test_max_depth() {
+    let contarct = read_max_depth_contract();
+    let address = Address::random();
+    let mut vm = VmTesterBuilder::new(HistoryEnabled)
+        .with_empty_in_memory_storage()
+        .with_random_rich_accounts(1)
+        .with_deployer()
+        .with_gas_limit(BLOCK_GAS_LIMIT)
+        .with_execution_mode(TxExecutionMode::VerifyExecute)
+        .with_custom_contracts(vec![(contarct, address, true)])
+        .build();
+
+    let account = &mut vm.rich_accounts[0];
+    let tx = account.get_l2_tx_for_execute(
+        Execute {
+            contract_address: address,
+            calldata: vec![],
+            value: Default::default(),
+            factory_deps: None,
+        },
+        None,
+    );
+
+    let result = Arc::new(OnceCell::new());
+    let call_tracer = CallTracer::new(result.clone(), HistoryEnabled);
+    vm.vm.push_transaction(tx);
+    let res = vm
+        .vm
+        .inspect(vec![Box::new(call_tracer)], VmExecutionMode::OneTx);
+    assert!(result.get().is_some());
+    assert!(res.result.is_failed());
+}
+
+#[test]
+fn test_basic_behavior() {
+    let contarct = read_test_contract();
+    let address = Address::random();
+    let mut vm = VmTesterBuilder::new(HistoryEnabled)
+        .with_empty_in_memory_storage()
+        .with_random_rich_accounts(1)
+        .with_deployer()
+        .with_gas_limit(BLOCK_GAS_LIMIT)
+        .with_execution_mode(TxExecutionMode::VerifyExecute)
+        .with_custom_contracts(vec![(contarct, address, true)])
+        .build();
+
+    let increment_by_6_calldata =
+        "7cf5dab00000000000000000000000000000000000000000000000000000000000000006";
+
+    let account = &mut vm.rich_accounts[0];
+    let tx = account.get_l2_tx_for_execute(
+        Execute {
+            contract_address: address,
+            calldata: hex::decode(increment_by_6_calldata).unwrap(),
+            value: Default::default(),
+            factory_deps: None,
+        },
+        None,
+    );
+
+    let result = Arc::new(OnceCell::new());
+    let call_tracer = CallTracer::new(result.clone(), HistoryEnabled);
+    vm.vm.push_transaction(tx);
+    let res = vm
+        .vm
+        .inspect(vec![Box::new(call_tracer)], VmExecutionMode::OneTx);
+
+    let call_tracer_result = result.get().unwrap();
+
+    assert_eq!(call_tracer_result.len(), 1);
+    // Expect that there are a plenty of subcalls underneath.
+    let subcall = &call_tracer_result[0].calls;
+    assert!(subcall.len() > 10);
+    assert!(!res.result.is_failed());
+}
diff --git a/core/lib/multivm/src/versions/vm_refunds_enhancement/tests/default_aa.rs b/core/lib/multivm/src/versions/vm_refunds_enhancement/tests/default_aa.rs
new file mode 100644
index 000000000000..92e043ae96f3
--- /dev/null
+++ b/core/lib/multivm/src/versions/vm_refunds_enhancement/tests/default_aa.rs
@@ -0,0 +1,70 @@
+use zksync_system_constants::L2_ETH_TOKEN_ADDRESS;
+use zksync_types::system_contracts::{DEPLOYMENT_NONCE_INCREMENT, TX_NONCE_INCREMENT};
+
+use zksync_types::{get_code_key, get_known_code_key, get_nonce_key, AccountTreeId, U256};
+use zksync_utils::u256_to_h256;
+
+use crate::interface::{TxExecutionMode, VmExecutionMode};
+use crate::vm_refunds_enhancement::tests::tester::{DeployContractsTx, TxType, VmTesterBuilder};
+use crate::vm_refunds_enhancement::tests::utils::{
+    get_balance, read_test_contract, verify_required_storage,
+};
+use crate::vm_refunds_enhancement::HistoryEnabled;
+
+#[test]
+fn test_default_aa_interaction() {
+    // In this test, we aim to test whether a simple account interaction (without any fee logic)
+    // will work. The account will try to deploy a simple contract from integration tests.
+    let mut vm = VmTesterBuilder::new(HistoryEnabled)
+        .with_empty_in_memory_storage()
+        .with_execution_mode(TxExecutionMode::VerifyExecute)
+        .with_random_rich_accounts(1)
+        .build();
+
+    let counter = read_test_contract();
+    let account = &mut vm.rich_accounts[0];
+    let DeployContractsTx {
+        tx,
+        bytecode_hash,
+        address,
+    } = account.get_deploy_tx(&counter, None, TxType::L2);
+    let maximal_fee = tx.gas_limit() * vm.vm.batch_env.base_fee();
+
+    vm.vm.push_transaction(tx);
+    let result = vm.vm.execute(VmExecutionMode::OneTx);
+    assert!(!result.result.is_failed(), "Transaction wasn't successful");
+
+    vm.vm.execute(VmExecutionMode::Batch);
+    vm.vm.get_current_execution_state();
+
+    // Both deployment and ordinary nonce should be incremented by one.
+    let account_nonce_key = get_nonce_key(&account.address);
+    let expected_nonce = TX_NONCE_INCREMENT + DEPLOYMENT_NONCE_INCREMENT;
+
+    // The code hash of the deployed contract should be marked as republished.
+    let known_codes_key = get_known_code_key(&bytecode_hash);
+
+    // The contract should be deployed successfully.
+    let account_code_key = get_code_key(&address);
+
+    let expected_slots = vec![
+        (u256_to_h256(expected_nonce), account_nonce_key),
+        (u256_to_h256(U256::from(1u32)), known_codes_key),
+        (bytecode_hash, account_code_key),
+    ];
+
+    verify_required_storage(&vm.vm.state, expected_slots);
+
+    let expected_fee = maximal_fee
+        - U256::from(result.refunds.gas_refunded) * U256::from(vm.vm.batch_env.base_fee());
+    let operator_balance = get_balance(
+        AccountTreeId::new(L2_ETH_TOKEN_ADDRESS),
+        &vm.fee_account,
+        vm.vm.state.storage.storage.get_ptr(),
+    );
+
+    assert_eq!(
+        operator_balance, expected_fee,
+        "Operator did not receive his fee"
+    );
+}
diff --git a/core/lib/multivm/src/versions/vm_refunds_enhancement/tests/gas_limit.rs b/core/lib/multivm/src/versions/vm_refunds_enhancement/tests/gas_limit.rs
new file mode 100644
index 000000000000..0ea1669cf217
--- /dev/null
+++ b/core/lib/multivm/src/versions/vm_refunds_enhancement/tests/gas_limit.rs
@@ -0,0 +1,47 @@
+use zksync_types::fee::Fee;
+use zksync_types::Execute;
+
+use crate::vm_refunds_enhancement::constants::{
+    BOOTLOADER_HEAP_PAGE, TX_DESCRIPTION_OFFSET, TX_GAS_LIMIT_OFFSET,
+};
+use crate::vm_refunds_enhancement::tests::tester::VmTesterBuilder;
+
+use crate::interface::TxExecutionMode;
+use crate::vm_refunds_enhancement::HistoryDisabled;
+
+/// Checks that `TX_GAS_LIMIT_OFFSET` constant is correct.
+#[test]
+fn test_tx_gas_limit_offset() {
+    let mut vm = VmTesterBuilder::new(HistoryDisabled)
+        .with_empty_in_memory_storage()
+        .with_execution_mode(TxExecutionMode::VerifyExecute)
+        .with_random_rich_accounts(1)
+        .build();
+
+    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,
+        },
+        Some(Fee {
+            gas_limit,
+            ..Default::default()
+        }),
+    );
+
+    vm.vm.push_transaction(tx);
+
+    let gas_limit_from_memory = vm
+        .vm
+        .state
+        .memory
+        .read_slot(
+            BOOTLOADER_HEAP_PAGE as usize,
+            TX_DESCRIPTION_OFFSET + TX_GAS_LIMIT_OFFSET,
+        )
+        .value;
+    assert_eq!(gas_limit_from_memory, gas_limit);
+}
diff --git a/core/lib/multivm/src/versions/vm_refunds_enhancement/tests/get_used_contracts.rs b/core/lib/multivm/src/versions/vm_refunds_enhancement/tests/get_used_contracts.rs
new file mode 100644
index 000000000000..a798a3178f5d
--- /dev/null
+++ b/core/lib/multivm/src/versions/vm_refunds_enhancement/tests/get_used_contracts.rs
@@ -0,0 +1,104 @@
+use std::collections::{HashMap, HashSet};
+
+use itertools::Itertools;
+
+use zksync_state::WriteStorage;
+use zksync_system_constants::CONTRACT_DEPLOYER_ADDRESS;
+use zksync_test_account::Account;
+use zksync_types::{Execute, U256};
+use zksync_utils::bytecode::hash_bytecode;
+use zksync_utils::h256_to_u256;
+
+use crate::interface::{TxExecutionMode, VmExecutionMode};
+use crate::vm_refunds_enhancement::tests::tester::{TxType, VmTesterBuilder};
+use crate::vm_refunds_enhancement::tests::utils::{read_test_contract, BASE_SYSTEM_CONTRACTS};
+use crate::vm_refunds_enhancement::{HistoryDisabled, HistoryMode, Vm};
+
+#[test]
+fn test_get_used_contracts() {
+    let mut vm = VmTesterBuilder::new(HistoryDisabled)
+        .with_empty_in_memory_storage()
+        .with_execution_mode(TxExecutionMode::VerifyExecute)
+        .build();
+
+    assert!(known_bytecodes_without_aa_code(&vm.vm).is_empty());
+
+    // create and push and execute some not-empty factory deps transaction with success status
+    // to check that get_used_contracts() updates
+    let contract_code = read_test_contract();
+    let mut account = Account::random();
+    let tx = account.get_deploy_tx(&contract_code, None, TxType::L1 { serial_id: 0 });
+    vm.vm.push_transaction(tx.tx.clone());
+    let result = vm.vm.execute(VmExecutionMode::OneTx);
+    assert!(!result.result.is_failed());
+
+    assert!(vm
+        .vm
+        .get_used_contracts()
+        .contains(&h256_to_u256(tx.bytecode_hash)));
+
+    // Note: Default_AA will be in the list of used contracts if l2 tx is used
+    assert_eq!(
+        vm.vm
+            .get_used_contracts()
+            .into_iter()
+            .collect::<HashSet<U256>>(),
+        known_bytecodes_without_aa_code(&vm.vm)
+            .keys()
+            .cloned()
+            .collect::<HashSet<U256>>()
+    );
+
+    // create push and execute some non-empty factory deps transaction that fails
+    // (known_bytecodes will be updated but we expect get_used_contracts() to not be updated)
+
+    let calldata = [1, 2, 3];
+    let big_calldata: Vec<u8> = calldata
+        .iter()
+        .cycle()
+        .take(calldata.len() * 1024)
+        .cloned()
+        .collect();
+    let account2 = Account::random();
+    let tx2 = account2.get_l1_tx(
+        Execute {
+            contract_address: CONTRACT_DEPLOYER_ADDRESS,
+            calldata: big_calldata,
+            value: Default::default(),
+            factory_deps: Some(vec![vec![1; 32]]),
+        },
+        1,
+    );
+
+    vm.vm.push_transaction(tx2.clone());
+
+    let res2 = vm.vm.execute(VmExecutionMode::OneTx);
+
+    assert!(res2.result.is_failed());
+
+    for factory_dep in tx2.execute.factory_deps.unwrap() {
+        let hash = hash_bytecode(&factory_dep);
+        let hash_to_u256 = h256_to_u256(hash);
+        assert!(known_bytecodes_without_aa_code(&vm.vm)
+            .keys()
+            .contains(&hash_to_u256));
+        assert!(!vm.vm.get_used_contracts().contains(&hash_to_u256));
+    }
+}
+
+fn known_bytecodes_without_aa_code<S: WriteStorage, H: HistoryMode>(
+    vm: &Vm<S, H>,
+) -> HashMap<U256, Vec<U256>> {
+    let mut known_bytecodes_without_aa_code = vm
+        .state
+        .decommittment_processor
+        .known_bytecodes
+        .inner()
+        .clone();
+
+    known_bytecodes_without_aa_code
+        .remove(&h256_to_u256(BASE_SYSTEM_CONTRACTS.default_aa.hash))
+        .unwrap();
+
+    known_bytecodes_without_aa_code
+}
diff --git a/core/lib/multivm/src/versions/vm_refunds_enhancement/tests/invalid_bytecode.rs b/core/lib/multivm/src/versions/vm_refunds_enhancement/tests/invalid_bytecode.rs
new file mode 100644
index 000000000000..88ed141630a2
--- /dev/null
+++ b/core/lib/multivm/src/versions/vm_refunds_enhancement/tests/invalid_bytecode.rs
@@ -0,0 +1,120 @@
+use zksync_types::H256;
+use zksync_utils::h256_to_u256;
+
+use crate::vm_refunds_enhancement::tests::tester::VmTesterBuilder;
+use crate::vm_refunds_enhancement::types::inputs::system_env::TxExecutionMode;
+use crate::vm_refunds_enhancement::{HistoryEnabled, TxRevertReason};
+
+// TODO this test requires a lot of hacks for bypassing the bytecode checks in the VM.
+// Port it later, it's not significant. for now
+
+#[test]
+fn test_invalid_bytecode() {
+    let mut vm_builder = VmTesterBuilder::new(HistoryEnabled)
+        .with_in_memory_storage()
+        .with_execution_mode(TxExecutionMode::VerifyExecute)
+        .with_random_rich_accounts(1);
+    let mut storage = vm_builder.take_storage();
+    let mut vm = vm_builder.build(&mut storage);
+
+    let block_gas_per_pubdata = vm_test_env
+        .block_context
+        .context
+        .block_gas_price_per_pubdata();
+
+    let mut test_vm_with_custom_bytecode_hash =
+        |bytecode_hash: H256, expected_revert_reason: Option<TxRevertReason>| {
+            let mut oracle_tools =
+                OracleTools::new(vm_test_env.storage_ptr.as_mut(), HistoryEnabled);
+
+            let (encoded_tx, predefined_overhead) = get_l1_tx_with_custom_bytecode_hash(
+                h256_to_u256(bytecode_hash),
+                block_gas_per_pubdata as u32,
+            );
+
+            run_vm_with_custom_factory_deps(
+                &mut oracle_tools,
+                vm_test_env.block_context.context,
+                &vm_test_env.block_properties,
+                encoded_tx,
+                predefined_overhead,
+                expected_revert_reason,
+            );
+        };
+
+    let failed_to_mark_factory_deps = |msg: &str, data: Vec<u8>| {
+        TxRevertReason::FailedToMarkFactoryDependencies(VmRevertReason::General {
+            msg: msg.to_string(),
+            data,
+        })
+    };
+
+    // Here we provide the correctly-formatted bytecode hash of
+    // odd length, so it should work.
+    test_vm_with_custom_bytecode_hash(
+        H256([
+            1, 0, 0, 1, 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,
+        ]),
+        None,
+    );
+
+    // Here we provide correctly formatted bytecode of even length, so
+    // it should fail.
+    test_vm_with_custom_bytecode_hash(
+        H256([
+            1, 0, 2, 2, 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,
+        ]),
+        Some(failed_to_mark_factory_deps(
+            "Code length in words must be odd",
+            vec![
+                8, 195, 121, 160, 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, 32, 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, 32, 67, 111, 100, 101, 32, 108, 101, 110,
+                103, 116, 104, 32, 105, 110, 32, 119, 111, 114, 100, 115, 32, 109, 117, 115, 116,
+                32, 98, 101, 32, 111, 100, 100,
+            ],
+        )),
+    );
+
+    // Here we provide incorrectly formatted bytecode of odd length, so
+    // it should fail.
+    test_vm_with_custom_bytecode_hash(
+        H256([
+            1, 1, 0, 1, 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,
+        ]),
+        Some(failed_to_mark_factory_deps(
+            "Incorrectly formatted bytecodeHash",
+            vec![
+                8, 195, 121, 160, 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, 32, 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, 34, 73, 110, 99, 111, 114, 114, 101, 99,
+                116, 108, 121, 32, 102, 111, 114, 109, 97, 116, 116, 101, 100, 32, 98, 121, 116,
+                101, 99, 111, 100, 101, 72, 97, 115, 104, 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,
+            ],
+        )),
+    );
+
+    // Here we provide incorrectly formatted bytecode of odd length, so
+    // it should fail.
+    test_vm_with_custom_bytecode_hash(
+        H256([
+            2, 0, 0, 1, 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,
+        ]),
+        Some(failed_to_mark_factory_deps(
+            "Incorrectly formatted bytecodeHash",
+            vec![
+                8, 195, 121, 160, 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, 32, 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, 34, 73, 110, 99, 111, 114, 114, 101, 99,
+                116, 108, 121, 32, 102, 111, 114, 109, 97, 116, 116, 101, 100, 32, 98, 121, 116,
+                101, 99, 111, 100, 101, 72, 97, 115, 104, 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,
+            ],
+        )),
+    );
+}
diff --git a/core/lib/multivm/src/versions/vm_refunds_enhancement/tests/is_write_initial.rs b/core/lib/multivm/src/versions/vm_refunds_enhancement/tests/is_write_initial.rs
new file mode 100644
index 000000000000..ca7ff595e193
--- /dev/null
+++ b/core/lib/multivm/src/versions/vm_refunds_enhancement/tests/is_write_initial.rs
@@ -0,0 +1,42 @@
+use zksync_state::ReadStorage;
+use zksync_types::get_nonce_key;
+
+use crate::interface::{TxExecutionMode, VmExecutionMode};
+use crate::vm_refunds_enhancement::tests::tester::{Account, TxType, VmTesterBuilder};
+use crate::vm_refunds_enhancement::tests::utils::read_test_contract;
+use crate::vm_refunds_enhancement::HistoryDisabled;
+
+#[test]
+fn test_is_write_initial_behaviour() {
+    // In this test, we check result of `is_write_initial` at different stages.
+    // The main idea is to check that `is_write_initial` storage uses the correct cache for initial_writes and doesn't
+    // messed up it with the repeated writes during the one batch execution.
+
+    let mut account = Account::random();
+    let mut vm = VmTesterBuilder::new(HistoryDisabled)
+        .with_empty_in_memory_storage()
+        .with_execution_mode(TxExecutionMode::VerifyExecute)
+        .with_rich_accounts(vec![account.clone()])
+        .build();
+
+    let nonce_key = get_nonce_key(&account.address);
+    // Check that the next write to the nonce key will be initial.
+    assert!(vm
+        .storage
+        .as_ref()
+        .borrow_mut()
+        .is_write_initial(&nonce_key));
+
+    let contract_code = read_test_contract();
+    let tx = account.get_deploy_tx(&contract_code, None, TxType::L2).tx;
+
+    vm.vm.push_transaction(tx);
+    vm.vm.execute(VmExecutionMode::OneTx);
+
+    // Check that `is_write_initial` still returns true for the nonce key.
+    assert!(vm
+        .storage
+        .as_ref()
+        .borrow_mut()
+        .is_write_initial(&nonce_key));
+}
diff --git a/core/lib/multivm/src/versions/vm_refunds_enhancement/tests/l1_tx_execution.rs b/core/lib/multivm/src/versions/vm_refunds_enhancement/tests/l1_tx_execution.rs
new file mode 100644
index 000000000000..138879cd7ede
--- /dev/null
+++ b/core/lib/multivm/src/versions/vm_refunds_enhancement/tests/l1_tx_execution.rs
@@ -0,0 +1,125 @@
+use zksync_system_constants::BOOTLOADER_ADDRESS;
+use zksync_types::l2_to_l1_log::L2ToL1Log;
+use zksync_types::storage_writes_deduplicator::StorageWritesDeduplicator;
+use zksync_types::{get_code_key, get_known_code_key, U256};
+use zksync_utils::u256_to_h256;
+
+use crate::interface::{TxExecutionMode, VmExecutionMode};
+use crate::vm_refunds_enhancement::tests::tester::{TxType, VmTesterBuilder};
+use crate::vm_refunds_enhancement::tests::utils::{
+    read_test_contract, verify_required_storage, BASE_SYSTEM_CONTRACTS,
+};
+use crate::vm_refunds_enhancement::types::internals::TransactionData;
+use crate::vm_refunds_enhancement::HistoryEnabled;
+
+#[test]
+fn test_l1_tx_execution() {
+    // In this test, we try to execute a contract deployment from L1
+    // Here instead of marking code hash via the bootloader means, we will be
+    // using L1->L2 communication, the same it would likely be done during the priority mode.
+
+    // There are always at least 3 initial writes here, because we pay fees from l1:
+    // - totalSupply of ETH token
+    // - balance of the refund recipient
+    // - balance of the bootloader
+    // - tx_rollout hash
+
+    let basic_initial_writes = 1;
+
+    let mut vm = VmTesterBuilder::new(HistoryEnabled)
+        .with_empty_in_memory_storage()
+        .with_base_system_smart_contracts(BASE_SYSTEM_CONTRACTS.clone())
+        .with_execution_mode(TxExecutionMode::VerifyExecute)
+        .with_random_rich_accounts(1)
+        .build();
+
+    let contract_code = read_test_contract();
+    let account = &mut vm.rich_accounts[0];
+    let deploy_tx = account.get_deploy_tx(&contract_code, None, TxType::L1 { serial_id: 1 });
+    let tx_data: TransactionData = deploy_tx.tx.clone().into();
+
+    let required_l2_to_l1_logs = vec![L2ToL1Log {
+        shard_id: 0,
+        is_service: true,
+        tx_number_in_block: 0,
+        sender: BOOTLOADER_ADDRESS,
+        key: tx_data.tx_hash(0.into()),
+        value: u256_to_h256(U256::from(1u32)),
+    }];
+
+    vm.vm.push_transaction(deploy_tx.tx.clone());
+
+    let res = vm.vm.execute(VmExecutionMode::OneTx);
+
+    // The code hash of the deployed contract should be marked as republished.
+    let known_codes_key = get_known_code_key(&deploy_tx.bytecode_hash);
+
+    // The contract should be deployed successfully.
+    let account_code_key = get_code_key(&deploy_tx.address);
+
+    let expected_slots = vec![
+        (u256_to_h256(U256::from(1u32)), known_codes_key),
+        (deploy_tx.bytecode_hash, account_code_key),
+    ];
+    assert!(!res.result.is_failed());
+
+    verify_required_storage(&vm.vm.state, expected_slots);
+
+    assert_eq!(res.logs.user_l2_to_l1_logs, required_l2_to_l1_logs);
+
+    let tx = account.get_test_contract_transaction(
+        deploy_tx.address,
+        true,
+        None,
+        false,
+        TxType::L1 { serial_id: 0 },
+    );
+    vm.vm.push_transaction(tx);
+    let res = vm.vm.execute(VmExecutionMode::OneTx);
+    let storage_logs = res.logs.storage_logs;
+    let res = StorageWritesDeduplicator::apply_on_empty_state(&storage_logs);
+
+    // Tx panicked
+    assert_eq!(res.initial_storage_writes - basic_initial_writes, 0);
+
+    let tx = account.get_test_contract_transaction(
+        deploy_tx.address,
+        false,
+        None,
+        false,
+        TxType::L1 { serial_id: 0 },
+    );
+    vm.vm.push_transaction(tx.clone());
+    let res = vm.vm.execute(VmExecutionMode::OneTx);
+    let storage_logs = res.logs.storage_logs;
+    let res = StorageWritesDeduplicator::apply_on_empty_state(&storage_logs);
+    // We changed one slot inside contract
+    assert_eq!(res.initial_storage_writes - basic_initial_writes, 1);
+
+    // No repeated writes
+    let repeated_writes = res.repeated_storage_writes;
+    assert_eq!(res.repeated_storage_writes, 0);
+
+    vm.vm.push_transaction(tx);
+    let storage_logs = vm.vm.execute(VmExecutionMode::OneTx).logs.storage_logs;
+    let res = StorageWritesDeduplicator::apply_on_empty_state(&storage_logs);
+    // We do the same storage write, it will be deduplicated, so still 4 initial write and 0 repeated
+    assert_eq!(res.initial_storage_writes - basic_initial_writes, 1);
+    assert_eq!(res.repeated_storage_writes, repeated_writes);
+
+    let tx = account.get_test_contract_transaction(
+        deploy_tx.address,
+        false,
+        Some(10.into()),
+        false,
+        TxType::L1 { serial_id: 1 },
+    );
+    vm.vm.push_transaction(tx);
+    let result = vm.vm.execute(VmExecutionMode::OneTx);
+    // Method is not payable tx should fail
+    assert!(result.result.is_failed(), "The transaction should fail");
+
+    let res = StorageWritesDeduplicator::apply_on_empty_state(&result.logs.storage_logs);
+    // There are only basic initial writes
+    assert_eq!(res.initial_storage_writes - basic_initial_writes, 2);
+}
diff --git a/core/lib/multivm/src/versions/vm_refunds_enhancement/tests/l2_blocks.rs b/core/lib/multivm/src/versions/vm_refunds_enhancement/tests/l2_blocks.rs
new file mode 100644
index 000000000000..9130b6627ca2
--- /dev/null
+++ b/core/lib/multivm/src/versions/vm_refunds_enhancement/tests/l2_blocks.rs
@@ -0,0 +1,498 @@
+//!
+//! Tests for the bootloader
+//! The description for each of the tests can be found in the corresponding `.yul` file.
+//!
+
+use crate::interface::{ExecutionResult, Halt, L2BlockEnv, TxExecutionMode, VmExecutionMode};
+use crate::vm_refunds_enhancement::constants::{
+    BOOTLOADER_HEAP_PAGE, TX_OPERATOR_L2_BLOCK_INFO_OFFSET, TX_OPERATOR_SLOTS_PER_L2_BLOCK_INFO,
+};
+use crate::vm_refunds_enhancement::tests::tester::default_l1_batch;
+use crate::vm_refunds_enhancement::tests::tester::VmTesterBuilder;
+use crate::vm_refunds_enhancement::utils::l2_blocks::get_l2_block_hash_key;
+use crate::vm_refunds_enhancement::{HistoryEnabled, HistoryMode, Vm};
+use zk_evm_1_3_3::aux_structures::Timestamp;
+use zksync_state::{ReadStorage, WriteStorage};
+use zksync_system_constants::{
+    CURRENT_VIRTUAL_BLOCK_INFO_POSITION, REQUIRED_L1_TO_L2_GAS_PER_PUBDATA_BYTE,
+};
+use zksync_types::block::{pack_block_info, unpack_block_info};
+use zksync_types::{
+    block::{legacy_miniblock_hash, miniblock_hash},
+    get_code_key, AccountTreeId, Execute, ExecuteTransactionCommon, L1BatchNumber, L1TxCommonData,
+    MiniblockNumber, StorageKey, Transaction, H160, H256, SYSTEM_CONTEXT_ADDRESS,
+    SYSTEM_CONTEXT_BLOCK_INFO_POSITION, SYSTEM_CONTEXT_CURRENT_L2_BLOCK_INFO_POSITION,
+    SYSTEM_CONTEXT_CURRENT_TX_ROLLING_HASH_POSITION, U256,
+};
+use zksync_utils::{h256_to_u256, u256_to_h256};
+
+fn get_l1_noop() -> Transaction {
+    Transaction {
+        common_data: ExecuteTransactionCommon::L1(L1TxCommonData {
+            sender: H160::random(),
+            gas_limit: U256::from(2000000u32),
+            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,
+        },
+        received_timestamp_ms: 0,
+        raw_bytes: None,
+    }
+}
+
+#[test]
+fn test_l2_block_initialization_timestamp() {
+    // This test checks that the L2 block initialization works correctly.
+    // Here we check that that the first block must have timestamp that is greater or equal to the timestamp
+    // of the current batch.
+
+    let mut vm = VmTesterBuilder::new(HistoryEnabled)
+        .with_empty_in_memory_storage()
+        .with_execution_mode(TxExecutionMode::VerifyExecute)
+        .with_random_rich_accounts(1)
+        .build();
+
+    // Override the timestamp of the current miniblock to be 0.
+    vm.vm.bootloader_state.push_l2_block(L2BlockEnv {
+        number: 1,
+        timestamp: 0,
+        prev_block_hash: legacy_miniblock_hash(MiniblockNumber(0)),
+        max_virtual_blocks_to_create: 1,
+    });
+    let l1_tx = get_l1_noop();
+
+    vm.vm.push_transaction(l1_tx);
+    let res = vm.vm.execute(VmExecutionMode::OneTx);
+
+    assert_eq!(
+        res.result,
+        ExecutionResult::Halt {reason: Halt::FailedToSetL2Block("The timestamp of the L2 block must be greater than or equal to the timestamp of the current batch".to_string())}
+    );
+}
+
+#[test]
+fn test_l2_block_initialization_number_non_zero() {
+    // This test checks that the L2 block initialization works correctly.
+    // Here we check that the first miniblock number can not be zero.
+
+    let l1_batch = default_l1_batch(L1BatchNumber(1));
+    let first_l2_block = L2BlockEnv {
+        number: 0,
+        timestamp: l1_batch.timestamp,
+        prev_block_hash: legacy_miniblock_hash(MiniblockNumber(0)),
+        max_virtual_blocks_to_create: 1,
+    };
+
+    let mut vm = VmTesterBuilder::new(HistoryEnabled)
+        .with_empty_in_memory_storage()
+        .with_execution_mode(TxExecutionMode::VerifyExecute)
+        .with_l1_batch_env(l1_batch)
+        .with_random_rich_accounts(1)
+        .build();
+
+    let l1_tx = get_l1_noop();
+
+    vm.vm.push_transaction(l1_tx);
+
+    let timestamp = Timestamp(vm.vm.state.local_state.timestamp);
+    set_manual_l2_block_info(&mut vm.vm, 0, first_l2_block, timestamp);
+
+    let res = vm.vm.execute(VmExecutionMode::OneTx);
+
+    assert_eq!(
+        res.result,
+        ExecutionResult::Halt {
+            reason: Halt::FailedToSetL2Block(
+                "L2 block number is never expected to be zero".to_string()
+            )
+        }
+    );
+}
+
+fn test_same_l2_block(
+    expected_error: Option<Halt>,
+    override_timestamp: Option<u64>,
+    override_prev_block_hash: Option<H256>,
+) {
+    let mut l1_batch = default_l1_batch(L1BatchNumber(1));
+    l1_batch.timestamp = 1;
+    let mut vm = VmTesterBuilder::new(HistoryEnabled)
+        .with_empty_in_memory_storage()
+        .with_execution_mode(TxExecutionMode::VerifyExecute)
+        .with_l1_batch_env(l1_batch)
+        .with_random_rich_accounts(1)
+        .build();
+
+    let l1_tx = get_l1_noop();
+    vm.vm.push_transaction(l1_tx.clone());
+    let res = vm.vm.execute(VmExecutionMode::OneTx);
+    assert!(!res.result.is_failed());
+
+    let mut current_l2_block = vm.vm.batch_env.first_l2_block;
+
+    if let Some(timestamp) = override_timestamp {
+        current_l2_block.timestamp = timestamp;
+    }
+    if let Some(prev_block_hash) = override_prev_block_hash {
+        current_l2_block.prev_block_hash = prev_block_hash;
+    }
+
+    if (None, None) == (override_timestamp, override_prev_block_hash) {
+        current_l2_block.max_virtual_blocks_to_create = 0;
+    }
+
+    vm.vm.push_transaction(l1_tx);
+    let timestamp = Timestamp(vm.vm.state.local_state.timestamp);
+    set_manual_l2_block_info(&mut vm.vm, 1, current_l2_block, timestamp);
+
+    let result = vm.vm.execute(VmExecutionMode::OneTx);
+
+    if let Some(err) = expected_error {
+        assert_eq!(result.result, ExecutionResult::Halt { reason: err });
+    } else {
+        assert_eq!(result.result, ExecutionResult::Success { output: vec![] });
+    }
+}
+
+#[test]
+fn test_l2_block_same_l2_block() {
+    // This test aims to test the case when there are multiple transactions inside the same L2 block.
+
+    // Case 1: Incorrect timestamp
+    test_same_l2_block(
+        Some(Halt::FailedToSetL2Block(
+            "The timestamp of the same L2 block must be same".to_string(),
+        )),
+        Some(0),
+        None,
+    );
+
+    // Case 2: Incorrect previous block hash
+    test_same_l2_block(
+        Some(Halt::FailedToSetL2Block(
+            "The previous hash of the same L2 block must be same".to_string(),
+        )),
+        None,
+        Some(H256::zero()),
+    );
+
+    // Case 3: Correct continuation of the same L2 block
+    test_same_l2_block(None, None, None);
+}
+
+fn test_new_l2_block(
+    first_l2_block: L2BlockEnv,
+    overriden_second_block_number: Option<u32>,
+    overriden_second_block_timestamp: Option<u64>,
+    overriden_second_block_prev_block_hash: Option<H256>,
+    expected_error: Option<Halt>,
+) {
+    let mut l1_batch = default_l1_batch(L1BatchNumber(1));
+    l1_batch.timestamp = 1;
+    l1_batch.first_l2_block = first_l2_block;
+
+    let mut vm = VmTesterBuilder::new(HistoryEnabled)
+        .with_empty_in_memory_storage()
+        .with_l1_batch_env(l1_batch)
+        .with_execution_mode(TxExecutionMode::VerifyExecute)
+        .with_random_rich_accounts(1)
+        .build();
+
+    let l1_tx = get_l1_noop();
+
+    // Firstly we execute the first transaction
+    vm.vm.push_transaction(l1_tx.clone());
+    vm.vm.execute(VmExecutionMode::OneTx);
+
+    let mut second_l2_block = vm.vm.batch_env.first_l2_block;
+    second_l2_block.number += 1;
+    second_l2_block.timestamp += 1;
+    second_l2_block.prev_block_hash = vm.vm.bootloader_state.last_l2_block().get_hash();
+
+    if let Some(block_number) = overriden_second_block_number {
+        second_l2_block.number = block_number;
+    }
+    if let Some(timestamp) = overriden_second_block_timestamp {
+        second_l2_block.timestamp = timestamp;
+    }
+    if let Some(prev_block_hash) = overriden_second_block_prev_block_hash {
+        second_l2_block.prev_block_hash = prev_block_hash;
+    }
+
+    vm.vm.bootloader_state.push_l2_block(second_l2_block);
+
+    vm.vm.push_transaction(l1_tx);
+
+    let result = vm.vm.execute(VmExecutionMode::OneTx);
+    if let Some(err) = expected_error {
+        assert_eq!(result.result, ExecutionResult::Halt { reason: err });
+    } else {
+        assert_eq!(result.result, ExecutionResult::Success { output: vec![] });
+    }
+}
+
+#[test]
+fn test_l2_block_new_l2_block() {
+    // This test is aimed to cover potential issue
+
+    let correct_first_block = L2BlockEnv {
+        number: 1,
+        timestamp: 1,
+        prev_block_hash: legacy_miniblock_hash(MiniblockNumber(0)),
+        max_virtual_blocks_to_create: 1,
+    };
+
+    // Case 1: Block number increasing by more than 1
+    test_new_l2_block(
+        correct_first_block,
+        Some(3),
+        None,
+        None,
+        Some(Halt::FailedToSetL2Block(
+            "Invalid new L2 block number".to_string(),
+        )),
+    );
+
+    // Case 2: Timestamp not increasing
+    test_new_l2_block(
+        correct_first_block,
+        None,
+        Some(1),
+        None,
+        Some(Halt::FailedToSetL2Block("The timestamp of the new L2 block must be greater than the timestamp of the previous L2 block".to_string())),
+    );
+
+    // Case 3: Incorrect previous block hash
+    test_new_l2_block(
+        correct_first_block,
+        None,
+        None,
+        Some(H256::zero()),
+        Some(Halt::FailedToSetL2Block(
+            "The current L2 block hash is incorrect".to_string(),
+        )),
+    );
+
+    // Case 4: Correct new block
+    test_new_l2_block(correct_first_block, None, None, None, None);
+}
+
+#[allow(clippy::too_many_arguments)]
+fn test_first_in_batch(
+    miniblock_timestamp: u64,
+    miniblock_number: u32,
+    pending_txs_hash: H256,
+    batch_timestamp: u64,
+    new_batch_timestamp: u64,
+    batch_number: u32,
+    proposed_block: L2BlockEnv,
+    expected_error: Option<Halt>,
+) {
+    let mut l1_batch = default_l1_batch(L1BatchNumber(1));
+    l1_batch.number += 1;
+    l1_batch.timestamp = new_batch_timestamp;
+
+    let mut vm = VmTesterBuilder::new(HistoryEnabled)
+        .with_empty_in_memory_storage()
+        .with_l1_batch_env(l1_batch)
+        .with_execution_mode(TxExecutionMode::VerifyExecute)
+        .with_random_rich_accounts(1)
+        .build();
+    let l1_tx = get_l1_noop();
+
+    // Setting the values provided.
+    let storage_ptr = vm.vm.state.storage.storage.get_ptr();
+    let miniblock_info_slot = StorageKey::new(
+        AccountTreeId::new(SYSTEM_CONTEXT_ADDRESS),
+        SYSTEM_CONTEXT_CURRENT_L2_BLOCK_INFO_POSITION,
+    );
+    let pending_txs_hash_slot = StorageKey::new(
+        AccountTreeId::new(SYSTEM_CONTEXT_ADDRESS),
+        SYSTEM_CONTEXT_CURRENT_TX_ROLLING_HASH_POSITION,
+    );
+    let batch_info_slot = StorageKey::new(
+        AccountTreeId::new(SYSTEM_CONTEXT_ADDRESS),
+        SYSTEM_CONTEXT_BLOCK_INFO_POSITION,
+    );
+    let prev_block_hash_position = get_l2_block_hash_key(miniblock_number - 1);
+
+    storage_ptr.borrow_mut().set_value(
+        miniblock_info_slot,
+        u256_to_h256(pack_block_info(
+            miniblock_number as u64,
+            miniblock_timestamp,
+        )),
+    );
+    storage_ptr
+        .borrow_mut()
+        .set_value(pending_txs_hash_slot, pending_txs_hash);
+    storage_ptr.borrow_mut().set_value(
+        batch_info_slot,
+        u256_to_h256(pack_block_info(batch_number as u64, batch_timestamp)),
+    );
+    storage_ptr.borrow_mut().set_value(
+        prev_block_hash_position,
+        legacy_miniblock_hash(MiniblockNumber(miniblock_number - 1)),
+    );
+
+    // In order to skip checks from the Rust side of the VM, we firstly use some definitely correct L2 block info.
+    // And then override it with the user-provided value
+
+    let last_l2_block = vm.vm.bootloader_state.last_l2_block();
+    let new_l2_block = L2BlockEnv {
+        number: last_l2_block.number + 1,
+        timestamp: last_l2_block.timestamp + 1,
+        prev_block_hash: last_l2_block.get_hash(),
+        max_virtual_blocks_to_create: last_l2_block.max_virtual_blocks_to_create,
+    };
+
+    vm.vm.bootloader_state.push_l2_block(new_l2_block);
+    vm.vm.push_transaction(l1_tx);
+    let timestamp = Timestamp(vm.vm.state.local_state.timestamp);
+    set_manual_l2_block_info(&mut vm.vm, 0, proposed_block, timestamp);
+
+    let result = vm.vm.execute(VmExecutionMode::OneTx);
+    if let Some(err) = expected_error {
+        assert_eq!(result.result, ExecutionResult::Halt { reason: err });
+    } else {
+        assert_eq!(result.result, ExecutionResult::Success { output: vec![] });
+    }
+}
+
+#[test]
+fn test_l2_block_first_in_batch() {
+    test_first_in_batch(
+        1,
+        1,
+        H256::zero(),
+        1,
+        2,
+        1,
+        L2BlockEnv {
+            number: 2,
+            timestamp: 2,
+            prev_block_hash: miniblock_hash(
+                MiniblockNumber(1),
+                1,
+                legacy_miniblock_hash(MiniblockNumber(0)),
+                H256::zero(),
+            ),
+            max_virtual_blocks_to_create: 1,
+        },
+        None,
+    );
+
+    test_first_in_batch(
+        8,
+        1,
+        H256::zero(),
+        5,
+        12,
+        1,
+        L2BlockEnv {
+            number: 2,
+            timestamp: 9,
+            prev_block_hash: miniblock_hash(MiniblockNumber(1), 8, legacy_miniblock_hash(MiniblockNumber(0)), H256::zero()),
+            max_virtual_blocks_to_create: 1
+        },
+        Some(Halt::FailedToSetL2Block("The timestamp of the L2 block must be greater than or equal to the timestamp of the current batch".to_string())),
+    );
+}
+
+#[test]
+fn test_l2_block_upgrade() {
+    let mut vm = VmTesterBuilder::new(HistoryEnabled)
+        .with_empty_in_memory_storage()
+        .with_execution_mode(TxExecutionMode::VerifyExecute)
+        .with_random_rich_accounts(1)
+        .build();
+
+    vm.vm
+        .state
+        .storage
+        .storage
+        .get_ptr()
+        .borrow_mut()
+        .set_value(get_code_key(&SYSTEM_CONTEXT_ADDRESS), H256::default());
+
+    let l1_tx = get_l1_noop();
+    // Firstly we execute the first transaction
+    vm.vm.push_transaction(l1_tx);
+    let result = vm.vm.execute(VmExecutionMode::OneTx);
+    assert!(!result.result.is_failed(), "No revert reason expected");
+    let result = vm.vm.execute(VmExecutionMode::Batch);
+    assert!(!result.result.is_failed(), "No revert reason expected");
+}
+
+#[test]
+fn test_l2_block_upgrade_ending() {
+    let mut l1_batch = default_l1_batch(L1BatchNumber(1));
+    l1_batch.timestamp = 1;
+    let mut vm = VmTesterBuilder::new(HistoryEnabled)
+        .with_empty_in_memory_storage()
+        .with_execution_mode(TxExecutionMode::VerifyExecute)
+        .with_l1_batch_env(l1_batch.clone())
+        .with_random_rich_accounts(1)
+        .build();
+
+    let l1_tx = get_l1_noop();
+
+    let storage = vm.storage.clone();
+
+    storage
+        .borrow_mut()
+        .set_value(get_code_key(&SYSTEM_CONTEXT_ADDRESS), H256::default());
+
+    vm.vm.push_transaction(l1_tx.clone());
+    let result = vm.vm.execute(VmExecutionMode::OneTx);
+
+    assert!(!result.result.is_failed(), "No revert reason expected");
+
+    let virtual_block_info = storage.borrow_mut().read_value(&StorageKey::new(
+        AccountTreeId::new(SYSTEM_CONTEXT_ADDRESS),
+        CURRENT_VIRTUAL_BLOCK_INFO_POSITION,
+    ));
+
+    let (virtual_block_number, virtual_block_timestamp) =
+        unpack_block_info(h256_to_u256(virtual_block_info));
+
+    assert_eq!(virtual_block_number as u32, l1_batch.first_l2_block.number);
+    assert_eq!(virtual_block_timestamp, l1_batch.first_l2_block.timestamp);
+    vm.vm.push_transaction(l1_tx);
+    let result = vm.vm.execute(VmExecutionMode::OneTx);
+    assert!(!result.result.is_failed(), "No revert reason expected");
+    let result = vm.vm.execute(VmExecutionMode::Batch);
+    assert!(!result.result.is_failed(), "No revert reason expected");
+}
+
+fn set_manual_l2_block_info<S: WriteStorage, H: HistoryMode>(
+    vm: &mut Vm<S, H>,
+    tx_number: usize,
+    block_info: L2BlockEnv,
+    timestamp: Timestamp,
+) {
+    let fictive_miniblock_position =
+        TX_OPERATOR_L2_BLOCK_INFO_OFFSET + TX_OPERATOR_SLOTS_PER_L2_BLOCK_INFO * tx_number;
+
+    vm.state.memory.populate_page(
+        BOOTLOADER_HEAP_PAGE as usize,
+        vec![
+            (fictive_miniblock_position, block_info.number.into()),
+            (fictive_miniblock_position + 1, block_info.timestamp.into()),
+            (
+                fictive_miniblock_position + 2,
+                h256_to_u256(block_info.prev_block_hash),
+            ),
+            (
+                fictive_miniblock_position + 3,
+                block_info.max_virtual_blocks_to_create.into(),
+            ),
+        ],
+        timestamp,
+    )
+}
diff --git a/core/lib/multivm/src/versions/vm_refunds_enhancement/tests/mod.rs b/core/lib/multivm/src/versions/vm_refunds_enhancement/tests/mod.rs
new file mode 100644
index 000000000000..ffb38dd3725a
--- /dev/null
+++ b/core/lib/multivm/src/versions/vm_refunds_enhancement/tests/mod.rs
@@ -0,0 +1,20 @@
+mod bootloader;
+mod default_aa;
+// TODO - fix this test
+// mod invalid_bytecode;
+mod bytecode_publishing;
+mod call_tracer;
+mod gas_limit;
+mod get_used_contracts;
+mod is_write_initial;
+mod l1_tx_execution;
+mod l2_blocks;
+mod nonce_holder;
+mod refunds;
+mod require_eip712;
+mod rollbacks;
+mod simple_execution;
+mod tester;
+mod tracing_execution_error;
+mod upgrade;
+mod utils;
diff --git a/core/lib/multivm/src/versions/vm_refunds_enhancement/tests/nonce_holder.rs b/core/lib/multivm/src/versions/vm_refunds_enhancement/tests/nonce_holder.rs
new file mode 100644
index 000000000000..219594619065
--- /dev/null
+++ b/core/lib/multivm/src/versions/vm_refunds_enhancement/tests/nonce_holder.rs
@@ -0,0 +1,181 @@
+use zksync_types::{Execute, Nonce};
+
+use crate::interface::TxExecutionMode;
+use crate::interface::VmRevertReason;
+use crate::interface::{ExecutionResult, Halt, TxRevertReason, VmExecutionMode};
+use crate::vm_refunds_enhancement::tests::tester::{Account, VmTesterBuilder};
+use crate::vm_refunds_enhancement::tests::utils::read_nonce_holder_tester;
+use crate::vm_refunds_enhancement::types::internals::TransactionData;
+use crate::vm_refunds_enhancement::HistoryEnabled;
+
+pub enum NonceHolderTestMode {
+    SetValueUnderNonce,
+    IncreaseMinNonceBy5,
+    IncreaseMinNonceTooMuch,
+    LeaveNonceUnused,
+    IncreaseMinNonceBy1,
+    SwitchToArbitraryOrdering,
+}
+
+impl From<NonceHolderTestMode> for u8 {
+    fn from(mode: NonceHolderTestMode) -> u8 {
+        match mode {
+            NonceHolderTestMode::SetValueUnderNonce => 0,
+            NonceHolderTestMode::IncreaseMinNonceBy5 => 1,
+            NonceHolderTestMode::IncreaseMinNonceTooMuch => 2,
+            NonceHolderTestMode::LeaveNonceUnused => 3,
+            NonceHolderTestMode::IncreaseMinNonceBy1 => 4,
+            NonceHolderTestMode::SwitchToArbitraryOrdering => 5,
+        }
+    }
+}
+
+#[test]
+fn test_nonce_holder() {
+    let mut account = Account::random();
+
+    let mut vm = VmTesterBuilder::new(HistoryEnabled)
+        .with_empty_in_memory_storage()
+        .with_execution_mode(TxExecutionMode::VerifyExecute)
+        .with_deployer()
+        .with_custom_contracts(vec![(
+            read_nonce_holder_tester().to_vec(),
+            account.address,
+            true,
+        )])
+        .with_rich_accounts(vec![account.clone()])
+        .build();
+
+    let mut run_nonce_test = |nonce: u32,
+                              test_mode: NonceHolderTestMode,
+                              error_message: Option<String>,
+                              comment: &'static str| {
+        // In this test we have to reset VM state after each test case. Because once bootloader failed during the validation of the transaction,
+        // it will fail again and again. At the same time we have to keep the same storage, because we want to keep the nonce holder contract state.
+        // The easiest way in terms of lifetimes is to reuse vm_builder to achieve it.
+        vm.reset_state(true);
+        let mut transaction_data: TransactionData = account
+            .get_l2_tx_for_execute_with_nonce(
+                Execute {
+                    contract_address: account.address,
+                    calldata: vec![12],
+                    value: Default::default(),
+                    factory_deps: None,
+                },
+                None,
+                Nonce(nonce),
+            )
+            .into();
+
+        transaction_data.signature = vec![test_mode.into()];
+        vm.vm.push_raw_transaction(transaction_data, 0, 0, true);
+        let result = vm.vm.execute(VmExecutionMode::OneTx);
+
+        if let Some(msg) = error_message {
+            let expected_error =
+                TxRevertReason::Halt(Halt::ValidationFailed(VmRevertReason::General {
+                    msg,
+                    data: vec![],
+                }));
+            let ExecutionResult::Halt { reason } = result.result else {
+                panic!("Expected revert, got {:?}", result.result);
+            };
+            assert_eq!(
+                reason.to_string(),
+                expected_error.to_string(),
+                "{}",
+                comment
+            );
+        } else {
+            assert!(!result.result.is_failed(), "{}", comment);
+        }
+    };
+    // Test 1: trying to set value under non sequential nonce value.
+    run_nonce_test(
+        1u32,
+        NonceHolderTestMode::SetValueUnderNonce,
+        Some("Previous nonce has not been used".to_string()),
+        "Allowed to set value under non sequential value",
+    );
+
+    // Test 2: increase min nonce by 1 with sequential nonce ordering:
+    run_nonce_test(
+        0u32,
+        NonceHolderTestMode::IncreaseMinNonceBy1,
+        None,
+        "Failed to increment nonce by 1 for sequential account",
+    );
+
+    // Test 3: correctly set value under nonce with sequential nonce ordering:
+    run_nonce_test(
+        1u32,
+        NonceHolderTestMode::SetValueUnderNonce,
+        None,
+        "Failed to set value under nonce sequential value",
+    );
+
+    // Test 5: migrate to the arbitrary nonce ordering:
+    run_nonce_test(
+        2u32,
+        NonceHolderTestMode::SwitchToArbitraryOrdering,
+        None,
+        "Failed to switch to arbitrary ordering",
+    );
+
+    // Test 6: increase min nonce by 5
+    run_nonce_test(
+        6u32,
+        NonceHolderTestMode::IncreaseMinNonceBy5,
+        None,
+        "Failed to increase min nonce by 5",
+    );
+
+    // Test 7: since the nonces in range [6,10] are no longer allowed, the
+    // tx with nonce 10 should not be allowed
+    run_nonce_test(
+        10u32,
+        NonceHolderTestMode::IncreaseMinNonceBy5,
+        Some("Reusing the same nonce twice".to_string()),
+        "Allowed to reuse nonce below the minimal one",
+    );
+
+    // Test 8: we should be able to use nonce 13
+    run_nonce_test(
+        13u32,
+        NonceHolderTestMode::SetValueUnderNonce,
+        None,
+        "Did not allow to use unused nonce 10",
+    );
+
+    // Test 9: we should not be able to reuse nonce 13
+    run_nonce_test(
+        13u32,
+        NonceHolderTestMode::IncreaseMinNonceBy5,
+        Some("Reusing the same nonce twice".to_string()),
+        "Allowed to reuse the same nonce twice",
+    );
+
+    // Test 10: we should be able to simply use nonce 14, while bumping the minimal nonce by 5
+    run_nonce_test(
+        14u32,
+        NonceHolderTestMode::IncreaseMinNonceBy5,
+        None,
+        "Did not allow to use a bumped nonce",
+    );
+
+    // Test 11: Do not allow bumping nonce by too much
+    run_nonce_test(
+        16u32,
+        NonceHolderTestMode::IncreaseMinNonceTooMuch,
+        Some("The value for incrementing the nonce is too high".to_string()),
+        "Allowed for incrementing min nonce too much",
+    );
+
+    // Test 12: Do not allow not setting a nonce as used
+    run_nonce_test(
+        16u32,
+        NonceHolderTestMode::LeaveNonceUnused,
+        Some("The nonce was not set as used".to_string()),
+        "Allowed to leave nonce as unused",
+    );
+}
diff --git a/core/lib/multivm/src/versions/vm_refunds_enhancement/tests/refunds.rs b/core/lib/multivm/src/versions/vm_refunds_enhancement/tests/refunds.rs
new file mode 100644
index 000000000000..54c281a99398
--- /dev/null
+++ b/core/lib/multivm/src/versions/vm_refunds_enhancement/tests/refunds.rs
@@ -0,0 +1,172 @@
+use crate::interface::{TxExecutionMode, VmExecutionMode};
+use crate::vm_refunds_enhancement::tests::tester::{DeployContractsTx, TxType, VmTesterBuilder};
+use crate::vm_refunds_enhancement::tests::utils::read_test_contract;
+
+use crate::vm_refunds_enhancement::types::internals::TransactionData;
+use crate::vm_refunds_enhancement::HistoryEnabled;
+
+#[test]
+fn test_predetermined_refunded_gas() {
+    // In this test, we compare the execution of the bootloader with the predefined
+    // refunded gas and without them
+
+    let mut vm = VmTesterBuilder::new(HistoryEnabled)
+        .with_empty_in_memory_storage()
+        .with_execution_mode(TxExecutionMode::VerifyExecute)
+        .with_random_rich_accounts(1)
+        .build();
+    let l1_batch = vm.vm.batch_env.clone();
+
+    let counter = read_test_contract();
+    let account = &mut vm.rich_accounts[0];
+
+    let DeployContractsTx {
+        tx,
+        bytecode_hash: _,
+        address: _,
+    } = account.get_deploy_tx(&counter, None, TxType::L2);
+    vm.vm.push_transaction(tx.clone());
+    let result = vm.vm.execute(VmExecutionMode::OneTx);
+
+    assert!(!result.result.is_failed());
+
+    // If the refund provided by the operator or the final refund are the 0
+    // there is no impact of the operator's refund at all and so this test does not
+    // make much sense.
+    assert!(
+        result.refunds.operator_suggested_refund > 0,
+        "The operator's refund is 0"
+    );
+    assert!(result.refunds.gas_refunded > 0, "The final refund is 0");
+
+    let result_without_predefined_refunds = vm.vm.execute(VmExecutionMode::Batch);
+    let mut current_state_without_predefined_refunds = vm.vm.get_current_execution_state();
+    assert!(!result_without_predefined_refunds.result.is_failed(),);
+
+    // Here we want to provide the same refund from the operator and check that it's the correct one.
+    // We execute the whole block without refund tracer, because refund tracer will eventually override the provided refund.
+    // But the overall result should be the same
+
+    let mut vm = VmTesterBuilder::new(HistoryEnabled)
+        .with_empty_in_memory_storage()
+        .with_l1_batch_env(l1_batch.clone())
+        .with_execution_mode(TxExecutionMode::VerifyExecute)
+        .with_rich_accounts(vec![account.clone()])
+        .build();
+
+    let tx: TransactionData = tx.into();
+    let block_gas_per_pubdata_byte = vm.vm.batch_env.block_gas_price_per_pubdata();
+    // Overhead
+    let overhead = tx.overhead_gas(block_gas_per_pubdata_byte as u32);
+    vm.vm
+        .push_raw_transaction(tx.clone(), overhead, result.refunds.gas_refunded, true);
+
+    let result_with_predefined_refunds = vm.vm.execute(VmExecutionMode::Batch);
+    let mut current_state_with_predefined_refunds = vm.vm.get_current_execution_state();
+
+    assert!(!result_with_predefined_refunds.result.is_failed());
+
+    // We need to sort these lists as those are flattened from HashMaps
+    current_state_with_predefined_refunds
+        .used_contract_hashes
+        .sort();
+    current_state_without_predefined_refunds
+        .used_contract_hashes
+        .sort();
+
+    assert_eq!(
+        current_state_with_predefined_refunds.events,
+        current_state_without_predefined_refunds.events
+    );
+
+    assert_eq!(
+        current_state_with_predefined_refunds.user_l2_to_l1_logs,
+        current_state_without_predefined_refunds.user_l2_to_l1_logs
+    );
+
+    assert_eq!(
+        current_state_with_predefined_refunds.system_logs,
+        current_state_without_predefined_refunds.system_logs
+    );
+
+    assert_eq!(
+        current_state_with_predefined_refunds.deduplicated_events_logs,
+        current_state_without_predefined_refunds.deduplicated_events_logs
+    );
+
+    assert_eq!(
+        current_state_with_predefined_refunds.storage_log_queries,
+        current_state_without_predefined_refunds.storage_log_queries
+    );
+    assert_eq!(
+        current_state_with_predefined_refunds.used_contract_hashes,
+        current_state_without_predefined_refunds.used_contract_hashes
+    );
+
+    // In this test we put the different refund from the operator.
+    // We still can't use the refund tracer, because it will override the refund.
+    // But we can check that the logs and events have changed.
+    let mut vm = VmTesterBuilder::new(HistoryEnabled)
+        .with_empty_in_memory_storage()
+        .with_l1_batch_env(l1_batch)
+        .with_execution_mode(TxExecutionMode::VerifyExecute)
+        .with_rich_accounts(vec![account.clone()])
+        .build();
+
+    let changed_operator_suggested_refund = result.refunds.gas_refunded + 1000;
+    vm.vm
+        .push_raw_transaction(tx, overhead, changed_operator_suggested_refund, true);
+    let result = vm.vm.execute(VmExecutionMode::Batch);
+    let mut current_state_with_changed_predefined_refunds = vm.vm.get_current_execution_state();
+
+    assert!(!result.result.is_failed());
+    current_state_with_changed_predefined_refunds
+        .used_contract_hashes
+        .sort();
+    current_state_without_predefined_refunds
+        .used_contract_hashes
+        .sort();
+
+    assert_eq!(
+        current_state_with_changed_predefined_refunds.events.len(),
+        current_state_without_predefined_refunds.events.len()
+    );
+
+    assert_ne!(
+        current_state_with_changed_predefined_refunds.events,
+        current_state_without_predefined_refunds.events
+    );
+
+    assert_eq!(
+        current_state_with_changed_predefined_refunds.user_l2_to_l1_logs,
+        current_state_without_predefined_refunds.user_l2_to_l1_logs
+    );
+
+    assert_eq!(
+        current_state_with_changed_predefined_refunds.system_logs,
+        current_state_without_predefined_refunds.system_logs
+    );
+
+    assert_eq!(
+        current_state_with_changed_predefined_refunds.deduplicated_events_logs,
+        current_state_without_predefined_refunds.deduplicated_events_logs
+    );
+
+    assert_eq!(
+        current_state_with_changed_predefined_refunds
+            .storage_log_queries
+            .len(),
+        current_state_without_predefined_refunds
+            .storage_log_queries
+            .len()
+    );
+
+    assert_ne!(
+        current_state_with_changed_predefined_refunds.storage_log_queries,
+        current_state_without_predefined_refunds.storage_log_queries
+    );
+    assert_eq!(
+        current_state_with_changed_predefined_refunds.used_contract_hashes,
+        current_state_without_predefined_refunds.used_contract_hashes
+    );
+}
diff --git a/core/lib/multivm/src/versions/vm_refunds_enhancement/tests/require_eip712.rs b/core/lib/multivm/src/versions/vm_refunds_enhancement/tests/require_eip712.rs
new file mode 100644
index 000000000000..253a3463c532
--- /dev/null
+++ b/core/lib/multivm/src/versions/vm_refunds_enhancement/tests/require_eip712.rs
@@ -0,0 +1,163 @@
+use std::convert::TryInto;
+
+use ethabi::Token;
+
+use zksync_eth_signer::raw_ethereum_tx::TransactionParameters;
+use zksync_eth_signer::EthereumSigner;
+use zksync_system_constants::L2_ETH_TOKEN_ADDRESS;
+use zksync_types::fee::Fee;
+use zksync_types::l2::L2Tx;
+use zksync_types::transaction_request::TransactionRequest;
+use zksync_types::utils::storage_key_for_standard_token_balance;
+use zksync_types::{
+    AccountTreeId, Address, Eip712Domain, Execute, L2ChainId, Nonce, Transaction, U256,
+};
+
+use crate::interface::{TxExecutionMode, VmExecutionMode};
+use crate::vm_refunds_enhancement::tests::tester::{Account, VmTester, VmTesterBuilder};
+use crate::vm_refunds_enhancement::tests::utils::read_many_owners_custom_account_contract;
+use crate::vm_refunds_enhancement::HistoryDisabled;
+
+impl VmTester<HistoryDisabled> {
+    pub(crate) fn get_eth_balance(&mut self, address: Address) -> U256 {
+        let key = storage_key_for_standard_token_balance(
+            AccountTreeId::new(L2_ETH_TOKEN_ADDRESS),
+            &address,
+        );
+        self.vm.state.storage.storage.read_from_storage(&key)
+    }
+}
+
+// TODO refactor this test it use too much internal details of the VM
+#[tokio::test]
+/// This test deploys 'buggy' account abstraction code, and then tries accessing it both with legacy
+/// and EIP712 transactions.
+/// Currently we support both, but in the future, we should allow only EIP712 transactions to access the AA accounts.
+async fn test_require_eip712() {
+    // Use 3 accounts:
+    // - private_address - EOA account, where we have the key
+    // - account_address - AA account, where the contract is deployed
+    // - beneficiary - an EOA account, where we'll try to transfer the tokens.
+    let account_abstraction = Account::random();
+    let mut private_account = Account::random();
+    let beneficiary = Account::random();
+
+    let (bytecode, contract) = read_many_owners_custom_account_contract();
+    let mut vm = VmTesterBuilder::new(HistoryDisabled)
+        .with_empty_in_memory_storage()
+        .with_custom_contracts(vec![(bytecode, account_abstraction.address, true)])
+        .with_execution_mode(TxExecutionMode::VerifyExecute)
+        .with_rich_accounts(vec![account_abstraction.clone(), private_account.clone()])
+        .build();
+
+    assert_eq!(vm.get_eth_balance(beneficiary.address), U256::from(0));
+
+    let chain_id: u32 = 270;
+
+    // First, let's set the owners of the AA account to the private_address.
+    // (so that messages signed by private_address, are authorized to act on behalf of the AA account).
+    let set_owners_function = contract.function("setOwners").unwrap();
+    let encoded_input = set_owners_function
+        .encode_input(&[Token::Array(vec![Token::Address(private_account.address)])])
+        .unwrap();
+
+    let tx = private_account.get_l2_tx_for_execute(
+        Execute {
+            contract_address: account_abstraction.address,
+            calldata: encoded_input,
+            value: Default::default(),
+            factory_deps: None,
+        },
+        None,
+    );
+
+    vm.vm.push_transaction(tx);
+    let result = vm.vm.execute(VmExecutionMode::OneTx);
+    assert!(!result.result.is_failed());
+
+    let private_account_balance = vm.get_eth_balance(private_account.address);
+
+    // And now let's do the transfer from the 'account abstraction' to 'beneficiary' (using 'legacy' transaction).
+    // Normally this would not work - unless the operator is malicious.
+    let aa_raw_tx = TransactionParameters {
+        nonce: U256::from(0),
+        to: Some(beneficiary.address),
+        gas: U256::from(100000000),
+        gas_price: Some(U256::from(10000000)),
+        value: U256::from(888000088),
+        data: vec![],
+        chain_id: 270,
+        transaction_type: None,
+        access_list: None,
+        max_fee_per_gas: U256::from(1000000000),
+        max_priority_fee_per_gas: U256::from(1000000000),
+    };
+
+    let aa_tx = private_account.sign_legacy_tx(aa_raw_tx).await;
+    let (tx_request, hash) = TransactionRequest::from_bytes(&aa_tx, L2ChainId::from(270)).unwrap();
+
+    let mut l2_tx: L2Tx = L2Tx::from_request(tx_request, 10000).unwrap();
+    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();
+
+    vm.vm.push_transaction(transaction);
+    let result = vm.vm.execute(VmExecutionMode::OneTx);
+    assert!(!result.result.is_failed());
+    assert_eq!(
+        vm.get_eth_balance(beneficiary.address),
+        U256::from(888000088)
+    );
+    // Make sure that the tokens were transfered from the AA account.
+    assert_eq!(
+        private_account_balance,
+        vm.get_eth_balance(private_account.address)
+    );
+
+    // // Now send the 'classic' EIP712 transaction
+    let tx_712 = L2Tx::new(
+        beneficiary.address,
+        vec![],
+        Nonce(1),
+        Fee {
+            gas_limit: U256::from(1000000000),
+            max_fee_per_gas: U256::from(1000000000),
+            max_priority_fee_per_gas: U256::from(1000000000),
+            gas_per_pubdata_limit: U256::from(1000000000),
+        },
+        account_abstraction.address,
+        U256::from(28374938),
+        None,
+        Default::default(),
+    );
+
+    let transaction_request: TransactionRequest = tx_712.into();
+
+    let domain = Eip712Domain::new(L2ChainId::from(chain_id));
+    let signature = private_account
+        .get_pk_signer()
+        .sign_typed_data(&domain, &transaction_request)
+        .await
+        .unwrap();
+    let encoded_tx = transaction_request.get_signed_bytes(&signature, L2ChainId::from(chain_id));
+
+    let (aa_txn_request, aa_hash) =
+        TransactionRequest::from_bytes(&encoded_tx, L2ChainId::from(chain_id)).unwrap();
+
+    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();
+    vm.vm.push_transaction(transaction);
+    vm.vm.execute(VmExecutionMode::OneTx);
+
+    assert_eq!(
+        vm.get_eth_balance(beneficiary.address),
+        U256::from(916375026)
+    );
+    assert_eq!(
+        private_account_balance,
+        vm.get_eth_balance(private_account.address)
+    );
+}
diff --git a/core/lib/multivm/src/versions/vm_refunds_enhancement/tests/rollbacks.rs b/core/lib/multivm/src/versions/vm_refunds_enhancement/tests/rollbacks.rs
new file mode 100644
index 000000000000..84c5a61c10df
--- /dev/null
+++ b/core/lib/multivm/src/versions/vm_refunds_enhancement/tests/rollbacks.rs
@@ -0,0 +1,259 @@
+use ethabi::Token;
+
+use zksync_contracts::get_loadnext_contract;
+use zksync_contracts::test_contracts::LoadnextContractExecutionParams;
+
+use zksync_state::WriteStorage;
+use zksync_types::{get_nonce_key, Execute, U256};
+
+use crate::interface::{TxExecutionMode, VmExecutionMode};
+use crate::vm_refunds_enhancement::tests::tester::{
+    DeployContractsTx, TransactionTestInfo, TxModifier, TxType, VmTesterBuilder,
+};
+use crate::vm_refunds_enhancement::tests::utils::read_test_contract;
+use crate::vm_refunds_enhancement::types::internals::ZkSyncVmState;
+use crate::vm_refunds_enhancement::{
+    BootloaderState, DynTracer, HistoryEnabled, HistoryMode, TracerExecutionStatus,
+    TracerExecutionStopReason, VmTracer,
+};
+
+#[test]
+fn test_vm_rollbacks() {
+    let mut vm = VmTesterBuilder::new(HistoryEnabled)
+        .with_empty_in_memory_storage()
+        .with_execution_mode(TxExecutionMode::VerifyExecute)
+        .with_random_rich_accounts(1)
+        .build();
+
+    let mut account = vm.rich_accounts[0].clone();
+    let counter = read_test_contract();
+    let tx_0 = account.get_deploy_tx(&counter, None, TxType::L2).tx;
+    let tx_1 = account.get_deploy_tx(&counter, None, TxType::L2).tx;
+    let tx_2 = account.get_deploy_tx(&counter, None, TxType::L2).tx;
+
+    let result_without_rollbacks = vm.execute_and_verify_txs(&vec![
+        TransactionTestInfo::new_processed(tx_0.clone(), false),
+        TransactionTestInfo::new_processed(tx_1.clone(), false),
+        TransactionTestInfo::new_processed(tx_2.clone(), false),
+    ]);
+
+    // reset vm
+    vm.reset_with_empty_storage();
+
+    let result_with_rollbacks = vm.execute_and_verify_txs(&vec![
+        TransactionTestInfo::new_rejected(tx_0.clone(), TxModifier::WrongSignatureLength.into()),
+        TransactionTestInfo::new_rejected(tx_0.clone(), TxModifier::WrongMagicValue.into()),
+        TransactionTestInfo::new_rejected(tx_0.clone(), TxModifier::WrongSignature.into()),
+        // The correct nonce is 0, this tx will fail
+        TransactionTestInfo::new_rejected(tx_2.clone(), TxModifier::WrongNonce.into()),
+        // This tx will succeed
+        TransactionTestInfo::new_processed(tx_0.clone(), false),
+        // The correct nonce is 1, this tx will fail
+        TransactionTestInfo::new_rejected(tx_0.clone(), TxModifier::NonceReused.into()),
+        // The correct nonce is 1, this tx will fail
+        TransactionTestInfo::new_rejected(tx_2.clone(), TxModifier::WrongNonce.into()),
+        // This tx will succeed
+        TransactionTestInfo::new_processed(tx_1, false),
+        // The correct nonce is 2, this tx will fail
+        TransactionTestInfo::new_rejected(tx_0.clone(), TxModifier::NonceReused.into()),
+        // This tx will succeed
+        TransactionTestInfo::new_processed(tx_2.clone(), false),
+        // This tx will fail
+        TransactionTestInfo::new_rejected(tx_2, TxModifier::NonceReused.into()),
+        TransactionTestInfo::new_rejected(tx_0, TxModifier::NonceReused.into()),
+    ]);
+
+    assert_eq!(result_without_rollbacks, result_with_rollbacks);
+}
+
+#[test]
+fn test_vm_loadnext_rollbacks() {
+    let mut vm = VmTesterBuilder::new(HistoryEnabled)
+        .with_empty_in_memory_storage()
+        .with_execution_mode(TxExecutionMode::VerifyExecute)
+        .with_random_rich_accounts(1)
+        .build();
+    let mut account = vm.rich_accounts[0].clone();
+
+    let loadnext_contract = get_loadnext_contract();
+    let loadnext_constructor_data = &[Token::Uint(U256::from(100))];
+    let DeployContractsTx {
+        tx: loadnext_deploy_tx,
+        address,
+        ..
+    } = account.get_deploy_tx_with_factory_deps(
+        &loadnext_contract.bytecode,
+        Some(loadnext_constructor_data),
+        loadnext_contract.factory_deps.clone(),
+        TxType::L2,
+    );
+
+    let loadnext_tx_1 = account.get_l2_tx_for_execute(
+        Execute {
+            contract_address: address,
+            calldata: LoadnextContractExecutionParams {
+                reads: 100,
+                writes: 100,
+                events: 100,
+                hashes: 500,
+                recursive_calls: 10,
+                deploys: 60,
+            }
+            .to_bytes(),
+            value: Default::default(),
+            factory_deps: None,
+        },
+        None,
+    );
+
+    let loadnext_tx_2 = account.get_l2_tx_for_execute(
+        Execute {
+            contract_address: address,
+            calldata: LoadnextContractExecutionParams {
+                reads: 100,
+                writes: 100,
+                events: 100,
+                hashes: 500,
+                recursive_calls: 10,
+                deploys: 60,
+            }
+            .to_bytes(),
+            value: Default::default(),
+            factory_deps: None,
+        },
+        None,
+    );
+
+    let result_without_rollbacks = vm.execute_and_verify_txs(&vec![
+        TransactionTestInfo::new_processed(loadnext_deploy_tx.clone(), false),
+        TransactionTestInfo::new_processed(loadnext_tx_1.clone(), false),
+        TransactionTestInfo::new_processed(loadnext_tx_2.clone(), false),
+    ]);
+
+    // reset vm
+    vm.reset_with_empty_storage();
+
+    let result_with_rollbacks = vm.execute_and_verify_txs(&vec![
+        TransactionTestInfo::new_processed(loadnext_deploy_tx.clone(), false),
+        TransactionTestInfo::new_processed(loadnext_tx_1.clone(), true),
+        TransactionTestInfo::new_rejected(
+            loadnext_deploy_tx.clone(),
+            TxModifier::NonceReused.into(),
+        ),
+        TransactionTestInfo::new_processed(loadnext_tx_1, false),
+        TransactionTestInfo::new_processed(loadnext_tx_2.clone(), true),
+        TransactionTestInfo::new_processed(loadnext_tx_2.clone(), true),
+        TransactionTestInfo::new_rejected(loadnext_deploy_tx, TxModifier::NonceReused.into()),
+        TransactionTestInfo::new_processed(loadnext_tx_2, false),
+    ]);
+
+    assert_eq!(result_without_rollbacks, result_with_rollbacks);
+}
+
+// Testing tracer that does not allow the recursion to go deeper than a certain limit
+struct MaxRecursionTracer {
+    max_recursion_depth: usize,
+}
+
+/// Tracer responsible for calculating the number of storage invocations and
+/// stopping the VM execution if the limit is reached.
+impl<S, H: HistoryMode> DynTracer<S, H> for MaxRecursionTracer {}
+
+impl<S: WriteStorage, H: HistoryMode> VmTracer<S, H> for MaxRecursionTracer {
+    fn finish_cycle(
+        &mut self,
+        state: &mut ZkSyncVmState<S, H>,
+        _bootloader_state: &mut BootloaderState,
+    ) -> TracerExecutionStatus {
+        let current_depth = state.local_state.callstack.depth();
+
+        if current_depth > self.max_recursion_depth {
+            TracerExecutionStatus::Stop(TracerExecutionStopReason::Finish)
+        } else {
+            TracerExecutionStatus::Continue
+        }
+    }
+}
+
+#[test]
+fn test_layered_rollback() {
+    // This test checks that the layered rollbacks work correctly, i.e.
+    // the rollback by the operator will always revert all the changes
+
+    let mut vm = VmTesterBuilder::new(HistoryEnabled)
+        .with_empty_in_memory_storage()
+        .with_execution_mode(TxExecutionMode::VerifyExecute)
+        .with_random_rich_accounts(1)
+        .build();
+
+    let account = &mut vm.rich_accounts[0];
+    let loadnext_contract = get_loadnext_contract().bytecode;
+
+    let DeployContractsTx {
+        tx: deploy_tx,
+        address,
+        ..
+    } = account.get_deploy_tx(
+        &loadnext_contract,
+        Some(&[Token::Uint(0.into())]),
+        TxType::L2,
+    );
+    vm.vm.push_transaction(deploy_tx);
+    let deployment_res = vm.vm.execute(VmExecutionMode::OneTx);
+    assert!(!deployment_res.result.is_failed(), "transaction failed");
+
+    let loadnext_transaction = account.get_loadnext_transaction(
+        address,
+        LoadnextContractExecutionParams {
+            writes: 1,
+            recursive_calls: 20,
+            ..LoadnextContractExecutionParams::empty()
+        },
+        TxType::L2,
+    );
+
+    let nonce_val = vm
+        .vm
+        .state
+        .storage
+        .storage
+        .read_from_storage(&get_nonce_key(&account.address));
+
+    vm.vm.make_snapshot();
+
+    vm.vm.push_transaction(loadnext_transaction.clone());
+    vm.vm.inspect(
+        vec![Box::new(MaxRecursionTracer {
+            max_recursion_depth: 15,
+        })],
+        VmExecutionMode::OneTx,
+    );
+
+    let nonce_val2 = vm
+        .vm
+        .state
+        .storage
+        .storage
+        .read_from_storage(&get_nonce_key(&account.address));
+
+    // The tracer stopped after the validation has passed, so nonce has already been increased
+    assert_eq!(nonce_val + U256::one(), nonce_val2, "nonce did not change");
+
+    vm.vm.rollback_to_the_latest_snapshot();
+
+    let nonce_val_after_rollback = vm
+        .vm
+        .state
+        .storage
+        .storage
+        .read_from_storage(&get_nonce_key(&account.address));
+
+    assert_eq!(
+        nonce_val, nonce_val_after_rollback,
+        "nonce changed after rollback"
+    );
+
+    vm.vm.push_transaction(loadnext_transaction);
+    let result = vm.vm.inspect(vec![], VmExecutionMode::OneTx);
+    assert!(!result.result.is_failed(), "transaction must not fail");
+}
diff --git a/core/lib/multivm/src/versions/vm_refunds_enhancement/tests/simple_execution.rs b/core/lib/multivm/src/versions/vm_refunds_enhancement/tests/simple_execution.rs
new file mode 100644
index 000000000000..f85c2144de1d
--- /dev/null
+++ b/core/lib/multivm/src/versions/vm_refunds_enhancement/tests/simple_execution.rs
@@ -0,0 +1,77 @@
+use crate::interface::{ExecutionResult, VmExecutionMode};
+use crate::vm_refunds_enhancement::tests::tester::{TxType, VmTesterBuilder};
+use crate::vm_refunds_enhancement::HistoryDisabled;
+
+#[test]
+fn estimate_fee() {
+    let mut vm_tester = VmTesterBuilder::new(HistoryDisabled)
+        .with_empty_in_memory_storage()
+        .with_deployer()
+        .with_random_rich_accounts(1)
+        .build();
+
+    vm_tester.deploy_test_contract();
+    let account = &mut vm_tester.rich_accounts[0];
+
+    let tx = account.get_test_contract_transaction(
+        vm_tester.test_contract.unwrap(),
+        false,
+        Default::default(),
+        false,
+        TxType::L2,
+    );
+
+    vm_tester.vm.push_transaction(tx);
+
+    let result = vm_tester.vm.execute(VmExecutionMode::OneTx);
+    assert!(matches!(result.result, ExecutionResult::Success { .. }));
+}
+
+#[test]
+fn simple_execute() {
+    let mut vm_tester = VmTesterBuilder::new(HistoryDisabled)
+        .with_empty_in_memory_storage()
+        .with_deployer()
+        .with_random_rich_accounts(1)
+        .build();
+
+    vm_tester.deploy_test_contract();
+
+    let account = &mut vm_tester.rich_accounts[0];
+
+    let tx1 = account.get_test_contract_transaction(
+        vm_tester.test_contract.unwrap(),
+        false,
+        Default::default(),
+        false,
+        TxType::L1 { serial_id: 1 },
+    );
+
+    let tx2 = account.get_test_contract_transaction(
+        vm_tester.test_contract.unwrap(),
+        true,
+        Default::default(),
+        false,
+        TxType::L1 { serial_id: 1 },
+    );
+
+    let tx3 = account.get_test_contract_transaction(
+        vm_tester.test_contract.unwrap(),
+        false,
+        Default::default(),
+        false,
+        TxType::L1 { serial_id: 1 },
+    );
+    let vm = &mut vm_tester.vm;
+    vm.push_transaction(tx1);
+    vm.push_transaction(tx2);
+    vm.push_transaction(tx3);
+    let tx = vm.execute(VmExecutionMode::OneTx);
+    assert!(matches!(tx.result, ExecutionResult::Success { .. }));
+    let tx = vm.execute(VmExecutionMode::OneTx);
+    assert!(matches!(tx.result, ExecutionResult::Revert { .. }));
+    let tx = vm.execute(VmExecutionMode::OneTx);
+    assert!(matches!(tx.result, ExecutionResult::Success { .. }));
+    let block_tip = vm.execute(VmExecutionMode::Batch);
+    assert!(matches!(block_tip.result, ExecutionResult::Success { .. }));
+}
diff --git a/core/lib/multivm/src/versions/vm_refunds_enhancement/tests/tester/inner_state.rs b/core/lib/multivm/src/versions/vm_refunds_enhancement/tests/tester/inner_state.rs
new file mode 100644
index 000000000000..c4c6ec05bd7f
--- /dev/null
+++ b/core/lib/multivm/src/versions/vm_refunds_enhancement/tests/tester/inner_state.rs
@@ -0,0 +1,127 @@
+use std::collections::HashMap;
+
+use zk_evm_1_3_3::aux_structures::Timestamp;
+use zk_evm_1_3_3::vm_state::VmLocalState;
+use zksync_state::WriteStorage;
+
+use zksync_types::{StorageKey, StorageLogQuery, StorageValue, U256};
+
+use crate::vm_refunds_enhancement::old_vm::event_sink::InMemoryEventSink;
+use crate::vm_refunds_enhancement::old_vm::history_recorder::{
+    AppDataFrameManagerWithHistory, HistoryRecorder,
+};
+use crate::vm_refunds_enhancement::{HistoryEnabled, HistoryMode, SimpleMemory, Vm};
+
+#[derive(Clone, Debug)]
+pub(crate) struct ModifiedKeysMap(HashMap<StorageKey, StorageValue>);
+
+// We consider hashmaps to be equal even if there is a key
+// that is not present in one but has zero value in another.
+impl PartialEq for ModifiedKeysMap {
+    fn eq(&self, other: &Self) -> bool {
+        for (key, value) in self.0.iter() {
+            if *value != other.0.get(key).cloned().unwrap_or_default() {
+                return false;
+            }
+        }
+        for (key, value) in other.0.iter() {
+            if *value != self.0.get(key).cloned().unwrap_or_default() {
+                return false;
+            }
+        }
+        true
+    }
+}
+
+#[derive(Clone, PartialEq, Debug)]
+pub(crate) struct DecommitterTestInnerState<H: HistoryMode> {
+    /// There is no way to "trully" compare the storage pointer,
+    /// 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>,
+}
+
+#[derive(Clone, PartialEq, Debug)]
+pub(crate) struct StorageOracleInnerState<H: HistoryMode> {
+    /// There is no way to "trully" compare the storage pointer,
+    /// so we just compare the modified keys. This is reasonable enough.
+    pub(crate) modified_storage_keys: ModifiedKeysMap,
+
+    pub(crate) frames_stack: AppDataFrameManagerWithHistory<Box<StorageLogQuery>, H>,
+
+    pub(crate) pre_paid_changes: HistoryRecorder<HashMap<StorageKey, u32>, H>,
+    pub(crate) paid_changes: HistoryRecorder<HashMap<StorageKey, u32>, H>,
+    pub(crate) initial_values: HistoryRecorder<HashMap<StorageKey, U256>, H>,
+    pub(crate) returned_refunds: HistoryRecorder<Vec<u32>, H>,
+}
+
+#[derive(Clone, PartialEq, Debug)]
+pub(crate) struct PrecompileProcessorTestInnerState<H: HistoryMode> {
+    pub(crate) timestamp_history: HistoryRecorder<Vec<Timestamp>, H>,
+}
+
+/// A struct that encapsulates the state of the VM's oracles
+/// The state is to be used in tests.
+#[derive(Clone, PartialEq, Debug)]
+pub(crate) struct VmInstanceInnerState<H: HistoryMode> {
+    event_sink: InMemoryEventSink<H>,
+    precompile_processor_state: PrecompileProcessorTestInnerState<H>,
+    memory: SimpleMemory<H>,
+    decommitter_state: DecommitterTestInnerState<H>,
+    storage_oracle_state: StorageOracleInnerState<H>,
+    local_state: VmLocalState,
+}
+
+impl<S: WriteStorage, H: HistoryMode> Vm<S, H> {
+    // Dump inner state of the VM.
+    pub(crate) fn dump_inner_state(&self) -> VmInstanceInnerState<H> {
+        let event_sink = self.state.event_sink.clone();
+        let precompile_processor_state = PrecompileProcessorTestInnerState {
+            timestamp_history: self.state.precompiles_processor.timestamp_history.clone(),
+        };
+        let memory = self.state.memory.clone();
+        let decommitter_state = DecommitterTestInnerState {
+            modified_storage_keys: ModifiedKeysMap(
+                self.state
+                    .decommittment_processor
+                    .get_storage()
+                    .borrow()
+                    .modified_storage_keys()
+                    .clone(),
+            ),
+            known_bytecodes: self.state.decommittment_processor.known_bytecodes.clone(),
+            decommitted_code_hashes: self
+                .state
+                .decommittment_processor
+                .get_decommitted_code_hashes_with_history()
+                .clone(),
+        };
+        let storage_oracle_state = StorageOracleInnerState {
+            modified_storage_keys: ModifiedKeysMap(
+                self.state
+                    .storage
+                    .storage
+                    .get_ptr()
+                    .borrow()
+                    .modified_storage_keys()
+                    .clone(),
+            ),
+            frames_stack: self.state.storage.frames_stack.clone(),
+            pre_paid_changes: self.state.storage.pre_paid_changes.clone(),
+            paid_changes: self.state.storage.paid_changes.clone(),
+            initial_values: self.state.storage.initial_values.clone(),
+            returned_refunds: self.state.storage.returned_refunds.clone(),
+        };
+        let local_state = self.state.local_state.clone();
+
+        VmInstanceInnerState {
+            event_sink,
+            precompile_processor_state,
+            memory,
+            decommitter_state,
+            storage_oracle_state,
+            local_state,
+        }
+    }
+}
diff --git a/core/lib/multivm/src/versions/vm_refunds_enhancement/tests/tester/mod.rs b/core/lib/multivm/src/versions/vm_refunds_enhancement/tests/tester/mod.rs
new file mode 100644
index 000000000000..dfe8905a7e08
--- /dev/null
+++ b/core/lib/multivm/src/versions/vm_refunds_enhancement/tests/tester/mod.rs
@@ -0,0 +1,7 @@
+pub(crate) use transaction_test_info::{ExpectedError, TransactionTestInfo, TxModifier};
+pub(crate) use vm_tester::{default_l1_batch, InMemoryStorageView, VmTester, VmTesterBuilder};
+pub(crate) use zksync_test_account::{Account, DeployContractsTx, TxType};
+
+mod inner_state;
+mod transaction_test_info;
+mod vm_tester;
diff --git a/core/lib/multivm/src/versions/vm_refunds_enhancement/tests/tester/transaction_test_info.rs b/core/lib/multivm/src/versions/vm_refunds_enhancement/tests/tester/transaction_test_info.rs
new file mode 100644
index 000000000000..8f7ecc0a7339
--- /dev/null
+++ b/core/lib/multivm/src/versions/vm_refunds_enhancement/tests/tester/transaction_test_info.rs
@@ -0,0 +1,217 @@
+use zksync_types::{ExecuteTransactionCommon, Transaction};
+
+use crate::interface::VmRevertReason;
+use crate::interface::{
+    CurrentExecutionState, ExecutionResult, Halt, TxRevertReason, VmExecutionMode,
+    VmExecutionResultAndLogs,
+};
+use crate::vm_refunds_enhancement::tests::tester::vm_tester::VmTester;
+use crate::vm_refunds_enhancement::HistoryEnabled;
+
+#[derive(Debug, Clone)]
+pub(crate) enum TxModifier {
+    WrongSignatureLength,
+    WrongSignature,
+    WrongMagicValue,
+    WrongNonce,
+    NonceReused,
+}
+
+#[derive(Debug, Clone)]
+pub(crate) enum TxExpectedResult {
+    Rejected { error: ExpectedError },
+    Processed { rollback: bool },
+}
+
+#[derive(Debug, Clone)]
+pub(crate) struct TransactionTestInfo {
+    tx: Transaction,
+    result: TxExpectedResult,
+}
+
+#[derive(Debug, Clone)]
+pub(crate) struct ExpectedError {
+    pub(crate) revert_reason: TxRevertReason,
+    pub(crate) modifier: Option<TxModifier>,
+}
+
+impl From<TxModifier> for ExpectedError {
+    fn from(value: TxModifier) -> Self {
+        let revert_reason = match value {
+            TxModifier::WrongSignatureLength => {
+                Halt::ValidationFailed(VmRevertReason::General {
+                    msg: "Signature length is incorrect".to_string(),
+                    data: vec![
+                        8, 195, 121, 160, 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, 32, 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, 29, 83, 105, 103, 110, 97, 116, 117, 114, 101, 32,
+                        108, 101, 110, 103, 116, 104, 32, 105, 115, 32, 105, 110, 99, 111, 114, 114, 101, 99,
+                        116, 0, 0, 0,
+                    ],
+                })
+            }
+            TxModifier::WrongSignature => {
+                Halt::ValidationFailed(VmRevertReason::General {
+                    msg: "Account validation returned invalid magic value. Most often this means that the signature is incorrect".to_string(),
+                    data: vec![],
+                })
+            }
+            TxModifier::WrongMagicValue => {
+                Halt::ValidationFailed(VmRevertReason::General {
+                    msg: "v is neither 27 nor 28".to_string(),
+                    data: vec![
+                        8, 195, 121, 160, 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, 32, 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, 22, 118, 32, 105, 115, 32, 110, 101, 105, 116, 104,
+                        101, 114, 32, 50, 55, 32, 110, 111, 114, 32, 50, 56, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+                    ],
+                })
+
+            }
+            TxModifier::WrongNonce => {
+                Halt::ValidationFailed(VmRevertReason::General {
+                    msg: "Incorrect nonce".to_string(),
+                    data: vec![
+                        8, 195, 121, 160, 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, 32, 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, 15, 73, 110, 99, 111, 114, 114, 101, 99, 116, 32, 110,
+                        111, 110, 99, 101, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+                    ],
+                })
+            }
+            TxModifier::NonceReused => {
+                Halt::ValidationFailed(VmRevertReason::General {
+                    msg: "Reusing the same nonce twice".to_string(),
+                    data: vec![
+                        8, 195, 121, 160, 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, 32, 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, 28, 82, 101, 117, 115, 105, 110, 103, 32, 116, 104,
+                        101, 32, 115, 97, 109, 101, 32, 110, 111, 110, 99, 101, 32, 116, 119, 105, 99, 101, 0,
+                        0, 0, 0,
+                    ],
+                })
+            }
+        };
+
+        ExpectedError {
+            revert_reason: TxRevertReason::Halt(revert_reason),
+            modifier: Some(value),
+        }
+    }
+}
+
+impl TransactionTestInfo {
+    pub(crate) fn new_rejected(
+        mut transaction: Transaction,
+        expected_error: ExpectedError,
+    ) -> Self {
+        transaction.common_data = match transaction.common_data {
+            ExecuteTransactionCommon::L2(mut data) => {
+                if let Some(modifier) = &expected_error.modifier {
+                    match modifier {
+                        TxModifier::WrongSignatureLength => {
+                            data.signature = data.signature[..data.signature.len() - 20].to_vec()
+                        }
+                        TxModifier::WrongSignature => data.signature = vec![27u8; 65],
+                        TxModifier::WrongMagicValue => data.signature = vec![1u8; 65],
+                        TxModifier::WrongNonce => {
+                            // Do not need to modify signature for nonce error
+                        }
+                        TxModifier::NonceReused => {
+                            // Do not need to modify signature for nonce error
+                        }
+                    }
+                }
+                ExecuteTransactionCommon::L2(data)
+            }
+            _ => panic!("L1 transactions are not supported"),
+        };
+
+        Self {
+            tx: transaction,
+            result: TxExpectedResult::Rejected {
+                error: expected_error,
+            },
+        }
+    }
+
+    pub(crate) fn new_processed(transaction: Transaction, should_be_rollbacked: bool) -> Self {
+        Self {
+            tx: transaction,
+            result: TxExpectedResult::Processed {
+                rollback: should_be_rollbacked,
+            },
+        }
+    }
+
+    fn verify_result(&self, result: &VmExecutionResultAndLogs) {
+        match &self.result {
+            TxExpectedResult::Rejected { error } => match &result.result {
+                ExecutionResult::Success { .. } => {
+                    panic!("Transaction should be reverted {:?}", self.tx.nonce())
+                }
+                ExecutionResult::Revert { output } => match &error.revert_reason {
+                    TxRevertReason::TxReverted(expected) => {
+                        assert_eq!(output, expected)
+                    }
+                    _ => {
+                        panic!("Error types mismatch");
+                    }
+                },
+                ExecutionResult::Halt { reason } => match &error.revert_reason {
+                    TxRevertReason::Halt(expected) => {
+                        assert_eq!(reason, expected)
+                    }
+                    _ => {
+                        panic!("Error types mismatch");
+                    }
+                },
+            },
+            TxExpectedResult::Processed { .. } => {
+                assert!(!result.result.is_failed());
+            }
+        }
+    }
+
+    fn should_rollback(&self) -> bool {
+        match &self.result {
+            TxExpectedResult::Rejected { .. } => true,
+            TxExpectedResult::Processed { rollback } => *rollback,
+        }
+    }
+}
+
+impl VmTester<HistoryEnabled> {
+    pub(crate) fn execute_and_verify_txs(
+        &mut self,
+        txs: &[TransactionTestInfo],
+    ) -> CurrentExecutionState {
+        for tx_test_info in txs {
+            self.execute_tx_and_verify(tx_test_info.clone());
+        }
+        self.vm.execute(VmExecutionMode::Batch);
+        let mut state = self.vm.get_current_execution_state();
+        state.used_contract_hashes.sort();
+        state
+    }
+
+    pub(crate) fn execute_tx_and_verify(
+        &mut self,
+        tx_test_info: TransactionTestInfo,
+    ) -> VmExecutionResultAndLogs {
+        let inner_state_before = self.vm.dump_inner_state();
+        self.vm.make_snapshot();
+        self.vm.push_transaction(tx_test_info.tx.clone());
+        let result = self.vm.execute(VmExecutionMode::OneTx);
+        tx_test_info.verify_result(&result);
+        if tx_test_info.should_rollback() {
+            self.vm.rollback_to_the_latest_snapshot();
+            let inner_state_after = self.vm.dump_inner_state();
+            assert_eq!(
+                inner_state_before, inner_state_after,
+                "Inner state before and after rollback should be equal"
+            );
+        }
+        result
+    }
+}
diff --git a/core/lib/multivm/src/versions/vm_refunds_enhancement/tests/tester/vm_tester.rs b/core/lib/multivm/src/versions/vm_refunds_enhancement/tests/tester/vm_tester.rs
new file mode 100644
index 000000000000..9c2478a4dbe7
--- /dev/null
+++ b/core/lib/multivm/src/versions/vm_refunds_enhancement/tests/tester/vm_tester.rs
@@ -0,0 +1,300 @@
+use zksync_contracts::BaseSystemContracts;
+use zksync_state::{InMemoryStorage, StoragePtr, StorageView, WriteStorage};
+
+use zksync_types::block::legacy_miniblock_hash;
+use zksync_types::helpers::unix_timestamp_ms;
+use zksync_types::utils::{deployed_address_create, storage_key_for_eth_balance};
+use zksync_types::{
+    get_code_key, get_is_account_key, Address, L1BatchNumber, L2ChainId, MiniblockNumber, Nonce,
+    ProtocolVersionId, U256,
+};
+use zksync_utils::bytecode::hash_bytecode;
+use zksync_utils::u256_to_h256;
+
+use crate::vm_refunds_enhancement::constants::BLOCK_GAS_LIMIT;
+
+use crate::interface::{
+    L1BatchEnv, L2Block, L2BlockEnv, SystemEnv, TxExecutionMode, VmExecutionMode,
+};
+use crate::vm_refunds_enhancement::tests::tester::Account;
+use crate::vm_refunds_enhancement::tests::tester::TxType;
+use crate::vm_refunds_enhancement::tests::utils::read_test_contract;
+use crate::vm_refunds_enhancement::utils::l2_blocks::load_last_l2_block;
+use crate::vm_refunds_enhancement::{HistoryMode, Vm};
+
+pub(crate) type InMemoryStorageView = StorageView<InMemoryStorage>;
+
+pub(crate) struct VmTester<H: HistoryMode> {
+    pub(crate) vm: Vm<InMemoryStorageView, H>,
+    pub(crate) storage: StoragePtr<InMemoryStorageView>,
+    pub(crate) fee_account: Address,
+    pub(crate) deployer: Option<Account>,
+    pub(crate) test_contract: Option<Address>,
+    pub(crate) rich_accounts: Vec<Account>,
+    pub(crate) custom_contracts: Vec<ContractsToDeploy>,
+    history_mode: H,
+}
+
+impl<H: HistoryMode> VmTester<H> {
+    pub(crate) fn deploy_test_contract(&mut self) {
+        let contract = read_test_contract();
+        let tx = self
+            .deployer
+            .as_mut()
+            .expect("You have to initialize builder with deployer")
+            .get_deploy_tx(&contract, None, TxType::L2)
+            .tx;
+        let nonce = tx.nonce().unwrap().0.into();
+        self.vm.push_transaction(tx);
+        self.vm.execute(VmExecutionMode::OneTx);
+        let deployed_address =
+            deployed_address_create(self.deployer.as_ref().unwrap().address, nonce);
+        self.test_contract = Some(deployed_address);
+    }
+
+    pub(crate) fn reset_with_empty_storage(&mut self) {
+        self.storage = StorageView::new(get_empty_storage()).to_rc_ptr();
+        self.reset_state(false);
+    }
+
+    /// Reset the state of the VM to the initial state.
+    /// If `use_latest_l2_block` is true, then the VM will use the latest L2 block from storage,
+    /// otherwise it will use the first L2 block of l1 batch env
+    pub(crate) fn reset_state(&mut self, use_latest_l2_block: bool) {
+        for account in self.rich_accounts.iter_mut() {
+            account.nonce = Nonce(0);
+            make_account_rich(self.storage.clone(), account);
+        }
+        if let Some(deployer) = &self.deployer {
+            make_account_rich(self.storage.clone(), deployer);
+        }
+
+        if !self.custom_contracts.is_empty() {
+            println!("Inserting custom contracts is not yet supported")
+            // insert_contracts(&mut self.storage, &self.custom_contracts);
+        }
+
+        let mut l1_batch = self.vm.batch_env.clone();
+        if use_latest_l2_block {
+            let last_l2_block = load_last_l2_block(self.storage.clone()).unwrap_or(L2Block {
+                number: 0,
+                timestamp: 0,
+                hash: legacy_miniblock_hash(MiniblockNumber(0)),
+            });
+            l1_batch.first_l2_block = L2BlockEnv {
+                number: last_l2_block.number + 1,
+                timestamp: std::cmp::max(last_l2_block.timestamp + 1, l1_batch.timestamp),
+                prev_block_hash: last_l2_block.hash,
+                max_virtual_blocks_to_create: 1,
+            };
+        }
+
+        let vm = Vm::new(
+            l1_batch,
+            self.vm.system_env.clone(),
+            self.storage.clone(),
+            self.history_mode.clone(),
+        );
+
+        if self.test_contract.is_some() {
+            self.deploy_test_contract();
+        }
+
+        self.vm = vm;
+    }
+}
+
+pub(crate) type ContractsToDeploy = (Vec<u8>, Address, bool);
+
+pub(crate) struct VmTesterBuilder<H: HistoryMode> {
+    history_mode: H,
+    storage: Option<InMemoryStorage>,
+    l1_batch_env: Option<L1BatchEnv>,
+    system_env: SystemEnv,
+    deployer: Option<Account>,
+    rich_accounts: Vec<Account>,
+    custom_contracts: Vec<ContractsToDeploy>,
+}
+
+impl<H: HistoryMode> Clone for VmTesterBuilder<H> {
+    fn clone(&self) -> Self {
+        Self {
+            history_mode: self.history_mode.clone(),
+            storage: None,
+            l1_batch_env: self.l1_batch_env.clone(),
+            system_env: self.system_env.clone(),
+            deployer: self.deployer.clone(),
+            rich_accounts: self.rich_accounts.clone(),
+            custom_contracts: self.custom_contracts.clone(),
+        }
+    }
+}
+
+#[allow(dead_code)]
+impl<H: HistoryMode> VmTesterBuilder<H> {
+    pub(crate) fn new(history_mode: H) -> Self {
+        Self {
+            history_mode,
+            storage: None,
+            l1_batch_env: None,
+            system_env: SystemEnv {
+                zk_porter_available: false,
+                version: ProtocolVersionId::latest(),
+                base_system_smart_contracts: BaseSystemContracts::playground(),
+                gas_limit: BLOCK_GAS_LIMIT,
+                execution_mode: TxExecutionMode::VerifyExecute,
+                default_validation_computational_gas_limit: BLOCK_GAS_LIMIT,
+                chain_id: L2ChainId::from(270),
+            },
+            deployer: None,
+            rich_accounts: vec![],
+            custom_contracts: vec![],
+        }
+    }
+
+    pub(crate) fn with_l1_batch_env(mut self, l1_batch_env: L1BatchEnv) -> Self {
+        self.l1_batch_env = Some(l1_batch_env);
+        self
+    }
+
+    pub(crate) fn with_system_env(mut self, system_env: SystemEnv) -> Self {
+        self.system_env = system_env;
+        self
+    }
+
+    pub(crate) fn with_storage(mut self, storage: InMemoryStorage) -> Self {
+        self.storage = Some(storage);
+        self
+    }
+
+    pub(crate) fn with_base_system_smart_contracts(
+        mut self,
+        base_system_smart_contracts: BaseSystemContracts,
+    ) -> Self {
+        self.system_env.base_system_smart_contracts = base_system_smart_contracts;
+        self
+    }
+
+    pub(crate) fn with_gas_limit(mut self, gas_limit: u32) -> Self {
+        self.system_env.gas_limit = gas_limit;
+        self
+    }
+
+    pub(crate) fn with_execution_mode(mut self, execution_mode: TxExecutionMode) -> Self {
+        self.system_env.execution_mode = execution_mode;
+        self
+    }
+
+    pub(crate) fn with_empty_in_memory_storage(mut self) -> Self {
+        self.storage = Some(get_empty_storage());
+        self
+    }
+
+    pub(crate) fn with_random_rich_accounts(mut self, number: u32) -> Self {
+        for _ in 0..number {
+            let account = Account::random();
+            self.rich_accounts.push(account);
+        }
+        self
+    }
+
+    pub(crate) fn with_rich_accounts(mut self, accounts: Vec<Account>) -> Self {
+        self.rich_accounts.extend(accounts);
+        self
+    }
+
+    pub(crate) fn with_deployer(mut self) -> Self {
+        let deployer = Account::random();
+        self.deployer = Some(deployer);
+        self
+    }
+
+    pub(crate) fn with_custom_contracts(mut self, contracts: Vec<ContractsToDeploy>) -> Self {
+        self.custom_contracts = contracts;
+        self
+    }
+
+    pub(crate) fn build(self) -> VmTester<H> {
+        let l1_batch_env = self
+            .l1_batch_env
+            .unwrap_or_else(|| default_l1_batch(L1BatchNumber(1)));
+
+        let mut raw_storage = self.storage.unwrap_or_else(get_empty_storage);
+        insert_contracts(&mut raw_storage, &self.custom_contracts);
+        let storage_ptr = StorageView::new(raw_storage).to_rc_ptr();
+        for account in self.rich_accounts.iter() {
+            make_account_rich(storage_ptr.clone(), account);
+        }
+        if let Some(deployer) = &self.deployer {
+            make_account_rich(storage_ptr.clone(), deployer);
+        }
+        let fee_account = l1_batch_env.fee_account;
+
+        let vm = Vm::new(
+            l1_batch_env,
+            self.system_env,
+            storage_ptr.clone(),
+            self.history_mode.clone(),
+        );
+
+        VmTester {
+            vm,
+            storage: storage_ptr,
+            fee_account,
+            deployer: self.deployer,
+            test_contract: None,
+            rich_accounts: self.rich_accounts.clone(),
+            custom_contracts: self.custom_contracts.clone(),
+            history_mode: self.history_mode,
+        }
+    }
+}
+
+pub(crate) fn default_l1_batch(number: L1BatchNumber) -> L1BatchEnv {
+    let timestamp = unix_timestamp_ms();
+    L1BatchEnv {
+        previous_batch_hash: None,
+        number,
+        timestamp,
+        l1_gas_price: 50_000_000_000,   // 50 gwei
+        fair_l2_gas_price: 250_000_000, // 0.25 gwei
+        fee_account: Address::random(),
+        enforced_base_fee: None,
+        first_l2_block: L2BlockEnv {
+            number: 1,
+            timestamp,
+            prev_block_hash: legacy_miniblock_hash(MiniblockNumber(0)),
+            max_virtual_blocks_to_create: 100,
+        },
+    }
+}
+
+pub(crate) fn make_account_rich(storage: StoragePtr<InMemoryStorageView>, account: &Account) {
+    let key = storage_key_for_eth_balance(&account.address);
+    storage
+        .as_ref()
+        .borrow_mut()
+        .set_value(key, u256_to_h256(U256::from(10u64.pow(19))));
+}
+
+pub(crate) fn get_empty_storage() -> InMemoryStorage {
+    InMemoryStorage::with_system_contracts(hash_bytecode)
+}
+
+// Inserts the contracts into the test environment, bypassing the
+// deployer system contract. Besides the reference to storage
+// it accepts a `contracts` tuple of information about the contract
+// and whether or not it is an account.
+fn insert_contracts(raw_storage: &mut InMemoryStorage, contracts: &[ContractsToDeploy]) {
+    for (contract, address, is_account) in contracts {
+        let deployer_code_key = get_code_key(address);
+        raw_storage.set_value(deployer_code_key, hash_bytecode(contract));
+
+        if *is_account {
+            let is_account_key = get_is_account_key(address);
+            raw_storage.set_value(is_account_key, u256_to_h256(1_u32.into()));
+        }
+
+        raw_storage.store_factory_dep(hash_bytecode(contract), contract.clone());
+    }
+}
diff --git a/core/lib/multivm/src/versions/vm_refunds_enhancement/tests/tracing_execution_error.rs b/core/lib/multivm/src/versions/vm_refunds_enhancement/tests/tracing_execution_error.rs
new file mode 100644
index 000000000000..a839f4708ad4
--- /dev/null
+++ b/core/lib/multivm/src/versions/vm_refunds_enhancement/tests/tracing_execution_error.rs
@@ -0,0 +1,53 @@
+use zksync_types::{Execute, H160};
+
+use crate::interface::TxExecutionMode;
+use crate::interface::{TxRevertReason, VmRevertReason};
+use crate::vm_refunds_enhancement::tests::tester::{
+    ExpectedError, TransactionTestInfo, VmTesterBuilder,
+};
+use crate::vm_refunds_enhancement::tests::utils::{
+    get_execute_error_calldata, read_error_contract, BASE_SYSTEM_CONTRACTS,
+};
+use crate::vm_refunds_enhancement::HistoryEnabled;
+
+#[test]
+fn test_tracing_of_execution_errors() {
+    let contract_address = H160::random();
+    let mut vm = VmTesterBuilder::new(HistoryEnabled)
+        .with_empty_in_memory_storage()
+        .with_base_system_smart_contracts(BASE_SYSTEM_CONTRACTS.clone())
+        .with_custom_contracts(vec![(read_error_contract(), contract_address, false)])
+        .with_execution_mode(TxExecutionMode::VerifyExecute)
+        .with_deployer()
+        .with_random_rich_accounts(1)
+        .build();
+
+    let account = &mut vm.rich_accounts[0];
+
+    let tx = account.get_l2_tx_for_execute(
+        Execute {
+            contract_address,
+            calldata: get_execute_error_calldata(),
+            value: Default::default(),
+            factory_deps: Some(vec![]),
+        },
+        None,
+    );
+
+    vm.execute_tx_and_verify(TransactionTestInfo::new_rejected(
+        tx,
+        ExpectedError {
+            revert_reason: TxRevertReason::TxReverted(VmRevertReason::General {
+                msg: "short".to_string(),
+                data: vec![
+                    8, 195, 121, 160, 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, 32, 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, 5, 115, 104, 111, 114, 116,
+                    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,
+                ],
+            }),
+            modifier: None,
+        },
+    ));
+}
diff --git a/core/lib/multivm/src/versions/vm_refunds_enhancement/tests/upgrade.rs b/core/lib/multivm/src/versions/vm_refunds_enhancement/tests/upgrade.rs
new file mode 100644
index 000000000000..9a7eaa084681
--- /dev/null
+++ b/core/lib/multivm/src/versions/vm_refunds_enhancement/tests/upgrade.rs
@@ -0,0 +1,342 @@
+use zk_evm_1_3_3::aux_structures::Timestamp;
+
+use zksync_types::{
+    ethabi::Contract,
+    Execute, COMPLEX_UPGRADER_ADDRESS, CONTRACT_DEPLOYER_ADDRESS, CONTRACT_FORCE_DEPLOYER_ADDRESS,
+    REQUIRED_L1_TO_L2_GAS_PER_PUBDATA_BYTE,
+    {ethabi::Token, Address, ExecuteTransactionCommon, Transaction, H256, U256},
+    {get_code_key, get_known_code_key, H160},
+};
+
+use zksync_utils::{bytecode::hash_bytecode, bytes_to_be_words, h256_to_u256, u256_to_h256};
+
+use zksync_contracts::{deployer_contract, load_contract, load_sys_contract, read_bytecode};
+use zksync_state::WriteStorage;
+use zksync_test_account::TxType;
+
+use crate::interface::{ExecutionResult, Halt, TxExecutionMode, VmExecutionMode};
+use crate::vm_refunds_enhancement::tests::tester::VmTesterBuilder;
+use crate::vm_refunds_enhancement::tests::utils::verify_required_storage;
+use crate::vm_refunds_enhancement::HistoryEnabled;
+use zksync_types::protocol_version::ProtocolUpgradeTxCommonData;
+
+use super::utils::read_test_contract;
+
+/// In this test we ensure that the requirements for protocol upgrade transactions are enforced by the bootloader:
+/// - This transaction must be the only one in block
+/// - If present, this transaction must be the first one in block
+#[test]
+fn test_protocol_upgrade_is_first() {
+    let mut vm = VmTesterBuilder::new(HistoryEnabled)
+        .with_empty_in_memory_storage()
+        .with_execution_mode(TxExecutionMode::VerifyExecute)
+        .with_random_rich_accounts(1)
+        .build();
+
+    let bytecode_hash = hash_bytecode(&read_test_contract());
+
+    // Here we just use some random transaction of protocol upgrade type:
+    let protocol_upgrade_transaction = get_forced_deploy_tx(&[ForceDeployment {
+        // The bytecode hash to put on an address
+        bytecode_hash,
+        // The address on which to deploy the bytecodehash to
+        address: H160::random(),
+        // Whether to run the constructor on the force deployment
+        call_constructor: false,
+        // The value with which to initialize a contract
+        value: U256::zero(),
+        // The constructor calldata
+        input: vec![],
+    }]);
+
+    let normal_l1_transaction = vm.rich_accounts[0]
+        .get_deploy_tx(&read_test_contract(), None, TxType::L1 { serial_id: 0 })
+        .tx;
+
+    let expected_error =
+        Halt::UnexpectedVMBehavior("Assertion error: Protocol upgrade tx not first".to_string());
+
+    vm.vm.make_snapshot();
+    // Test 1: there must be only one system transaction in block
+    vm.vm.push_transaction(protocol_upgrade_transaction.clone());
+    vm.vm.push_transaction(normal_l1_transaction.clone());
+    vm.vm.push_transaction(protocol_upgrade_transaction.clone());
+
+    vm.vm.execute(VmExecutionMode::OneTx);
+    vm.vm.execute(VmExecutionMode::OneTx);
+    let result = vm.vm.execute(VmExecutionMode::OneTx);
+    assert_eq!(
+        result.result,
+        ExecutionResult::Halt {
+            reason: expected_error.clone()
+        }
+    );
+
+    // Test 2: the protocol upgrade tx must be the first one in block
+    vm.vm.rollback_to_the_latest_snapshot();
+    vm.vm.make_snapshot();
+    vm.vm.push_transaction(normal_l1_transaction.clone());
+    vm.vm.push_transaction(protocol_upgrade_transaction.clone());
+
+    vm.vm.execute(VmExecutionMode::OneTx);
+    let result = vm.vm.execute(VmExecutionMode::OneTx);
+    assert_eq!(
+        result.result,
+        ExecutionResult::Halt {
+            reason: expected_error
+        }
+    );
+
+    vm.vm.rollback_to_the_latest_snapshot();
+    vm.vm.make_snapshot();
+    vm.vm.push_transaction(protocol_upgrade_transaction);
+    vm.vm.push_transaction(normal_l1_transaction);
+
+    vm.vm.execute(VmExecutionMode::OneTx);
+    let result = vm.vm.execute(VmExecutionMode::OneTx);
+    assert!(!result.result.is_failed());
+}
+
+/// In this test we try to test how force deployments could be done via protocol upgrade transactions.
+#[test]
+fn test_force_deploy_upgrade() {
+    let mut vm = VmTesterBuilder::new(HistoryEnabled)
+        .with_empty_in_memory_storage()
+        .with_execution_mode(TxExecutionMode::VerifyExecute)
+        .with_random_rich_accounts(1)
+        .build();
+
+    let storage_view = vm.storage.clone();
+    let bytecode_hash = hash_bytecode(&read_test_contract());
+
+    let known_code_key = get_known_code_key(&bytecode_hash);
+    // It is generally expected that all the keys will be set as known prior to the protocol upgrade.
+    storage_view
+        .borrow_mut()
+        .set_value(known_code_key, u256_to_h256(1.into()));
+    drop(storage_view);
+
+    let address_to_deploy = H160::random();
+    // Here we just use some random transaction of protocol upgrade type:
+    let transaction = get_forced_deploy_tx(&[ForceDeployment {
+        // The bytecode hash to put on an address
+        bytecode_hash,
+        // The address on which to deploy the bytecodehash to
+        address: address_to_deploy,
+        // Whether to run the constructor on the force deployment
+        call_constructor: false,
+        // The value with which to initialize a contract
+        value: U256::zero(),
+        // The constructor calldata
+        input: vec![],
+    }]);
+
+    vm.vm.push_transaction(transaction);
+
+    let result = vm.vm.execute(VmExecutionMode::OneTx);
+    assert!(
+        !result.result.is_failed(),
+        "The force upgrade was not successful"
+    );
+
+    let expected_slots = vec![(bytecode_hash, get_code_key(&address_to_deploy))];
+
+    // Verify that the bytecode has been set correctly
+    verify_required_storage(&vm.vm.state, expected_slots);
+}
+
+/// Here we show how the work with the complex upgrader could be done
+#[test]
+fn test_complex_upgrader() {
+    let mut vm = VmTesterBuilder::new(HistoryEnabled)
+        .with_empty_in_memory_storage()
+        .with_execution_mode(TxExecutionMode::VerifyExecute)
+        .with_random_rich_accounts(1)
+        .build();
+
+    let storage_view = vm.storage.clone();
+
+    let bytecode_hash = hash_bytecode(&read_complex_upgrade());
+    let msg_sender_test_hash = hash_bytecode(&read_msg_sender_test());
+
+    // Let's assume that the bytecode for the implementation of the complex upgrade
+    // is already deployed in some address in userspace
+    let upgrade_impl = H160::random();
+    let account_code_key = get_code_key(&upgrade_impl);
+
+    storage_view
+        .borrow_mut()
+        .set_value(get_known_code_key(&bytecode_hash), u256_to_h256(1.into()));
+    storage_view.borrow_mut().set_value(
+        get_known_code_key(&msg_sender_test_hash),
+        u256_to_h256(1.into()),
+    );
+    storage_view
+        .borrow_mut()
+        .set_value(account_code_key, bytecode_hash);
+    drop(storage_view);
+
+    vm.vm.state.decommittment_processor.populate(
+        vec![
+            (
+                h256_to_u256(bytecode_hash),
+                bytes_to_be_words(read_complex_upgrade()),
+            ),
+            (
+                h256_to_u256(msg_sender_test_hash),
+                bytes_to_be_words(read_msg_sender_test()),
+            ),
+        ],
+        Timestamp(0),
+    );
+
+    let address_to_deploy1 = H160::random();
+    let address_to_deploy2 = H160::random();
+
+    let transaction = get_complex_upgrade_tx(
+        upgrade_impl,
+        address_to_deploy1,
+        address_to_deploy2,
+        bytecode_hash,
+    );
+
+    vm.vm.push_transaction(transaction);
+    let result = vm.vm.execute(VmExecutionMode::OneTx);
+    assert!(
+        !result.result.is_failed(),
+        "The force upgrade was not successful"
+    );
+
+    let expected_slots = vec![
+        (bytecode_hash, get_code_key(&address_to_deploy1)),
+        (bytecode_hash, get_code_key(&address_to_deploy2)),
+    ];
+
+    // Verify that the bytecode has been set correctly
+    verify_required_storage(&vm.vm.state, expected_slots);
+}
+
+#[derive(Debug, Clone)]
+struct ForceDeployment {
+    // The bytecode hash to put on an address
+    bytecode_hash: H256,
+    // The address on which to deploy the bytecodehash to
+    address: Address,
+    // Whether to run the constructor on the force deployment
+    call_constructor: bool,
+    // The value with which to initialize a contract
+    value: U256,
+    // The constructor calldata
+    input: Vec<u8>,
+}
+
+fn get_forced_deploy_tx(deployment: &[ForceDeployment]) -> Transaction {
+    let deployer = deployer_contract();
+    let contract_function = deployer.function("forceDeployOnAddresses").unwrap();
+
+    let encoded_deployments: Vec<_> = deployment
+        .iter()
+        .map(|deployment| {
+            Token::Tuple(vec![
+                Token::FixedBytes(deployment.bytecode_hash.as_bytes().to_vec()),
+                Token::Address(deployment.address),
+                Token::Bool(deployment.call_constructor),
+                Token::Uint(deployment.value),
+                Token::Bytes(deployment.input.clone()),
+            ])
+        })
+        .collect();
+
+    let params = [Token::Array(encoded_deployments)];
+
+    let calldata = contract_function
+        .encode_input(&params)
+        .expect("failed to encode parameters");
+
+    let execute = Execute {
+        contract_address: CONTRACT_DEPLOYER_ADDRESS,
+        calldata,
+        factory_deps: None,
+        value: U256::zero(),
+    };
+
+    Transaction {
+        common_data: ExecuteTransactionCommon::ProtocolUpgrade(ProtocolUpgradeTxCommonData {
+            sender: CONTRACT_FORCE_DEPLOYER_ADDRESS,
+            gas_limit: U256::from(200_000_000u32),
+            gas_per_pubdata_limit: REQUIRED_L1_TO_L2_GAS_PER_PUBDATA_BYTE.into(),
+            ..Default::default()
+        }),
+        execute,
+        received_timestamp_ms: 0,
+        raw_bytes: None,
+    }
+}
+
+// Returns the transaction that performs a complex protocol upgrade.
+// The first param is the address of the implementation of the complex upgrade
+// in user-space, while the next 3 params are params of the implenentaiton itself
+// For the explanatation for the parameters, please refer to:
+// etc/contracts-test-data/complex-upgrade/complex-upgrade.sol
+fn get_complex_upgrade_tx(
+    implementation_address: Address,
+    address1: Address,
+    address2: Address,
+    bytecode_hash: H256,
+) -> Transaction {
+    let impl_contract = get_complex_upgrade_abi();
+    let impl_function = impl_contract.function("someComplexUpgrade").unwrap();
+    let impl_calldata = impl_function
+        .encode_input(&[
+            Token::Address(address1),
+            Token::Address(address2),
+            Token::FixedBytes(bytecode_hash.as_bytes().to_vec()),
+        ])
+        .unwrap();
+
+    let complex_upgrader = get_complex_upgrader_abi();
+    let upgrade_function = complex_upgrader.function("upgrade").unwrap();
+    let complex_upgrader_calldata = upgrade_function
+        .encode_input(&[
+            Token::Address(implementation_address),
+            Token::Bytes(impl_calldata),
+        ])
+        .unwrap();
+
+    let execute = Execute {
+        contract_address: COMPLEX_UPGRADER_ADDRESS,
+        calldata: complex_upgrader_calldata,
+        factory_deps: None,
+        value: U256::zero(),
+    };
+
+    Transaction {
+        common_data: ExecuteTransactionCommon::ProtocolUpgrade(ProtocolUpgradeTxCommonData {
+            sender: CONTRACT_FORCE_DEPLOYER_ADDRESS,
+            gas_limit: U256::from(200_000_000u32),
+            gas_per_pubdata_limit: REQUIRED_L1_TO_L2_GAS_PER_PUBDATA_BYTE.into(),
+            ..Default::default()
+        }),
+        execute,
+        received_timestamp_ms: 0,
+        raw_bytes: None,
+    }
+}
+
+fn read_complex_upgrade() -> Vec<u8> {
+    read_bytecode("etc/contracts-test-data/artifacts-zk/contracts/complex-upgrade/complex-upgrade.sol/ComplexUpgrade.json")
+}
+
+fn read_msg_sender_test() -> Vec<u8> {
+    read_bytecode("etc/contracts-test-data/artifacts-zk/contracts/complex-upgrade/msg-sender.sol/MsgSenderTest.json")
+}
+
+fn get_complex_upgrade_abi() -> Contract {
+    load_contract(
+        "etc/contracts-test-data/artifacts-zk/contracts/complex-upgrade/complex-upgrade.sol/ComplexUpgrade.json"
+    )
+}
+
+fn get_complex_upgrader_abi() -> Contract {
+    load_sys_contract("ComplexUpgrader")
+}
diff --git a/core/lib/multivm/src/versions/vm_refunds_enhancement/tests/utils.rs b/core/lib/multivm/src/versions/vm_refunds_enhancement/tests/utils.rs
new file mode 100644
index 000000000000..7d3cc7d8e2dc
--- /dev/null
+++ b/core/lib/multivm/src/versions/vm_refunds_enhancement/tests/utils.rs
@@ -0,0 +1,106 @@
+use ethabi::Contract;
+use once_cell::sync::Lazy;
+
+use crate::vm_refunds_enhancement::tests::tester::InMemoryStorageView;
+use zksync_contracts::{
+    load_contract, read_bytecode, read_zbin_bytecode, BaseSystemContracts, SystemContractCode,
+};
+use zksync_state::{StoragePtr, WriteStorage};
+use zksync_types::utils::storage_key_for_standard_token_balance;
+use zksync_types::{AccountTreeId, Address, StorageKey, H256, U256};
+use zksync_utils::bytecode::hash_bytecode;
+use zksync_utils::{bytes_to_be_words, h256_to_u256, u256_to_h256};
+
+use crate::vm_refunds_enhancement::types::internals::ZkSyncVmState;
+use crate::vm_refunds_enhancement::HistoryMode;
+
+pub(crate) static BASE_SYSTEM_CONTRACTS: Lazy<BaseSystemContracts> =
+    Lazy::new(BaseSystemContracts::load_from_disk);
+
+// Probably make it a part of vm tester
+pub(crate) fn verify_required_storage<H: HistoryMode>(
+    state: &ZkSyncVmState<InMemoryStorageView, H>,
+    required_values: Vec<(H256, StorageKey)>,
+) {
+    for (required_value, key) in required_values {
+        let current_value = state.storage.storage.read_from_storage(&key);
+
+        assert_eq!(
+            u256_to_h256(current_value),
+            required_value,
+            "Invalid value at key {key:?}"
+        );
+    }
+}
+
+pub(crate) fn verify_required_memory<H: HistoryMode>(
+    state: &ZkSyncVmState<InMemoryStorageView, H>,
+    required_values: Vec<(U256, u32, u32)>,
+) {
+    for (required_value, memory_page, cell) in required_values {
+        let current_value = state
+            .memory
+            .read_slot(memory_page as usize, cell as usize)
+            .value;
+        assert_eq!(current_value, required_value);
+    }
+}
+
+pub(crate) fn get_balance<S: WriteStorage>(
+    token_id: AccountTreeId,
+    account: &Address,
+    main_storage: StoragePtr<S>,
+) -> U256 {
+    let key = storage_key_for_standard_token_balance(token_id, account);
+    h256_to_u256(main_storage.borrow_mut().read_value(&key))
+}
+
+pub(crate) fn read_test_contract() -> Vec<u8> {
+    read_bytecode("etc/contracts-test-data/artifacts-zk/contracts/counter/counter.sol/Counter.json")
+}
+
+pub(crate) fn get_bootloader(test: &str) -> SystemContractCode {
+    let bootloader_code = read_zbin_bytecode(format!(
+        "etc/system-contracts/bootloader/tests/artifacts/{}.yul/{}.yul.zbin",
+        test, test
+    ));
+
+    let bootloader_hash = hash_bytecode(&bootloader_code);
+    SystemContractCode {
+        code: bytes_to_be_words(bootloader_code),
+        hash: bootloader_hash,
+    }
+}
+
+pub(crate) fn read_nonce_holder_tester() -> Vec<u8> {
+    read_bytecode("etc/contracts-test-data/artifacts-zk/contracts/custom-account/nonce-holder-test.sol/NonceHolderTest.json")
+}
+
+pub(crate) fn read_error_contract() -> Vec<u8> {
+    read_bytecode(
+        "etc/contracts-test-data/artifacts-zk/contracts/error/error.sol/SimpleRequire.json",
+    )
+}
+
+pub(crate) fn get_execute_error_calldata() -> Vec<u8> {
+    let test_contract = load_contract(
+        "etc/contracts-test-data/artifacts-zk/contracts/error/error.sol/SimpleRequire.json",
+    );
+
+    let function = test_contract.function("require_short").unwrap();
+
+    function
+        .encode_input(&[])
+        .expect("failed to encode parameters")
+}
+
+pub(crate) fn read_many_owners_custom_account_contract() -> (Vec<u8>, Contract) {
+    let path = "etc/contracts-test-data/artifacts-zk/contracts/custom-account/many-owners-custom-account.sol/ManyOwnersCustomAccount.json";
+    (read_bytecode(path), load_contract(path))
+}
+
+pub(crate) fn read_max_depth_contract() -> Vec<u8> {
+    read_zbin_bytecode(
+        "core/tests/ts-integration/contracts/zkasm/artifacts/deep_stak.zkasm/deep_stak.zkasm.zbin",
+    )
+}
diff --git a/core/lib/multivm/src/versions/vm_refunds_enhancement/tracers/default_tracers.rs b/core/lib/multivm/src/versions/vm_refunds_enhancement/tracers/default_tracers.rs
new file mode 100644
index 000000000000..51fbf06d855d
--- /dev/null
+++ b/core/lib/multivm/src/versions/vm_refunds_enhancement/tracers/default_tracers.rs
@@ -0,0 +1,294 @@
+use std::fmt::{Debug, Formatter};
+
+use crate::interface::dyn_tracers::vm_1_3_3::DynTracer;
+use crate::interface::tracer::{
+    TracerExecutionStatus, TracerExecutionStopReason, VmExecutionStopReason,
+};
+use crate::interface::{Halt, VmExecutionMode};
+use crate::vm_refunds_enhancement::VmTracer;
+use zk_evm_1_3_3::{
+    tracing::{
+        AfterDecodingData, AfterExecutionData, BeforeExecutionData, Tracer, VmLocalStateData,
+    },
+    vm_state::VmLocalState,
+    witness_trace::DummyTracer,
+    zkevm_opcode_defs::{decoding::EncodingModeProduction, Opcode, RetOpcode},
+};
+use zksync_state::{StoragePtr, WriteStorage};
+use zksync_types::Timestamp;
+
+use crate::vm_refunds_enhancement::bootloader_state::utils::apply_l2_block;
+use crate::vm_refunds_enhancement::bootloader_state::BootloaderState;
+use crate::vm_refunds_enhancement::constants::BOOTLOADER_HEAP_PAGE;
+use crate::vm_refunds_enhancement::old_vm::history_recorder::HistoryMode;
+use crate::vm_refunds_enhancement::old_vm::memory::SimpleMemory;
+use crate::vm_refunds_enhancement::tracers::dispatcher::TracerDispatcher;
+use crate::vm_refunds_enhancement::tracers::utils::{
+    computational_gas_price, gas_spent_on_bytecodes_and_long_messages_this_opcode,
+    print_debug_if_needed, VmHook,
+};
+use crate::vm_refunds_enhancement::tracers::{RefundsTracer, ResultTracer};
+use crate::vm_refunds_enhancement::types::internals::ZkSyncVmState;
+
+/// Default tracer for the VM. It manages the other tracers execution and stop the vm when needed.
+pub(crate) struct DefaultExecutionTracer<S: WriteStorage, H: HistoryMode> {
+    tx_has_been_processed: bool,
+    execution_mode: VmExecutionMode,
+
+    pub(crate) gas_spent_on_bytecodes_and_long_messages: u32,
+    // Amount of gas used during account validation.
+    pub(crate) computational_gas_used: u32,
+    // Maximum number of gas that we're allowed to use during account validation.
+    tx_validation_gas_limit: u32,
+    in_account_validation: bool,
+    final_batch_info_requested: bool,
+    pub(crate) result_tracer: ResultTracer,
+    // This tracer is designed specifically for calculating refunds. Its separation from the custom tracer
+    // ensures static dispatch, enhancing performance by avoiding dynamic dispatch overhead.
+    // Additionally, being an internal tracer, it saves the results directly to VmResultAndLogs.
+    pub(crate) refund_tracer: Option<RefundsTracer>,
+    pub(crate) dispatcher: TracerDispatcher<S, H>,
+    ret_from_the_bootloader: Option<RetOpcode>,
+    storage: StoragePtr<S>,
+}
+
+impl<S: WriteStorage, H: HistoryMode> Debug for DefaultExecutionTracer<S, H> {
+    fn fmt(&self, f: &mut Formatter<'_>) -> std::fmt::Result {
+        f.debug_struct("DefaultExecutionTracer").finish()
+    }
+}
+
+impl<S: WriteStorage, H: HistoryMode> Tracer for DefaultExecutionTracer<S, H> {
+    const CALL_BEFORE_DECODING: bool = false;
+    const CALL_AFTER_DECODING: bool = true;
+    const CALL_BEFORE_EXECUTION: bool = true;
+    const CALL_AFTER_EXECUTION: bool = true;
+    type SupportedMemory = SimpleMemory<H>;
+
+    fn before_decoding(
+        &mut self,
+        _state: VmLocalStateData<'_, 8, EncodingModeProduction>,
+        _memory: &Self::SupportedMemory,
+    ) {
+    }
+
+    fn after_decoding(
+        &mut self,
+        state: VmLocalStateData<'_>,
+        data: AfterDecodingData,
+        memory: &Self::SupportedMemory,
+    ) {
+        <ResultTracer as DynTracer<S, SimpleMemory<H>>>::after_decoding(
+            &mut self.result_tracer,
+            state,
+            data,
+            memory,
+        );
+
+        if let Some(refund_tracer) = &mut self.refund_tracer {
+            <RefundsTracer as DynTracer<S, SimpleMemory<H>>>::after_decoding(
+                refund_tracer,
+                state,
+                data,
+                memory,
+            );
+        }
+
+        self.dispatcher.after_decoding(state, data, memory);
+    }
+
+    fn before_execution(
+        &mut self,
+        state: VmLocalStateData<'_>,
+        data: BeforeExecutionData,
+        memory: &Self::SupportedMemory,
+    ) {
+        if self.in_account_validation {
+            self.computational_gas_used = self
+                .computational_gas_used
+                .saturating_add(computational_gas_price(state, &data));
+        }
+
+        let hook = VmHook::from_opcode_memory(&state, &data);
+        print_debug_if_needed(&hook, &state, memory);
+
+        match hook {
+            VmHook::TxHasEnded => self.tx_has_been_processed = true,
+            VmHook::NoValidationEntered => self.in_account_validation = false,
+            VmHook::AccountValidationEntered => self.in_account_validation = true,
+            VmHook::FinalBatchInfo => self.final_batch_info_requested = true,
+            _ => {}
+        }
+
+        self.gas_spent_on_bytecodes_and_long_messages +=
+            gas_spent_on_bytecodes_and_long_messages_this_opcode(&state, &data);
+        self.result_tracer
+            .before_execution(state, data, memory, self.storage.clone());
+
+        if let Some(refund_tracer) = &mut self.refund_tracer {
+            refund_tracer.before_execution(state, data, memory, self.storage.clone());
+        }
+        self.dispatcher
+            .before_execution(state, data, memory, self.storage.clone());
+    }
+
+    fn after_execution(
+        &mut self,
+        state: VmLocalStateData<'_>,
+        data: AfterExecutionData,
+        memory: &Self::SupportedMemory,
+    ) {
+        if let VmExecutionMode::Bootloader = self.execution_mode {
+            let (next_opcode, _, _) = zk_evm_1_3_3::vm_state::read_and_decode(
+                state.vm_local_state,
+                memory,
+                &mut DummyTracer,
+                self,
+            );
+            if current_frame_is_bootloader(state.vm_local_state) {
+                if let Opcode::Ret(ret) = next_opcode.inner.variant.opcode {
+                    self.ret_from_the_bootloader = Some(ret);
+                }
+            }
+        }
+
+        self.result_tracer
+            .after_execution(state, data, memory, self.storage.clone());
+        if let Some(refund_tracer) = &mut self.refund_tracer {
+            refund_tracer.after_execution(state, data, memory, self.storage.clone())
+        }
+        self.dispatcher
+            .after_execution(state, data, memory, self.storage.clone());
+    }
+}
+
+impl<S: WriteStorage, H: HistoryMode> DefaultExecutionTracer<S, H> {
+    pub(crate) fn new(
+        computational_gas_limit: u32,
+        execution_mode: VmExecutionMode,
+        dispatcher: TracerDispatcher<S, H>,
+        storage: StoragePtr<S>,
+        refund_tracer: Option<RefundsTracer>,
+    ) -> Self {
+        Self {
+            tx_has_been_processed: false,
+            execution_mode,
+            gas_spent_on_bytecodes_and_long_messages: 0,
+            computational_gas_used: 0,
+            tx_validation_gas_limit: computational_gas_limit,
+            in_account_validation: false,
+            final_batch_info_requested: false,
+            result_tracer: ResultTracer::new(execution_mode),
+            refund_tracer,
+            dispatcher,
+            ret_from_the_bootloader: None,
+            storage,
+        }
+    }
+
+    pub(crate) fn tx_has_been_processed(&self) -> bool {
+        self.tx_has_been_processed
+    }
+
+    pub(crate) fn validation_run_out_of_gas(&self) -> bool {
+        self.computational_gas_used > self.tx_validation_gas_limit
+    }
+
+    pub(crate) fn gas_spent_on_pubdata(&self, vm_local_state: &VmLocalState) -> u32 {
+        self.gas_spent_on_bytecodes_and_long_messages + vm_local_state.spent_pubdata_counter
+    }
+
+    fn set_fictive_l2_block(
+        &mut self,
+        state: &mut ZkSyncVmState<S, H>,
+        bootloader_state: &mut BootloaderState,
+    ) {
+        let current_timestamp = Timestamp(state.local_state.timestamp);
+        let txs_index = bootloader_state.free_tx_index();
+        let l2_block = bootloader_state.insert_fictive_l2_block();
+        let mut memory = vec![];
+        apply_l2_block(&mut memory, l2_block, txs_index);
+        state
+            .memory
+            .populate_page(BOOTLOADER_HEAP_PAGE as usize, memory, current_timestamp);
+        self.final_batch_info_requested = false;
+    }
+
+    fn should_stop_execution(&self) -> TracerExecutionStatus {
+        match self.execution_mode {
+            VmExecutionMode::OneTx if self.tx_has_been_processed() => {
+                return TracerExecutionStatus::Stop(TracerExecutionStopReason::Finish);
+            }
+            VmExecutionMode::Bootloader if self.ret_from_the_bootloader == Some(RetOpcode::Ok) => {
+                return TracerExecutionStatus::Stop(TracerExecutionStopReason::Finish);
+            }
+            _ => {}
+        };
+        if self.validation_run_out_of_gas() {
+            return TracerExecutionStatus::Stop(TracerExecutionStopReason::Abort(
+                Halt::ValidationOutOfGas,
+            ));
+        }
+        TracerExecutionStatus::Continue
+    }
+}
+
+impl<S: WriteStorage, H: HistoryMode> DynTracer<S, SimpleMemory<H>>
+    for DefaultExecutionTracer<S, H>
+{
+}
+
+impl<S: WriteStorage, H: HistoryMode> VmTracer<S, H> for DefaultExecutionTracer<S, H> {
+    fn initialize_tracer(&mut self, state: &mut ZkSyncVmState<S, H>) {
+        self.result_tracer.initialize_tracer(state);
+        if let Some(refund_tracer) = &mut self.refund_tracer {
+            refund_tracer.initialize_tracer(state);
+        }
+        self.dispatcher.initialize_tracer(state);
+    }
+
+    fn finish_cycle(
+        &mut self,
+        state: &mut ZkSyncVmState<S, H>,
+        bootloader_state: &mut BootloaderState,
+    ) -> TracerExecutionStatus {
+        if self.final_batch_info_requested {
+            self.set_fictive_l2_block(state, bootloader_state)
+        }
+
+        let mut result = self.result_tracer.finish_cycle(state, bootloader_state);
+        if let Some(refund_tracer) = &mut self.refund_tracer {
+            result = refund_tracer
+                .finish_cycle(state, bootloader_state)
+                .stricter(&result);
+        }
+        result = self
+            .dispatcher
+            .finish_cycle(state, bootloader_state)
+            .stricter(&result);
+        result.stricter(&self.should_stop_execution())
+    }
+
+    fn after_vm_execution(
+        &mut self,
+        state: &mut ZkSyncVmState<S, H>,
+        bootloader_state: &BootloaderState,
+        stop_reason: VmExecutionStopReason,
+    ) {
+        self.result_tracer
+            .after_vm_execution(state, bootloader_state, stop_reason.clone());
+
+        if let Some(refund_tracer) = &mut self.refund_tracer {
+            refund_tracer.after_vm_execution(state, bootloader_state, stop_reason.clone());
+        }
+        self.dispatcher
+            .after_vm_execution(state, bootloader_state, stop_reason.clone());
+    }
+}
+
+fn current_frame_is_bootloader(local_state: &VmLocalState) -> bool {
+    // The current frame is bootloader if the callstack depth is 1.
+    // Some of the near calls inside the bootloader can be out of gas, which is totally normal behavior
+    // and it shouldn't result in `is_bootloader_out_of_gas` becoming true.
+    local_state.callstack.inner.len() == 1
+}
diff --git a/core/lib/multivm/src/versions/vm_refunds_enhancement/tracers/dispatcher.rs b/core/lib/multivm/src/versions/vm_refunds_enhancement/tracers/dispatcher.rs
new file mode 100644
index 000000000000..bdb5a2df112c
--- /dev/null
+++ b/core/lib/multivm/src/versions/vm_refunds_enhancement/tracers/dispatcher.rs
@@ -0,0 +1,120 @@
+use crate::interface::dyn_tracers::vm_1_3_3::DynTracer;
+use crate::interface::tracer::{TracerExecutionStatus, VmExecutionStopReason};
+use crate::vm_refunds_enhancement::{
+    BootloaderState, HistoryMode, SimpleMemory, TracerPointer, VmTracer, ZkSyncVmState,
+};
+use zk_evm_1_3_3::tracing::{
+    AfterDecodingData, AfterExecutionData, BeforeExecutionData, VmLocalStateData,
+};
+use zksync_state::{StoragePtr, WriteStorage};
+
+/// Tracer dispatcher is a tracer that can dispatch calls to multiple tracers.
+pub struct TracerDispatcher<S: WriteStorage, H: HistoryMode> {
+    tracers: Vec<TracerPointer<S, H>>,
+}
+
+impl<S: WriteStorage, H: HistoryMode> TracerDispatcher<S, H> {
+    pub fn new(tracers: Vec<TracerPointer<S, H>>) -> Self {
+        Self { tracers }
+    }
+}
+impl<S: WriteStorage, H: HistoryMode> From<TracerPointer<S, H>> for TracerDispatcher<S, H> {
+    fn from(value: TracerPointer<S, H>) -> Self {
+        Self {
+            tracers: vec![value],
+        }
+    }
+}
+
+impl<S: WriteStorage, H: HistoryMode> From<Vec<TracerPointer<S, H>>> for TracerDispatcher<S, H> {
+    fn from(value: Vec<TracerPointer<S, H>>) -> Self {
+        Self { tracers: value }
+    }
+}
+
+impl<S: WriteStorage, H: HistoryMode> Default for TracerDispatcher<S, H> {
+    fn default() -> Self {
+        Self { tracers: vec![] }
+    }
+}
+
+impl<S: WriteStorage, H: HistoryMode> DynTracer<S, SimpleMemory<H>> for TracerDispatcher<S, H> {
+    #[inline(always)]
+    fn before_decoding(&mut self, _state: VmLocalStateData<'_>, _memory: &SimpleMemory<H>) {
+        for tracer in self.tracers.iter_mut() {
+            tracer.before_decoding(_state, _memory);
+        }
+    }
+
+    #[inline(always)]
+    fn after_decoding(
+        &mut self,
+        _state: VmLocalStateData<'_>,
+        _data: AfterDecodingData,
+        _memory: &SimpleMemory<H>,
+    ) {
+        for tracer in self.tracers.iter_mut() {
+            tracer.after_decoding(_state, _data, _memory);
+        }
+    }
+
+    #[inline(always)]
+    fn before_execution(
+        &mut self,
+        _state: VmLocalStateData<'_>,
+        _data: BeforeExecutionData,
+        _memory: &SimpleMemory<H>,
+        _storage: StoragePtr<S>,
+    ) {
+        for tracer in self.tracers.iter_mut() {
+            tracer.before_execution(_state, _data, _memory, _storage.clone());
+        }
+    }
+
+    #[inline(always)]
+    fn after_execution(
+        &mut self,
+        _state: VmLocalStateData<'_>,
+        _data: AfterExecutionData,
+        _memory: &SimpleMemory<H>,
+        _storage: StoragePtr<S>,
+    ) {
+        for tracer in self.tracers.iter_mut() {
+            tracer.after_execution(_state, _data, _memory, _storage.clone());
+        }
+    }
+}
+
+impl<S: WriteStorage, H: HistoryMode> VmTracer<S, H> for TracerDispatcher<S, H> {
+    fn initialize_tracer(&mut self, _state: &mut ZkSyncVmState<S, H>) {
+        for tracer in self.tracers.iter_mut() {
+            tracer.initialize_tracer(_state);
+        }
+    }
+
+    /// Run after each vm execution cycle
+    #[inline(always)]
+    fn finish_cycle(
+        &mut self,
+        _state: &mut ZkSyncVmState<S, H>,
+        _bootloader_state: &mut BootloaderState,
+    ) -> TracerExecutionStatus {
+        let mut result = TracerExecutionStatus::Continue;
+        for tracer in self.tracers.iter_mut() {
+            result = result.stricter(&tracer.finish_cycle(_state, _bootloader_state));
+        }
+        result
+    }
+
+    /// Run after the vm execution
+    fn after_vm_execution(
+        &mut self,
+        _state: &mut ZkSyncVmState<S, H>,
+        _bootloader_state: &BootloaderState,
+        _stop_reason: VmExecutionStopReason,
+    ) {
+        for tracer in self.tracers.iter_mut() {
+            tracer.after_vm_execution(_state, _bootloader_state, _stop_reason.clone());
+        }
+    }
+}
diff --git a/core/lib/multivm/src/versions/vm_refunds_enhancement/tracers/mod.rs b/core/lib/multivm/src/versions/vm_refunds_enhancement/tracers/mod.rs
new file mode 100644
index 000000000000..af17b77237ec
--- /dev/null
+++ b/core/lib/multivm/src/versions/vm_refunds_enhancement/tracers/mod.rs
@@ -0,0 +1,10 @@
+pub(crate) use default_tracers::DefaultExecutionTracer;
+pub(crate) use refunds::RefundsTracer;
+pub(crate) use result_tracer::ResultTracer;
+
+pub(crate) mod default_tracers;
+pub mod dispatcher;
+pub(crate) mod refunds;
+pub(crate) mod result_tracer;
+pub(crate) mod traits;
+pub(crate) mod utils;
diff --git a/core/lib/multivm/src/versions/vm_refunds_enhancement/tracers/refunds.rs b/core/lib/multivm/src/versions/vm_refunds_enhancement/tracers/refunds.rs
new file mode 100644
index 000000000000..5256561b5eb5
--- /dev/null
+++ b/core/lib/multivm/src/versions/vm_refunds_enhancement/tracers/refunds.rs
@@ -0,0 +1,346 @@
+use vise::{Buckets, EncodeLabelSet, EncodeLabelValue, Family, Histogram, Metrics};
+
+use zk_evm_1_3_3::{
+    aux_structures::Timestamp,
+    tracing::{BeforeExecutionData, VmLocalStateData},
+    vm_state::VmLocalState,
+};
+use zksync_state::{StoragePtr, WriteStorage};
+use zksync_system_constants::{PUBLISH_BYTECODE_OVERHEAD, SYSTEM_CONTEXT_ADDRESS};
+use zksync_types::{
+    event::{extract_long_l2_to_l1_messages, extract_published_bytecodes},
+    l2_to_l1_log::L2ToL1Log,
+    L1BatchNumber, U256,
+};
+use zksync_utils::bytecode::bytecode_len_in_bytes;
+use zksync_utils::{ceil_div_u256, u256_to_h256};
+
+use crate::interface::{
+    dyn_tracers::vm_1_3_3::DynTracer, tracer::TracerExecutionStatus, L1BatchEnv, Refunds,
+};
+use crate::vm_refunds_enhancement::constants::{
+    BOOTLOADER_HEAP_PAGE, OPERATOR_REFUNDS_OFFSET, TX_GAS_LIMIT_OFFSET,
+};
+
+use crate::vm_refunds_enhancement::{
+    bootloader_state::BootloaderState,
+    old_vm::{
+        events::merge_events, history_recorder::HistoryMode, memory::SimpleMemory,
+        utils::eth_price_per_pubdata_byte,
+    },
+    tracers::{
+        traits::VmTracer,
+        utils::{gas_spent_on_bytecodes_and_long_messages_this_opcode, get_vm_hook_params, VmHook},
+    },
+    types::internals::ZkSyncVmState,
+};
+
+/// Tracer responsible for collecting information about refunds.
+#[derive(Debug, Clone)]
+pub(crate) struct RefundsTracer {
+    // Some(x) means that the bootloader has asked the operator
+    // to provide the refund the user, where `x` is the refund proposed
+    // by the bootloader itself.
+    pending_operator_refund: Option<u32>,
+    refund_gas: u32,
+    operator_refund: Option<u32>,
+    timestamp_initial: Timestamp,
+    timestamp_before_cycle: Timestamp,
+    gas_remaining_before: u32,
+    spent_pubdata_counter_before: u32,
+    gas_spent_on_bytecodes_and_long_messages: u32,
+    l1_batch: L1BatchEnv,
+    pubdata_published: u32,
+}
+
+impl RefundsTracer {
+    pub(crate) fn new(l1_batch: L1BatchEnv) -> Self {
+        Self {
+            pending_operator_refund: None,
+            refund_gas: 0,
+            operator_refund: None,
+            timestamp_initial: Timestamp(0),
+            timestamp_before_cycle: Timestamp(0),
+            gas_remaining_before: 0,
+            spent_pubdata_counter_before: 0,
+            gas_spent_on_bytecodes_and_long_messages: 0,
+            l1_batch,
+            pubdata_published: 0,
+        }
+    }
+}
+
+impl RefundsTracer {
+    fn requested_refund(&self) -> Option<u32> {
+        self.pending_operator_refund
+    }
+
+    fn set_refund_as_done(&mut self) {
+        self.pending_operator_refund = None;
+    }
+
+    fn block_overhead_refund(&mut self) -> u32 {
+        0
+    }
+
+    pub(crate) fn get_refunds(&self) -> Refunds {
+        Refunds {
+            gas_refunded: self.refund_gas,
+            operator_suggested_refund: self.operator_refund.unwrap_or_default(),
+        }
+    }
+
+    pub(crate) fn tx_body_refund(
+        &self,
+        bootloader_refund: u32,
+        gas_spent_on_pubdata: u32,
+        tx_gas_limit: u32,
+        current_ergs_per_pubdata_byte: u32,
+        pubdata_published: u32,
+    ) -> u32 {
+        let total_gas_spent = tx_gas_limit - bootloader_refund;
+
+        let gas_spent_on_computation = total_gas_spent
+            .checked_sub(gas_spent_on_pubdata)
+            .unwrap_or_else(|| {
+                tracing::error!(
+                    "Gas spent on pubdata is greater than total gas spent. On pubdata: {}, total: {}",
+                    gas_spent_on_pubdata,
+                    total_gas_spent
+                );
+                0
+            });
+
+        // For now, bootloader charges only for base fee.
+        let effective_gas_price = self.l1_batch.base_fee();
+
+        let bootloader_eth_price_per_pubdata_byte =
+            U256::from(effective_gas_price) * U256::from(current_ergs_per_pubdata_byte);
+
+        let fair_eth_price_per_pubdata_byte =
+            U256::from(eth_price_per_pubdata_byte(self.l1_batch.l1_gas_price));
+
+        // For now, L1 originated transactions are allowed to pay less than fair fee per pubdata,
+        // so we should take it into account.
+        let eth_price_per_pubdata_byte_for_calculation = std::cmp::min(
+            bootloader_eth_price_per_pubdata_byte,
+            fair_eth_price_per_pubdata_byte,
+        );
+
+        let fair_fee_eth = U256::from(gas_spent_on_computation)
+            * U256::from(self.l1_batch.fair_l2_gas_price)
+            + U256::from(pubdata_published) * eth_price_per_pubdata_byte_for_calculation;
+        let pre_paid_eth = U256::from(tx_gas_limit) * U256::from(effective_gas_price);
+        let refund_eth = pre_paid_eth.checked_sub(fair_fee_eth).unwrap_or_else(|| {
+            tracing::error!(
+                "Fair fee is greater than pre paid. Fair fee: {} wei, pre paid: {} wei",
+                fair_fee_eth,
+                pre_paid_eth
+            );
+            U256::zero()
+        });
+
+        ceil_div_u256(refund_eth, effective_gas_price.into()).as_u32()
+    }
+
+    pub(crate) fn gas_spent_on_pubdata(&self, vm_local_state: &VmLocalState) -> u32 {
+        self.gas_spent_on_bytecodes_and_long_messages + vm_local_state.spent_pubdata_counter
+    }
+
+    pub(crate) fn pubdata_published(&self) -> u32 {
+        self.pubdata_published
+    }
+}
+
+impl<S, H: HistoryMode> DynTracer<S, SimpleMemory<H>> for RefundsTracer {
+    fn before_execution(
+        &mut self,
+        state: VmLocalStateData<'_>,
+        data: BeforeExecutionData,
+        memory: &SimpleMemory<H>,
+        _storage: StoragePtr<S>,
+    ) {
+        self.timestamp_before_cycle = Timestamp(state.vm_local_state.timestamp);
+        let hook = VmHook::from_opcode_memory(&state, &data);
+        match hook {
+            VmHook::NotifyAboutRefund => self.refund_gas = get_vm_hook_params(memory)[0].as_u32(),
+            VmHook::AskOperatorForRefund => {
+                self.pending_operator_refund = Some(get_vm_hook_params(memory)[0].as_u32())
+            }
+            _ => {}
+        }
+
+        self.gas_spent_on_bytecodes_and_long_messages +=
+            gas_spent_on_bytecodes_and_long_messages_this_opcode(&state, &data);
+    }
+}
+
+impl<S: WriteStorage, H: HistoryMode> VmTracer<S, H> for RefundsTracer {
+    fn initialize_tracer(&mut self, state: &mut ZkSyncVmState<S, H>) {
+        self.timestamp_initial = Timestamp(state.local_state.timestamp);
+        self.gas_remaining_before = state.local_state.callstack.current.ergs_remaining;
+        self.spent_pubdata_counter_before = state.local_state.spent_pubdata_counter;
+    }
+
+    fn finish_cycle(
+        &mut self,
+        state: &mut ZkSyncVmState<S, H>,
+        bootloader_state: &mut BootloaderState,
+    ) -> TracerExecutionStatus {
+        #[derive(Debug, Clone, Copy, PartialEq, Eq, Hash, EncodeLabelValue, EncodeLabelSet)]
+        #[metrics(label = "type", rename_all = "snake_case")]
+        enum RefundType {
+            Bootloader,
+            Operator,
+        }
+
+        const PERCENT_BUCKETS: Buckets = Buckets::values(&[
+            5.0, 10.0, 20.0, 30.0, 40.0, 50.0, 60.0, 70.0, 80.0, 90.0, 100.0, 120.0,
+        ]);
+
+        #[derive(Debug, Metrics)]
+        #[metrics(prefix = "vm_refunds_enhancement")]
+        struct RefundMetrics {
+            #[metrics(buckets = PERCENT_BUCKETS)]
+            refund: Family<RefundType, Histogram<f64>>,
+            #[metrics(buckets = PERCENT_BUCKETS)]
+            refund_diff: Histogram<f64>,
+        }
+
+        #[vise::register]
+        static METRICS: vise::Global<RefundMetrics> = vise::Global::new();
+
+        // This means that the bootloader has informed the system (usually via VMHooks) - that some gas
+        // should be refunded back (see askOperatorForRefund in bootloader.yul for details).
+        if let Some(bootloader_refund) = self.requested_refund() {
+            assert!(
+                self.operator_refund.is_none(),
+                "Operator was asked for refund two times"
+            );
+            let gas_spent_on_pubdata =
+                self.gas_spent_on_pubdata(&state.local_state) - self.spent_pubdata_counter_before;
+
+            let current_tx_index = bootloader_state.current_tx();
+            let tx_description_offset =
+                bootloader_state.get_tx_description_offset(current_tx_index);
+            let tx_gas_limit = state
+                .memory
+                .read_slot(
+                    BOOTLOADER_HEAP_PAGE as usize,
+                    tx_description_offset + TX_GAS_LIMIT_OFFSET,
+                )
+                .value
+                .as_u32();
+
+            let used_published_storage_slots = state
+                .storage
+                .save_paid_changes(Timestamp(state.local_state.timestamp));
+
+            let pubdata_published = pubdata_published(
+                state,
+                used_published_storage_slots,
+                self.timestamp_initial,
+                self.l1_batch.number,
+            );
+
+            self.pubdata_published = pubdata_published;
+            let current_ergs_per_pubdata_byte = state.local_state.current_ergs_per_pubdata_byte;
+            let tx_body_refund = self.tx_body_refund(
+                bootloader_refund,
+                gas_spent_on_pubdata,
+                tx_gas_limit,
+                current_ergs_per_pubdata_byte,
+                pubdata_published,
+            );
+
+            if tx_body_refund < bootloader_refund {
+                tracing::error!(
+                    "Suggested tx body refund is less than bootloader refund. Tx body refund: {tx_body_refund}, \
+                     bootloader refund: {bootloader_refund}"
+                );
+            }
+
+            let refund_to_propose = tx_body_refund + self.block_overhead_refund();
+
+            let refund_slot = OPERATOR_REFUNDS_OFFSET + current_tx_index;
+
+            // Writing the refund into memory
+            state.memory.populate_page(
+                BOOTLOADER_HEAP_PAGE as usize,
+                vec![(refund_slot, refund_to_propose.into())],
+                self.timestamp_before_cycle,
+            );
+
+            bootloader_state.set_refund_for_current_tx(refund_to_propose);
+            self.operator_refund = Some(refund_to_propose);
+            self.set_refund_as_done();
+
+            if tx_gas_limit < bootloader_refund {
+                tracing::error!(
+                    "Tx gas limit is less than bootloader refund. Tx gas limit: {tx_gas_limit}, \
+                    bootloader refund: {bootloader_refund}"
+                );
+            }
+            if tx_gas_limit < refund_to_propose {
+                tracing::error!(
+                    "Tx gas limit is less than operator refund. Tx gas limit: {tx_gas_limit}, \
+                     operator refund: {refund_to_propose}"
+                );
+            }
+
+            METRICS.refund[&RefundType::Bootloader]
+                .observe(bootloader_refund as f64 / tx_gas_limit as f64 * 100.0);
+            METRICS.refund[&RefundType::Operator]
+                .observe(refund_to_propose as f64 / tx_gas_limit as f64 * 100.0);
+            let refund_diff =
+                (refund_to_propose as f64 - bootloader_refund as f64) / tx_gas_limit as f64 * 100.0;
+            METRICS.refund_diff.observe(refund_diff);
+        }
+        TracerExecutionStatus::Continue
+    }
+}
+
+/// Returns the given transactions' gas limit - by reading it directly from the VM memory.
+pub(crate) fn pubdata_published<S: WriteStorage, H: HistoryMode>(
+    state: &ZkSyncVmState<S, H>,
+    storage_writes_pubdata_published: u32,
+    from_timestamp: Timestamp,
+    batch_number: L1BatchNumber,
+) -> u32 {
+    let (raw_events, l1_messages) = state
+        .event_sink
+        .get_events_and_l2_l1_logs_after_timestamp(from_timestamp);
+    let events: Vec<_> = merge_events(raw_events)
+        .into_iter()
+        .map(|e| e.into_vm_event(batch_number))
+        .collect();
+    // For the first transaction in L1 batch there may be (it depends on the execution mode) an L2->L1 log
+    // that is sent by `SystemContext` in `setNewBlock`. It's a part of the L1 batch pubdata overhead and not the transaction itself.
+    let l2_l1_logs_bytes = (l1_messages
+        .into_iter()
+        .map(|log| L2ToL1Log {
+            shard_id: log.shard_id,
+            is_service: log.is_first,
+            tx_number_in_block: log.tx_number_in_block,
+            sender: log.address,
+            key: u256_to_h256(log.key),
+            value: u256_to_h256(log.value),
+        })
+        .filter(|log| log.sender != SYSTEM_CONTEXT_ADDRESS)
+        .count() as u32)
+        * zk_evm_1_3_3::zkevm_opcode_defs::system_params::L1_MESSAGE_PUBDATA_BYTES;
+    let l2_l1_long_messages_bytes: u32 = extract_long_l2_to_l1_messages(&events)
+        .iter()
+        .map(|event| event.len() as u32)
+        .sum();
+
+    let published_bytecode_bytes: u32 = extract_published_bytecodes(&events)
+        .iter()
+        .map(|bytecodehash| bytecode_len_in_bytes(*bytecodehash) as u32 + PUBLISH_BYTECODE_OVERHEAD)
+        .sum();
+
+    storage_writes_pubdata_published
+        + l2_l1_logs_bytes
+        + l2_l1_long_messages_bytes
+        + published_bytecode_bytes
+}
diff --git a/core/lib/multivm/src/versions/vm_refunds_enhancement/tracers/result_tracer.rs b/core/lib/multivm/src/versions/vm_refunds_enhancement/tracers/result_tracer.rs
new file mode 100644
index 000000000000..c0a8e5d6cc0d
--- /dev/null
+++ b/core/lib/multivm/src/versions/vm_refunds_enhancement/tracers/result_tracer.rs
@@ -0,0 +1,243 @@
+use zk_evm_1_3_3::{
+    tracing::{AfterDecodingData, BeforeExecutionData, VmLocalStateData},
+    vm_state::{ErrorFlags, VmLocalState},
+    zkevm_opcode_defs::FatPointer,
+};
+use zksync_state::{StoragePtr, WriteStorage};
+
+use crate::interface::dyn_tracers::vm_1_3_3::DynTracer;
+use crate::interface::tracer::{TracerExecutionStopReason, VmExecutionStopReason};
+use crate::interface::{ExecutionResult, Halt, TxRevertReason, VmExecutionMode, VmRevertReason};
+use zksync_types::U256;
+
+use crate::vm_refunds_enhancement::bootloader_state::BootloaderState;
+use crate::vm_refunds_enhancement::old_vm::{
+    history_recorder::HistoryMode,
+    memory::SimpleMemory,
+    utils::{vm_may_have_ended_inner, VmExecutionResult},
+};
+use crate::vm_refunds_enhancement::tracers::utils::{get_vm_hook_params, read_pointer, VmHook};
+
+use crate::vm_refunds_enhancement::constants::{BOOTLOADER_HEAP_PAGE, RESULT_SUCCESS_FIRST_SLOT};
+use crate::vm_refunds_enhancement::types::internals::ZkSyncVmState;
+use crate::vm_refunds_enhancement::VmTracer;
+
+#[derive(Debug, Clone)]
+enum Result {
+    Error { error_reason: VmRevertReason },
+    Success { return_data: Vec<u8> },
+    Halt { reason: Halt },
+}
+
+/// Tracer responsible for handling the VM execution result.
+#[derive(Debug, Clone)]
+pub(crate) struct ResultTracer {
+    result: Option<Result>,
+    bootloader_out_of_gas: bool,
+    execution_mode: VmExecutionMode,
+}
+
+impl ResultTracer {
+    pub(crate) fn new(execution_mode: VmExecutionMode) -> Self {
+        Self {
+            result: None,
+            bootloader_out_of_gas: false,
+            execution_mode,
+        }
+    }
+}
+
+fn current_frame_is_bootloader(local_state: &VmLocalState) -> bool {
+    // The current frame is bootloader if the callstack depth is 1.
+    // Some of the near calls inside the bootloader can be out of gas, which is totally normal behavior
+    // and it shouldn't result in `is_bootloader_out_of_gas` becoming true.
+    local_state.callstack.inner.len() == 1
+}
+
+impl<S, H: HistoryMode> DynTracer<S, SimpleMemory<H>> for ResultTracer {
+    fn after_decoding(
+        &mut self,
+        state: VmLocalStateData<'_>,
+        data: AfterDecodingData,
+        _memory: &SimpleMemory<H>,
+    ) {
+        // We should check not only for the `NOT_ENOUGH_ERGS` flag but if the current frame is bootloader too.
+        if current_frame_is_bootloader(state.vm_local_state)
+            && data
+                .error_flags_accumulated
+                .contains(ErrorFlags::NOT_ENOUGH_ERGS)
+        {
+            self.bootloader_out_of_gas = true;
+        }
+    }
+
+    fn before_execution(
+        &mut self,
+        state: VmLocalStateData<'_>,
+        data: BeforeExecutionData,
+        memory: &SimpleMemory<H>,
+        _storage: StoragePtr<S>,
+    ) {
+        let hook = VmHook::from_opcode_memory(&state, &data);
+        if let VmHook::ExecutionResult = hook {
+            let vm_hook_params = get_vm_hook_params(memory);
+            let success = vm_hook_params[0];
+            let returndata_ptr = FatPointer::from_u256(vm_hook_params[1]);
+            let returndata = read_pointer(memory, returndata_ptr);
+            if success == U256::zero() {
+                self.result = Some(Result::Error {
+                    // Tx has reverted, without bootloader error, we can simply parse the revert reason
+                    error_reason: (VmRevertReason::from(returndata.as_slice())),
+                });
+            } else {
+                self.result = Some(Result::Success {
+                    return_data: returndata,
+                });
+            }
+        }
+    }
+}
+
+impl<S: WriteStorage, H: HistoryMode> VmTracer<S, H> for ResultTracer {
+    fn after_vm_execution(
+        &mut self,
+        state: &mut ZkSyncVmState<S, H>,
+        bootloader_state: &BootloaderState,
+        stop_reason: VmExecutionStopReason,
+    ) {
+        match stop_reason {
+            // Vm has finished execution, we need to check the result of it
+            VmExecutionStopReason::VmFinished => {
+                self.vm_finished_execution(state);
+            }
+            // One of the tracers above has requested to stop the execution.
+            // If it was the correct stop we already have the result,
+            // otherwise it can be out of gas error
+            VmExecutionStopReason::TracerRequestedStop(reason) => {
+                match self.execution_mode {
+                    VmExecutionMode::OneTx => {
+                        self.vm_stopped_execution(state, bootloader_state, reason)
+                    }
+                    VmExecutionMode::Batch => self.vm_finished_execution(state),
+                    VmExecutionMode::Bootloader => self.vm_finished_execution(state),
+                };
+            }
+        }
+    }
+}
+
+impl ResultTracer {
+    fn vm_finished_execution<S: WriteStorage, H: HistoryMode>(
+        &mut self,
+        state: &ZkSyncVmState<S, H>,
+    ) {
+        let Some(result) = vm_may_have_ended_inner(state) else {
+            // The VM has finished execution, but the result is not yet available.
+            self.result = Some(Result::Success {
+                return_data: vec![],
+            });
+            return;
+        };
+
+        // Check it's not inside tx
+        match result {
+            VmExecutionResult::Ok(output) => {
+                self.result = Some(Result::Success {
+                    return_data: output,
+                });
+            }
+            VmExecutionResult::Revert(output) => {
+                // Unlike VmHook::ExecutionResult,  vm has completely finished and returned not only the revert reason,
+                // but with bytecode, which represents the type of error from the bootloader side
+                let revert_reason = TxRevertReason::parse_error(&output);
+
+                match revert_reason {
+                    TxRevertReason::TxReverted(reason) => {
+                        self.result = Some(Result::Error {
+                            error_reason: reason,
+                        });
+                    }
+                    TxRevertReason::Halt(halt) => {
+                        self.result = Some(Result::Halt { reason: halt });
+                    }
+                };
+            }
+            VmExecutionResult::Panic => {
+                if self.bootloader_out_of_gas {
+                    self.result = Some(Result::Halt {
+                        reason: Halt::BootloaderOutOfGas,
+                    });
+                } else {
+                    self.result = Some(Result::Halt {
+                        reason: Halt::VMPanic,
+                    });
+                }
+            }
+            VmExecutionResult::MostLikelyDidNotFinish(_, _) => {
+                unreachable!()
+            }
+        }
+    }
+
+    fn vm_stopped_execution<S: WriteStorage, H: HistoryMode>(
+        &mut self,
+        state: &ZkSyncVmState<S, H>,
+        bootloader_state: &BootloaderState,
+        reason: TracerExecutionStopReason,
+    ) {
+        if let TracerExecutionStopReason::Abort(halt) = reason {
+            self.result = Some(Result::Halt { reason: halt });
+            return;
+        }
+
+        if self.bootloader_out_of_gas {
+            self.result = Some(Result::Halt {
+                reason: Halt::BootloaderOutOfGas,
+            });
+        } else {
+            if self.result.is_some() {
+                return;
+            }
+
+            let has_failed = tx_has_failed(state, bootloader_state.current_tx() as u32);
+            if has_failed {
+                self.result = Some(Result::Error {
+                    error_reason: VmRevertReason::General {
+                        msg: "Transaction reverted with empty reason. Possibly out of gas"
+                            .to_string(),
+                        data: vec![],
+                    },
+                });
+            } else {
+                self.result = Some(self.result.clone().unwrap_or(Result::Success {
+                    return_data: vec![],
+                }));
+            }
+        }
+    }
+
+    pub(crate) fn into_result(self) -> ExecutionResult {
+        match self.result.unwrap() {
+            Result::Error { error_reason } => ExecutionResult::Revert {
+                output: error_reason,
+            },
+            Result::Success { return_data } => ExecutionResult::Success {
+                output: return_data,
+            },
+            Result::Halt { reason } => ExecutionResult::Halt { reason },
+        }
+    }
+}
+
+pub(crate) fn tx_has_failed<S: WriteStorage, H: HistoryMode>(
+    state: &ZkSyncVmState<S, H>,
+    tx_id: u32,
+) -> bool {
+    let mem_slot = RESULT_SUCCESS_FIRST_SLOT + tx_id;
+    let mem_value = state
+        .memory
+        .read_slot(BOOTLOADER_HEAP_PAGE as usize, mem_slot as usize)
+        .value;
+
+    mem_value == U256::zero()
+}
diff --git a/core/lib/multivm/src/versions/vm_refunds_enhancement/tracers/traits.rs b/core/lib/multivm/src/versions/vm_refunds_enhancement/tracers/traits.rs
new file mode 100644
index 000000000000..13b295b9fe9b
--- /dev/null
+++ b/core/lib/multivm/src/versions/vm_refunds_enhancement/tracers/traits.rs
@@ -0,0 +1,42 @@
+use crate::interface::dyn_tracers::vm_1_3_3::DynTracer;
+use crate::interface::tracer::{TracerExecutionStatus, VmExecutionStopReason};
+use zksync_state::WriteStorage;
+
+use crate::vm_refunds_enhancement::bootloader_state::BootloaderState;
+use crate::vm_refunds_enhancement::old_vm::history_recorder::HistoryMode;
+use crate::vm_refunds_enhancement::old_vm::memory::SimpleMemory;
+use crate::vm_refunds_enhancement::types::internals::ZkSyncVmState;
+
+pub type TracerPointer<S, H> = Box<dyn VmTracer<S, H>>;
+
+/// Run tracer for collecting data during the vm execution cycles
+pub trait VmTracer<S: WriteStorage, H: HistoryMode>: DynTracer<S, SimpleMemory<H>> {
+    /// Initialize the tracer before the vm execution
+    fn initialize_tracer(&mut self, _state: &mut ZkSyncVmState<S, H>) {}
+    /// Run after each vm execution cycle
+    fn finish_cycle(
+        &mut self,
+        _state: &mut ZkSyncVmState<S, H>,
+        _bootloader_state: &mut BootloaderState,
+    ) -> TracerExecutionStatus {
+        TracerExecutionStatus::Continue
+    }
+    /// Run after the vm execution
+    fn after_vm_execution(
+        &mut self,
+        _state: &mut ZkSyncVmState<S, H>,
+        _bootloader_state: &BootloaderState,
+        _stop_reason: VmExecutionStopReason,
+    ) {
+    }
+}
+
+pub trait ToTracerPointer<S, H> {
+    fn into_tracer_pointer(self) -> TracerPointer<S, H>;
+}
+
+impl<S: WriteStorage, H: HistoryMode, T: VmTracer<S, H> + 'static> ToTracerPointer<S, H> for T {
+    fn into_tracer_pointer(self) -> TracerPointer<S, H> {
+        Box::new(self)
+    }
+}
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
new file mode 100644
index 000000000000..654c7300e4ad
--- /dev/null
+++ b/core/lib/multivm/src/versions/vm_refunds_enhancement/tracers/utils.rs
@@ -0,0 +1,221 @@
+use zk_evm_1_3_3::{
+    aux_structures::MemoryPage,
+    tracing::{BeforeExecutionData, VmLocalStateData},
+    zkevm_opcode_defs::{
+        FarCallABI, FarCallForwardPageType, FatPointer, LogOpcode, Opcode, UMAOpcode,
+    },
+};
+
+use zksync_system_constants::{
+    ECRECOVER_PRECOMPILE_ADDRESS, KECCAK256_PRECOMPILE_ADDRESS, KNOWN_CODES_STORAGE_ADDRESS,
+    L1_MESSENGER_ADDRESS, SHA256_PRECOMPILE_ADDRESS,
+};
+use zksync_types::U256;
+use zksync_utils::u256_to_h256;
+
+use crate::vm_refunds_enhancement::constants::{
+    BOOTLOADER_HEAP_PAGE, VM_HOOK_PARAMS_COUNT, VM_HOOK_PARAMS_START_POSITION, VM_HOOK_POSITION,
+};
+use crate::vm_refunds_enhancement::old_vm::{
+    history_recorder::HistoryMode,
+    memory::SimpleMemory,
+    utils::{aux_heap_page_from_base, heap_page_from_base},
+};
+
+#[derive(Clone, Debug, Copy)]
+pub(crate) enum VmHook {
+    AccountValidationEntered,
+    PaymasterValidationEntered,
+    NoValidationEntered,
+    ValidationStepEndeded,
+    TxHasEnded,
+    DebugLog,
+    DebugReturnData,
+    NoHook,
+    NearCallCatch,
+    AskOperatorForRefund,
+    NotifyAboutRefund,
+    ExecutionResult,
+    FinalBatchInfo,
+}
+
+impl VmHook {
+    pub(crate) fn from_opcode_memory(
+        state: &VmLocalStateData<'_>,
+        data: &BeforeExecutionData,
+    ) -> Self {
+        let opcode_variant = data.opcode.variant;
+        let heap_page =
+            heap_page_from_base(state.vm_local_state.callstack.current.base_memory_page).0;
+
+        let src0_value = data.src0_value.value;
+
+        let fat_ptr = FatPointer::from_u256(src0_value);
+
+        let value = data.src1_value.value;
+
+        // Only UMA opcodes in the bootloader serve for vm hooks
+        if !matches!(opcode_variant.opcode, Opcode::UMA(UMAOpcode::HeapWrite))
+            || heap_page != BOOTLOADER_HEAP_PAGE
+            || fat_ptr.offset != VM_HOOK_POSITION * 32
+        {
+            return Self::NoHook;
+        }
+
+        match value.as_u32() {
+            0 => Self::AccountValidationEntered,
+            1 => Self::PaymasterValidationEntered,
+            2 => Self::NoValidationEntered,
+            3 => Self::ValidationStepEndeded,
+            4 => Self::TxHasEnded,
+            5 => Self::DebugLog,
+            6 => Self::DebugReturnData,
+            7 => Self::NearCallCatch,
+            8 => Self::AskOperatorForRefund,
+            9 => Self::NotifyAboutRefund,
+            10 => Self::ExecutionResult,
+            11 => Self::FinalBatchInfo,
+            _ => panic!("Unkown hook"),
+        }
+    }
+}
+
+pub(crate) fn get_debug_log<H: HistoryMode>(
+    state: &VmLocalStateData<'_>,
+    memory: &SimpleMemory<H>,
+) -> String {
+    let vm_hook_params: Vec<_> = get_vm_hook_params(memory)
+        .into_iter()
+        .map(u256_to_h256)
+        .collect();
+    let msg = vm_hook_params[0].as_bytes().to_vec();
+    let data = vm_hook_params[1].as_bytes().to_vec();
+
+    let msg = String::from_utf8(msg).expect("Invalid debug message");
+    let data = U256::from_big_endian(&data);
+
+    // For long data, it is better to use hex-encoding for greater readibility
+    let data_str = if data > U256::from(u64::max_value()) {
+        let mut bytes = [0u8; 32];
+        data.to_big_endian(&mut bytes);
+        format!("0x{}", hex::encode(bytes))
+    } else {
+        data.to_string()
+    };
+
+    let tx_id = state.vm_local_state.tx_number_in_block;
+
+    format!("Bootloader transaction {}: {} {}", tx_id, msg, data_str)
+}
+
+/// Reads the memory slice represented by the fat pointer.
+/// Note, that the fat pointer must point to the accesible memory (i.e. not cleared up yet).
+pub(crate) fn read_pointer<H: HistoryMode>(
+    memory: &SimpleMemory<H>,
+    pointer: FatPointer,
+) -> Vec<u8> {
+    let FatPointer {
+        offset,
+        length,
+        start,
+        memory_page,
+    } = pointer;
+
+    // The actual bounds of the returndata ptr is [start+offset..start+length]
+    let mem_region_start = start + offset;
+    let mem_region_length = length - offset;
+
+    memory.read_unaligned_bytes(
+        memory_page as usize,
+        mem_region_start as usize,
+        mem_region_length as usize,
+    )
+}
+
+/// Outputs the returndata for the latest call.
+/// This is usually used to output the revert reason.
+pub(crate) fn get_debug_returndata<H: HistoryMode>(memory: &SimpleMemory<H>) -> String {
+    let vm_hook_params: Vec<_> = get_vm_hook_params(memory);
+    let returndata_ptr = FatPointer::from_u256(vm_hook_params[0]);
+    let returndata = read_pointer(memory, returndata_ptr);
+
+    format!("0x{}", hex::encode(returndata))
+}
+
+/// Accepts a vm hook and, if it requires to output some debug log, outputs it.
+pub(crate) fn print_debug_if_needed<H: HistoryMode>(
+    hook: &VmHook,
+    state: &VmLocalStateData<'_>,
+    memory: &SimpleMemory<H>,
+) {
+    let log = match hook {
+        VmHook::DebugLog => get_debug_log(state, memory),
+        VmHook::DebugReturnData => get_debug_returndata(memory),
+        _ => return,
+    };
+
+    tracing::trace!("{}", log);
+}
+
+pub(crate) fn computational_gas_price(
+    state: VmLocalStateData<'_>,
+    data: &BeforeExecutionData,
+) -> u32 {
+    // We calculate computational gas used as a raw price for opcode plus cost for precompiles.
+    // This calculation is incomplete as it misses decommitment and memory growth costs.
+    // To calculate decommitment cost we need an access to decommitter oracle which is missing in tracer now.
+    // Memory growth calculation is complex and it will require different logic for different opcodes (`FarCall`, `Ret`, `UMA`).
+    let base_price = data.opcode.inner.variant.ergs_price();
+    let precompile_price = match data.opcode.variant.opcode {
+        Opcode::Log(LogOpcode::PrecompileCall) => {
+            let address = state.vm_local_state.callstack.current.this_address;
+
+            if address == KECCAK256_PRECOMPILE_ADDRESS
+                || address == SHA256_PRECOMPILE_ADDRESS
+                || address == ECRECOVER_PRECOMPILE_ADDRESS
+            {
+                data.src1_value.value.low_u32()
+            } else {
+                0
+            }
+        }
+        _ => 0,
+    };
+    base_price + precompile_price
+}
+
+pub(crate) fn gas_spent_on_bytecodes_and_long_messages_this_opcode(
+    state: &VmLocalStateData<'_>,
+    data: &BeforeExecutionData,
+) -> u32 {
+    if data.opcode.variant.opcode == Opcode::Log(LogOpcode::PrecompileCall) {
+        let current_stack = state.vm_local_state.callstack.get_current_stack();
+        // Trace for precompile calls from `KNOWN_CODES_STORAGE_ADDRESS` and `L1_MESSENGER_ADDRESS` that burn some gas.
+        // Note, that if there is less gas left than requested to burn it will be burnt anyway.
+        if current_stack.this_address == KNOWN_CODES_STORAGE_ADDRESS
+            || current_stack.this_address == L1_MESSENGER_ADDRESS
+        {
+            std::cmp::min(data.src1_value.value.as_u32(), current_stack.ergs_remaining)
+        } else {
+            0
+        }
+    } else {
+        0
+    }
+}
+
+pub(crate) fn get_calldata_page_via_abi(far_call_abi: &FarCallABI, base_page: MemoryPage) -> u32 {
+    match far_call_abi.forwarding_mode {
+        FarCallForwardPageType::ForwardFatPointer => {
+            far_call_abi.memory_quasi_fat_pointer.memory_page
+        }
+        FarCallForwardPageType::UseAuxHeap => aux_heap_page_from_base(base_page).0,
+        FarCallForwardPageType::UseHeap => heap_page_from_base(base_page).0,
+    }
+}
+pub(crate) fn get_vm_hook_params<H: HistoryMode>(memory: &SimpleMemory<H>) -> Vec<U256> {
+    memory.dump_page_content_as_u256_words(
+        BOOTLOADER_HEAP_PAGE,
+        VM_HOOK_PARAMS_START_POSITION..VM_HOOK_PARAMS_START_POSITION + VM_HOOK_PARAMS_COUNT,
+    )
+}
diff --git a/core/lib/multivm/src/versions/vm_refunds_enhancement/types/internals/mod.rs b/core/lib/multivm/src/versions/vm_refunds_enhancement/types/internals/mod.rs
new file mode 100644
index 000000000000..601b7b8bd014
--- /dev/null
+++ b/core/lib/multivm/src/versions/vm_refunds_enhancement/types/internals/mod.rs
@@ -0,0 +1,7 @@
+pub(crate) use snapshot::VmSnapshot;
+pub(crate) use transaction_data::TransactionData;
+pub(crate) use vm_state::new_vm_state;
+pub use vm_state::ZkSyncVmState;
+mod snapshot;
+mod transaction_data;
+mod vm_state;
diff --git a/core/lib/multivm/src/versions/vm_refunds_enhancement/types/internals/snapshot.rs b/core/lib/multivm/src/versions/vm_refunds_enhancement/types/internals/snapshot.rs
new file mode 100644
index 000000000000..cbb893cf56bf
--- /dev/null
+++ b/core/lib/multivm/src/versions/vm_refunds_enhancement/types/internals/snapshot.rs
@@ -0,0 +1,11 @@
+use zk_evm_1_3_3::vm_state::VmLocalState;
+
+use crate::vm_refunds_enhancement::bootloader_state::BootloaderStateSnapshot;
+
+/// A snapshot of the VM that holds enough information to
+/// rollback the VM to some historical state.
+#[derive(Debug, Clone)]
+pub(crate) struct VmSnapshot {
+    pub(crate) local_state: VmLocalState,
+    pub(crate) bootloader_state: BootloaderStateSnapshot,
+}
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
new file mode 100644
index 000000000000..1b589146a298
--- /dev/null
+++ b/core/lib/multivm/src/versions/vm_refunds_enhancement/types/internals/transaction_data.rs
@@ -0,0 +1,344 @@
+use std::convert::TryInto;
+use zksync_types::ethabi::{encode, Address, Token};
+use zksync_types::fee::{encoding_len, Fee};
+use zksync_types::l1::is_l1_tx_type;
+use zksync_types::l2::L2Tx;
+use zksync_types::transaction_request::{PaymasterParams, TransactionRequest};
+use zksync_types::{
+    l2::TransactionType, Bytes, Execute, ExecuteTransactionCommon, L2ChainId, L2TxCommonData,
+    Nonce, Transaction, H256, U256,
+};
+use zksync_utils::address_to_h256;
+use zksync_utils::{bytecode::hash_bytecode, bytes_to_be_words, h256_to_u256};
+
+use crate::vm_refunds_enhancement::utils::overhead::{get_amortized_overhead, OverheadCoeficients};
+
+/// This structure represents the data that is used by
+/// the Bootloader to describe the transaction.
+#[derive(Debug, Default, Clone)]
+pub(crate) struct TransactionData {
+    pub(crate) tx_type: u8,
+    pub(crate) from: Address,
+    pub(crate) to: Address,
+    pub(crate) gas_limit: U256,
+    pub(crate) pubdata_price_limit: U256,
+    pub(crate) max_fee_per_gas: U256,
+    pub(crate) max_priority_fee_per_gas: U256,
+    pub(crate) paymaster: Address,
+    pub(crate) nonce: U256,
+    pub(crate) value: U256,
+    // The reserved fields that are unique for different types of transactions.
+    // E.g. nonce is currently used in all transaction, but it should not be mandatory
+    // in the long run.
+    pub(crate) reserved: [U256; 4],
+    pub(crate) data: Vec<u8>,
+    pub(crate) signature: Vec<u8>,
+    // The factory deps provided with the transaction.
+    // Note that *only hashes* of these bytecodes are signed by the user
+    // and they are used in the ABI encoding of the struct.
+    // TODO: include this into the tx signature as part of SMA-1010
+    pub(crate) factory_deps: Vec<Vec<u8>>,
+    pub(crate) paymaster_input: Vec<u8>,
+    pub(crate) reserved_dynamic: Vec<u8>,
+    pub(crate) raw_bytes: Option<Vec<u8>>,
+}
+
+impl From<Transaction> for TransactionData {
+    fn from(execute_tx: Transaction) -> Self {
+        match execute_tx.common_data {
+            ExecuteTransactionCommon::L2(common_data) => {
+                let nonce = U256::from_big_endian(&common_data.nonce.to_be_bytes());
+
+                let should_check_chain_id = if matches!(
+                    common_data.transaction_type,
+                    TransactionType::LegacyTransaction
+                ) && common_data.extract_chain_id().is_some()
+                {
+                    U256([1, 0, 0, 0])
+                } else {
+                    U256::zero()
+                };
+
+                TransactionData {
+                    tx_type: (common_data.transaction_type as u32) as u8,
+                    from: common_data.initiator_address,
+                    to: execute_tx.execute.contract_address,
+                    gas_limit: common_data.fee.gas_limit,
+                    pubdata_price_limit: common_data.fee.gas_per_pubdata_limit,
+                    max_fee_per_gas: common_data.fee.max_fee_per_gas,
+                    max_priority_fee_per_gas: common_data.fee.max_priority_fee_per_gas,
+                    paymaster: common_data.paymaster_params.paymaster,
+                    nonce,
+                    value: execute_tx.execute.value,
+                    reserved: [
+                        should_check_chain_id,
+                        U256::zero(),
+                        U256::zero(),
+                        U256::zero(),
+                    ],
+                    data: execute_tx.execute.calldata,
+                    signature: common_data.signature,
+                    factory_deps: execute_tx.execute.factory_deps.unwrap_or_default(),
+                    paymaster_input: common_data.paymaster_params.paymaster_input,
+                    reserved_dynamic: vec![],
+                    raw_bytes: execute_tx.raw_bytes.map(|a| a.0),
+                }
+            }
+            ExecuteTransactionCommon::L1(common_data) => {
+                let refund_recipient = h256_to_u256(address_to_h256(&common_data.refund_recipient));
+                TransactionData {
+                    tx_type: common_data.tx_format() as u8,
+                    from: common_data.sender,
+                    to: execute_tx.execute.contract_address,
+                    gas_limit: common_data.gas_limit,
+                    pubdata_price_limit: common_data.gas_per_pubdata_limit,
+                    // It doesn't matter what we put here, since
+                    // the bootloader does not charge anything
+                    max_fee_per_gas: common_data.max_fee_per_gas,
+                    max_priority_fee_per_gas: U256::zero(),
+                    paymaster: Address::default(),
+                    nonce: U256::from(common_data.serial_id.0), // priority op ID
+                    value: execute_tx.execute.value,
+                    reserved: [
+                        common_data.to_mint,
+                        refund_recipient,
+                        U256::zero(),
+                        U256::zero(),
+                    ],
+                    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(),
+                    paymaster_input: vec![],
+                    reserved_dynamic: vec![],
+                    raw_bytes: None,
+                }
+            }
+            ExecuteTransactionCommon::ProtocolUpgrade(common_data) => {
+                let refund_recipient = h256_to_u256(address_to_h256(&common_data.refund_recipient));
+                TransactionData {
+                    tx_type: common_data.tx_format() as u8,
+                    from: common_data.sender,
+                    to: execute_tx.execute.contract_address,
+                    gas_limit: common_data.gas_limit,
+                    pubdata_price_limit: common_data.gas_per_pubdata_limit,
+                    // It doesn't matter what we put here, since
+                    // the bootloader does not charge anything
+                    max_fee_per_gas: common_data.max_fee_per_gas,
+                    max_priority_fee_per_gas: U256::zero(),
+                    paymaster: Address::default(),
+                    nonce: U256::from(common_data.upgrade_id as u16),
+                    value: execute_tx.execute.value,
+                    reserved: [
+                        common_data.to_mint,
+                        refund_recipient,
+                        U256::zero(),
+                        U256::zero(),
+                    ],
+                    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(),
+                    paymaster_input: vec![],
+                    reserved_dynamic: vec![],
+                    raw_bytes: None,
+                }
+            }
+        }
+    }
+}
+
+impl TransactionData {
+    pub(crate) fn abi_encode_with_custom_factory_deps(
+        self,
+        factory_deps_hashes: Vec<U256>,
+    ) -> Vec<u8> {
+        encode(&[Token::Tuple(vec![
+            Token::Uint(U256::from_big_endian(&self.tx_type.to_be_bytes())),
+            Token::Address(self.from),
+            Token::Address(self.to),
+            Token::Uint(self.gas_limit),
+            Token::Uint(self.pubdata_price_limit),
+            Token::Uint(self.max_fee_per_gas),
+            Token::Uint(self.max_priority_fee_per_gas),
+            Token::Address(self.paymaster),
+            Token::Uint(self.nonce),
+            Token::Uint(self.value),
+            Token::FixedArray(self.reserved.iter().copied().map(Token::Uint).collect()),
+            Token::Bytes(self.data),
+            Token::Bytes(self.signature),
+            Token::Array(factory_deps_hashes.into_iter().map(Token::Uint).collect()),
+            Token::Bytes(self.paymaster_input),
+            Token::Bytes(self.reserved_dynamic),
+        ])])
+    }
+
+    pub(crate) fn abi_encode(self) -> Vec<u8> {
+        let factory_deps_hashes = self
+            .factory_deps
+            .iter()
+            .map(|dep| h256_to_u256(hash_bytecode(dep)))
+            .collect();
+        self.abi_encode_with_custom_factory_deps(factory_deps_hashes)
+    }
+
+    pub(crate) fn into_tokens(self) -> Vec<U256> {
+        let bytes = self.abi_encode();
+        assert!(bytes.len() % 32 == 0);
+
+        bytes_to_be_words(bytes)
+    }
+
+    pub(crate) fn effective_gas_price_per_pubdata(&self, block_gas_price_per_pubdata: u32) -> u32 {
+        // It is enforced by the protocol that the L1 transactions always pay the exact amount of gas per pubdata
+        // as was supplied in the transaction.
+        if is_l1_tx_type(self.tx_type) {
+            self.pubdata_price_limit.as_u32()
+        } else {
+            block_gas_price_per_pubdata
+        }
+    }
+
+    pub(crate) fn overhead_gas(&self, block_gas_price_per_pubdata: u32) -> u32 {
+        let total_gas_limit = self.gas_limit.as_u32();
+        let gas_price_per_pubdata =
+            self.effective_gas_price_per_pubdata(block_gas_price_per_pubdata);
+
+        let encoded_len = encoding_len(
+            self.data.len() as u64,
+            self.signature.len() as u64,
+            self.factory_deps.len() as u64,
+            self.paymaster_input.len() as u64,
+            self.reserved_dynamic.len() as u64,
+        );
+
+        let coeficients = OverheadCoeficients::from_tx_type(self.tx_type);
+        get_amortized_overhead(
+            total_gas_limit,
+            gas_price_per_pubdata,
+            encoded_len,
+            coeficients,
+        )
+    }
+
+    pub(crate) fn trusted_ergs_limit(&self, _block_gas_price_per_pubdata: u64) -> U256 {
+        // TODO (EVM-66): correctly calculate the trusted gas limit for a transaction
+        self.gas_limit
+    }
+
+    pub(crate) fn tx_hash(&self, chain_id: L2ChainId) -> H256 {
+        if is_l1_tx_type(self.tx_type) {
+            return self.canonical_l1_tx_hash().unwrap();
+        }
+
+        let l2_tx: L2Tx = self.clone().try_into().unwrap();
+        let transaction_request: TransactionRequest = l2_tx.into();
+
+        // It is assumed that the TransactionData always has all the necessary components to recover the hash.
+        transaction_request
+            .get_tx_hash(chain_id)
+            .expect("Could not recover L2 transaction hash")
+    }
+
+    fn canonical_l1_tx_hash(&self) -> Result<H256, TxHashCalculationError> {
+        use zksync_types::web3::signing::keccak256;
+
+        if !is_l1_tx_type(self.tx_type) {
+            return Err(TxHashCalculationError::CannotCalculateL1HashForL2Tx);
+        }
+
+        let encoded_bytes = self.clone().abi_encode();
+
+        Ok(H256(keccak256(&encoded_bytes)))
+    }
+}
+
+#[derive(Debug, Clone, Copy)]
+pub(crate) enum TxHashCalculationError {
+    CannotCalculateL1HashForL2Tx,
+    CannotCalculateL2HashForL1Tx,
+}
+
+impl TryInto<L2Tx> for TransactionData {
+    type Error = TxHashCalculationError;
+
+    fn try_into(self) -> Result<L2Tx, Self::Error> {
+        if is_l1_tx_type(self.tx_type) {
+            return Err(TxHashCalculationError::CannotCalculateL2HashForL1Tx);
+        }
+
+        let common_data = L2TxCommonData {
+            transaction_type: (self.tx_type as u32).try_into().unwrap(),
+            nonce: Nonce(self.nonce.as_u32()),
+            fee: Fee {
+                max_fee_per_gas: self.max_fee_per_gas,
+                max_priority_fee_per_gas: self.max_priority_fee_per_gas,
+                gas_limit: self.gas_limit,
+                gas_per_pubdata_limit: self.pubdata_price_limit,
+            },
+            signature: self.signature,
+            input: None,
+            initiator_address: self.from,
+            paymaster_params: PaymasterParams {
+                paymaster: self.paymaster,
+                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,
+        };
+
+        Ok(L2Tx {
+            execute,
+            common_data,
+            received_timestamp_ms: 0,
+            raw_bytes: self.raw_bytes.map(Bytes::from),
+        })
+    }
+}
+
+#[cfg(test)]
+mod tests {
+    use super::*;
+    use zksync_types::fee::encoding_len;
+
+    #[test]
+    fn test_consistency_with_encoding_length() {
+        let transaction = TransactionData {
+            tx_type: 113,
+            from: Address::random(),
+            to: Address::random(),
+            gas_limit: U256::from(1u32),
+            pubdata_price_limit: U256::from(1u32),
+            max_fee_per_gas: U256::from(1u32),
+            max_priority_fee_per_gas: U256::from(1u32),
+            paymaster: Address::random(),
+            nonce: U256::zero(),
+            value: U256::zero(),
+            // The reserved fields that are unique for different types of transactions.
+            // E.g. nonce is currently used in all transaction, but it should not be mandatory
+            // in the long run.
+            reserved: [U256::zero(); 4],
+            data: vec![0u8; 65],
+            signature: vec![0u8; 75],
+            // The factory deps provided with the transaction.
+            // Note that *only hashes* of these bytecodes are signed by the user
+            // and they are used in the ABI encoding of the struct.
+            // TODO: include this into the tx signature as part of SMA-1010
+            factory_deps: vec![vec![0u8; 32], vec![1u8; 32]],
+            paymaster_input: vec![0u8; 85],
+            reserved_dynamic: vec![0u8; 32],
+            raw_bytes: None,
+        };
+
+        let assumed_encoded_len = encoding_len(65, 75, 2, 85, 32);
+
+        let true_encoding_len = transaction.into_tokens().len();
+
+        assert_eq!(assumed_encoded_len, true_encoding_len);
+    }
+}
diff --git a/core/lib/multivm/src/versions/vm_refunds_enhancement/types/internals/vm_state.rs b/core/lib/multivm/src/versions/vm_refunds_enhancement/types/internals/vm_state.rs
new file mode 100644
index 000000000000..b656cd09f9b5
--- /dev/null
+++ b/core/lib/multivm/src/versions/vm_refunds_enhancement/types/internals/vm_state.rs
@@ -0,0 +1,175 @@
+use zk_evm_1_3_3::{
+    aux_structures::MemoryPage,
+    aux_structures::Timestamp,
+    block_properties::BlockProperties,
+    vm_state::{CallStackEntry, PrimitiveValue, VmState},
+    witness_trace::DummyTracer,
+    zkevm_opcode_defs::{
+        system_params::{BOOTLOADER_MAX_MEMORY, INITIAL_FRAME_FORMAL_EH_LOCATION},
+        FatPointer, BOOTLOADER_CALLDATA_PAGE,
+    },
+};
+
+use crate::interface::{L1BatchEnv, L2Block, SystemEnv};
+use zk_evm_1_3_3::zkevm_opcode_defs::{
+    BOOTLOADER_BASE_PAGE, BOOTLOADER_CODE_PAGE, STARTING_BASE_PAGE, STARTING_TIMESTAMP,
+};
+use zksync_state::{StoragePtr, WriteStorage};
+use zksync_system_constants::BOOTLOADER_ADDRESS;
+use zksync_types::block::legacy_miniblock_hash;
+use zksync_types::{zkevm_test_harness::INITIAL_MONOTONIC_CYCLE_COUNTER, Address, MiniblockNumber};
+use zksync_utils::h256_to_u256;
+
+use crate::vm_refunds_enhancement::bootloader_state::BootloaderState;
+use crate::vm_refunds_enhancement::constants::BOOTLOADER_HEAP_PAGE;
+use crate::vm_refunds_enhancement::old_vm::{
+    event_sink::InMemoryEventSink, history_recorder::HistoryMode, memory::SimpleMemory,
+    oracles::decommitter::DecommitterOracle, oracles::precompile::PrecompilesProcessorWithHistory,
+};
+use crate::vm_refunds_enhancement::oracles::storage::StorageOracle;
+use crate::vm_refunds_enhancement::types::l1_batch::bootloader_initial_memory;
+use crate::vm_refunds_enhancement::utils::l2_blocks::{assert_next_block, load_last_l2_block};
+
+pub type ZkSyncVmState<S, H> = VmState<
+    StorageOracle<S, H>,
+    SimpleMemory<H>,
+    InMemoryEventSink<H>,
+    PrecompilesProcessorWithHistory<false, H>,
+    DecommitterOracle<false, S, H>,
+    DummyTracer,
+>;
+
+fn formal_calldata_abi() -> PrimitiveValue {
+    let fat_pointer = FatPointer {
+        offset: 0,
+        memory_page: BOOTLOADER_CALLDATA_PAGE,
+        start: 0,
+        length: 0,
+    };
+
+    PrimitiveValue {
+        value: fat_pointer.to_u256(),
+        is_pointer: true,
+    }
+}
+
+/// Initialize the vm state and all necessary oracles
+pub(crate) fn new_vm_state<S: WriteStorage, H: HistoryMode>(
+    storage: StoragePtr<S>,
+    system_env: &SystemEnv,
+    l1_batch_env: &L1BatchEnv,
+) -> (ZkSyncVmState<S, H>, BootloaderState) {
+    let last_l2_block = if let Some(last_l2_block) = load_last_l2_block(storage.clone()) {
+        last_l2_block
+    } else {
+        // This is the scenario of either the first L2 block ever or
+        // the first block after the upgrade for support of L2 blocks.
+        L2Block {
+            number: l1_batch_env.first_l2_block.number.saturating_sub(1),
+            timestamp: 0,
+            hash: legacy_miniblock_hash(MiniblockNumber(l1_batch_env.first_l2_block.number) - 1),
+        }
+    };
+
+    assert_next_block(&last_l2_block, &l1_batch_env.first_l2_block);
+    let first_l2_block = l1_batch_env.first_l2_block;
+    let storage_oracle: StorageOracle<S, H> = StorageOracle::new(storage.clone());
+    let mut memory = SimpleMemory::default();
+    let event_sink = InMemoryEventSink::default();
+    let precompiles_processor = PrecompilesProcessorWithHistory::<false, H>::default();
+    let mut decommittment_processor: DecommitterOracle<false, S, H> =
+        DecommitterOracle::new(storage);
+
+    decommittment_processor.populate(
+        vec![(
+            h256_to_u256(system_env.base_system_smart_contracts.default_aa.hash),
+            system_env
+                .base_system_smart_contracts
+                .default_aa
+                .code
+                .clone(),
+        )],
+        Timestamp(0),
+    );
+
+    memory.populate(
+        vec![(
+            BOOTLOADER_CODE_PAGE,
+            system_env
+                .base_system_smart_contracts
+                .bootloader
+                .code
+                .clone(),
+        )],
+        Timestamp(0),
+    );
+
+    let bootloader_initial_memory = bootloader_initial_memory(l1_batch_env);
+    memory.populate_page(
+        BOOTLOADER_HEAP_PAGE as usize,
+        bootloader_initial_memory.clone(),
+        Timestamp(0),
+    );
+
+    let mut vm = VmState::empty_state(
+        storage_oracle,
+        memory,
+        event_sink,
+        precompiles_processor,
+        decommittment_processor,
+        DummyTracer,
+        BlockProperties {
+            default_aa_code_hash: h256_to_u256(
+                system_env.base_system_smart_contracts.default_aa.hash,
+            ),
+            zkporter_is_available: system_env.zk_porter_available,
+        },
+    );
+
+    vm.local_state.callstack.current.ergs_remaining = system_env.gas_limit;
+
+    let initial_context = CallStackEntry {
+        this_address: BOOTLOADER_ADDRESS,
+        msg_sender: Address::zero(),
+        code_address: BOOTLOADER_ADDRESS,
+        base_memory_page: MemoryPage(BOOTLOADER_BASE_PAGE),
+        code_page: MemoryPage(BOOTLOADER_CODE_PAGE),
+        sp: 0,
+        pc: 0,
+        // Note, that since the results are written at the end of the memory
+        // it is needed to have the entire heap available from the beginning
+        heap_bound: BOOTLOADER_MAX_MEMORY,
+        aux_heap_bound: BOOTLOADER_MAX_MEMORY,
+        exception_handler_location: INITIAL_FRAME_FORMAL_EH_LOCATION,
+        ergs_remaining: system_env.gas_limit,
+        this_shard_id: 0,
+        caller_shard_id: 0,
+        code_shard_id: 0,
+        is_static: false,
+        is_local_frame: false,
+        context_u128_value: 0,
+    };
+
+    // We consider the contract that is being run as a bootloader
+    vm.push_bootloader_context(INITIAL_MONOTONIC_CYCLE_COUNTER - 1, initial_context);
+    vm.local_state.timestamp = STARTING_TIMESTAMP;
+    vm.local_state.memory_page_counter = STARTING_BASE_PAGE;
+    vm.local_state.monotonic_cycle_counter = INITIAL_MONOTONIC_CYCLE_COUNTER;
+    vm.local_state.current_ergs_per_pubdata_byte = 0;
+    vm.local_state.registers[0] = formal_calldata_abi();
+
+    // Deleting all the historical records brought by the initial
+    // initialization of the VM to make them permanent.
+    vm.decommittment_processor.delete_history();
+    vm.event_sink.delete_history();
+    vm.storage.delete_history();
+    vm.memory.delete_history();
+    vm.precompiles_processor.delete_history();
+    let bootloader_state = BootloaderState::new(
+        system_env.execution_mode,
+        bootloader_initial_memory,
+        first_l2_block,
+    );
+
+    (vm, bootloader_state)
+}
diff --git a/core/lib/multivm/src/versions/vm_refunds_enhancement/types/l1_batch.rs b/core/lib/multivm/src/versions/vm_refunds_enhancement/types/l1_batch.rs
new file mode 100644
index 000000000000..631f1436cc3b
--- /dev/null
+++ b/core/lib/multivm/src/versions/vm_refunds_enhancement/types/l1_batch.rs
@@ -0,0 +1,37 @@
+use crate::interface::L1BatchEnv;
+use zksync_types::U256;
+use zksync_utils::{address_to_u256, h256_to_u256};
+
+const OPERATOR_ADDRESS_SLOT: usize = 0;
+const PREV_BLOCK_HASH_SLOT: usize = 1;
+const NEW_BLOCK_TIMESTAMP_SLOT: usize = 2;
+const NEW_BLOCK_NUMBER_SLOT: usize = 3;
+const L1_GAS_PRICE_SLOT: usize = 4;
+const FAIR_L2_GAS_PRICE_SLOT: usize = 5;
+const EXPECTED_BASE_FEE_SLOT: usize = 6;
+const SHOULD_SET_NEW_BLOCK_SLOT: usize = 7;
+
+/// Returns the initial memory for the bootloader based on the current batch environment.
+pub(crate) fn bootloader_initial_memory(l1_batch: &L1BatchEnv) -> Vec<(usize, U256)> {
+    let (prev_block_hash, should_set_new_block) = l1_batch
+        .previous_batch_hash
+        .map(|prev_block_hash| (h256_to_u256(prev_block_hash), U256::one()))
+        .unwrap_or_default();
+
+    vec![
+        (
+            OPERATOR_ADDRESS_SLOT,
+            address_to_u256(&l1_batch.fee_account),
+        ),
+        (PREV_BLOCK_HASH_SLOT, prev_block_hash),
+        (NEW_BLOCK_TIMESTAMP_SLOT, U256::from(l1_batch.timestamp)),
+        (NEW_BLOCK_NUMBER_SLOT, U256::from(l1_batch.number.0)),
+        (L1_GAS_PRICE_SLOT, U256::from(l1_batch.l1_gas_price)),
+        (
+            FAIR_L2_GAS_PRICE_SLOT,
+            U256::from(l1_batch.fair_l2_gas_price),
+        ),
+        (EXPECTED_BASE_FEE_SLOT, U256::from(l1_batch.base_fee())),
+        (SHOULD_SET_NEW_BLOCK_SLOT, should_set_new_block),
+    ]
+}
diff --git a/core/lib/multivm/src/versions/vm_refunds_enhancement/types/mod.rs b/core/lib/multivm/src/versions/vm_refunds_enhancement/types/mod.rs
new file mode 100644
index 000000000000..a12005734abb
--- /dev/null
+++ b/core/lib/multivm/src/versions/vm_refunds_enhancement/types/mod.rs
@@ -0,0 +1,2 @@
+pub(crate) mod internals;
+mod l1_batch;
diff --git a/core/lib/multivm/src/versions/vm_refunds_enhancement/utils/fee.rs b/core/lib/multivm/src/versions/vm_refunds_enhancement/utils/fee.rs
new file mode 100644
index 000000000000..02ea1c4a5618
--- /dev/null
+++ b/core/lib/multivm/src/versions/vm_refunds_enhancement/utils/fee.rs
@@ -0,0 +1,29 @@
+//! Utility functions for vm
+use zksync_system_constants::MAX_GAS_PER_PUBDATA_BYTE;
+use zksync_utils::ceil_div;
+
+use crate::vm_refunds_enhancement::old_vm::utils::eth_price_per_pubdata_byte;
+
+/// Calcluates the amount of gas required to publish one byte of pubdata
+pub fn base_fee_to_gas_per_pubdata(l1_gas_price: u64, base_fee: u64) -> u64 {
+    let eth_price_per_pubdata_byte = eth_price_per_pubdata_byte(l1_gas_price);
+
+    ceil_div(eth_price_per_pubdata_byte, base_fee)
+}
+
+/// Calculates the base fee and gas per pubdata for the given L1 gas price.
+pub fn derive_base_fee_and_gas_per_pubdata(l1_gas_price: u64, fair_gas_price: u64) -> (u64, u64) {
+    let eth_price_per_pubdata_byte = eth_price_per_pubdata_byte(l1_gas_price);
+
+    // The baseFee is set in such a way that it is always possible for a transaction to
+    // publish enough public data while compensating us for it.
+    let base_fee = std::cmp::max(
+        fair_gas_price,
+        ceil_div(eth_price_per_pubdata_byte, MAX_GAS_PER_PUBDATA_BYTE),
+    );
+
+    (
+        base_fee,
+        base_fee_to_gas_per_pubdata(l1_gas_price, base_fee),
+    )
+}
diff --git a/core/lib/multivm/src/versions/vm_refunds_enhancement/utils/l2_blocks.rs b/core/lib/multivm/src/versions/vm_refunds_enhancement/utils/l2_blocks.rs
new file mode 100644
index 000000000000..3d5f58094e01
--- /dev/null
+++ b/core/lib/multivm/src/versions/vm_refunds_enhancement/utils/l2_blocks.rs
@@ -0,0 +1,93 @@
+use crate::interface::{L2Block, L2BlockEnv};
+use zksync_state::{ReadStorage, StoragePtr};
+use zksync_system_constants::{
+    SYSTEM_CONTEXT_ADDRESS, SYSTEM_CONTEXT_CURRENT_L2_BLOCK_HASHES_POSITION,
+    SYSTEM_CONTEXT_CURRENT_L2_BLOCK_INFO_POSITION, SYSTEM_CONTEXT_CURRENT_TX_ROLLING_HASH_POSITION,
+    SYSTEM_CONTEXT_STORED_L2_BLOCK_HASHES,
+};
+use zksync_types::block::unpack_block_info;
+use zksync_types::web3::signing::keccak256;
+use zksync_types::{AccountTreeId, MiniblockNumber, StorageKey, H256, U256};
+use zksync_utils::{h256_to_u256, u256_to_h256};
+
+pub(crate) fn get_l2_block_hash_key(block_number: u32) -> StorageKey {
+    let position = h256_to_u256(SYSTEM_CONTEXT_CURRENT_L2_BLOCK_HASHES_POSITION)
+        + U256::from(block_number % SYSTEM_CONTEXT_STORED_L2_BLOCK_HASHES);
+    StorageKey::new(
+        AccountTreeId::new(SYSTEM_CONTEXT_ADDRESS),
+        u256_to_h256(position),
+    )
+}
+
+pub(crate) fn assert_next_block(prev_block: &L2Block, next_block: &L2BlockEnv) {
+    if prev_block.number == 0 {
+        // Special case for the first block it can have the same timestamp as the previous block.
+        assert!(prev_block.timestamp <= next_block.timestamp);
+    } else {
+        assert_eq!(prev_block.number + 1, next_block.number);
+        assert!(prev_block.timestamp < next_block.timestamp);
+    }
+    assert_eq!(prev_block.hash, next_block.prev_block_hash);
+}
+
+/// Returns the hash of the l2_block.
+/// `txs_rolling_hash` of the l2_block is calculated the following way:
+/// If the l2_block has 0 transactions, then `txs_rolling_hash` is equal to `H256::zero()`.
+/// If the l2_block has i transactions, then `txs_rolling_hash` is equal to `H(H_{i-1}, H(tx_i))`, where
+/// `H_{i-1}` is the `txs_rolling_hash` of the first i-1 transactions.
+pub(crate) fn l2_block_hash(
+    l2_block_number: MiniblockNumber,
+    l2_block_timestamp: u64,
+    prev_l2_block_hash: H256,
+    txs_rolling_hash: H256,
+) -> H256 {
+    let mut digest: [u8; 128] = [0u8; 128];
+    U256::from(l2_block_number.0).to_big_endian(&mut digest[0..32]);
+    U256::from(l2_block_timestamp).to_big_endian(&mut digest[32..64]);
+    digest[64..96].copy_from_slice(prev_l2_block_hash.as_bytes());
+    digest[96..128].copy_from_slice(txs_rolling_hash.as_bytes());
+
+    H256(keccak256(&digest))
+}
+
+/// Get last saved block from storage
+pub fn load_last_l2_block<S: ReadStorage>(storage: StoragePtr<S>) -> Option<L2Block> {
+    // Get block number and timestamp
+    let current_l2_block_info_key = StorageKey::new(
+        AccountTreeId::new(SYSTEM_CONTEXT_ADDRESS),
+        SYSTEM_CONTEXT_CURRENT_L2_BLOCK_INFO_POSITION,
+    );
+    let mut storage_ptr = storage.borrow_mut();
+    let current_l2_block_info = storage_ptr.read_value(&current_l2_block_info_key);
+    let (block_number, block_timestamp) = unpack_block_info(h256_to_u256(current_l2_block_info));
+    let block_number = block_number as u32;
+    if block_number == 0 {
+        // The block does not exist yet
+        return None;
+    }
+
+    // Get prev block hash
+    let position = get_l2_block_hash_key(block_number - 1);
+    let prev_block_hash = storage_ptr.read_value(&position);
+
+    // Get current tx rolling hash
+    let position = StorageKey::new(
+        AccountTreeId::new(SYSTEM_CONTEXT_ADDRESS),
+        SYSTEM_CONTEXT_CURRENT_TX_ROLLING_HASH_POSITION,
+    );
+    let current_tx_rolling_hash = storage_ptr.read_value(&position);
+
+    // Calculate current hash
+    let current_block_hash = l2_block_hash(
+        MiniblockNumber(block_number),
+        block_timestamp,
+        prev_block_hash,
+        current_tx_rolling_hash,
+    );
+
+    Some(L2Block {
+        number: block_number,
+        timestamp: block_timestamp,
+        hash: current_block_hash,
+    })
+}
diff --git a/core/lib/multivm/src/versions/vm_refunds_enhancement/utils/mod.rs b/core/lib/multivm/src/versions/vm_refunds_enhancement/utils/mod.rs
new file mode 100644
index 000000000000..15ffa92b5490
--- /dev/null
+++ b/core/lib/multivm/src/versions/vm_refunds_enhancement/utils/mod.rs
@@ -0,0 +1,5 @@
+/// Utility functions for the VM.
+pub mod fee;
+pub mod l2_blocks;
+pub mod overhead;
+pub mod transaction_encoding;
diff --git a/core/lib/multivm/src/versions/vm_refunds_enhancement/utils/overhead.rs b/core/lib/multivm/src/versions/vm_refunds_enhancement/utils/overhead.rs
new file mode 100644
index 000000000000..671ff0e05722
--- /dev/null
+++ b/core/lib/multivm/src/versions/vm_refunds_enhancement/utils/overhead.rs
@@ -0,0 +1,349 @@
+use crate::vm_refunds_enhancement::constants::{
+    BLOCK_OVERHEAD_GAS, BLOCK_OVERHEAD_PUBDATA, BOOTLOADER_TX_ENCODING_SPACE,
+};
+use zk_evm_1_3_3::zkevm_opcode_defs::system_params::MAX_TX_ERGS_LIMIT;
+use zksync_system_constants::{MAX_L2_TX_GAS_LIMIT, MAX_TXS_IN_BLOCK};
+use zksync_types::l1::is_l1_tx_type;
+use zksync_types::U256;
+use zksync_utils::ceil_div_u256;
+
+/// Derives the overhead for processing transactions in a block.
+pub fn derive_overhead(
+    gas_limit: u32,
+    gas_price_per_pubdata: u32,
+    encoded_len: usize,
+    coeficients: OverheadCoeficients,
+) -> u32 {
+    // Even if the gas limit is greater than the MAX_TX_ERGS_LIMIT, we assume that everything beyond MAX_TX_ERGS_LIMIT
+    // will be spent entirely on publishing bytecodes and so we derive the overhead solely based on the capped value
+    let gas_limit = std::cmp::min(MAX_TX_ERGS_LIMIT, gas_limit);
+
+    // Using large U256 type to avoid overflow
+    let max_block_overhead = U256::from(block_overhead_gas(gas_price_per_pubdata));
+    let gas_limit = U256::from(gas_limit);
+    let encoded_len = U256::from(encoded_len);
+
+    // The MAX_TX_ERGS_LIMIT is formed in a way that may fullfills a single-instance circuits
+    // if used in full. That is, within MAX_TX_ERGS_LIMIT it is possible to fully saturate all the single-instance
+    // circuits.
+    let overhead_for_single_instance_circuits =
+        ceil_div_u256(gas_limit * max_block_overhead, MAX_TX_ERGS_LIMIT.into());
+
+    // The overhead for occupying the bootloader memory
+    let overhead_for_length = ceil_div_u256(
+        encoded_len * max_block_overhead,
+        BOOTLOADER_TX_ENCODING_SPACE.into(),
+    );
+
+    // The overhead for occupying a single tx slot
+    let tx_slot_overhead = ceil_div_u256(max_block_overhead, MAX_TXS_IN_BLOCK.into());
+
+    // We use "ceil" here for formal reasons to allow easier approach for calculating the overhead in O(1)
+    // let max_pubdata_in_tx = ceil_div_u256(gas_limit, gas_price_per_pubdata);
+
+    // The maximal potential overhead from pubdata
+    // TODO (EVM-67): possibly use overhead for pubdata
+    // let pubdata_overhead = ceil_div_u256(
+    //     max_pubdata_in_tx * max_block_overhead,
+    //     MAX_PUBDATA_PER_BLOCK.into(),
+    // );
+
+    vec![
+        (coeficients.ergs_limit_overhead_coeficient
+            * overhead_for_single_instance_circuits.as_u32() as f64)
+            .floor() as u32,
+        (coeficients.bootloader_memory_overhead_coeficient * overhead_for_length.as_u32() as f64)
+            .floor() as u32,
+        (coeficients.slot_overhead_coeficient * tx_slot_overhead.as_u32() as f64) as u32,
+    ]
+    .into_iter()
+    .max()
+    .unwrap()
+}
+
+/// Contains the coeficients with which the overhead for transactions will be calculated.
+/// All of the coeficients should be <= 1. There are here to provide a certain "discount" for normal transactions
+/// at the risk of malicious transactions that may close the block prematurely.
+/// IMPORTANT: to perform correct computations, `MAX_TX_ERGS_LIMIT / coeficients.ergs_limit_overhead_coeficient` MUST
+/// result in an integer number
+#[derive(Debug, Clone, Copy)]
+pub struct OverheadCoeficients {
+    slot_overhead_coeficient: f64,
+    bootloader_memory_overhead_coeficient: f64,
+    ergs_limit_overhead_coeficient: f64,
+}
+
+impl OverheadCoeficients {
+    // This method ensures that the parameters keep the required invariants
+    fn new_checked(
+        slot_overhead_coeficient: f64,
+        bootloader_memory_overhead_coeficient: f64,
+        ergs_limit_overhead_coeficient: f64,
+    ) -> Self {
+        assert!(
+            (MAX_TX_ERGS_LIMIT as f64 / ergs_limit_overhead_coeficient).round()
+                == MAX_TX_ERGS_LIMIT as f64 / ergs_limit_overhead_coeficient,
+            "MAX_TX_ERGS_LIMIT / ergs_limit_overhead_coeficient must be an integer"
+        );
+
+        Self {
+            slot_overhead_coeficient,
+            bootloader_memory_overhead_coeficient,
+            ergs_limit_overhead_coeficient,
+        }
+    }
+
+    // L1->L2 do not receive any discounts
+    fn new_l1() -> Self {
+        OverheadCoeficients::new_checked(1.0, 1.0, 1.0)
+    }
+
+    fn new_l2() -> Self {
+        OverheadCoeficients::new_checked(
+            1.0, 1.0,
+            // For L2 transactions we allow a certain default discount with regard to the number of ergs.
+            // Multiinstance circuits can in theory be spawned infinite times, while projected future limitations
+            // on gas per pubdata allow for roughly 800kk gas per L1 batch, so the rough trust "discount" on the proof's part
+            // to be paid by the users is 0.1.
+            0.1,
+        )
+    }
+
+    /// Return the coeficients for the given transaction type
+    pub fn from_tx_type(tx_type: u8) -> Self {
+        if is_l1_tx_type(tx_type) {
+            Self::new_l1()
+        } else {
+            Self::new_l2()
+        }
+    }
+}
+
+/// This method returns the overhead for processing the block
+pub(crate) fn get_amortized_overhead(
+    total_gas_limit: u32,
+    gas_per_pubdata_byte_limit: u32,
+    encoded_len: usize,
+    coeficients: OverheadCoeficients,
+) -> u32 {
+    // Using large U256 type to prevent overflows.
+    let overhead_for_block_gas = U256::from(block_overhead_gas(gas_per_pubdata_byte_limit));
+    let total_gas_limit = U256::from(total_gas_limit);
+    let encoded_len = U256::from(encoded_len);
+
+    // Derivation of overhead consists of 4 parts:
+    // 1. The overhead for taking up a transaction's slot. (O1): O1 = 1 / MAX_TXS_IN_BLOCK
+    // 2. The overhead for taking up the bootloader's memory (O2): O2 = encoded_len / BOOTLOADER_TX_ENCODING_SPACE
+    // 3. The overhead for possible usage of pubdata. (O3): O3 = max_pubdata_in_tx / MAX_PUBDATA_PER_BLOCK
+    // 4. The overhead for possible usage of all the single-instance circuits. (O4): O4 = gas_limit / MAX_TX_ERGS_LIMIT
+    //
+    // The maximum of these is taken to derive the part of the block's overhead to be paid by the users:
+    //
+    // max_overhead = max(O1, O2, O3, O4)
+    // overhead_gas = ceil(max_overhead * overhead_for_block_gas). Thus, overhead_gas is a function of
+    // tx_gas_limit, gas_per_pubdata_byte_limit and encoded_len.
+    //
+    // While it is possible to derive the overhead with binary search in O(log n), it is too expensive to be done
+    // on L1, so here is a reference implementation of finding the overhead for transaction in O(1):
+    //
+    // Given total_gas_limit = tx_gas_limit + overhead_gas, we need to find overhead_gas and tx_gas_limit, such that:
+    // 1. overhead_gas is maximal possible (the operator is paid fairly)
+    // 2. overhead_gas(tx_gas_limit, gas_per_pubdata_byte_limit, encoded_len) >= overhead_gas (the user does not overpay)
+    // The third part boils to the following 4 inequalities (at least one of these must hold):
+    // ceil(O1 * overhead_for_block_gas) >= overhead_gas
+    // ceil(O2 * overhead_for_block_gas) >= overhead_gas
+    // ceil(O3 * overhead_for_block_gas) >= overhead_gas
+    // ceil(O4 * overhead_for_block_gas) >= overhead_gas
+    //
+    // Now, we need to solve each of these separately:
+
+    // 1. The overhead for occupying a single tx slot is a constant:
+    let tx_slot_overhead = {
+        let tx_slot_overhead =
+            ceil_div_u256(overhead_for_block_gas, MAX_TXS_IN_BLOCK.into()).as_u32();
+        (coeficients.slot_overhead_coeficient * tx_slot_overhead as f64).floor() as u32
+    };
+
+    // 2. The overhead for occupying the bootloader memory can be derived from encoded_len
+    let overhead_for_length = {
+        let overhead_for_length = ceil_div_u256(
+            encoded_len * overhead_for_block_gas,
+            BOOTLOADER_TX_ENCODING_SPACE.into(),
+        )
+        .as_u32();
+
+        (coeficients.bootloader_memory_overhead_coeficient * overhead_for_length as f64).floor()
+            as u32
+    };
+
+    // TODO (EVM-67): possibly include the overhead for pubdata. The formula below has not been properly maintained,
+    // since the pubdat is not published. If decided to use the pubdata overhead, it needs to be updated.
+    // 3. ceil(O3 * overhead_for_block_gas) >= overhead_gas
+    // O3 = max_pubdata_in_tx / MAX_PUBDATA_PER_BLOCK = ceil(gas_limit / gas_per_pubdata_byte_limit) / MAX_PUBDATA_PER_BLOCK
+    // >= (gas_limit / (gas_per_pubdata_byte_limit * MAX_PUBDATA_PER_BLOCK). Throwing off the `ceil`, while may provide marginally lower
+    // overhead to the operator, provides substantially easier formula to work with.
+    //
+    // For better clarity, let's denote gas_limit = GL, MAX_PUBDATA_PER_BLOCK = MP, gas_per_pubdata_byte_limit = EP, overhead_for_block_gas = OB, total_gas_limit = TL, overhead_gas = OE
+    // ceil(OB * (TL - OE) / (EP * MP)) >= OE
+    //
+    // OB * (TL - OE) / (MP * EP) > OE - 1
+    // OB * (TL - OE) > (OE - 1) * EP * MP
+    // OB * TL + EP * MP > OE * EP * MP + OE * OB
+    // (OB * TL + EP * MP) / (EP * MP + OB) > OE
+    // OE = floor((OB * TL + EP * MP) / (EP * MP + OB)) with possible -1 if the division is without remainder
+    // 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;
+
+    //     // Corner case: if `total_gas_limit` = `gas_per_pubdata_byte_limit` = 0
+    //     // then the numerator will be 0 and subtracting 1 will cause a panic, so we just return a zero.
+    //     if numerator.is_zero() {
+    //         0.into()
+    //     } else {
+    //         (numerator - 1) / denominator
+    //     }
+    // };
+
+    // 4. K * ceil(O4 * overhead_for_block_gas) >= overhead_gas, where K is the discount
+    // O4 = gas_limit / MAX_TX_ERGS_LIMIT. Using the notation from the previous equation:
+    // ceil(OB * GL / MAX_TX_ERGS_LIMIT) >= (OE / K)
+    // ceil(OB * (TL - OE) / MAX_TX_ERGS_LIMIT) >= (OE/K)
+    // OB * (TL - OE) / MAX_TX_ERGS_LIMIT > (OE/K) - 1
+    // OB * (TL - OE) > (OE/K) * MAX_TX_ERGS_LIMIT - MAX_TX_ERGS_LIMIT
+    // OB * TL + MAX_TX_ERGS_LIMIT > OE * ( MAX_TX_ERGS_LIMIT/K + OB)
+    // OE = floor(OB * TL + MAX_TX_ERGS_LIMIT / (MAX_TX_ERGS_LIMIT/K + OB)), with possible -1 if the division is without remainder
+    let overhead_for_gas = {
+        let numerator = overhead_for_block_gas * total_gas_limit + U256::from(MAX_TX_ERGS_LIMIT);
+        let denominator: U256 = U256::from(
+            (MAX_TX_ERGS_LIMIT as f64 / coeficients.ergs_limit_overhead_coeficient) as u64,
+        ) + overhead_for_block_gas;
+
+        let overhead_for_gas = (numerator - 1) / denominator;
+
+        overhead_for_gas.as_u32()
+    };
+
+    let overhead = vec![tx_slot_overhead, overhead_for_length, overhead_for_gas]
+        .into_iter()
+        .max()
+        // For the sake of consistency making sure that total_gas_limit >= max_overhead
+        .map(|max_overhead| std::cmp::min(max_overhead, total_gas_limit.as_u32()))
+        .unwrap();
+
+    let limit_after_deducting_overhead = total_gas_limit - overhead;
+
+    // During double checking of the overhead, the bootloader will assume that the
+    // body of the transaction does not have any more than MAX_L2_TX_GAS_LIMIT ergs available to it.
+    if limit_after_deducting_overhead.as_u64() > MAX_L2_TX_GAS_LIMIT {
+        // We derive the same overhead that would exist for the MAX_L2_TX_GAS_LIMIT ergs
+        derive_overhead(
+            MAX_L2_TX_GAS_LIMIT as u32,
+            gas_per_pubdata_byte_limit,
+            encoded_len.as_usize(),
+            coeficients,
+        )
+    } else {
+        overhead
+    }
+}
+
+pub(crate) fn block_overhead_gas(gas_per_pubdata_byte: u32) -> u32 {
+    BLOCK_OVERHEAD_GAS + BLOCK_OVERHEAD_PUBDATA * gas_per_pubdata_byte
+}
+
+#[cfg(test)]
+mod tests {
+
+    use super::*;
+
+    // This method returns the maximum block overhead that can be charged from the user based on the binary search approach
+    pub(crate) fn get_maximal_allowed_overhead_bin_search(
+        total_gas_limit: u32,
+        gas_per_pubdata_byte_limit: u32,
+        encoded_len: usize,
+        coeficients: OverheadCoeficients,
+    ) -> u32 {
+        let mut left_bound = if MAX_TX_ERGS_LIMIT < total_gas_limit {
+            total_gas_limit - MAX_TX_ERGS_LIMIT
+        } else {
+            0u32
+        };
+        // Safe cast: the gas_limit for a transaction can not be larger than 2^32
+        let mut right_bound = total_gas_limit;
+
+        // The closure returns whether a certain overhead would be accepted by the bootloader.
+        // It is accepted if the derived overhead (i.e. the actual overhead that the user has to pay)
+        // is >= than the overhead proposed by the operator.
+        let is_overhead_accepted = |suggested_overhead: u32| {
+            let derived_overhead = derive_overhead(
+                total_gas_limit - suggested_overhead,
+                gas_per_pubdata_byte_limit,
+                encoded_len,
+                coeficients,
+            );
+
+            derived_overhead >= suggested_overhead
+        };
+
+        // In order to find the maximal allowed overhead we are doing binary search
+        while left_bound + 1 < right_bound {
+            let mid = (left_bound + right_bound) / 2;
+
+            if is_overhead_accepted(mid) {
+                left_bound = mid;
+            } else {
+                right_bound = mid;
+            }
+        }
+
+        if is_overhead_accepted(right_bound) {
+            right_bound
+        } else {
+            left_bound
+        }
+    }
+
+    #[test]
+    fn test_correctness_for_efficient_overhead() {
+        let test_params = |total_gas_limit: u32,
+                           gas_per_pubdata: u32,
+                           encoded_len: usize,
+                           coeficients: OverheadCoeficients| {
+            let result_by_efficient_search =
+                get_amortized_overhead(total_gas_limit, gas_per_pubdata, encoded_len, coeficients);
+
+            let result_by_binary_search = get_maximal_allowed_overhead_bin_search(
+                total_gas_limit,
+                gas_per_pubdata,
+                encoded_len,
+                coeficients,
+            );
+
+            assert_eq!(result_by_efficient_search, result_by_binary_search);
+        };
+
+        // Some arbitrary test
+        test_params(60_000_000, 800, 2900, OverheadCoeficients::new_l2());
+
+        // Very small parameters
+        test_params(0, 1, 12, OverheadCoeficients::new_l2());
+
+        // Relatively big parameters
+        let max_tx_overhead = derive_overhead(
+            MAX_TX_ERGS_LIMIT,
+            5000,
+            10000,
+            OverheadCoeficients::new_l2(),
+        );
+        test_params(
+            MAX_TX_ERGS_LIMIT + max_tx_overhead,
+            5000,
+            10000,
+            OverheadCoeficients::new_l2(),
+        );
+
+        test_params(115432560, 800, 2900, OverheadCoeficients::new_l1());
+    }
+}
diff --git a/core/lib/multivm/src/versions/vm_refunds_enhancement/utils/transaction_encoding.rs b/core/lib/multivm/src/versions/vm_refunds_enhancement/utils/transaction_encoding.rs
new file mode 100644
index 000000000000..ab1352c2c75f
--- /dev/null
+++ b/core/lib/multivm/src/versions/vm_refunds_enhancement/utils/transaction_encoding.rs
@@ -0,0 +1,15 @@
+use crate::vm_refunds_enhancement::types::internals::TransactionData;
+use zksync_types::Transaction;
+
+/// Extension  for transactions, specific for VM. Required for bypassing the orphan rule
+pub trait TransactionVmExt {
+    /// Get the size of the transaction in tokens.
+    fn bootloader_encoding_size(&self) -> usize;
+}
+
+impl TransactionVmExt for Transaction {
+    fn bootloader_encoding_size(&self) -> usize {
+        let transaction_data: TransactionData = self.clone().into();
+        transaction_data.into_tokens().len()
+    }
+}
diff --git a/core/lib/multivm/src/versions/vm_refunds_enhancement/vm.rs b/core/lib/multivm/src/versions/vm_refunds_enhancement/vm.rs
new file mode 100644
index 000000000000..d0ef20246087
--- /dev/null
+++ b/core/lib/multivm/src/versions/vm_refunds_enhancement/vm.rs
@@ -0,0 +1,168 @@
+use crate::HistoryMode;
+use zksync_state::{StoragePtr, WriteStorage};
+use zksync_types::l2_to_l1_log::UserL2ToL1Log;
+use zksync_types::Transaction;
+use zksync_utils::bytecode::CompressedBytecodeInfo;
+
+use crate::vm_refunds_enhancement::old_vm::events::merge_events;
+
+use crate::interface::{
+    BootloaderMemory, CurrentExecutionState, L1BatchEnv, L2BlockEnv, SystemEnv, VmExecutionMode,
+    VmExecutionResultAndLogs, VmInterface, VmInterfaceHistoryEnabled,
+};
+use crate::interface::{BytecodeCompressionError, FinishedL1Batch, VmMemoryMetrics};
+use crate::vm_latest::HistoryEnabled;
+use crate::vm_refunds_enhancement::bootloader_state::BootloaderState;
+use crate::vm_refunds_enhancement::tracers::dispatcher::TracerDispatcher;
+use crate::vm_refunds_enhancement::types::internals::{new_vm_state, VmSnapshot, ZkSyncVmState};
+
+/// Main entry point for Virtual Machine integration.
+/// The instance should process only one l1 batch
+#[derive(Debug)]
+pub struct Vm<S: WriteStorage, H: HistoryMode> {
+    pub(crate) bootloader_state: BootloaderState,
+    // Current state and oracles of virtual machine
+    pub(crate) state: ZkSyncVmState<S, H::VmVirtualBlocksRefundsEnhancement>,
+    pub(crate) storage: StoragePtr<S>,
+    pub(crate) system_env: SystemEnv,
+    pub(crate) batch_env: L1BatchEnv,
+    // Snapshots for the current run
+    pub(crate) snapshots: Vec<VmSnapshot>,
+    _phantom: std::marker::PhantomData<H>,
+}
+
+/// Public interface for VM
+impl<S: WriteStorage, H: HistoryMode> VmInterface<S, H> for Vm<S, H> {
+    type TracerDispatcher = TracerDispatcher<S, H::VmVirtualBlocksRefundsEnhancement>;
+
+    fn new(batch_env: L1BatchEnv, system_env: SystemEnv, storage: StoragePtr<S>) -> Self {
+        let (state, bootloader_state) = new_vm_state(storage.clone(), &system_env, &batch_env);
+        Self {
+            bootloader_state,
+            state,
+            storage,
+            system_env,
+            batch_env,
+            snapshots: vec![],
+            _phantom: Default::default(),
+        }
+    }
+
+    /// Push tx into memory for the future execution
+    fn push_transaction(&mut self, tx: Transaction) {
+        self.push_transaction_with_compression(tx, true)
+    }
+
+    /// Execute VM with custom tracers.
+    fn inspect(
+        &mut self,
+        dispatcher: Self::TracerDispatcher,
+        execution_mode: VmExecutionMode,
+    ) -> VmExecutionResultAndLogs {
+        self.inspect_inner(dispatcher, execution_mode)
+    }
+
+    /// Get current state of bootloader memory.
+    fn get_bootloader_memory(&self) -> BootloaderMemory {
+        self.bootloader_state.bootloader_memory()
+    }
+
+    /// Get compressed bytecodes of the last executed transaction
+    fn get_last_tx_compressed_bytecodes(&self) -> Vec<CompressedBytecodeInfo> {
+        self.bootloader_state.get_last_tx_compressed_bytecodes()
+    }
+
+    fn start_new_l2_block(&mut self, l2_block_env: L2BlockEnv) {
+        self.bootloader_state.start_new_l2_block(l2_block_env);
+    }
+
+    /// Get current state of virtual machine.
+    /// This method should be used only after the batch execution.
+    /// Otherwise it can panic.
+    fn get_current_execution_state(&self) -> CurrentExecutionState {
+        let (deduplicated_events_logs, raw_events, l1_messages) = self.state.event_sink.flatten();
+        let events: Vec<_> = merge_events(raw_events)
+            .into_iter()
+            .map(|e| e.into_vm_event(self.batch_env.number))
+            .collect();
+
+        let l2_to_l1_logs = l1_messages
+            .into_iter()
+            .map(|log| UserL2ToL1Log(log.into()))
+            .collect();
+        let total_log_queries = self.state.event_sink.get_log_queries()
+            + self
+                .state
+                .precompiles_processor
+                .get_timestamp_history()
+                .len()
+            + self.state.storage.get_final_log_queries().len();
+
+        CurrentExecutionState {
+            events,
+            storage_log_queries: self.state.storage.get_final_log_queries(),
+            used_contract_hashes: self.get_used_contracts(),
+            user_l2_to_l1_logs: l2_to_l1_logs,
+            system_logs: vec![],
+            total_log_queries,
+            cycles_used: self.state.local_state.monotonic_cycle_counter,
+            deduplicated_events_logs,
+            storage_refunds: Vec::new(),
+        }
+    }
+
+    /// Inspect transaction with optional bytecode compression.
+    fn inspect_transaction_with_bytecode_compression(
+        &mut self,
+        dispatcher: Self::TracerDispatcher,
+        tx: Transaction,
+        with_compression: bool,
+    ) -> Result<VmExecutionResultAndLogs, BytecodeCompressionError> {
+        self.push_transaction_with_compression(tx, with_compression);
+        let result = self.inspect(dispatcher, VmExecutionMode::OneTx);
+        if self.has_unpublished_bytecodes() {
+            Err(BytecodeCompressionError::BytecodeCompressionFailed)
+        } else {
+            Ok(result)
+        }
+    }
+
+    fn record_vm_memory_metrics(&self) -> VmMemoryMetrics {
+        self.record_vm_memory_metrics_inner()
+    }
+
+    fn finish_batch(&mut self) -> FinishedL1Batch {
+        let result = self.execute(VmExecutionMode::Batch);
+        let execution_state = self.get_current_execution_state();
+        let bootloader_memory = self.get_bootloader_memory();
+        FinishedL1Batch {
+            block_tip_execution_result: result,
+            final_execution_state: execution_state,
+            final_bootloader_memory: Some(bootloader_memory),
+        }
+    }
+}
+
+/// Methods of vm, which required some history manipullations
+impl<S: WriteStorage> VmInterfaceHistoryEnabled<S> for Vm<S, HistoryEnabled> {
+    /// Create snapshot of current vm state and push it into the memory
+    fn make_snapshot(&mut self) {
+        self.make_snapshot_inner()
+    }
+
+    /// Rollback vm state to the latest snapshot and destroy the snapshot
+    fn rollback_to_the_latest_snapshot(&mut self) {
+        let snapshot = self
+            .snapshots
+            .pop()
+            .expect("Snapshot should be created before rolling it back");
+        self.rollback_to_snapshot(snapshot);
+    }
+
+    /// Pop the latest snapshot from the memory and destroy it
+    fn pop_snapshot_no_rollback(&mut self) {
+        self.snapshots
+            .pop()
+            .expect("Snapshot should be created before rolling it back");
+    }
+}
diff --git a/core/lib/multivm/src/versions/vm_virtual_blocks/implementation/logs.rs b/core/lib/multivm/src/versions/vm_virtual_blocks/implementation/logs.rs
index 24fe4cb96c7d..a32f3a165727 100644
--- a/core/lib/multivm/src/versions/vm_virtual_blocks/implementation/logs.rs
+++ b/core/lib/multivm/src/versions/vm_virtual_blocks/implementation/logs.rs
@@ -1,9 +1,9 @@
 use zk_evm_1_3_3::aux_structures::Timestamp;
 use zksync_state::WriteStorage;
 
+use crate::interface::types::outputs::VmExecutionLogs;
 use crate::HistoryMode;
-use zksync_types::l2_to_l1_log::L2ToL1Log;
-use zksync_types::tx::tx_execution_info::VmExecutionLogs;
+use zksync_types::l2_to_l1_log::{L2ToL1Log, UserL2ToL1Log};
 use zksync_types::VmEvent;
 
 use crate::vm_virtual_blocks::old_vm::events::merge_events;
@@ -42,7 +42,8 @@ impl<S: WriteStorage, H: HistoryMode> Vm<S, H> {
         VmExecutionLogs {
             storage_logs,
             events,
-            l2_to_l1_logs,
+            user_l2_to_l1_logs: l2_to_l1_logs.into_iter().map(UserL2ToL1Log).collect(),
+            system_l2_to_l1_logs: vec![],
             total_log_queries_count,
         }
     }
diff --git a/core/lib/multivm/src/versions/vm_virtual_blocks/mod.rs b/core/lib/multivm/src/versions/vm_virtual_blocks/mod.rs
index efd39b4e12c6..3a7a96e729d7 100644
--- a/core/lib/multivm/src/versions/vm_virtual_blocks/mod.rs
+++ b/core/lib/multivm/src/versions/vm_virtual_blocks/mod.rs
@@ -7,7 +7,6 @@ pub use old_vm::{
 pub use tracers::{
     dispatcher::TracerDispatcher,
     traits::{ExecutionEndTracer, ExecutionProcessing, TracerPointer, VmTracer},
-    utils::VmExecutionStopReason,
 };
 
 pub use types::internals::ZkSyncVmState;
@@ -27,5 +26,5 @@ mod vm;
 pub mod constants;
 pub mod utils;
 
-#[cfg(test)]
-mod tests;
+// #[cfg(test)]
+// mod tests;
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 a2698e85c101..abf8714bbe9a 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
@@ -216,9 +216,3 @@ pub(crate) fn get_vm_hook_params<H: HistoryMode>(memory: &SimpleMemory<H>) -> Ve
         VM_HOOK_PARAMS_START_POSITION..VM_HOOK_PARAMS_START_POSITION + VM_HOOK_PARAMS_COUNT,
     )
 }
-
-#[derive(Debug, Clone, Copy, PartialEq)]
-pub enum VmExecutionStopReason {
-    VmFinished,
-    TracerRequestedStop,
-}
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 9e4e48634f35..d1533dbcd5a2 100644
--- a/core/lib/multivm/src/versions/vm_virtual_blocks/vm.rs
+++ b/core/lib/multivm/src/versions/vm_virtual_blocks/vm.rs
@@ -6,6 +6,7 @@ use crate::interface::{
 use crate::vm_latest::HistoryEnabled;
 use crate::HistoryMode;
 use zksync_state::{StoragePtr, WriteStorage};
+use zksync_types::l2_to_l1_log::UserL2ToL1Log;
 use zksync_types::Transaction;
 use zksync_utils::bytecode::CompressedBytecodeInfo;
 
@@ -80,12 +81,16 @@ impl<S: WriteStorage, H: HistoryMode> VmInterface<S, H> for Vm<S, H> {
     /// This method should be used only after the batch execution.
     /// Otherwise it can panic.
     fn get_current_execution_state(&self) -> CurrentExecutionState {
-        let (_full_history, raw_events, l1_messages) = self.state.event_sink.flatten();
-        let events = merge_events(raw_events)
+        let (deduplicated_events_logs, raw_events, l1_messages) = self.state.event_sink.flatten();
+        let events: Vec<_> = merge_events(raw_events)
             .into_iter()
             .map(|e| e.into_vm_event(self.batch_env.number))
             .collect();
-        let l2_to_l1_logs = l1_messages.into_iter().map(|log| log.into()).collect();
+
+        let l2_to_l1_logs = l1_messages
+            .into_iter()
+            .map(|log| UserL2ToL1Log(log.into()))
+            .collect();
         let total_log_queries = self.state.event_sink.get_log_queries()
             + self
                 .state
@@ -98,9 +103,11 @@ impl<S: WriteStorage, H: HistoryMode> VmInterface<S, H> for Vm<S, H> {
             events,
             storage_log_queries: self.state.storage.get_final_log_queries(),
             used_contract_hashes: self.get_used_contracts(),
-            l2_to_l1_logs,
+            user_l2_to_l1_logs: l2_to_l1_logs,
+            system_logs: vec![],
             total_log_queries,
             cycles_used: self.state.local_state.monotonic_cycle_counter,
+            deduplicated_events_logs,
             storage_refunds: Vec::new(),
         }
     }
diff --git a/core/lib/multivm/src/vm_instance.rs b/core/lib/multivm/src/vm_instance.rs
index c9964b57f949..7239d10b32b7 100644
--- a/core/lib/multivm/src/vm_instance.rs
+++ b/core/lib/multivm/src/vm_instance.rs
@@ -18,7 +18,8 @@ pub enum VmInstance<S: WriteStorage, H: HistoryMode> {
     VmM6(crate::vm_m6::Vm<S, H>),
     Vm1_3_2(crate::vm_1_3_2::Vm<S, H>),
     VmVirtualBlocks(crate::vm_virtual_blocks::Vm<S, H>),
-    VmVirtualBlocksRefundsEnhancement(crate::vm_latest::Vm<S, H>),
+    VmVirtualBlocksRefundsEnhancement(crate::vm_refunds_enhancement::Vm<S, H>),
+    VmBoojumIntegration(crate::vm_latest::Vm<S, H>),
 }
 
 impl<S: WriteStorage, H: HistoryMode> VmInterface<S, H> for VmInstance<S, H> {
@@ -169,9 +170,14 @@ impl<S: WriteStorage, H: HistoryMode> VmInstance<S, H> {
                 VmInstance::VmVirtualBlocks(vm)
             }
             VmVersion::VmVirtualBlocksRefundsEnhancement => {
-                let vm = crate::vm_latest::Vm::new(l1_batch_env, system_env, storage_view);
+                let vm =
+                    crate::vm_refunds_enhancement::Vm::new(l1_batch_env, system_env, storage_view);
                 VmInstance::VmVirtualBlocksRefundsEnhancement(vm)
             }
+            VmVersion::VmBoojumIntegration => {
+                let vm = crate::vm_latest::Vm::new(l1_batch_env, system_env, storage_view);
+                VmInstance::VmBoojumIntegration(vm)
+            }
         }
     }
 }
diff --git a/core/lib/prover_utils/src/gcs_proof_fetcher.rs b/core/lib/prover_utils/src/gcs_proof_fetcher.rs
index 25a29b52fe95..8b59fe67a611 100644
--- a/core/lib/prover_utils/src/gcs_proof_fetcher.rs
+++ b/core/lib/prover_utils/src/gcs_proof_fetcher.rs
@@ -1,4 +1,4 @@
-use zksync_object_store::ObjectStore;
+use zksync_object_store::{ObjectStore, ObjectStoreError};
 use zksync_types::aggregated_operations::L1BatchProofForL1;
 use zksync_types::L1BatchNumber;
 
@@ -10,11 +10,14 @@ pub async fn load_wrapped_fri_proofs_for_range(
     let mut proofs = Vec::new();
     for l1_batch_number in from.0..=to.0 {
         let l1_batch_number = L1BatchNumber(l1_batch_number);
-        let proof = blob_store
-            .get(l1_batch_number)
-            .await
-            .expect("Failed to load proof");
-        proofs.push(proof);
+        match blob_store.get(l1_batch_number).await {
+            Ok(proof) => proofs.push(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
+            ),
+        }
     }
     proofs
 }
diff --git a/core/lib/state/README.md b/core/lib/state/README.md
index 5ec04d976a3d..0e98203bc473 100644
--- a/core/lib/state/README.md
+++ b/core/lib/state/README.md
@@ -7,5 +7,5 @@ All state keeper data is currently stored in Postgres. (Beside it, we provide an
 benchmarking / testing purposes.) We also keep a secondary copy for part of it in RocksDB for performance reasons.
 Currently, we only duplicate the data needed by the [`vm`] crate.
 
-[`zksync_core`]: ../../bin/zksync_core
+[`zksync_core`]: ../zksync_core
 [`vm`]: ../vm
diff --git a/core/lib/state/src/rocksdb/mod.rs b/core/lib/state/src/rocksdb/mod.rs
index 1964a48297f0..e3748f3acfdf 100644
--- a/core/lib/state/src/rocksdb/mod.rs
+++ b/core/lib/state/src/rocksdb/mod.rs
@@ -185,7 +185,11 @@ impl RocksdbStorage {
             "Secondary storage for L1 batch #{latest_l1_batch_number} initialized, size is {estimated_size}"
         );
 
-        self.save_missing_enum_indices(conn).await;
+        assert!(self.enum_index_migration_chunk_size > 0);
+        // Enum indices must be at the storage. Run migration till the end.
+        while self.enum_migration_start_from().is_some() {
+            self.save_missing_enum_indices(conn).await;
+        }
     }
 
     async fn apply_storage_logs(
diff --git a/core/lib/storage/README.md b/core/lib/storage/README.md
index f7447fe0681d..f2dee915b3a2 100644
--- a/core/lib/storage/README.md
+++ b/core/lib/storage/README.md
@@ -4,5 +4,5 @@ This crate adds the generic support for RocksDB storage. It provides more typesa
 generic metrics (e.g., the size of merged batches, and the current file / memory sizes for each column family in the
 database).
 
-RocksDB is currently used in the [state keeper](../../bin/zksync_core/src/state_keeper) to speed up access to VM state,
-and by the [Merkle tree](../merkle_tree).
+RocksDB is currently used in the [state keeper](../zksync_core/src/state_keeper) to speed up access to VM state, and by
+the [Merkle tree](../merkle_tree).
diff --git a/core/lib/types/Cargo.toml b/core/lib/types/Cargo.toml
index 5798605da478..35ccb4a93702 100644
--- a/core/lib/types/Cargo.toml
+++ b/core/lib/types/Cargo.toml
@@ -19,6 +19,7 @@ zksync_mini_merkle_tree = { path = "../mini_merkle_tree" }
 # We need this import because we wanat DAL to be responsible for (de)serialization
 codegen = { git = "https://github.com/matter-labs/solidity_plonk_verifier.git", branch = "dev" }
 zkevm_test_harness = { git = "https://github.com/matter-labs/era-zkevm_test_harness.git", branch = "v1.3.3" }
+zk_evm_1_4_0 = { git = "https://github.com/matter-labs/era-zk_evm.git", branch = "v1.4.0", package = "zk_evm" }
 zk_evm = { git = "https://github.com/matter-labs/era-zk_evm.git", tag = "v1.3.3-rc2" }
 
 chrono = { version = "0.4", features = ["serde"] }
diff --git a/core/lib/types/src/block.rs b/core/lib/types/src/block.rs
index c41fdd93ed98..1896fe0eb50c 100644
--- a/core/lib/types/src/block.rs
+++ b/core/lib/types/src/block.rs
@@ -7,9 +7,10 @@ use zksync_basic_types::{H2048, H256, U256};
 use zksync_contracts::BaseSystemContractsHashes;
 
 use crate::{
-    l2_to_l1_log::L2ToL1Log, priority_op_onchain_data::PriorityOpOnchainData,
-    web3::signing::keccak256, AccountTreeId, Address, L1BatchNumber, MiniblockNumber,
-    ProtocolVersionId, Transaction,
+    l2_to_l1_log::{SystemL2ToL1Log, UserL2ToL1Log},
+    priority_op_onchain_data::PriorityOpOnchainData,
+    web3::signing::keccak256,
+    AccountTreeId, Address, L1BatchNumber, MiniblockNumber, ProtocolVersionId, Transaction,
 };
 
 /// Represents a successfully deployed smart contract.
@@ -46,7 +47,7 @@ pub struct L1BatchHeader {
     /// The data of the processed priority operations hash which must be sent to the smart contract.
     pub priority_ops_onchain_data: Vec<PriorityOpOnchainData>,
     /// All user generated L2 -> L1 logs in the block.
-    pub l2_to_l1_logs: Vec<L2ToL1Log>,
+    pub l2_to_l1_logs: Vec<UserL2ToL1Log>,
     /// Preimages of the hashes that were sent as value of L2 logs by special system L2 contract.
     pub l2_to_l1_messages: Vec<Vec<u8>>,
     /// Bloom filter for the event logs in the block.
@@ -61,7 +62,7 @@ pub struct L1BatchHeader {
     pub l2_fair_gas_price: u64,
     pub base_system_contracts_hashes: BaseSystemContractsHashes,
     /// System logs are those emitted as part of the Vm excecution.
-    pub system_logs: Vec<L2ToL1Log>,
+    pub system_logs: Vec<SystemL2ToL1Log>,
     /// Version of protocol used for the L1 batch.
     pub protocol_version: Option<ProtocolVersionId>,
 }
diff --git a/core/lib/types/src/commitment.rs b/core/lib/types/src/commitment.rs
index 049560277afc..d4f5fec30cd8 100644
--- a/core/lib/types/src/commitment.rs
+++ b/core/lib/types/src/commitment.rs
@@ -16,7 +16,7 @@ use zksync_system_constants::ZKPORTER_IS_AVAILABLE;
 use crate::{
     block::L1BatchHeader,
     ethabi::Token,
-    l2_to_l1_log::L2ToL1Log,
+    l2_to_l1_log::{L2ToL1Log, SystemL2ToL1Log, UserL2ToL1Log},
     web3::signing::keccak256,
     writes::{
         compress_state_diffs, InitialStorageWrite, RepeatedStorageWrite, StateDiffRecord,
@@ -34,15 +34,12 @@ pub trait SerializeCommitment {
     fn serialize_commitment(&self, buffer: &mut [u8]);
 }
 
-/// Serialize elements for commitment. The results consist of:
-/// 1. Number of elements (4 bytes)
-/// 2. Serialized elements
-pub(crate) fn serialize_commitments<I: SerializeCommitment>(values: &[I]) -> Vec<u8> {
-    let final_len = values.len() * I::SERIALIZED_SIZE + 4;
+/// Serialize elements for commitment. The result consists of packed serialized elements.
+pub fn serialize_commitments<I: SerializeCommitment>(values: &[I]) -> Vec<u8> {
+    let final_len = values.len() * I::SERIALIZED_SIZE;
     let mut input = vec![0_u8; final_len];
-    input[0..4].copy_from_slice(&(values.len() as u32).to_be_bytes());
 
-    let chunks = input[4..].chunks_mut(I::SERIALIZED_SIZE);
+    let chunks = input.chunks_mut(I::SERIALIZED_SIZE);
     for (value, chunk) in values.iter().zip(chunks) {
         value.serialize_commitment(chunk);
     }
@@ -101,12 +98,13 @@ impl L1BatchWithMetadata {
         unsorted_factory_deps: &'a HashMap<H256, Vec<u8>>,
     ) -> impl Iterator<Item = &'a [u8]> + 'a {
         header.l2_to_l1_logs.iter().filter_map(move |log| {
-            if log.sender == KNOWN_CODES_STORAGE_ADDRESS {
-                let bytecode = unsorted_factory_deps.get(&log.key).unwrap_or_else(|| {
+            let inner = &log.0;
+            if inner.sender == KNOWN_CODES_STORAGE_ADDRESS {
+                let bytecode = unsorted_factory_deps.get(&inner.key).unwrap_or_else(|| {
                     panic!(
                         "Failed to get bytecode that was marked as known: bytecode_hash {:?}, \
                              L1 batch number {:?}",
-                        log.key, header.number
+                        inner.key, header.number
                     );
                 });
                 Some(bytecode.as_slice())
@@ -118,7 +116,7 @@ impl L1BatchWithMetadata {
 
     pub fn l1_header_data(&self) -> Token {
         Token::Tuple(vec![
-            Token::Uint(U256::from(*self.header.number)),
+            Token::Uint(U256::from(self.header.number.0)),
             Token::FixedBytes(self.metadata.root_hash.as_bytes().to_vec()),
             Token::Uint(U256::from(self.metadata.rollup_last_leaf_index)),
             Token::Uint(U256::from(self.header.l1_tx_count)),
@@ -212,7 +210,7 @@ impl L1BatchWithMetadata {
         // Process and Pack Logs
         res.extend((self.header.l2_to_l1_logs.len() as u32).to_be_bytes());
         for l2_to_l1_log in &self.header.l2_to_l1_logs {
-            res.extend(l2_to_l1_log.to_bytes());
+            res.extend(l2_to_l1_log.0.to_bytes());
         }
 
         // Process and Pack Msgs
@@ -249,6 +247,22 @@ impl SerializeCommitment for L2ToL1Log {
     }
 }
 
+impl SerializeCommitment for UserL2ToL1Log {
+    const SERIALIZED_SIZE: usize = L2ToL1Log::SERIALIZED_SIZE;
+
+    fn serialize_commitment(&self, buffer: &mut [u8]) {
+        self.0.serialize_commitment(buffer);
+    }
+}
+
+impl SerializeCommitment for SystemL2ToL1Log {
+    const SERIALIZED_SIZE: usize = L2ToL1Log::SERIALIZED_SIZE;
+
+    fn serialize_commitment(&self, buffer: &mut [u8]) {
+        self.0.serialize_commitment(buffer);
+    }
+}
+
 impl SerializeCommitment for InitialStorageWrite {
     const SERIALIZED_SIZE: usize = 64;
 
@@ -280,7 +294,7 @@ impl SerializeCommitment for StateDiffRecord {
 struct L1BatchAuxiliaryOutput {
     // We use initial fields for debugging
     #[allow(dead_code)]
-    l2_l1_logs: Vec<L2ToL1Log>,
+    l2_l1_logs: Vec<UserL2ToL1Log>,
     #[allow(dead_code)]
     initial_writes: Vec<InitialStorageWrite>,
     #[allow(dead_code)]
@@ -313,10 +327,10 @@ struct L1BatchAuxiliaryOutput {
 
 impl L1BatchAuxiliaryOutput {
     fn new(
-        l2_l1_logs: Vec<L2ToL1Log>,
+        l2_l1_logs: Vec<UserL2ToL1Log>,
         initial_writes: Vec<InitialStorageWrite>,
         repeated_writes: Vec<RepeatedStorageWrite>,
-        system_logs: Vec<L2ToL1Log>,
+        system_logs: Vec<SystemL2ToL1Log>,
         state_diffs: Vec<StateDiffRecord>,
         bootloader_heap_hash: H256,
         events_state_queue_hash: H256,
@@ -335,11 +349,11 @@ impl L1BatchAuxiliaryOutput {
         let repeated_writes_hash = H256::from(keccak256(&repeated_writes_compressed));
         let state_diffs_hash = H256::from(keccak256(&(state_diffs_packed)));
 
-        let merkle_tree_leaves = l2_l1_logs_compressed[4..]
-            .chunks(L2ToL1Log::SERIALIZED_SIZE)
-            .map(|chunk| <[u8; L2ToL1Log::SERIALIZED_SIZE]>::try_from(chunk).unwrap());
+        let merkle_tree_leaves = l2_l1_logs_compressed
+            .chunks(UserL2ToL1Log::SERIALIZED_SIZE)
+            .map(|chunk| <[u8; UserL2ToL1Log::SERIALIZED_SIZE]>::try_from(chunk).unwrap());
         // ^ Skip first 4 bytes of the serialized logs (i.e., the number of logs).
-        let min_tree_size = Some(L2ToL1Log::LEGACY_LIMIT_PER_L1_BATCH);
+        let min_tree_size = Some(L2ToL1Log::MIN_L2_L1_LOGS_TREE_SIZE);
         let l2_l1_logs_merkle_root =
             MiniMerkleTree::new(merkle_tree_leaves, min_tree_size).merkle_root();
 
@@ -368,10 +382,10 @@ impl L1BatchAuxiliaryOutput {
         // 4 H256 values
         const SERIALIZED_SIZE: usize = 128;
         let mut result = Vec::with_capacity(SERIALIZED_SIZE);
-        result.extend(self.l2_l1_logs_merkle_root.as_bytes());
-        result.extend(self.l2_l1_logs_linear_hash.as_bytes());
-        result.extend(self.initial_writes_hash.as_bytes());
-        result.extend(self.repeated_writes_hash.as_bytes());
+        result.extend(self.system_logs_linear_hash.as_bytes());
+        result.extend(self.state_diffs_hash.as_bytes());
+        result.extend(self.bootloader_heap_hash.as_bytes());
+        result.extend(self.events_state_queue_hash.as_bytes());
         result
     }
 
@@ -454,14 +468,14 @@ pub struct L1BatchCommitmentHash {
 impl L1BatchCommitment {
     #[allow(clippy::too_many_arguments)]
     pub fn new(
-        l2_to_l1_logs: Vec<L2ToL1Log>,
+        l2_to_l1_logs: Vec<UserL2ToL1Log>,
         rollup_last_leaf_index: u64,
         rollup_root_hash: H256,
         initial_writes: Vec<InitialStorageWrite>,
         repeated_writes: Vec<RepeatedStorageWrite>,
         bootloader_code_hash: H256,
         default_aa_code_hash: H256,
-        system_logs: Vec<L2ToL1Log>,
+        system_logs: Vec<SystemL2ToL1Log>,
         state_diffs: Vec<StateDiffRecord>,
         bootloader_heap_hash: H256,
         events_state_queue_hash: H256,
@@ -566,7 +580,7 @@ mod tests {
     use crate::commitment::{
         L1BatchAuxiliaryOutput, L1BatchCommitment, L1BatchMetaParameters, L1BatchPassThroughData,
     };
-    use crate::l2_to_l1_log::L2ToL1Log;
+    use crate::l2_to_l1_log::{L2ToL1Log, UserL2ToL1Log};
     use crate::writes::{InitialStorageWrite, RepeatedStorageWrite};
     use crate::{H256, U256};
 
@@ -616,6 +630,8 @@ mod tests {
         expected_outputs: ExpectedOutput,
     }
 
+    // TODO(PLA-568): restore this test
+    #[ignore]
     #[test]
     fn commitment_test() {
         let zksync_home = std::env::var("ZKSYNC_HOME").unwrap_or_else(|_| ".".into());
@@ -637,7 +653,12 @@ mod tests {
             })
             .collect();
         let auxiliary_output = L1BatchAuxiliaryOutput::new(
-            commitment_test.auxiliary_input.l2_l1_logs.clone(),
+            commitment_test
+                .auxiliary_input
+                .l2_l1_logs
+                .into_iter()
+                .map(UserL2ToL1Log)
+                .collect(),
             initial_writes,
             commitment_test.auxiliary_input.repeated_writes.clone(),
             vec![],
diff --git a/core/lib/types/src/eth_sender.rs b/core/lib/types/src/eth_sender.rs
index 3873da17c860..847662eaeaa5 100644
--- a/core/lib/types/src/eth_sender.rs
+++ b/core/lib/types/src/eth_sender.rs
@@ -1,7 +1,7 @@
 use crate::aggregated_operations::AggregatedActionType;
 use crate::{Address, Nonce, H256};
 
-#[derive(Debug, Clone)]
+#[derive(Clone)]
 pub struct EthTx {
     pub id: u32,
     pub nonce: Nonce,
@@ -12,6 +12,20 @@ pub struct EthTx {
     pub predicted_gas_cost: u64,
 }
 
+impl std::fmt::Debug for EthTx {
+    fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
+        // Do not print raw_tx
+        f.debug_struct("EthTx")
+            .field("id", &self.id)
+            .field("nonce", &self.nonce)
+            .field("contract_address", &self.contract_address)
+            .field("tx_type", &self.tx_type)
+            .field("created_at_timestamp", &self.created_at_timestamp)
+            .field("predicted_gas_cost", &self.predicted_gas_cost)
+            .finish()
+    }
+}
+
 #[derive(Clone, Debug)]
 pub struct TxHistory {
     pub id: u32,
diff --git a/core/lib/types/src/event.rs b/core/lib/types/src/event.rs
index fccd5a43ac22..c901ac8b0f43 100644
--- a/core/lib/types/src/event.rs
+++ b/core/lib/types/src/event.rs
@@ -66,12 +66,12 @@ static L1_MESSAGE_EVENT_SIGNATURE: Lazy<H256> = Lazy::new(|| {
 /// ```
 #[derive(Debug, Default, Clone, PartialEq)]
 pub struct L1MessengerL2ToL1Log {
-    l2_shard_id: u8,
-    is_service: bool,
-    tx_number_in_block: u16,
-    sender: Address,
-    key: U256,
-    value: U256,
+    pub l2_shard_id: u8,
+    pub is_service: bool,
+    pub tx_number_in_block: u16,
+    pub sender: Address,
+    pub key: U256,
+    pub value: U256,
 }
 
 impl L1MessengerL2ToL1Log {
diff --git a/core/lib/types/src/fee.rs b/core/lib/types/src/fee.rs
index 4c614229b1d7..53e05fbb59a9 100644
--- a/core/lib/types/src/fee.rs
+++ b/core/lib/types/src/fee.rs
@@ -22,6 +22,7 @@ pub struct TransactionExecutionMetrics {
     pub total_log_queries: usize,
     pub cycles_used: u32,
     pub computational_gas_used: u32,
+    pub total_updated_values_size: usize,
     pub pubdata_published: u32,
 }
 
diff --git a/core/lib/types/src/l2_to_l1_log.rs b/core/lib/types/src/l2_to_l1_log.rs
index f392b0fb41b2..3e8cfb402415 100644
--- a/core/lib/types/src/l2_to_l1_log.rs
+++ b/core/lib/types/src/l2_to_l1_log.rs
@@ -2,6 +2,7 @@ use crate::commitment::SerializeCommitment;
 use crate::{Address, H256};
 use serde::{Deserialize, Serialize};
 use zk_evm::reference_impls::event_sink::EventMessage;
+use zk_evm_1_4_0::reference_impls::event_sink::EventMessage as EventMessage_1_4_0;
 use zksync_utils::u256_to_h256;
 
 #[derive(Debug, Clone, PartialEq, Serialize, Deserialize, Default, Eq)]
@@ -14,11 +15,21 @@ pub struct L2ToL1Log {
     pub value: H256,
 }
 
+/// A struct representing a "user" L2->L1 log, i.e. the one that has been emitted by using the L1Messenger.
+/// It is identical to the SystemL2ToL1Log struct, but
+#[derive(Debug, Clone, PartialEq, Serialize, Deserialize, Default, Eq)]
+pub struct UserL2ToL1Log(pub L2ToL1Log);
+
+/// A struct representing a "user" L2->L1 log, i.e. the one that has been emitted by using the L1Messenger.
+/// It is identical to the SystemL2ToL1Log struct, but
+
+#[derive(Debug, Clone, PartialEq, Serialize, Deserialize, Default, Eq)]
+pub struct SystemL2ToL1Log(pub L2ToL1Log);
+
 impl L2ToL1Log {
-    /// Legacy upper bound of L2-to-L1 logs per single L1 batch. This is not used as a limit now,
-    /// but still determines the minimum number of items in the Merkle tree built from L2-to-L1 logs
+    /// Determines the minimum number of items in the Merkle tree built from L2-to-L1 logs
     /// for a certain batch.
-    pub const LEGACY_LIMIT_PER_L1_BATCH: usize = 512;
+    pub const MIN_L2_L1_LOGS_TREE_SIZE: usize = 2048;
 
     pub fn from_slice(data: &[u8]) -> Self {
         assert_eq!(data.len(), Self::SERIALIZED_SIZE);
@@ -38,6 +49,17 @@ impl L2ToL1Log {
         self.serialize_commitment(&mut buffer);
         buffer
     }
+
+    pub fn packed_encoding(&self) -> Vec<u8> {
+        let mut res = vec![];
+        res.extend_from_slice(&self.shard_id.to_be_bytes());
+        res.extend_from_slice(&(self.is_service as u8).to_be_bytes());
+        res.extend_from_slice(&self.tx_number_in_block.to_be_bytes());
+        res.extend_from_slice(self.sender.as_bytes());
+        res.extend(self.key.as_bytes());
+        res.extend(self.value.as_bytes());
+        res
+    }
 }
 
 impl From<EventMessage> for L2ToL1Log {
@@ -53,6 +75,19 @@ impl From<EventMessage> for L2ToL1Log {
     }
 }
 
+impl From<EventMessage_1_4_0> for L2ToL1Log {
+    fn from(m: EventMessage_1_4_0) -> Self {
+        Self {
+            shard_id: m.shard_id,
+            is_service: m.is_first,
+            tx_number_in_block: m.tx_number_in_block,
+            sender: m.address,
+            key: u256_to_h256(m.key),
+            value: u256_to_h256(m.value),
+        }
+    }
+}
+
 #[cfg(test)]
 mod tests {
     use super::L2ToL1Log;
diff --git a/core/lib/types/src/protocol_version.rs b/core/lib/types/src/protocol_version.rs
index 05d25d6db939..fa7a07e9d6fb 100644
--- a/core/lib/types/src/protocol_version.rs
+++ b/core/lib/types/src/protocol_version.rs
@@ -37,15 +37,17 @@ pub enum ProtocolVersionId {
     Version15,
     Version16,
     Version17,
+    Version18,
+    Version19,
 }
 
 impl ProtocolVersionId {
     pub fn latest() -> Self {
-        Self::Version16
+        Self::Version18
     }
 
     pub fn next() -> Self {
-        Self::Version17
+        Self::Version19
     }
 
     /// Returns VM version to be used by API for this protocol version.
@@ -70,11 +72,13 @@ impl ProtocolVersionId {
             ProtocolVersionId::Version15 => VmVersion::VmVirtualBlocks,
             ProtocolVersionId::Version16 => VmVersion::VmVirtualBlocksRefundsEnhancement,
             ProtocolVersionId::Version17 => VmVersion::VmVirtualBlocksRefundsEnhancement,
+            ProtocolVersionId::Version18 => VmVersion::VmBoojumIntegration,
+            ProtocolVersionId::Version19 => VmVersion::VmBoojumIntegration,
         }
     }
 
     pub fn is_pre_boojum(&self) -> bool {
-        self <= &ProtocolVersionId::Version17
+        self < &ProtocolVersionId::Version18
     }
 }
 
@@ -160,7 +164,7 @@ pub struct L1VerifierConfig {
     pub recursion_scheduler_level_vk_hash: H256,
 }
 
-/// Represents a call that was made during governance operation.
+/// Represents a call to be made during governance operation.
 #[derive(Debug, Clone, Serialize, Deserialize)]
 pub struct Call {
     /// The address to which the call will be made.
@@ -169,13 +173,13 @@ pub struct Call {
     pub value: U256,
     /// The calldata to be executed on the `target` address.
     pub data: Vec<u8>,
-    /// Hash of the corresponding Ethereum transaction.
+    /// 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,
 }
 
-/// Defines the structure of an operation that Governance contract executed.
+/// Defines the structure of an operation that Governance contract executes.
 #[derive(Debug, Clone, Default)]
 pub struct GovernanceOperation {
     /// An array of `Call` structs, each representing a call to be made during the operation.
@@ -259,7 +263,7 @@ impl TryFrom<Log> for ProtocolUpgrade {
         let mut decoded = decode(
             &[ParamType::Tuple(vec![
                 transaction_param_type,                       // transaction data
-                ParamType::Array(Box::new(ParamType::Bytes)), //factory deps
+                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
@@ -438,6 +442,39 @@ impl TryFrom<Log> for ProtocolUpgrade {
     }
 }
 
+impl TryFrom<Call> for ProtocolUpgrade {
+    type Error = crate::ethabi::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)
+    }
+}
+
 impl TryFrom<Log> for GovernanceOperation {
     type Error = crate::ethabi::Error;
 
@@ -506,38 +543,6 @@ impl TryFrom<Log> for GovernanceOperation {
     }
 }
 
-impl TryFrom<Call> for ProtocolUpgrade {
-    type Error = crate::ethabi::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)
-    }
-}
-
 #[derive(Debug, Clone, Default)]
 pub struct ProtocolVersion {
     /// Protocol version ID
@@ -686,6 +691,8 @@ impl From<ProtocolVersionId> for VmVersion {
             ProtocolVersionId::Version15 => VmVersion::VmVirtualBlocks,
             ProtocolVersionId::Version16 => VmVersion::VmVirtualBlocksRefundsEnhancement,
             ProtocolVersionId::Version17 => VmVersion::VmVirtualBlocksRefundsEnhancement,
+            ProtocolVersionId::Version18 => VmVersion::VmBoojumIntegration,
+            ProtocolVersionId::Version19 => VmVersion::VmBoojumIntegration,
         }
     }
 }
diff --git a/core/lib/types/src/storage/writes/mod.rs b/core/lib/types/src/storage/writes/mod.rs
index 0826af82000a..6a17afb7d15f 100644
--- a/core/lib/types/src/storage/writes/mod.rs
+++ b/core/lib/types/src/storage/writes/mod.rs
@@ -4,13 +4,17 @@ use crate::H256;
 use serde::{Deserialize, Serialize};
 use zksync_basic_types::{Address, U256};
 
-use self::compression::{compress_with_best_strategy, COMPRESSION_VERSION_NUMBER};
+pub(crate) use self::compression::{compress_with_best_strategy, COMPRESSION_VERSION_NUMBER};
 
-mod compression;
+pub mod compression;
 
-const BYTES_PER_ENUMERATION_INDEX: u8 = 4;
-// Total byte size of all fields in StateDiffRecord struct
-// 20 + 32 + 32 +8 + 32 + 32
+/// The number of bytes being used for state diff enumeration indices. Applicable to repeated writes.
+pub const BYTES_PER_ENUMERATION_INDEX: u8 = 4;
+/// The number of bytes being used for state diff derived keys. Applicable to initial writes.
+pub const BYTES_PER_DERIVED_KEY: u8 = 32;
+
+/// Total byte size of all fields in StateDiffRecord struct
+/// 20 + 32 + 32 + 8 + 32 + 32
 const STATE_DIFF_RECORD_SIZE: usize = 156;
 
 // 2 * 136 - the size that allows for two keccak rounds.
@@ -203,8 +207,7 @@ mod tests {
         ];
         let bytes = serialize_commitments(&initial_writes);
 
-        let expected_bytes = "00000002\
-            0100000000000000000000000000000000000000000000000000000000000000\
+        let expected_bytes = "0100000000000000000000000000000000000000000000000000000000000000\
             0101010101010101010101010101010101010101010101010101010101010101\
             0200000000000000000000000000000000000000000000000000000000000000\
             0303030303030303030303030303030303030303030303030303030303030303";
@@ -223,8 +226,7 @@ mod tests {
         ];
         let bytes = serialize_commitments(&repeated_writes);
 
-        let expected_bytes = "00000002\
-            0000000000000001\
+        let expected_bytes = "0000000000000001\
             0101010101010101010101010101010101010101010101010101010101010101\
             0000000000000002\
             0303030303030303030303030303030303030303030303030303030303030303";
diff --git a/core/lib/types/src/storage_writes_deduplicator.rs b/core/lib/types/src/storage_writes_deduplicator.rs
index e781c963fe53..42ce67e63757 100644
--- a/core/lib/types/src/storage_writes_deduplicator.rs
+++ b/core/lib/types/src/storage_writes_deduplicator.rs
@@ -3,14 +3,17 @@ use std::collections::HashMap;
 use zksync_utils::u256_to_h256;
 
 use crate::tx::tx_execution_info::DeduplicatedWritesMetrics;
+use crate::writes::compression::compress_with_best_strategy;
 use crate::{AccountTreeId, StorageKey, StorageLogQuery, StorageLogQueryType, U256};
 
-#[derive(Debug, Clone, Copy, PartialEq)]
+#[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,
+    /// Size of pubdata update in bytes
+    pub size: usize,
 }
 
 #[derive(Debug, Clone, Copy, PartialEq)]
@@ -107,12 +110,15 @@ impl StorageWritesDeduplicator {
                 &mut self.metrics.repeated_storage_writes
             };
 
+            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(|| {
                         panic!("tried removing key: {:?} before insertion", key)
                     });
                     *field_to_change -= 1;
+                    *total_size -= value.size;
                     updates.push(UpdateItem {
                         key,
                         update_type: UpdateType::Remove(value),
@@ -120,6 +126,7 @@ impl StorageWritesDeduplicator {
                     });
                 }
                 (true, Some(new_value)) => {
+                    let value_size = compress_with_best_strategy(initial_value, new_value).len();
                     let old_value = self
                         .modified_key_values
                         .insert(
@@ -127,26 +134,34 @@ impl StorageWritesDeduplicator {
                             ModifiedSlot {
                                 value: new_value,
                                 tx_index: log.log_query.tx_number_in_block,
+                                size: value_size,
                             },
                         )
                         .unwrap_or_else(|| {
                             panic!("tried removing key: {:?} before insertion", key)
                         });
+
                     updates.push(UpdateItem {
                         key,
                         update_type: UpdateType::Update(old_value),
                         is_write_initial,
-                    })
+                    });
+
+                    *total_size -= old_value.size;
+                    *total_size += value_size;
                 }
                 (false, Some(new_value)) => {
+                    let value_size = compress_with_best_strategy(initial_value, 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,
                         },
                     );
                     *field_to_change += 1;
+                    *total_size += value_size;
                     updates.push(UpdateItem {
                         key,
                         update_type: UpdateType::Insert,
@@ -167,17 +182,33 @@ impl StorageWritesDeduplicator {
                 &mut self.metrics.repeated_storage_writes
             };
 
+            let total_size = &mut self.metrics.total_updated_values_size;
+
             match item.update_type {
                 UpdateType::Insert => {
-                    self.modified_key_values.remove(&item.key);
+                    let value = self
+                        .modified_key_values
+                        .remove(&item.key)
+                        .unwrap_or_else(|| {
+                            panic!("tried removing key: {:?} before insertion", item.key)
+                        });
                     *field_to_change -= 1;
+                    *total_size -= value.size;
                 }
                 UpdateType::Update(value) => {
-                    self.modified_key_values.insert(item.key, value);
+                    let old_value = self
+                        .modified_key_values
+                        .insert(item.key, value)
+                        .unwrap_or_else(|| {
+                            panic!("tried removing key: {:?} before insertion", item.key)
+                        });
+                    *total_size += value.size;
+                    *total_size -= old_value.size;
                 }
                 UpdateType::Remove(value) => {
                     self.modified_key_values.insert(item.key, value);
                     *field_to_change += 1;
+                    *total_size += value.size;
                 }
             }
         }
@@ -247,6 +278,7 @@ mod tests {
                 DeduplicatedWritesMetrics {
                     initial_storage_writes: 1,
                     repeated_storage_writes: 0,
+                    total_updated_values_size: 2,
                 },
                 "single initial write".into(),
             ),
@@ -258,6 +290,7 @@ mod tests {
                 DeduplicatedWritesMetrics {
                     initial_storage_writes: 1,
                     repeated_storage_writes: 1,
+                    total_updated_values_size: 4,
                 },
                 "initial and repeated write".into(),
             ),
@@ -269,6 +302,7 @@ mod tests {
                 DeduplicatedWritesMetrics {
                     initial_storage_writes: 0,
                     repeated_storage_writes: 0,
+                    total_updated_values_size: 0,
                 },
                 "single rollback".into(),
             ),
@@ -283,6 +317,7 @@ mod tests {
                 DeduplicatedWritesMetrics {
                     initial_storage_writes: 0,
                     repeated_storage_writes: 0,
+                    total_updated_values_size: 0,
                 },
                 "idle write".into(),
             ),
@@ -295,6 +330,7 @@ mod tests {
                 DeduplicatedWritesMetrics {
                     initial_storage_writes: 0,
                     repeated_storage_writes: 0,
+                    total_updated_values_size: 0,
                 },
                 "idle write cycle".into(),
             ),
@@ -311,6 +347,7 @@ mod tests {
                 DeduplicatedWritesMetrics {
                     initial_storage_writes: 2,
                     repeated_storage_writes: 1,
+                    total_updated_values_size: 6,
                 },
                 "complex".into(),
             ),
@@ -336,7 +373,7 @@ mod tests {
             assert_eq!(
                 deduplicator.metrics,
                 Default::default(),
-                "rolled back incorrectly for scenario: {}",
+                "rolled back incorrectly for scenario: {:?}",
                 descr
             )
         }
@@ -357,6 +394,7 @@ mod tests {
                 ModifiedSlot {
                     value: 8u32.into(),
                     tx_index: 0,
+                    size: 2,
                 },
             ),
             (
@@ -364,6 +402,7 @@ mod tests {
                 ModifiedSlot {
                     value: 6u32.into(),
                     tx_index: 0,
+                    size: 2,
                 },
             ),
             (
@@ -371,6 +410,7 @@ mod tests {
                 ModifiedSlot {
                     value: 9u32.into(),
                     tx_index: 0,
+                    size: 2,
                 },
             ),
             (
@@ -378,6 +418,7 @@ mod tests {
                 ModifiedSlot {
                     value: 11u32.into(),
                     tx_index: 0,
+                    size: 2,
                 },
             ),
             (
@@ -385,6 +426,7 @@ mod tests {
                 ModifiedSlot {
                     value: 2u32.into(),
                     tx_index: 0,
+                    size: 2,
                 },
             ),
             (
@@ -392,6 +434,7 @@ mod tests {
                 ModifiedSlot {
                     value: 7u32.into(),
                     tx_index: 0,
+                    size: 2,
                 },
             ),
         ]);
@@ -416,6 +459,7 @@ mod tests {
                 ModifiedSlot {
                     value: 6u32.into(),
                     tx_index: 0,
+                    size: 2,
                 },
             ),
             (
@@ -423,6 +467,7 @@ mod tests {
                 ModifiedSlot {
                     value: 11u32.into(),
                     tx_index: 0,
+                    size: 2,
                 },
             ),
             (
@@ -430,6 +475,7 @@ mod tests {
                 ModifiedSlot {
                     value: 7u32.into(),
                     tx_index: 0,
+                    size: 2,
                 },
             ),
         ]);
@@ -454,6 +500,7 @@ mod tests {
                 ModifiedSlot {
                     value: 3u32.into(),
                     tx_index: 0,
+                    size: 2,
                 },
             ),
             (
@@ -461,6 +508,7 @@ mod tests {
                 ModifiedSlot {
                     value: 4u32.into(),
                     tx_index: 0,
+                    size: 2,
                 },
             ),
             (
@@ -468,6 +516,7 @@ mod tests {
                 ModifiedSlot {
                     value: 5u32.into(),
                     tx_index: 0,
+                    size: 2,
                 },
             ),
         ]);
@@ -488,6 +537,7 @@ mod tests {
             ModifiedSlot {
                 value: 2u32.into(),
                 tx_index: 0,
+                size: 2,
             },
         )]);
         let mut deduplicator = StorageWritesDeduplicator::new();
diff --git a/core/lib/types/src/system_contracts.rs b/core/lib/types/src/system_contracts.rs
index f4fd4e14ffc1..430d8d4701dd 100644
--- a/core/lib/types/src/system_contracts.rs
+++ b/core/lib/types/src/system_contracts.rs
@@ -3,15 +3,14 @@ use std::path::PathBuf;
 use zksync_basic_types::{AccountTreeId, Address, U256};
 use zksync_contracts::{read_sys_contract_bytecode, ContractLanguage, SystemContractsRepo};
 use zksync_system_constants::{
-    BOOTLOADER_UTILITIES_ADDRESS, BYTECODE_COMPRESSOR_ADDRESS, COMPLEX_UPGRADER_ADDRESS,
-    EVENT_WRITER_ADDRESS,
+    BOOTLOADER_UTILITIES_ADDRESS, COMPRESSOR_ADDRESS, EVENT_WRITER_ADDRESS,
 };
 
 use crate::{
     block::DeployedContract, ACCOUNT_CODE_STORAGE_ADDRESS, BOOTLOADER_ADDRESS,
-    CONTRACT_DEPLOYER_ADDRESS, ECRECOVER_PRECOMPILE_ADDRESS, IMMUTABLE_SIMULATOR_STORAGE_ADDRESS,
-    KECCAK256_PRECOMPILE_ADDRESS, KNOWN_CODES_STORAGE_ADDRESS, L1_MESSENGER_ADDRESS,
-    L2_ETH_TOKEN_ADDRESS, MSG_VALUE_SIMULATOR_ADDRESS, NONCE_HOLDER_ADDRESS,
+    COMPLEX_UPGRADER_ADDRESS, CONTRACT_DEPLOYER_ADDRESS, ECRECOVER_PRECOMPILE_ADDRESS,
+    IMMUTABLE_SIMULATOR_STORAGE_ADDRESS, KECCAK256_PRECOMPILE_ADDRESS, KNOWN_CODES_STORAGE_ADDRESS,
+    L1_MESSENGER_ADDRESS, L2_ETH_TOKEN_ADDRESS, MSG_VALUE_SIMULATOR_ADDRESS, NONCE_HOLDER_ADDRESS,
     SHA256_PRECOMPILE_ADDRESS, SYSTEM_CONTEXT_ADDRESS,
 };
 use once_cell::sync::Lazy;
@@ -109,12 +108,7 @@ static SYSTEM_CONTRACT_LIST: [(&str, &str, Address, ContractLanguage); 18] = [
         BOOTLOADER_UTILITIES_ADDRESS,
         ContractLanguage::Sol,
     ),
-    (
-        "",
-        "BytecodeCompressor",
-        BYTECODE_COMPRESSOR_ADDRESS,
-        ContractLanguage::Sol,
-    ),
+    ("", "Compressor", COMPRESSOR_ADDRESS, ContractLanguage::Sol),
     (
         "",
         "ComplexUpgrader",
diff --git a/core/lib/types/src/tx/tx_execution_info.rs b/core/lib/types/src/tx/tx_execution_info.rs
index c734c715f08a..0f72172f529c 100644
--- a/core/lib/types/src/tx/tx_execution_info.rs
+++ b/core/lib/types/src/tx/tx_execution_info.rs
@@ -1,20 +1,15 @@
-use crate::commitment::SerializeCommitment;
 use crate::fee::TransactionExecutionMetrics;
 use crate::l2_to_l1_log::L2ToL1Log;
-use crate::writes::{InitialStorageWrite, RepeatedStorageWrite};
-use crate::{StorageLogQuery, VmEvent};
+use crate::{
+    commitment::SerializeCommitment,
+    writes::{
+        InitialStorageWrite, RepeatedStorageWrite, BYTES_PER_DERIVED_KEY,
+        BYTES_PER_ENUMERATION_INDEX,
+    },
+    ProtocolVersionId,
+};
 use std::ops::{Add, AddAssign};
 
-/// Events/storage logs/l2->l1 logs created within transaction execution.
-#[derive(Debug, Clone, Default, PartialEq)]
-pub struct VmExecutionLogs {
-    pub storage_logs: Vec<StorageLogQuery>,
-    pub events: Vec<VmEvent>,
-    pub l2_to_l1_logs: Vec<L2ToL1Log>,
-    // This field moved to statistics, but we need to keep it for backward compatibility
-    pub total_log_queries_count: usize,
-}
-
 #[derive(Debug, Clone, Copy, Eq, PartialEq)]
 pub enum TxExecutionStatus {
     Success,
@@ -35,6 +30,7 @@ impl TxExecutionStatus {
 pub struct DeduplicatedWritesMetrics {
     pub initial_storage_writes: usize,
     pub repeated_storage_writes: usize,
+    pub total_updated_values_size: usize,
 }
 
 impl DeduplicatedWritesMetrics {
@@ -42,12 +38,19 @@ impl DeduplicatedWritesMetrics {
         Self {
             initial_storage_writes: tx_metrics.initial_storage_writes,
             repeated_storage_writes: tx_metrics.repeated_storage_writes,
+            total_updated_values_size: tx_metrics.total_updated_values_size,
         }
     }
 
-    pub fn size(&self) -> usize {
-        self.initial_storage_writes * InitialStorageWrite::SERIALIZED_SIZE
-            + self.repeated_storage_writes * RepeatedStorageWrite::SERIALIZED_SIZE
+    pub fn size(&self, protocol_version: ProtocolVersionId) -> usize {
+        if protocol_version.is_pre_boojum() {
+            self.initial_storage_writes * InitialStorageWrite::SERIALIZED_SIZE
+                + self.repeated_storage_writes * RepeatedStorageWrite::SERIALIZED_SIZE
+        } else {
+            self.total_updated_values_size
+                + (BYTES_PER_DERIVED_KEY as usize) * self.initial_storage_writes
+                + (BYTES_PER_ENUMERATION_INDEX as usize) * self.repeated_storage_writes
+        }
     }
 }
 
@@ -56,7 +59,7 @@ pub struct ExecutionMetrics {
     pub gas_used: usize,
     pub published_bytecode_bytes: usize,
     pub l2_l1_long_messages: usize,
-    pub l2_l1_logs: usize,
+    pub l2_to_l1_logs: usize,
     pub contracts_used: usize,
     pub contracts_deployed: u16,
     pub vm_events: usize,
@@ -72,7 +75,7 @@ impl ExecutionMetrics {
         Self {
             published_bytecode_bytes: tx_metrics.published_bytecode_bytes,
             l2_l1_long_messages: tx_metrics.l2_l1_long_messages,
-            l2_l1_logs: tx_metrics.l2_l1_logs,
+            l2_to_l1_logs: tx_metrics.l2_l1_logs,
             contracts_deployed: tx_metrics.contracts_deployed,
             contracts_used: tx_metrics.contracts_used,
             gas_used: tx_metrics.gas_used,
@@ -86,9 +89,14 @@ impl ExecutionMetrics {
     }
 
     pub fn size(&self) -> usize {
-        self.l2_l1_logs * L2ToL1Log::SERIALIZED_SIZE
+        self.l2_to_l1_logs * L2ToL1Log::SERIALIZED_SIZE
             + self.l2_l1_long_messages
             + self.published_bytecode_bytes
+            // TODO(PLA-648): refactor this constant
+            // It represents the need to store the length's of messages as well as bytecodes. 
+            // It works due to the fact that each bytecode/L2->L1 long message is accompanied by a corresponding
+            // user L2->L1 log.  
+            + self.l2_to_l1_logs * 4
     }
 }
 
@@ -102,7 +110,7 @@ impl Add for ExecutionMetrics {
             contracts_deployed: self.contracts_deployed + other.contracts_deployed,
             contracts_used: self.contracts_used + other.contracts_used,
             l2_l1_long_messages: self.l2_l1_long_messages + other.l2_l1_long_messages,
-            l2_l1_logs: self.l2_l1_logs + other.l2_l1_logs,
+            l2_to_l1_logs: self.l2_to_l1_logs + other.l2_to_l1_logs,
             gas_used: self.gas_used + other.gas_used,
             vm_events: self.vm_events + other.vm_events,
             storage_logs: self.storage_logs + other.storage_logs,
diff --git a/core/lib/types/src/vm_version.rs b/core/lib/types/src/vm_version.rs
index 7f043bb5552b..0f0fe4d337fc 100644
--- a/core/lib/types/src/vm_version.rs
+++ b/core/lib/types/src/vm_version.rs
@@ -7,11 +7,12 @@ pub enum VmVersion {
     Vm1_3_2,
     VmVirtualBlocks,
     VmVirtualBlocksRefundsEnhancement,
+    VmBoojumIntegration,
 }
 
 impl VmVersion {
     /// Returns the latest supported VM version.
     pub const fn latest() -> VmVersion {
-        Self::VmVirtualBlocksRefundsEnhancement
+        Self::VmBoojumIntegration
     }
 }
diff --git a/core/lib/zksync_core/src/api_server/execution_sandbox/tracers.rs b/core/lib/zksync_core/src/api_server/execution_sandbox/tracers.rs
index 5e45aec74335..ac675eee707f 100644
--- a/core/lib/zksync_core/src/api_server/execution_sandbox/tracers.rs
+++ b/core/lib/zksync_core/src/api_server/execution_sandbox/tracers.rs
@@ -16,7 +16,7 @@ pub(crate) enum ApiTracer {
 impl ApiTracer {
     pub fn into_boxed<
         S: WriteStorage,
-        H: HistoryMode + multivm::HistoryMode<VmVirtualBlocksRefundsEnhancement = H> + 'static,
+        H: HistoryMode + multivm::HistoryMode<VmBoojumIntegration = H> + 'static,
     >(
         self,
     ) -> MultiVmTracerPointer<S, H> {
diff --git a/core/lib/zksync_core/src/api_server/execution_sandbox/vm_metrics.rs b/core/lib/zksync_core/src/api_server/execution_sandbox/vm_metrics.rs
index 7bc1d39145e9..138d06a3a7c8 100644
--- a/core/lib/zksync_core/src/api_server/execution_sandbox/vm_metrics.rs
+++ b/core/lib/zksync_core/src/api_server/execution_sandbox/vm_metrics.rs
@@ -229,7 +229,7 @@ pub(super) fn collect_tx_execution_metrics(
         event_topics,
         published_bytecode_bytes,
         l2_l1_long_messages,
-        l2_l1_logs: result.logs.l2_to_l1_logs.len(),
+        l2_l1_logs: result.logs.total_l2_to_l1_logs_count(),
         contracts_used: result.statistics.contracts_used,
         contracts_deployed,
         vm_events: result.logs.events.len(),
@@ -237,6 +237,7 @@ pub(super) fn collect_tx_execution_metrics(
         total_log_queries: result.statistics.total_log_queries,
         cycles_used: result.statistics.cycles_used,
         computational_gas_used: result.statistics.computational_gas_used,
+        total_updated_values_size: writes_metrics.total_updated_values_size,
         pubdata_published: result.statistics.pubdata_published,
     }
 }
diff --git a/core/lib/zksync_core/src/api_server/tx_sender/mod.rs b/core/lib/zksync_core/src/api_server/tx_sender/mod.rs
index 7a29112d879b..fd9c2cad99af 100644
--- a/core/lib/zksync_core/src/api_server/tx_sender/mod.rs
+++ b/core/lib/zksync_core/src/api_server/tx_sender/mod.rs
@@ -71,6 +71,8 @@ pub struct MultiVMBaseSystemContracts {
     pub(crate) post_virtual_blocks: BaseSystemContracts,
     /// Contracts to be used for protocol versions after virtual block upgrade fix.
     pub(crate) post_virtual_blocks_finish_upgrade_fix: BaseSystemContracts,
+    /// Contracts to be used for post-boojum protocol versions.
+    pub(crate) post_boojum: BaseSystemContracts,
 }
 
 impl MultiVMBaseSystemContracts {
@@ -94,6 +96,7 @@ impl MultiVMBaseSystemContracts {
             | ProtocolVersionId::Version15
             | ProtocolVersionId::Version16
             | ProtocolVersionId::Version17 => self.post_virtual_blocks_finish_upgrade_fix,
+            ProtocolVersionId::Version18 | ProtocolVersionId::Version19 => self.post_boojum,
         }
     }
 }
@@ -123,12 +126,14 @@ impl ApiContracts {
                 post_virtual_blocks: BaseSystemContracts::estimate_gas_post_virtual_blocks(),
                 post_virtual_blocks_finish_upgrade_fix:
                     BaseSystemContracts::estimate_gas_post_virtual_blocks_finish_upgrade_fix(),
+                post_boojum: BaseSystemContracts::estimate_gas_post_boojum(),
             },
             eth_call: MultiVMBaseSystemContracts {
                 pre_virtual_blocks: BaseSystemContracts::playground_pre_virtual_blocks(),
                 post_virtual_blocks: BaseSystemContracts::playground_post_virtual_blocks(),
                 post_virtual_blocks_finish_upgrade_fix:
                     BaseSystemContracts::playground_post_virtual_blocks_finish_upgrade_fix(),
+                post_boojum: BaseSystemContracts::playground_post_boojum(),
             },
         }
     }
@@ -906,8 +911,14 @@ impl<G: L1GasPriceProvider> TxSender<G> {
             H256::zero()
         };
 
-        let seal_data = SealData::for_transaction(transaction, tx_metrics);
-        if let Some(reason) = ConditionalSealer::find_unexecutable_reason(sk_config, &seal_data) {
+        // Using `ProtocolVersionId::latest()` for a short period we might end up in a scenario where the StateKeeper is still pre-boojum
+        // but the API assumes we are post boojum. In this situation we will determine a tx as being executable but the StateKeeper will
+        // still reject them as it's not.
+        let protocol_version = ProtocolVersionId::latest();
+        let seal_data = SealData::for_transaction(transaction, tx_metrics, protocol_version);
+        if let Some(reason) =
+            ConditionalSealer::find_unexecutable_reason(sk_config, &seal_data, protocol_version)
+        {
             let message = format!(
                 "Tx is Unexecutable because of {reason}; inputs for decision: {seal_data:?}"
             );
diff --git a/core/lib/zksync_core/src/api_server/web3/namespaces/zks.rs b/core/lib/zksync_core/src/api_server/web3/namespaces/zks.rs
index c7cfbe4b7a10..3e31ea6bb062 100644
--- a/core/lib/zksync_core/src/api_server/web3/namespaces/zks.rs
+++ b/core/lib/zksync_core/src/api_server/web3/namespaces/zks.rs
@@ -343,7 +343,7 @@ impl<G: L1GasPriceProvider> ZksNamespace<G> {
         };
 
         let merkle_tree_leaves = all_l1_logs_in_batch.iter().map(L2ToL1Log::to_bytes);
-        let min_tree_size = Some(L2ToL1Log::LEGACY_LIMIT_PER_L1_BATCH);
+        let min_tree_size = Some(L2ToL1Log::MIN_L2_L1_LOGS_TREE_SIZE);
         let (root, proof) = MiniMerkleTree::new(merkle_tree_leaves, min_tree_size)
             .merkle_root_and_path(l1_log_index);
         Ok(Some(L2ToL1LogProof {
diff --git a/core/lib/zksync_core/src/block_reverter/mod.rs b/core/lib/zksync_core/src/block_reverter/mod.rs
index a2b716ad5502..8fbafec4135f 100644
--- a/core/lib/zksync_core/src/block_reverter/mod.rs
+++ b/core/lib/zksync_core/src/block_reverter/mod.rs
@@ -351,9 +351,9 @@ impl BlockReverter {
 
     async fn get_l1_batch_number_from_contract(&self, op: AggregatedActionType) -> L1BatchNumber {
         let function_name = match op {
-            AggregatedActionType::Commit => "getTotalBlocksCommitted",
-            AggregatedActionType::PublishProofOnchain => "getTotalBlocksVerified",
-            AggregatedActionType::Execute => "getTotalBlocksExecuted",
+            AggregatedActionType::Commit => "getTotalBatchesCommitted",
+            AggregatedActionType::PublishProofOnchain => "getTotalBatchesVerified",
+            AggregatedActionType::Execute => "getTotalBatchesExecuted",
         };
         let eth_config = self
             .eth_config
diff --git a/core/lib/zksync_core/src/consistency_checker/mod.rs b/core/lib/zksync_core/src/consistency_checker/mod.rs
index 3613cd568981..35bb7b04c589 100644
--- a/core/lib/zksync_core/src/consistency_checker/mod.rs
+++ b/core/lib/zksync_core/src/consistency_checker/mod.rs
@@ -98,6 +98,7 @@ impl ConsistencyChecker {
             Some(1.into()),
             "Main node gave us a failed commit tx"
         );
+
         let commit_function = if block_metadata
             .header
             .protocol_version
diff --git a/core/lib/zksync_core/src/eth_sender/aggregator.rs b/core/lib/zksync_core/src/eth_sender/aggregator.rs
index a8f35b037f2d..92a2cb324d87 100644
--- a/core/lib/zksync_core/src/eth_sender/aggregator.rs
+++ b/core/lib/zksync_core/src/eth_sender/aggregator.rs
@@ -173,15 +173,28 @@ impl Aggregator {
             .get_last_committed_to_eth_l1_batch()
             .await
             .unwrap()?;
-        let ready_for_commit_l1_batches = blocks_dal
-            .get_ready_for_commit_l1_batches(
-                limit,
-                base_system_contracts_hashes.bootloader,
-                base_system_contracts_hashes.default_aa,
-                protocol_version_id,
-            )
-            .await
-            .unwrap();
+
+        let ready_for_commit_l1_batches = if protocol_version_id.is_pre_boojum() {
+            blocks_dal
+                .pre_boojum_get_ready_for_commit_l1_batches(
+                    limit,
+                    base_system_contracts_hashes.bootloader,
+                    base_system_contracts_hashes.default_aa,
+                    protocol_version_id,
+                )
+                .await
+                .unwrap()
+        } else {
+            blocks_dal
+                .get_ready_for_commit_l1_batches(
+                    limit,
+                    base_system_contracts_hashes.bootloader,
+                    base_system_contracts_hashes.default_aa,
+                    protocol_version_id,
+                )
+                .await
+                .unwrap()
+        };
 
         // Check that the L1 batches that are selected are sequential
         ready_for_commit_l1_batches
diff --git a/core/lib/zksync_core/src/eth_sender/tests.rs b/core/lib/zksync_core/src/eth_sender/tests.rs
index 81837e58099a..b2c1fa77e608 100644
--- a/core/lib/zksync_core/src/eth_sender/tests.rs
+++ b/core/lib/zksync_core/src/eth_sender/tests.rs
@@ -945,7 +945,7 @@ async fn send_operation(
         .save_eth_tx(
             &mut tester.conn.access_storage().await.unwrap(),
             &aggregated_operation,
-            true,
+            false,
         )
         .await
         .unwrap();
diff --git a/core/lib/zksync_core/src/eth_sender/zksync_functions.rs b/core/lib/zksync_core/src/eth_sender/zksync_functions.rs
index ba20054b880a..8e27af5b628d 100644
--- a/core/lib/zksync_core/src/eth_sender/zksync_functions.rs
+++ b/core/lib/zksync_core/src/eth_sender/zksync_functions.rs
@@ -1,6 +1,6 @@
 use zksync_contracts::{
     multicall_contract, verifier_contract, zksync_contract, PRE_BOOJUM_COMMIT_FUNCTION,
-    PRE_BOOJUM_EXECUTE_FUNCTION, PRE_BOOJUM_PROVE_FUNCTION,
+    PRE_BOOJUM_EXECUTE_FUNCTION, PRE_BOOJUM_GET_VK_FUNCTION, PRE_BOOJUM_PROVE_FUNCTION,
 };
 use zksync_types::ethabi::{Contract, Function};
 
@@ -63,7 +63,7 @@ impl Default for ZkSyncFunctions {
         let get_verifier = get_function(&zksync_contract, "getVerifier");
         let get_verifier_params = get_function(&zksync_contract, "getVerifierParams");
         let get_protocol_version = get_function(&zksync_contract, "getProtocolVersion");
-        let get_verification_key = get_function(&verifier_contract, "get_verification_key");
+        let get_verification_key = PRE_BOOJUM_GET_VK_FUNCTION.clone();
         let aggregate3 = get_function(&multicall_contract, "aggregate3");
         let verification_key_hash =
             get_optional_function(&verifier_contract, "verificationKeyHash");
diff --git a/core/lib/zksync_core/src/eth_watch/event_processors/governance_upgrades.rs b/core/lib/zksync_core/src/eth_watch/event_processors/governance_upgrades.rs
index 2867f63cd403..b43fc6fb0505 100644
--- a/core/lib/zksync_core/src/eth_watch/event_processors/governance_upgrades.rs
+++ b/core/lib/zksync_core/src/eth_watch/event_processors/governance_upgrades.rs
@@ -57,8 +57,14 @@ impl<W: EthClient + Sync> EventProcessor<W> for GovernanceUpgradesEventProcessor
                 .into_iter()
                 .filter(|call| call.target == self.diamond_proxy_address)
             {
-                let upgrade = ProtocolUpgrade::try_from(call)
-                    .map_err(|err| Error::LogParse(format!("{:?}", err)))?;
+                // We might not get an upgrade operation here, but something else instead
+                // (e.g. `acceptGovernor` call), so if parsing doesn't work, just skip the call.
+                let Ok(upgrade) = ProtocolUpgrade::try_from(call) else {
+                    tracing::warn!(
+                        "Failed to parse governance operation call as protocol upgrade, skipping"
+                    );
+                    continue;
+                };
                 // Scheduler VK is not present in proposal event. It is hardcoded in verifier contract.
                 let scheduler_vk_hash = if let Some(address) = upgrade.verifier_address {
                     Some(client.scheduler_vk_hash(address).await?)
diff --git a/core/lib/zksync_core/src/eth_watch/event_processors/upgrades.rs b/core/lib/zksync_core/src/eth_watch/event_processors/upgrades.rs
index 0b996c675e48..210b540c48e4 100644
--- a/core/lib/zksync_core/src/eth_watch/event_processors/upgrades.rs
+++ b/core/lib/zksync_core/src/eth_watch/event_processors/upgrades.rs
@@ -1,6 +1,4 @@
 use std::convert::TryFrom;
-
-use zksync_contracts::zksync_contract;
 use zksync_dal::StorageProcessor;
 use zksync_types::{web3::types::Log, ProtocolUpgrade, ProtocolVersionId, H256};
 
@@ -10,21 +8,21 @@ use crate::eth_watch::{
     metrics::{PollStage, METRICS},
 };
 
+pub(crate) const UPGRADE_PROPOSAL_SIGNATURE: H256 = H256([
+    105, 17, 91, 73, 175, 231, 166, 16, 26, 46, 122, 241, 125, 66, 30, 218, 29, 193, 83, 189, 38,
+    214, 153, 240, 19, 196, 255, 240, 64, 70, 70, 166,
+]);
+
 /// Responsible for saving new protocol upgrade proposals to the database.
 #[derive(Debug)]
 pub struct UpgradesEventProcessor {
     last_seen_version_id: ProtocolVersionId,
-    upgrade_proposal_signature: H256,
 }
 
 impl UpgradesEventProcessor {
     pub fn new(last_seen_version_id: ProtocolVersionId) -> Self {
         Self {
             last_seen_version_id,
-            upgrade_proposal_signature: zksync_contract()
-                .event("ProposeTransparentUpgrade")
-                .expect("ProposeTransparentUpgrade event is missing in abi")
-                .signature(),
         }
     }
 }
@@ -40,7 +38,7 @@ impl<W: EthClient + Sync> EventProcessor<W> for UpgradesEventProcessor {
         let mut upgrades = Vec::new();
         for event in events
             .into_iter()
-            .filter(|event| event.topics[0] == self.upgrade_proposal_signature)
+            .filter(|event| event.topics[0] == UPGRADE_PROPOSAL_SIGNATURE)
         {
             let upgrade = ProtocolUpgrade::try_from(event)
                 .map_err(|err| Error::LogParse(format!("{:?}", err)))?;
@@ -91,6 +89,6 @@ impl<W: EthClient + Sync> EventProcessor<W> for UpgradesEventProcessor {
     }
 
     fn relevant_topic(&self) -> H256 {
-        self.upgrade_proposal_signature
+        UPGRADE_PROPOSAL_SIGNATURE
     }
 }
diff --git a/core/lib/zksync_core/src/eth_watch/mod.rs b/core/lib/zksync_core/src/eth_watch/mod.rs
index 26faf89a3003..640f96707e4a 100644
--- a/core/lib/zksync_core/src/eth_watch/mod.rs
+++ b/core/lib/zksync_core/src/eth_watch/mod.rs
@@ -191,20 +191,20 @@ pub async fn start_eth_watch<E: EthInterface + Send + Sync + 'static>(
     pool: ConnectionPool,
     eth_gateway: E,
     diamond_proxy_addr: Address,
-    governance: Option<(Contract, Address)>,
+    governance: (Contract, Address),
     stop_receiver: watch::Receiver<bool>,
 ) -> anyhow::Result<JoinHandle<anyhow::Result<()>>> {
     let eth_watch = ETHWatchConfig::from_env().context("ETHWatchConfig::from_env()")?;
     let eth_client = EthHttpQueryClient::new(
         eth_gateway,
         diamond_proxy_addr,
-        governance.as_ref().map(|(_, address)| *address),
+        Some(governance.1),
         eth_watch.confirmations_for_eth_event,
     );
 
     let mut eth_watch = EthWatch::new(
         diamond_proxy_addr,
-        governance.map(|(contract, _)| contract),
+        Some(governance.0),
         eth_client,
         &pool,
         eth_watch.poll_interval(),
diff --git a/core/lib/zksync_core/src/eth_watch/tests.rs b/core/lib/zksync_core/src/eth_watch/tests.rs
index cf68b191af66..d7627a56c136 100644
--- a/core/lib/zksync_core/src/eth_watch/tests.rs
+++ b/core/lib/zksync_core/src/eth_watch/tests.rs
@@ -4,12 +4,12 @@ use std::sync::Arc;
 
 use tokio::sync::RwLock;
 
-use zksync_contracts::zksync_contract;
+use zksync_contracts::{governance_contract, zksync_contract};
 use zksync_dal::{ConnectionPool, StorageProcessor};
 use zksync_types::protocol_version::{ProtocolUpgradeTx, ProtocolUpgradeTxCommonData};
 use zksync_types::web3::types::{Address, BlockNumber};
 use zksync_types::{
-    ethabi::{encode, Contract, Hash, Token},
+    ethabi::{encode, Hash, Token},
     l1::{L1Tx, OpProcessingType, PriorityQueueType},
     web3::types::Log,
     Execute, L1TxCommonData, PriorityOpId, ProtocolUpgrade, ProtocolVersion, ProtocolVersionId,
@@ -17,7 +17,9 @@ use zksync_types::{
 };
 
 use super::client::Error;
-use crate::eth_watch::{client::EthClient, EthWatch};
+use crate::eth_watch::{
+    client::EthClient, event_processors::upgrades::UPGRADE_PROPOSAL_SIGNATURE, EthWatch,
+};
 
 struct FakeEthClientData {
     transactions: HashMap<u64, Vec<Log>>,
@@ -591,10 +593,7 @@ fn upgrade_into_diamond_proxy_log(upgrade: ProtocolUpgrade, eth_block: u64) -> L
     let data = encode(&[diamond_cut, Token::FixedBytes(vec![0u8; 32])]);
     Log {
         address: Address::repeat_byte(0x1),
-        topics: vec![zksync_contract()
-            .event("ProposeTransparentUpgrade")
-            .expect("ProposeTransparentUpgrade event is missing in abi")
-            .signature()],
+        topics: vec![UPGRADE_PROPOSAL_SIGNATURE],
         data: data.into(),
         block_hash: Some(H256::repeat_byte(0x11)),
         block_number: Some(eth_block.into()),
@@ -777,68 +776,3 @@ async fn setup_db(connection_pool: &ConnectionPool) {
         })
         .await;
 }
-
-fn governance_contract() -> Contract {
-    let json = r#"[
-        {
-          "anonymous": false,
-          "inputs": [
-            {
-              "indexed": true,
-              "internalType": "bytes32",
-              "name": "_id",
-              "type": "bytes32"
-            },
-            {
-              "indexed": false,
-              "internalType": "uint256",
-              "name": "delay",
-              "type": "uint256"
-            },
-            {
-              "components": [
-                {
-                  "components": [
-                    {
-                      "internalType": "address",
-                      "name": "target",
-                      "type": "address"
-                    },
-                    {
-                      "internalType": "uint256",
-                      "name": "value",
-                      "type": "uint256"
-                    },
-                    {
-                      "internalType": "bytes",
-                      "name": "data",
-                      "type": "bytes"
-                    }
-                  ],
-                  "internalType": "struct IGovernance.Call[]",
-                  "name": "calls",
-                  "type": "tuple[]"
-                },
-                {
-                  "internalType": "bytes32",
-                  "name": "predecessor",
-                  "type": "bytes32"
-                },
-                {
-                  "internalType": "bytes32",
-                  "name": "salt",
-                  "type": "bytes32"
-                }
-              ],
-              "indexed": false,
-              "internalType": "struct IGovernance.Operation",
-              "name": "_operation",
-              "type": "tuple"
-            }
-          ],
-          "name": "TransparentOperationScheduled",
-          "type": "event"
-        }
-    ]"#;
-    serde_json::from_str(json).unwrap()
-}
diff --git a/core/lib/zksync_core/src/gas_tracker/mod.rs b/core/lib/zksync_core/src/gas_tracker/mod.rs
index adadfb5c5304..c27d4fb11739 100644
--- a/core/lib/zksync_core/src/gas_tracker/mod.rs
+++ b/core/lib/zksync_core/src/gas_tracker/mod.rs
@@ -7,7 +7,7 @@ use zksync_types::{
     block::{BlockGasCount, L1BatchHeader},
     commitment::{L1BatchMetadata, L1BatchWithMetadata},
     tx::tx_execution_info::{DeduplicatedWritesMetrics, ExecutionMetrics},
-    ExecuteTransactionCommon, Transaction, H256,
+    ExecuteTransactionCommon, ProtocolVersionId, Transaction, H256,
 };
 
 mod constants;
@@ -46,8 +46,11 @@ fn additional_pubdata_commit_cost(execution_metrics: &ExecutionMetrics) -> u32 {
     (execution_metrics.size() as u32) * GAS_PER_BYTE
 }
 
-fn additional_writes_commit_cost(writes_metrics: &DeduplicatedWritesMetrics) -> u32 {
-    (writes_metrics.size() as u32) * GAS_PER_BYTE
+fn additional_writes_commit_cost(
+    writes_metrics: &DeduplicatedWritesMetrics,
+    protocol_version: ProtocolVersionId,
+) -> u32 {
+    (writes_metrics.size(protocol_version) as u32) * GAS_PER_BYTE
 }
 
 pub fn new_block_gas_count() -> BlockGasCount {
@@ -79,9 +82,12 @@ pub fn gas_count_from_metrics(execution_metrics: &ExecutionMetrics) -> BlockGasC
     }
 }
 
-pub fn gas_count_from_writes(writes_metrics: &DeduplicatedWritesMetrics) -> BlockGasCount {
+pub fn gas_count_from_writes(
+    writes_metrics: &DeduplicatedWritesMetrics,
+    protocol_version: ProtocolVersionId,
+) -> BlockGasCount {
     BlockGasCount {
-        commit: additional_writes_commit_cost(writes_metrics),
+        commit: additional_writes_commit_cost(writes_metrics, protocol_version),
         prove: 0,
         execute: 0,
     }
@@ -103,7 +109,16 @@ pub(crate) fn commit_gas_count_for_l1_batch(
     let total_factory_deps_len: u32 = sorted_factory_deps
         .map(|factory_dep| factory_dep.len() as u32)
         .sum();
-    let additional_calldata_bytes = metadata.initial_writes_compressed.len() as u32
+
+    // Boojum upgrade changes how storage writes are communicated/compressed.
+    let state_diff_size = if header.protocol_version.unwrap().is_pre_boojum() {
+        metadata.initial_writes_compressed.len() as u32
+            + metadata.repeated_writes_compressed.len() as u32
+    } else {
+        metadata.state_diffs_compressed.len() as u32
+    };
+
+    let additional_calldata_bytes = state_diff_size
         + metadata.repeated_writes_compressed.len() as u32
         + metadata.l2_l1_messages_compressed.len() as u32
         + total_messages_len
diff --git a/core/lib/zksync_core/src/genesis.rs b/core/lib/zksync_core/src/genesis.rs
index dfd70b62c4da..ae1c737cb44a 100644
--- a/core/lib/zksync_core/src/genesis.rs
+++ b/core/lib/zksync_core/src/genesis.rs
@@ -127,7 +127,7 @@ pub async fn ensure_genesis_state(
     // We need to `println` this value because it will be used to initialize the smart contract.
     println!("CONTRACTS_GENESIS_ROOT={:?}", genesis_root_hash);
     println!(
-        "CONTRACTS_GENESIS_BLOCK_COMMITMENT={:?}",
+        "CONTRACTS_GENESIS_BATCH_COMMITMENT={:?}",
         block_commitment.hash().commitment
     );
     println!(
diff --git a/core/lib/zksync_core/src/lib.rs b/core/lib/zksync_core/src/lib.rs
index 6e01de149df6..2e35cf573a94 100644
--- a/core/lib/zksync_core/src/lib.rs
+++ b/core/lib/zksync_core/src/lib.rs
@@ -12,6 +12,7 @@ use zksync_circuit_breaker::{
     CircuitBreakerChecker, CircuitBreakerError,
 };
 use zksync_config::configs::api::MerkleTreeApiConfig;
+use zksync_config::configs::contracts::ProverAtGenesis;
 use zksync_config::configs::{
     api::{HealthCheckConfig, Web3JsonRpcConfig},
     chain::{
@@ -32,6 +33,7 @@ use zksync_dal::{
     connection::DbVariant, healthcheck::ConnectionPoolHealthCheck, ConnectionPool, StorageProcessor,
 };
 use zksync_eth_client::clients::http::QueryClient;
+use zksync_eth_client::EthInterface;
 use zksync_eth_client::{clients::http::PKSigningClient, BoundEthInterface};
 use zksync_health_check::{CheckHealth, HealthStatus, ReactiveHealthCheck};
 use zksync_object_store::ObjectStoreFactory;
@@ -112,6 +114,7 @@ pub async fn genesis_init(
     eth_sender: &ETHSenderConfig,
     network_config: &NetworkConfig,
     contracts_config: &ContractsConfig,
+    eth_client_url: &str,
 ) -> anyhow::Result<()> {
     let mut storage = StorageProcessor::establish_connection(true)
         .await
@@ -124,6 +127,52 @@ pub async fn genesis_init(
     )
     .context("Failed to restore operator address from private key")?;
 
+    // Select the first prover to be used during genesis.
+    // Later we can change provers using the system upgrades, but for genesis
+    // we should select one using the environment config.
+    let first_l1_verifier_config =
+        if matches!(contracts_config.prover_at_genesis, ProverAtGenesis::Fri) {
+            let l1_verifier_config = L1VerifierConfig {
+                params: VerifierParams {
+                    recursion_node_level_vk_hash: contracts_config.fri_recursion_node_level_vk_hash,
+                    recursion_leaf_level_vk_hash: contracts_config.fri_recursion_leaf_level_vk_hash,
+                    recursion_circuits_set_vks_hash: zksync_types::H256::zero(),
+                },
+                recursion_scheduler_level_vk_hash: contracts_config.snark_wrapper_vk_hash,
+            };
+
+            let eth_client = QueryClient::new(eth_client_url)?;
+            let vk_hash: zksync_types::H256 = eth_client
+                .call_contract_function(
+                    "verificationKeyHash",
+                    (),
+                    None,
+                    Default::default(),
+                    None,
+                    contracts_config.verifier_addr,
+                    zksync_contracts::verifier_contract(),
+                )
+                .await?;
+
+            assert_eq!(
+                vk_hash, l1_verifier_config.recursion_scheduler_level_vk_hash,
+                "L1 verifier key does not match the one in the config"
+            );
+
+            l1_verifier_config
+        } else {
+            L1VerifierConfig {
+                params: VerifierParams {
+                    recursion_node_level_vk_hash: contracts_config.recursion_node_level_vk_hash,
+                    recursion_leaf_level_vk_hash: contracts_config.recursion_leaf_level_vk_hash,
+                    recursion_circuits_set_vks_hash: contracts_config
+                        .recursion_circuits_set_vks_hash,
+                },
+                recursion_scheduler_level_vk_hash: contracts_config
+                    .recursion_scheduler_level_vk_hash,
+            }
+        };
+
     genesis::ensure_genesis_state(
         &mut storage,
         network_config.zksync_network_id,
@@ -134,16 +183,7 @@ pub async fn genesis_init(
             base_system_contracts: BaseSystemContracts::load_from_disk(),
             system_contracts: get_system_smart_contracts(),
             first_verifier_address: contracts_config.verifier_addr,
-            first_l1_verifier_config: L1VerifierConfig {
-                params: VerifierParams {
-                    recursion_node_level_vk_hash: contracts_config.recursion_node_level_vk_hash,
-                    recursion_leaf_level_vk_hash: contracts_config.recursion_leaf_level_vk_hash,
-                    recursion_circuits_set_vks_hash: contracts_config
-                        .recursion_circuits_set_vks_hash,
-                },
-                recursion_scheduler_level_vk_hash: contracts_config
-                    .recursion_scheduler_level_vk_hash,
-            },
+            first_l1_verifier_config,
         },
     )
     .await?;
@@ -508,11 +548,7 @@ pub async fn initialize_components(
             .build()
             .await
             .context("failed to build eth_watch_pool")?;
-        let governance = contracts_config.governance_addr.map(|addr| {
-            let contract = governance_contract()
-                .expect("Governance contract must be present if governance_addr is set in config");
-            (contract, addr)
-        });
+        let governance = (governance_contract(), contracts_config.governance_addr);
         task_futures.push(
             start_eth_watch(
                 eth_watch_pool,
diff --git a/core/lib/zksync_core/src/metadata_calculator/mod.rs b/core/lib/zksync_core/src/metadata_calculator/mod.rs
index b278b094ac95..3602a79fa829 100644
--- a/core/lib/zksync_core/src/metadata_calculator/mod.rs
+++ b/core/lib/zksync_core/src/metadata_calculator/mod.rs
@@ -210,7 +210,7 @@ impl MetadataCalculator {
             initial_writes_compressed: commitment.initial_writes_compressed().to_vec(),
             repeated_writes_compressed: commitment.repeated_writes_compressed().to_vec(),
             commitment: commitment_hash.commitment,
-            l2_l1_messages_compressed: commitment.l2_l1_logs_compressed().to_vec(),
+            l2_l1_messages_compressed: commitment.system_logs_compressed().to_vec(),
             l2_l1_merkle_root: commitment.l2_l1_logs_merkle_root(),
             block_meta_params: commitment.meta_parameters(),
             aux_data_hash: commitment_hash.aux_output,
diff --git a/core/lib/zksync_core/src/proof_data_handler/request_processor.rs b/core/lib/zksync_core/src/proof_data_handler/request_processor.rs
index 2f49b54f68c9..0e3505ec3511 100644
--- a/core/lib/zksync_core/src/proof_data_handler/request_processor.rs
+++ b/core/lib/zksync_core/src/proof_data_handler/request_processor.rs
@@ -6,6 +6,9 @@ use std::sync::Arc;
 use zksync_config::configs::{
     proof_data_handler::ProtocolVersionLoadingMode, ProofDataHandlerConfig,
 };
+use zksync_types::commitment::serialize_commitments;
+use zksync_types::web3::signing::keccak256;
+use zksync_utils::u256_to_h256;
 
 use zksync_dal::{ConnectionPool, SqlxError};
 use zksync_object_store::{ObjectStore, ObjectStoreError};
@@ -16,7 +19,7 @@ use zksync_types::{
         ProofGenerationData, ProofGenerationDataRequest, ProofGenerationDataResponse,
         SubmitProofRequest, SubmitProofResponse,
     },
-    L1BatchNumber,
+    L1BatchNumber, H256,
 };
 
 #[derive(Clone)]
@@ -140,7 +143,57 @@ impl RequestProcessor {
                     .await
                     .map_err(RequestProcessorError::ObjectStore)?;
 
+                let system_logs_hash_from_prover =
+                    H256::from_slice(&proof.aggregation_result_coords[0]);
+                let state_diff_hash_from_prover =
+                    H256::from_slice(&proof.aggregation_result_coords[1]);
+                let bootloader_heap_initial_content_from_prover =
+                    H256::from_slice(&proof.aggregation_result_coords[2]);
+                let events_queue_state_from_prover =
+                    H256::from_slice(&proof.aggregation_result_coords[3]);
+
                 let mut storage = self.pool.access_storage().await.unwrap();
+
+                let l1_batch = storage
+                    .blocks_dal()
+                    .get_l1_batch_metadata(l1_batch_number)
+                    .await
+                    .unwrap()
+                    .expect("Proved block without metadata");
+
+                let events_queue_state = l1_batch
+                    .metadata
+                    .events_queue_commitment
+                    .expect("No events_queue_commitment");
+                let bootloader_heap_initial_content = l1_batch
+                    .metadata
+                    .bootloader_initial_content_commitment
+                    .expect("No bootloader_initial_content_commitment");
+                let system_logs = serialize_commitments(&l1_batch.header.system_logs);
+                let system_logs_hash = H256(keccak256(&system_logs));
+
+                let state_diff_hash = l1_batch
+                    .header
+                    .system_logs
+                    .into_iter()
+                    .find(|elem| elem.0.key == u256_to_h256(2.into()))
+                    .expect("No state diff hash key")
+                    .0
+                    .value;
+
+                if events_queue_state != events_queue_state_from_prover
+                    || bootloader_heap_initial_content
+                        != bootloader_heap_initial_content_from_prover
+                    || state_diff_hash != state_diff_hash_from_prover
+                    || system_logs_hash != system_logs_hash_from_prover
+                {
+                    let server_values = format!("{system_logs_hash} {state_diff_hash} {events_queue_state} {bootloader_heap_initial_content}");
+                    let prover_values = format!("{system_logs_hash_from_prover} {state_diff_hash_from_prover} {events_queue_state_from_prover} {bootloader_heap_initial_content_from_prover}");
+                    panic!(
+                        "Auxilary output doesn't match, server values: {} prover values: {}",
+                        server_values, prover_values
+                    );
+                }
                 storage
                     .proof_generation_dal()
                     .save_proof_artifacts_metadata(l1_batch_number, &blob_url)
diff --git a/core/lib/zksync_core/src/state_keeper/batch_executor/mod.rs b/core/lib/zksync_core/src/state_keeper/batch_executor/mod.rs
index 62b0429f6c25..fffabe0b7e2e 100644
--- a/core/lib/zksync_core/src/state_keeper/batch_executor/mod.rs
+++ b/core/lib/zksync_core/src/state_keeper/batch_executor/mod.rs
@@ -398,7 +398,7 @@ impl BatchExecutor {
             ExecutionResult::Halt { reason } => match reason {
                 Halt::BootloaderOutOfGas => TxExecutionResult::BootloaderOutOfGasForBlockTip,
                 _ => {
-                    panic!("VM must not revert when finalizing block (except `BootloaderOutOfGas`)")
+                    panic!("VM must not revert when finalizing block (except `BootloaderOutOfGas`). Reason: {:#?}", reason)
                 }
             },
         }
@@ -426,7 +426,10 @@ impl BatchExecutor {
         // There is some post-processing work that the VM needs to do before the block is fully processed.
         let result = vm.finish_batch();
         if result.block_tip_execution_result.result.is_failed() {
-            panic!("VM must not fail when finalizing block");
+            panic!(
+                "VM must not fail when finalizing block: {:#?}",
+                result.block_tip_execution_result.result
+            );
         }
         result
     }
diff --git a/core/lib/zksync_core/src/state_keeper/io/seal_logic.rs b/core/lib/zksync_core/src/state_keeper/io/seal_logic.rs
index 181d2f4df8bd..ca2dc6419098 100644
--- a/core/lib/zksync_core/src/state_keeper/io/seal_logic.rs
+++ b/core/lib/zksync_core/src/state_keeper/io/seal_logic.rs
@@ -2,7 +2,6 @@
 //! It contains the logic of the block sealing, which is used by both the mempool-based and external node IO.
 
 use itertools::Itertools;
-
 use std::{
     collections::HashMap,
     time::{Duration, Instant},
@@ -12,12 +11,13 @@ use multivm::interface::{FinishedL1Batch, L1BatchEnv};
 use zksync_dal::StorageProcessor;
 use zksync_system_constants::ACCOUNT_CODE_STORAGE_ADDRESS;
 use zksync_types::{
-    block::unpack_block_info, CURRENT_VIRTUAL_BLOCK_INFO_POSITION, SYSTEM_CONTEXT_ADDRESS,
+    block::unpack_block_info,
+    l2_to_l1_log::{SystemL2ToL1Log, UserL2ToL1Log},
+    CURRENT_VIRTUAL_BLOCK_INFO_POSITION, SYSTEM_CONTEXT_ADDRESS,
 };
 use zksync_types::{
     block::{L1BatchHeader, MiniblockHeader},
     event::{extract_added_tokens, extract_long_l2_to_l1_messages},
-    l2_to_l1_log::L2ToL1Log,
     storage_writes_deduplicator::{ModifiedSlot, StorageWritesDeduplicator},
     tx::{
         tx_execution_info::DeduplicatedWritesMetrics, IncludedTxLocation,
@@ -90,7 +90,10 @@ impl UpdatesManager {
              {event_count} events, {reads_count} reads ({dedup_reads_count} deduped), \
              {writes_count} writes ({dedup_writes_count} deduped)",
             total_tx_count = l1_tx_count + l2_tx_count,
-            l2_to_l1_log_count = finished_batch.final_execution_state.l2_to_l1_logs.len(),
+            l2_to_l1_log_count = finished_batch
+                .final_execution_state
+                .user_l2_to_l1_logs
+                .len(),
             event_count = finished_batch.final_execution_state.events.len(),
             current_l1_batch_number = l1_batch_env.number
         );
@@ -107,6 +110,9 @@ impl UpdatesManager {
             extractors::display_timestamp(l1_batch_env.timestamp)
         );
 
+        let l2_to_l1_messages =
+            extract_long_l2_to_l1_messages(&finished_batch.final_execution_state.events);
+
         let l1_batch = L1BatchHeader {
             number: l1_batch_env.number,
             is_finished: true,
@@ -115,10 +121,8 @@ impl UpdatesManager {
             priority_ops_onchain_data: self.l1_batch.priority_ops_onchain_data.clone(),
             l1_tx_count: l1_tx_count as u16,
             l2_tx_count: l2_tx_count as u16,
-            l2_to_l1_logs: finished_batch.final_execution_state.l2_to_l1_logs,
-            l2_to_l1_messages: extract_long_l2_to_l1_messages(
-                &finished_batch.final_execution_state.events,
-            ),
+            l2_to_l1_logs: finished_batch.final_execution_state.user_l2_to_l1_logs,
+            l2_to_l1_messages,
             bloom: Default::default(),
             used_contract_hashes: finished_batch.final_execution_state.used_contract_hashes,
             base_fee_per_gas: l1_batch_env.base_fee(),
@@ -126,18 +130,18 @@ impl UpdatesManager {
             l2_fair_gas_price: self.fair_l2_gas_price(),
             base_system_contracts_hashes: self.base_system_contract_hashes(),
             protocol_version: Some(self.protocol_version()),
-            system_logs: vec![],
+            system_logs: finished_batch.final_execution_state.system_logs,
         };
 
-        let initial_bootloader_contents =
-            finished_batch.final_bootloader_memory.unwrap_or_default();
+        let events_queue = finished_batch
+            .final_execution_state
+            .deduplicated_events_logs;
 
-        let events_queue = Vec::new(); // TODO: put actual value when new VM is merged.
         transaction
             .blocks_dal()
             .insert_l1_batch(
                 &l1_batch,
-                &initial_bootloader_contents,
+                finished_batch.final_bootloader_memory.as_ref().unwrap(),
                 self.l1_batch.l1_gas_count,
                 &events_queue,
                 &finished_batch.final_execution_state.storage_refunds,
@@ -378,18 +382,27 @@ impl MiniblockSealCommand {
         progress.observe(miniblock_event_count);
 
         let progress = MINIBLOCK_METRICS.start(MiniblockSealStage::ExtractL2ToL1Logs, is_fictive);
-        let l2_to_l1_logs = self.extract_l2_to_l1_logs(is_fictive);
-        let l2_to_l1_log_count: usize = l2_to_l1_logs
+
+        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(l2_to_l1_log_count);
+
+        progress.observe(system_l2_to_l1_log_count + user_l2_to_l1_log_count);
+
         let progress = MINIBLOCK_METRICS.start(MiniblockSealStage::InsertL2ToL1Logs, is_fictive);
         transaction
             .events_dal()
-            .save_l2_to_l1_logs(miniblock_number, &l2_to_l1_logs)
+            .save_user_l2_to_l1_logs(miniblock_number, &user_l2_to_l1_logs)
             .await;
-        progress.observe(l2_to_l1_log_count);
+        progress.observe(user_l2_to_l1_log_count);
 
         let progress = MINIBLOCK_METRICS.start(MiniblockSealStage::CommitMiniblock, is_fictive);
         let current_l2_virtual_block_info = transaction
@@ -442,7 +455,14 @@ impl MiniblockSealCommand {
 
         deduplicated_logs
             .into_iter()
-            .map(|(key, ModifiedSlot { value, tx_index })| (tx_index, (key, value)))
+            .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()
@@ -518,12 +538,21 @@ impl MiniblockSealCommand {
         grouped_entries.collect()
     }
 
-    fn extract_l2_to_l1_logs(
+    fn extract_system_l2_to_l1_logs(
+        &self,
+        is_fictive: bool,
+    ) -> Vec<(IncludedTxLocation, Vec<&SystemL2ToL1Log>)> {
+        self.group_by_tx_location(&self.miniblock.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,
-    ) -> Vec<(IncludedTxLocation, Vec<&L2ToL1Log>)> {
-        self.group_by_tx_location(&self.miniblock.l2_to_l1_logs, is_fictive, |log| {
-            u32::from(log.tx_number_in_block)
+    ) -> Vec<(IncludedTxLocation, Vec<&UserL2ToL1Log>)> {
+        self.group_by_tx_location(&self.miniblock.user_l2_to_l1_logs, is_fictive, |log| {
+            u32::from(log.0.tx_number_in_block)
         })
     }
 
diff --git a/core/lib/zksync_core/src/state_keeper/keeper.rs b/core/lib/zksync_core/src/state_keeper/keeper.rs
index 22ff96d9be94..761e186e7aec 100644
--- a/core/lib/zksync_core/src/state_keeper/keeper.rs
+++ b/core/lib/zksync_core/src/state_keeper/keeper.rs
@@ -622,11 +622,15 @@ impl ZkSyncStateKeeper {
                 let block_writes_metrics = updates_manager
                     .storage_writes_deduplicator
                     .apply_and_rollback(logs_to_apply_iter.clone());
-                let block_writes_l1_gas = gas_count_from_writes(&block_writes_metrics);
+                let block_writes_l1_gas = gas_count_from_writes(
+                    &block_writes_metrics,
+                    updates_manager.protocol_version(),
+                );
 
                 let tx_writes_metrics =
                     StorageWritesDeduplicator::apply_on_empty_state(logs_to_apply_iter);
-                let tx_writes_l1_gas = gas_count_from_writes(&tx_writes_metrics);
+                let tx_writes_l1_gas =
+                    gas_count_from_writes(&tx_writes_metrics, updates_manager.protocol_version());
                 let tx_gas_excluding_writes = tx_l1_gas_this_tx + finish_block_l1_gas;
 
                 let tx_data = SealData {
@@ -653,6 +657,7 @@ impl ZkSyncStateKeeper {
                         updates_manager.pending_executed_transactions_len() + 1,
                         &block_data,
                         &tx_data,
+                        updates_manager.protocol_version(),
                     )
                 } else {
                     SealResolution::NoSeal
diff --git a/core/lib/zksync_core/src/state_keeper/seal_criteria/conditional_sealer.rs b/core/lib/zksync_core/src/state_keeper/seal_criteria/conditional_sealer.rs
index 21233c051bc7..2b5fb9fba485 100644
--- a/core/lib/zksync_core/src/state_keeper/seal_criteria/conditional_sealer.rs
+++ b/core/lib/zksync_core/src/state_keeper/seal_criteria/conditional_sealer.rs
@@ -4,6 +4,7 @@
 //! which unconditionally follows the instructions from the main node).
 
 use zksync_config::configs::chain::StateKeeperConfig;
+use zksync_types::ProtocolVersionId;
 
 use super::{criteria, SealCriterion, SealData, SealResolution, AGGREGATION_METRICS};
 
@@ -22,12 +23,20 @@ impl ConditionalSealer {
     pub(crate) fn find_unexecutable_reason(
         config: &StateKeeperConfig,
         data: &SealData,
+        protocol_version: ProtocolVersionId,
     ) -> Option<&'static str> {
         for sealer in &Self::default_sealers() {
             const MOCK_BLOCK_TIMESTAMP: u128 = 0;
             const TX_COUNT: usize = 1;
 
-            let resolution = sealer.should_seal(config, MOCK_BLOCK_TIMESTAMP, TX_COUNT, data, data);
+            let resolution = sealer.should_seal(
+                config,
+                MOCK_BLOCK_TIMESTAMP,
+                TX_COUNT,
+                data,
+                data,
+                protocol_version,
+            );
             if matches!(resolution, SealResolution::Unexecutable(_)) {
                 return Some(sealer.prom_criterion_name());
             }
@@ -55,6 +64,7 @@ impl ConditionalSealer {
         tx_count: usize,
         block_data: &SealData,
         tx_data: &SealData,
+        protocol_version: ProtocolVersionId,
     ) -> SealResolution {
         tracing::trace!(
             "Determining seal resolution for L1 batch #{l1_batch_number} with {tx_count} transactions \
@@ -70,6 +80,7 @@ impl ConditionalSealer {
                 tx_count,
                 block_data,
                 tx_data,
+                protocol_version,
             );
             match &seal_resolution {
                 SealResolution::IncludeAndSeal
diff --git a/core/lib/zksync_core/src/state_keeper/seal_criteria/criteria/gas.rs b/core/lib/zksync_core/src/state_keeper/seal_criteria/criteria/gas.rs
index 29c22c3c96bb..4683d9cf8798 100644
--- a/core/lib/zksync_core/src/state_keeper/seal_criteria/criteria/gas.rs
+++ b/core/lib/zksync_core/src/state_keeper/seal_criteria/criteria/gas.rs
@@ -1,3 +1,5 @@
+use zksync_types::ProtocolVersionId;
+
 use crate::{
     gas_tracker::new_block_gas_count,
     state_keeper::seal_criteria::{SealCriterion, SealData, SealResolution, StateKeeperConfig},
@@ -20,6 +22,7 @@ impl SealCriterion for GasCriterion {
         _tx_count: usize,
         block_data: &SealData,
         tx_data: &SealData,
+        _protocol_version_id: ProtocolVersionId,
     ) -> SealResolution {
         let tx_bound =
             (config.max_single_tx_gas as f64 * config.reject_tx_at_gas_percentage).round() as u32;
@@ -67,6 +70,7 @@ mod tests {
                 ..SealData::default()
             },
             &SealData::default(),
+            ProtocolVersionId::latest(),
         );
         assert_eq!(empty_block_resolution, SealResolution::NoSeal);
 
@@ -88,6 +92,7 @@ mod tests {
                 gas_count: tx_gas,
                 ..SealData::default()
             },
+            ProtocolVersionId::latest(),
         );
         assert_eq!(
             huge_transaction_resolution,
@@ -114,6 +119,7 @@ mod tests {
                 gas_count: tx_gas,
                 ..SealData::default()
             },
+            ProtocolVersionId::latest(),
         );
         assert_eq!(resolution_after_first_tx, SealResolution::NoSeal);
 
@@ -129,6 +135,7 @@ mod tests {
                 gas_count: tx_gas,
                 ..SealData::default()
             },
+            ProtocolVersionId::latest(),
         );
         assert_eq!(resolution_after_second_tx, SealResolution::ExcludeAndSeal);
 
@@ -157,6 +164,7 @@ mod tests {
                 gas_count: tx_gas,
                 ..SealData::default()
             },
+            ProtocolVersionId::latest(),
         );
         assert_eq!(resolution_after_first_tx, SealResolution::IncludeAndSeal);
     }
diff --git a/core/lib/zksync_core/src/state_keeper/seal_criteria/criteria/geometry_seal_criteria.rs b/core/lib/zksync_core/src/state_keeper/seal_criteria/criteria/geometry_seal_criteria.rs
index 5a03107a97f0..1ec0c66e4d72 100644
--- a/core/lib/zksync_core/src/state_keeper/seal_criteria/criteria/geometry_seal_criteria.rs
+++ b/core/lib/zksync_core/src/state_keeper/seal_criteria/criteria/geometry_seal_criteria.rs
@@ -4,6 +4,7 @@ use zksync_config::configs::chain::StateKeeperConfig;
 use zksync_types::{
     circuit::{GEOMETRY_CONFIG, SCHEDULER_UPPER_BOUND},
     tx::tx_execution_info::{DeduplicatedWritesMetrics, ExecutionMetrics},
+    ProtocolVersionId,
 };
 
 // Local uses
@@ -25,7 +26,7 @@ pub struct L2ToL1LogsCriterion;
 
 trait MetricExtractor {
     const PROM_METRIC_CRITERION_NAME: &'static str;
-    fn limit_per_block() -> usize;
+    fn limit_per_block(protocol_version: ProtocolVersionId) -> usize;
     fn extract(metric: &ExecutionMetrics, writes: &DeduplicatedWritesMetrics) -> usize;
 }
 
@@ -40,16 +41,19 @@ where
         _tx_count: usize,
         block_data: &SealData,
         tx_data: &SealData,
+        protocol_version_id: ProtocolVersionId,
     ) -> SealResolution {
-        let reject_bound =
-            (T::limit_per_block() as f64 * config.reject_tx_at_geometry_percentage).round();
-        let close_bound =
-            (T::limit_per_block() as f64 * config.close_block_at_geometry_percentage).round();
+        let reject_bound = (T::limit_per_block(protocol_version_id) as f64
+            * config.reject_tx_at_geometry_percentage)
+            .round();
+        let close_bound = (T::limit_per_block(protocol_version_id) as f64
+            * config.close_block_at_geometry_percentage)
+            .round();
 
         if T::extract(&tx_data.execution_metrics, &tx_data.writes_metrics) > reject_bound as usize {
             SealResolution::Unexecutable("ZK proof cannot be generated for a transaction".into())
         } else if T::extract(&block_data.execution_metrics, &block_data.writes_metrics)
-            >= T::limit_per_block()
+            >= T::limit_per_block(protocol_version_id)
         {
             SealResolution::ExcludeAndSeal
         } else if T::extract(&block_data.execution_metrics, &block_data.writes_metrics)
@@ -69,8 +73,13 @@ where
 impl MetricExtractor for RepeatedWritesCriterion {
     const PROM_METRIC_CRITERION_NAME: &'static str = "repeated_storage_writes";
 
-    fn limit_per_block() -> usize {
-        GEOMETRY_CONFIG.limit_for_repeated_writes_pubdata_hasher as usize
+    fn limit_per_block(protocol_version_id: ProtocolVersionId) -> usize {
+        if protocol_version_id.is_pre_boojum() {
+            GEOMETRY_CONFIG.limit_for_repeated_writes_pubdata_hasher as usize
+        } else {
+            // In boojum there is no limit for repeated writes.
+            usize::MAX
+        }
     }
 
     fn extract(_metrics: &ExecutionMetrics, writes: &DeduplicatedWritesMetrics) -> usize {
@@ -81,8 +90,13 @@ impl MetricExtractor for RepeatedWritesCriterion {
 impl MetricExtractor for InitialWritesCriterion {
     const PROM_METRIC_CRITERION_NAME: &'static str = "initial_storage_writes";
 
-    fn limit_per_block() -> usize {
-        GEOMETRY_CONFIG.limit_for_initial_writes_pubdata_hasher as usize
+    fn limit_per_block(protocol_version_id: ProtocolVersionId) -> usize {
+        if protocol_version_id.is_pre_boojum() {
+            GEOMETRY_CONFIG.limit_for_initial_writes_pubdata_hasher as usize
+        } else {
+            // In boojum there is no limit for initial writes.
+            usize::MAX
+        }
     }
 
     fn extract(_metrics: &ExecutionMetrics, writes: &DeduplicatedWritesMetrics) -> usize {
@@ -93,7 +107,7 @@ impl MetricExtractor for InitialWritesCriterion {
 impl MetricExtractor for MaxCyclesCriterion {
     const PROM_METRIC_CRITERION_NAME: &'static str = "max_cycles";
 
-    fn limit_per_block() -> usize {
+    fn limit_per_block(_protocol_version_id: ProtocolVersionId) -> usize {
         MAX_CYCLES_FOR_TX as usize
     }
 
@@ -105,7 +119,7 @@ impl MetricExtractor for MaxCyclesCriterion {
 impl MetricExtractor for ComputationalGasCriterion {
     const PROM_METRIC_CRITERION_NAME: &'static str = "computational_gas";
 
-    fn limit_per_block() -> usize {
+    fn limit_per_block(_protocol_version_id: ProtocolVersionId) -> usize {
         // We subtract constant to take into account that circuits may be not fully filled.
         // This constant should be greater than number of circuits types
         // but we keep it larger to be on the safe side.
@@ -124,12 +138,17 @@ impl MetricExtractor for ComputationalGasCriterion {
 impl MetricExtractor for L2ToL1LogsCriterion {
     const PROM_METRIC_CRITERION_NAME: &'static str = "l2_to_l1_logs";
 
-    fn limit_per_block() -> usize {
-        GEOMETRY_CONFIG.limit_for_l1_messages_merklizer as usize
+    fn limit_per_block(protocol_version_id: ProtocolVersionId) -> usize {
+        if protocol_version_id.is_pre_boojum() {
+            GEOMETRY_CONFIG.limit_for_l1_messages_merklizer as usize
+        } else {
+            // In boojum there is no limit for L2 to L1 logs.
+            usize::MAX
+        }
     }
 
     fn extract(metrics: &ExecutionMetrics, _writes: &DeduplicatedWritesMetrics) -> usize {
-        metrics.l2_l1_logs
+        metrics.l2_to_l1_logs
     }
 }
 
@@ -149,6 +168,7 @@ mod tests {
         block_execution_metrics: ExecutionMetrics,
         block_writes_metrics: DeduplicatedWritesMetrics,
         criterion: &dyn SealCriterion,
+        protocol_version: ProtocolVersionId,
     ) {
         let config = get_config();
         let block_resolution = criterion.should_seal(
@@ -161,6 +181,7 @@ mod tests {
                 ..SealData::default()
             },
             &SealData::default(),
+            protocol_version,
         );
         assert_eq!(block_resolution, SealResolution::NoSeal);
     }
@@ -169,6 +190,7 @@ mod tests {
         block_execution_metrics: ExecutionMetrics,
         block_writes_metrics: DeduplicatedWritesMetrics,
         criterion: &dyn SealCriterion,
+        protocol_version: ProtocolVersionId,
     ) {
         let config = get_config();
         let block_resolution = criterion.should_seal(
@@ -181,6 +203,7 @@ mod tests {
                 ..SealData::default()
             },
             &SealData::default(),
+            protocol_version,
         );
         assert_eq!(block_resolution, SealResolution::IncludeAndSeal);
     }
@@ -189,6 +212,7 @@ mod tests {
         block_execution_metrics: ExecutionMetrics,
         block_writes_metrics: DeduplicatedWritesMetrics,
         criterion: &dyn SealCriterion,
+        protocol_version: ProtocolVersionId,
     ) {
         let config = get_config();
         let block_resolution = criterion.should_seal(
@@ -201,6 +225,7 @@ mod tests {
                 ..SealData::default()
             },
             &SealData::default(),
+            protocol_version,
         );
         assert_eq!(block_resolution, SealResolution::ExcludeAndSeal);
     }
@@ -209,6 +234,7 @@ mod tests {
         tx_execution_metrics: ExecutionMetrics,
         tx_writes_metrics: DeduplicatedWritesMetrics,
         criterion: &dyn SealCriterion,
+        protocol_version: ProtocolVersionId,
     ) {
         let config = get_config();
         let block_resolution = criterion.should_seal(
@@ -221,6 +247,7 @@ mod tests {
                 writes_metrics: tx_writes_metrics,
                 ..SealData::default()
             },
+            protocol_version,
         );
 
         assert_eq!(
@@ -230,17 +257,22 @@ mod tests {
     }
 
     macro_rules! test_scenario_execution_metrics {
-        ($criterion: tt, $metric_name: ident, $metric_type: ty) => {
+        ($criterion: tt, $metric_name: ident, $metric_type: ty, $protocol_version: expr) => {
             let config = get_config();
             let writes_metrics = DeduplicatedWritesMetrics::default();
             let block_execution_metrics = ExecutionMetrics {
-                $metric_name: ($criterion::limit_per_block() / 2) as $metric_type,
+                $metric_name: ($criterion::limit_per_block($protocol_version) / 2) as $metric_type,
                 ..ExecutionMetrics::default()
             };
-            test_no_seal_block_resolution(block_execution_metrics, writes_metrics, &$criterion);
+            test_no_seal_block_resolution(
+                block_execution_metrics,
+                writes_metrics,
+                &$criterion,
+                $protocol_version,
+            );
 
             let block_execution_metrics = ExecutionMetrics {
-                $metric_name: ($criterion::limit_per_block() - 1) as $metric_type,
+                $metric_name: ($criterion::limit_per_block($protocol_version) - 1) as $metric_type,
                 ..ExecutionMetrics::default()
             };
 
@@ -248,10 +280,11 @@ mod tests {
                 block_execution_metrics,
                 writes_metrics,
                 &$criterion,
+                $protocol_version,
             );
 
             let block_execution_metrics = ExecutionMetrics {
-                $metric_name: ($criterion::limit_per_block()) as $metric_type,
+                $metric_name: ($criterion::limit_per_block($protocol_version)) as $metric_type,
                 ..ExecutionMetrics::default()
             };
 
@@ -259,32 +292,43 @@ mod tests {
                 block_execution_metrics,
                 writes_metrics,
                 &$criterion,
+                $protocol_version,
             );
 
             let tx_execution_metrics = ExecutionMetrics {
-                $metric_name: ($criterion::limit_per_block() as f64
+                $metric_name: ($criterion::limit_per_block($protocol_version) as f64
                     * config.reject_tx_at_geometry_percentage
                     + 1f64)
                     .round() as $metric_type,
                 ..ExecutionMetrics::default()
             };
 
-            test_unexecutable_tx_resolution(tx_execution_metrics, writes_metrics, &$criterion);
+            test_unexecutable_tx_resolution(
+                tx_execution_metrics,
+                writes_metrics,
+                &$criterion,
+                $protocol_version,
+            );
         };
     }
 
     macro_rules! test_scenario_writes_metrics {
-        ($criterion:tt, $metric_name:ident, $metric_type:ty) => {
+        ($criterion:tt, $metric_name:ident, $metric_type:ty, $protocol_version:expr) => {
             let config = get_config();
             let execution_metrics = ExecutionMetrics::default();
             let block_writes_metrics = DeduplicatedWritesMetrics {
-                $metric_name: ($criterion::limit_per_block() / 2) as $metric_type,
+                $metric_name: ($criterion::limit_per_block($protocol_version) / 2) as $metric_type,
                 ..Default::default()
             };
-            test_no_seal_block_resolution(execution_metrics, block_writes_metrics, &$criterion);
+            test_no_seal_block_resolution(
+                execution_metrics,
+                block_writes_metrics,
+                &$criterion,
+                $protocol_version,
+            );
 
             let block_writes_metrics = DeduplicatedWritesMetrics {
-                $metric_name: ($criterion::limit_per_block() - 1) as $metric_type,
+                $metric_name: ($criterion::limit_per_block($protocol_version) - 1) as $metric_type,
                 ..Default::default()
             };
 
@@ -292,10 +336,11 @@ mod tests {
                 execution_metrics,
                 block_writes_metrics,
                 &$criterion,
+                $protocol_version,
             );
 
             let block_writes_metrics = DeduplicatedWritesMetrics {
-                $metric_name: ($criterion::limit_per_block()) as $metric_type,
+                $metric_name: ($criterion::limit_per_block($protocol_version)) as $metric_type,
                 ..Default::default()
             };
 
@@ -303,42 +348,73 @@ mod tests {
                 execution_metrics,
                 block_writes_metrics,
                 &$criterion,
+                $protocol_version,
             );
 
             let tx_writes_metrics = DeduplicatedWritesMetrics {
-                $metric_name: ($criterion::limit_per_block() as f64
+                $metric_name: ($criterion::limit_per_block($protocol_version) as f64
                     * config.reject_tx_at_geometry_percentage
                     + 1f64)
                     .round() as $metric_type,
                 ..Default::default()
             };
 
-            test_unexecutable_tx_resolution(execution_metrics, tx_writes_metrics, &$criterion);
+            test_unexecutable_tx_resolution(
+                execution_metrics,
+                tx_writes_metrics,
+                &$criterion,
+                $protocol_version,
+            );
         };
     }
 
     #[test]
     fn repeated_writes_seal_criterion() {
-        test_scenario_writes_metrics!(RepeatedWritesCriterion, repeated_storage_writes, usize);
+        test_scenario_writes_metrics!(
+            RepeatedWritesCriterion,
+            repeated_storage_writes,
+            usize,
+            ProtocolVersionId::Version17
+        );
     }
 
     #[test]
     fn initial_writes_seal_criterion() {
-        test_scenario_writes_metrics!(InitialWritesCriterion, initial_storage_writes, usize);
+        test_scenario_writes_metrics!(
+            InitialWritesCriterion,
+            initial_storage_writes,
+            usize,
+            ProtocolVersionId::Version17
+        );
     }
 
     #[test]
     fn max_cycles_seal_criterion() {
-        test_scenario_execution_metrics!(MaxCyclesCriterion, cycles_used, u32);
+        test_scenario_execution_metrics!(
+            MaxCyclesCriterion,
+            cycles_used,
+            u32,
+            ProtocolVersionId::Version17
+        );
     }
 
     #[test]
     fn computational_gas_seal_criterion() {
-        test_scenario_execution_metrics!(ComputationalGasCriterion, computational_gas_used, u32);
+        test_scenario_execution_metrics!(
+            ComputationalGasCriterion,
+            computational_gas_used,
+            u32,
+            ProtocolVersionId::Version17
+        );
     }
 
     #[test]
     fn l2_to_l1_logs_seal_criterion() {
-        test_scenario_execution_metrics!(L2ToL1LogsCriterion, l2_l1_logs, usize);
+        test_scenario_execution_metrics!(
+            L2ToL1LogsCriterion,
+            l2_to_l1_logs,
+            usize,
+            ProtocolVersionId::Version17
+        );
     }
 }
diff --git a/core/lib/zksync_core/src/state_keeper/seal_criteria/criteria/pubdata_bytes.rs b/core/lib/zksync_core/src/state_keeper/seal_criteria/criteria/pubdata_bytes.rs
index 6142f258d794..143104d5ae53 100644
--- a/core/lib/zksync_core/src/state_keeper/seal_criteria/criteria/pubdata_bytes.rs
+++ b/core/lib/zksync_core/src/state_keeper/seal_criteria/criteria/pubdata_bytes.rs
@@ -1,4 +1,4 @@
-use zksync_types::MAX_PUBDATA_PER_L1_BATCH;
+use zksync_types::{ProtocolVersionId, MAX_PUBDATA_PER_L1_BATCH};
 
 use crate::state_keeper::seal_criteria::{
     SealCriterion, SealData, SealResolution, StateKeeperConfig,
@@ -15,6 +15,7 @@ impl SealCriterion for PubDataBytesCriterion {
         _tx_count: usize,
         block_data: &SealData,
         tx_data: &SealData,
+        protocol_version: ProtocolVersionId,
     ) -> SealResolution {
         let max_pubdata_per_l1_batch = MAX_PUBDATA_PER_L1_BATCH as usize;
         let reject_bound =
@@ -22,12 +23,13 @@ impl SealCriterion for PubDataBytesCriterion {
         let include_and_seal_bound =
             (max_pubdata_per_l1_batch as f64 * config.close_block_at_eth_params_percentage).round();
 
-        let block_size = block_data.execution_metrics.size() + block_data.writes_metrics.size();
+        let block_size =
+            block_data.execution_metrics.size() + block_data.writes_metrics.size(protocol_version);
         // For backward compatibility, we need to keep calculating the size of the pubdata based
         // StorageDeduplication metrics. All vm versions
         // after vm with virtual blocks will provide the size of the pubdata in the execution metrics.
         let tx_size = if tx_data.execution_metrics.pubdata_published == 0 {
-            tx_data.execution_metrics.size() + tx_data.writes_metrics.size()
+            tx_data.execution_metrics.size() + tx_data.writes_metrics.size(protocol_version)
         } else {
             tx_data.execution_metrics.pubdata_published as usize
         };
@@ -76,6 +78,7 @@ mod tests {
                 ..SealData::default()
             },
             &SealData::default(),
+            ProtocolVersionId::latest(),
         );
         assert_eq!(empty_block_resolution, SealResolution::NoSeal);
 
@@ -96,6 +99,7 @@ mod tests {
                 ..SealData::default()
             },
             &SealData::default(),
+            ProtocolVersionId::latest(),
         );
         assert_eq!(full_block_resolution, SealResolution::IncludeAndSeal);
 
@@ -112,6 +116,7 @@ mod tests {
                 ..SealData::default()
             },
             &SealData::default(),
+            ProtocolVersionId::latest(),
         );
         assert_eq!(full_block_resolution, SealResolution::ExcludeAndSeal);
     }
diff --git a/core/lib/zksync_core/src/state_keeper/seal_criteria/criteria/slots.rs b/core/lib/zksync_core/src/state_keeper/seal_criteria/criteria/slots.rs
index 2ab5029f5ae6..b434c3ba42a7 100644
--- a/core/lib/zksync_core/src/state_keeper/seal_criteria/criteria/slots.rs
+++ b/core/lib/zksync_core/src/state_keeper/seal_criteria/criteria/slots.rs
@@ -1,3 +1,5 @@
+use zksync_types::ProtocolVersionId;
+
 use crate::state_keeper::seal_criteria::{
     SealCriterion, SealData, SealResolution, StateKeeperConfig,
 };
@@ -14,6 +16,7 @@ impl SealCriterion for SlotsCriterion {
         tx_count: usize,
         _block_data: &SealData,
         _tx_data: &SealData,
+        _protocol_version: ProtocolVersionId,
     ) -> SealResolution {
         if tx_count >= config.transaction_slots {
             SealResolution::IncludeAndSeal
@@ -42,6 +45,7 @@ mod tests {
             config.transaction_slots - 1,
             &SealData::default(),
             &SealData::default(),
+            ProtocolVersionId::latest(),
         );
         assert_eq!(almost_full_block_resolution, SealResolution::NoSeal);
 
@@ -51,6 +55,7 @@ mod tests {
             config.transaction_slots,
             &SealData::default(),
             &SealData::default(),
+            ProtocolVersionId::latest(),
         );
         assert_eq!(full_block_resolution, SealResolution::IncludeAndSeal);
     }
diff --git a/core/lib/zksync_core/src/state_keeper/seal_criteria/criteria/tx_encoding_size.rs b/core/lib/zksync_core/src/state_keeper/seal_criteria/criteria/tx_encoding_size.rs
index 39eb6a68062f..4672ac36e557 100644
--- a/core/lib/zksync_core/src/state_keeper/seal_criteria/criteria/tx_encoding_size.rs
+++ b/core/lib/zksync_core/src/state_keeper/seal_criteria/criteria/tx_encoding_size.rs
@@ -1,4 +1,5 @@
 use multivm::vm_latest::constants::BOOTLOADER_TX_ENCODING_SPACE;
+use zksync_types::ProtocolVersionId;
 
 use crate::state_keeper::seal_criteria::{
     SealCriterion, SealData, SealResolution, StateKeeperConfig,
@@ -15,6 +16,7 @@ impl SealCriterion for TxEncodingSizeCriterion {
         _tx_count: usize,
         block_data: &SealData,
         tx_data: &SealData,
+        _protocol_version_id: ProtocolVersionId,
     ) -> SealResolution {
         let reject_bound =
             (BOOTLOADER_TX_ENCODING_SPACE as f64 * config.reject_tx_at_geometry_percentage).round();
@@ -48,8 +50,14 @@ mod tests {
         let config = StateKeeperConfig::from_env().unwrap();
         let criterion = TxEncodingSizeCriterion;
 
-        let empty_block_resolution =
-            criterion.should_seal(&config, 0, 0, &SealData::default(), &SealData::default());
+        let empty_block_resolution = criterion.should_seal(
+            &config,
+            0,
+            0,
+            &SealData::default(),
+            &SealData::default(),
+            ProtocolVersionId::latest(),
+        );
         assert_eq!(empty_block_resolution, SealResolution::NoSeal);
 
         let unexecutable_resolution = criterion.should_seal(
@@ -61,6 +69,7 @@ mod tests {
                 cumulative_size: BOOTLOADER_TX_ENCODING_SPACE as usize + 1,
                 ..SealData::default()
             },
+            ProtocolVersionId::latest(),
         );
         assert_eq!(
             unexecutable_resolution,
@@ -81,6 +90,7 @@ mod tests {
                 cumulative_size: 1,
                 ..SealData::default()
             },
+            ProtocolVersionId::latest(),
         );
         assert_eq!(exclude_and_seal_resolution, SealResolution::ExcludeAndSeal);
 
@@ -96,6 +106,7 @@ mod tests {
                 cumulative_size: 1,
                 ..SealData::default()
             },
+            ProtocolVersionId::latest(),
         );
         assert_eq!(include_and_seal_resolution, SealResolution::IncludeAndSeal);
     }
diff --git a/core/lib/zksync_core/src/state_keeper/seal_criteria/mod.rs b/core/lib/zksync_core/src/state_keeper/seal_criteria/mod.rs
index da410ebaf5f1..99cb25c654d8 100644
--- a/core/lib/zksync_core/src/state_keeper/seal_criteria/mod.rs
+++ b/core/lib/zksync_core/src/state_keeper/seal_criteria/mod.rs
@@ -18,7 +18,7 @@ use zksync_types::{
     block::BlockGasCount,
     fee::TransactionExecutionMetrics,
     tx::tx_execution_info::{DeduplicatedWritesMetrics, ExecutionMetrics},
-    Transaction,
+    ProtocolVersionId, Transaction,
 };
 use zksync_utils::time::millis_since;
 
@@ -89,11 +89,12 @@ impl SealData {
     pub(crate) fn for_transaction(
         transaction: Transaction,
         tx_metrics: &TransactionExecutionMetrics,
+        protocol_version: ProtocolVersionId,
     ) -> Self {
         let execution_metrics = ExecutionMetrics::from_tx_metrics(tx_metrics);
         let writes_metrics = DeduplicatedWritesMetrics::from_tx_metrics(tx_metrics);
         let gas_count = gas_count_from_tx_and_metrics(&transaction, &execution_metrics)
-            + gas_count_from_writes(&writes_metrics);
+            + gas_count_from_writes(&writes_metrics, protocol_version);
         Self {
             execution_metrics,
             gas_count,
@@ -111,6 +112,7 @@ pub(super) trait SealCriterion: fmt::Debug + Send + 'static {
         tx_count: usize,
         block_data: &SealData,
         tx_data: &SealData,
+        protocol_version: ProtocolVersionId,
     ) -> SealResolution;
 
     // We need self here only for rust restrictions for creating an object from trait
diff --git a/core/lib/zksync_core/src/state_keeper/tests/mod.rs b/core/lib/zksync_core/src/state_keeper/tests/mod.rs
index 6d797e73c5f5..c5841fd8b1b3 100644
--- a/core/lib/zksync_core/src/state_keeper/tests/mod.rs
+++ b/core/lib/zksync_core/src/state_keeper/tests/mod.rs
@@ -12,7 +12,7 @@ use multivm::interface::{
     CurrentExecutionState, ExecutionResult, FinishedL1Batch, L1BatchEnv, L2BlockEnv, Refunds,
     SystemEnv, TxExecutionMode, VmExecutionResultAndLogs, VmExecutionStatistics,
 };
-use multivm::vm_latest::constants::BLOCK_GAS_LIMIT;
+use multivm::vm_latest::{constants::BLOCK_GAS_LIMIT, VmExecutionLogs};
 use zksync_config::configs::chain::StateKeeperConfig;
 use zksync_contracts::{BaseSystemContracts, BaseSystemContractsHashes};
 use zksync_system_constants::ZKPORTER_IS_AVAILABLE;
@@ -23,7 +23,7 @@ use zksync_types::{
     fee::Fee,
     l2::L2Tx,
     transaction_request::PaymasterParams,
-    tx::tx_execution_info::{ExecutionMetrics, VmExecutionLogs},
+    tx::tx_execution_info::ExecutionMetrics,
     Address, L1BatchNumber, L2ChainId, LogQuery, MiniblockNumber, Nonce, ProtocolVersionId,
     StorageLogQuery, StorageLogQueryType, Timestamp, Transaction, H256, U256,
 };
@@ -119,9 +119,11 @@ pub(super) fn default_vm_block_result() -> FinishedL1Batch {
             events: vec![],
             storage_log_queries: vec![],
             used_contract_hashes: vec![],
-            l2_to_l1_logs: 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(),
         },
         final_bootloader_memory: Some(vec![]),
@@ -181,7 +183,8 @@ pub(super) fn create_execution_result(
         result: ExecutionResult::Success { output: vec![] },
         logs: VmExecutionLogs {
             events: vec![],
-            l2_to_l1_logs: vec![],
+            system_l2_to_l1_logs: vec![],
+            user_l2_to_l1_logs: vec![],
             storage_logs,
             total_log_queries_count: total_log_queries,
         },
diff --git a/core/lib/zksync_core/src/state_keeper/updates/l1_batch_updates.rs b/core/lib/zksync_core/src/state_keeper/updates/l1_batch_updates.rs
index f03a12224cb3..fdaa0b036f9e 100644
--- a/core/lib/zksync_core/src/state_keeper/updates/l1_batch_updates.rs
+++ b/core/lib/zksync_core/src/state_keeper/updates/l1_batch_updates.rs
@@ -75,7 +75,10 @@ mod tests {
         assert_eq!(l1_batch_accumulator.executed_transactions.len(), 1);
         assert_eq!(l1_batch_accumulator.l1_gas_count, new_block_gas_count());
         assert_eq!(l1_batch_accumulator.priority_ops_onchain_data.len(), 0);
-        assert_eq!(l1_batch_accumulator.block_execution_metrics.l2_l1_logs, 0);
+        assert_eq!(
+            l1_batch_accumulator.block_execution_metrics.l2_to_l1_logs,
+            0
+        );
         assert_eq!(l1_batch_accumulator.txs_encoding_size, expected_tx_size);
     }
 }
diff --git a/core/lib/zksync_core/src/state_keeper/updates/miniblock_updates.rs b/core/lib/zksync_core/src/state_keeper/updates/miniblock_updates.rs
index 67b02fab5ceb..d0a4f035f514 100644
--- a/core/lib/zksync_core/src/state_keeper/updates/miniblock_updates.rs
+++ b/core/lib/zksync_core/src/state_keeper/updates/miniblock_updates.rs
@@ -1,11 +1,11 @@
 use multivm::interface::{ExecutionResult, L2BlockEnv, VmExecutionResultAndLogs};
 use multivm::vm_latest::TransactionVmExt;
 use std::collections::HashMap;
+use zksync_types::l2_to_l1_log::{SystemL2ToL1Log, UserL2ToL1Log};
 
 use zksync_types::{
     block::{legacy_miniblock_hash, miniblock_hash, BlockGasCount},
     event::extract_bytecodes_marked_as_known,
-    l2_to_l1_log::L2ToL1Log,
     tx::tx_execution_info::TxExecutionStatus,
     tx::{ExecutionMetrics, TransactionExecutionResult},
     vm_trace::Call,
@@ -19,7 +19,8 @@ pub struct MiniblockUpdates {
     pub executed_transactions: Vec<TransactionExecutionResult>,
     pub events: Vec<VmEvent>,
     pub storage_logs: Vec<StorageLogQuery>,
-    pub l2_to_l1_logs: Vec<L2ToL1Log>,
+    pub user_l2_to_l1_logs: Vec<UserL2ToL1Log>,
+    pub system_l2_to_l1_logs: Vec<SystemL2ToL1Log>,
     pub new_factory_deps: HashMap<H256, Vec<u8>>,
     /// How much L1 gas will it take to submit this block?
     pub l1_gas_count: BlockGasCount,
@@ -45,7 +46,8 @@ impl MiniblockUpdates {
             executed_transactions: vec![],
             events: vec![],
             storage_logs: vec![],
-            l2_to_l1_logs: vec![],
+            user_l2_to_l1_logs: vec![],
+            system_l2_to_l1_logs: vec![],
             new_factory_deps: HashMap::new(),
             l1_gas_count: BlockGasCount::default(),
             block_execution_metrics: ExecutionMetrics::default(),
@@ -62,7 +64,10 @@ impl MiniblockUpdates {
     pub(crate) fn extend_from_fictive_transaction(&mut self, result: VmExecutionResultAndLogs) {
         self.events.extend(result.logs.events);
         self.storage_logs.extend(result.logs.storage_logs);
-        self.l2_to_l1_logs.extend(result.logs.l2_to_l1_logs);
+        self.user_l2_to_l1_logs
+            .extend(result.logs.user_l2_to_l1_logs);
+        self.system_l2_to_l1_logs
+            .extend(result.logs.system_l2_to_l1_logs);
     }
 
     pub(crate) fn extend_from_executed_transaction(
@@ -77,8 +82,10 @@ impl MiniblockUpdates {
         let saved_factory_deps =
             extract_bytecodes_marked_as_known(&tx_execution_result.logs.events);
         self.events.extend(tx_execution_result.logs.events);
-        self.l2_to_l1_logs
-            .extend(tx_execution_result.logs.l2_to_l1_logs);
+        self.user_l2_to_l1_logs
+            .extend(tx_execution_result.logs.user_l2_to_l1_logs);
+        self.system_l2_to_l1_logs
+            .extend(tx_execution_result.logs.system_l2_to_l1_logs);
 
         let gas_refunded = tx_execution_result.refunds.gas_refunded;
         let operator_suggested_refund = tx_execution_result.refunds.operator_suggested_refund;
@@ -183,10 +190,11 @@ mod tests {
         assert_eq!(accumulator.executed_transactions.len(), 1);
         assert_eq!(accumulator.events.len(), 0);
         assert_eq!(accumulator.storage_logs.len(), 0);
-        assert_eq!(accumulator.l2_to_l1_logs.len(), 0);
+        assert_eq!(accumulator.user_l2_to_l1_logs.len(), 0);
+        assert_eq!(accumulator.system_l2_to_l1_logs.len(), 0);
         assert_eq!(accumulator.l1_gas_count, Default::default());
         assert_eq!(accumulator.new_factory_deps.len(), 0);
-        assert_eq!(accumulator.block_execution_metrics.l2_l1_logs, 0);
+        assert_eq!(accumulator.block_execution_metrics.l2_to_l1_logs, 0);
         assert_eq!(accumulator.txs_encoding_size, bootloader_encoding_size);
     }
 }
diff --git a/core/lib/zksync_core/src/sync_layer/client.rs b/core/lib/zksync_core/src/sync_layer/client.rs
index 148953572477..5d4f61a4f2a3 100644
--- a/core/lib/zksync_core/src/sync_layer/client.rs
+++ b/core/lib/zksync_core/src/sync_layer/client.rs
@@ -182,18 +182,19 @@ impl CachingMainNodeClient {
 
     /// Cached version of [`HttpClient::sync_l2_block`].
     pub async fn fetch_l2_block(
-        &self,
+        &mut self,
         miniblock: MiniblockNumber,
     ) -> anyhow::Result<Option<SyncBlock>> {
-        let block = self.blocks.get(&miniblock).cloned();
         FETCHER_METRICS.cache_total[&CachedMethod::SyncL2Block].inc();
-        match block {
-            Some(block) => {
-                FETCHER_METRICS.cache_hit[&CachedMethod::SyncL2Block].inc();
-                Ok(Some(block))
-            }
-            None => self.client.fetch_l2_block(miniblock, true).await,
+        if let Some(block) = self.blocks.get(&miniblock).cloned() {
+            FETCHER_METRICS.cache_hit[&CachedMethod::SyncL2Block].inc();
+            return Ok(Some(block));
+        }
+        let block = self.client.fetch_l2_block(miniblock, true).await?;
+        if let Some(block) = block.clone() {
+            self.blocks.insert(miniblock, block);
         }
+        Ok(block)
     }
 
     /// Re-export of [`MainNodeClient::fetch_l2_block_number()`]. Added to not expose the internal client.
diff --git a/core/lib/zksync_core/src/sync_layer/external_io.rs b/core/lib/zksync_core/src/sync_layer/external_io.rs
index c451587ff025..e7b49fedddcb 100644
--- a/core/lib/zksync_core/src/sync_layer/external_io.rs
+++ b/core/lib/zksync_core/src/sync_layer/external_io.rs
@@ -543,8 +543,8 @@ impl StateKeeperIO for ExternalIO {
 
         self.sync_state
             .set_local_block(self.current_miniblock_number);
-        self.current_miniblock_number += 1;
         tracing::info!("Miniblock {} is sealed", self.current_miniblock_number);
+        self.current_miniblock_number += 1;
     }
 
     async fn seal_l1_batch(
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 b50cfde00bd2..c4ab6823c10b 100644
--- a/core/tests/revert-test/tests/revert-and-restart.test.ts
+++ b/core/tests/revert-test/tests/revert-and-restart.test.ts
@@ -71,9 +71,9 @@ describe('Block reverting test', function () {
         await killServerAndWaitForShutdown(tester).catch(ignoreError);
 
         // Set 1000 seconds deadline for `ExecuteBlocks` operation.
-        process.env.CHAIN_STATE_KEEPER_AGGREGATED_BLOCK_EXECUTE_DEADLINE = '1000';
-        // Set lightweight mode for the Merkle tree.
-        process.env.DATABASE_MERKLE_TREE_MODE = 'lightweight';
+        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.
         const components = 'api,tree,eth,data_fetcher,state_keeper';
@@ -169,7 +169,7 @@ describe('Block reverting test', function () {
 
     step('execute transaction after revert', async () => {
         // Set 1 second deadline for `ExecuteBlocks` operation.
-        process.env.CHAIN_STATE_KEEPER_AGGREGATED_BLOCK_EXECUTE_DEADLINE = '1';
+        process.env.ETH_SENDER_SENDER_AGGREGATED_BLOCK_EXECUTE_DEADLINE = '1';
 
         // Run server.
         utils.background('zk server --components api,tree,eth,data_fetcher,state_keeper', [null, logs, logs]);
diff --git a/core/tests/ts-integration/package.json b/core/tests/ts-integration/package.json
index de181227fc2c..fe4ff18fcd78 100644
--- a/core/tests/ts-integration/package.json
+++ b/core/tests/ts-integration/package.json
@@ -8,11 +8,13 @@
         "long-running-test": "zk f jest",
         "fee-test": "RUN_FEE_TEST=1 zk f jest -- fees.test.ts",
         "api-test": "zk f jest -- api/web3.test.ts",
-        "contract-verification-test": "zk f jest -- api/contract-verification.test.ts"
+        "contract-verification-test": "zk f jest -- api/contract-verification.test.ts",
+        "build": "hardhat compile",
+        "build-yul": "hardhat run scripts/compile-yul.ts"
     },
     "devDependencies": {
         "@matterlabs/hardhat-zksync-deploy": "^0.6.1",
-        "@matterlabs/hardhat-zksync-solc": "^0.3.15",
+        "@matterlabs/hardhat-zksync-solc": "0.4.2",
         "@matterlabs/hardhat-zksync-vyper": "^0.2.0",
         "@nomiclabs/hardhat-vyper": "^3.0.3",
         "@types/jest": "^29.0.3",
@@ -21,7 +23,7 @@
         "chalk": "^4.0.0",
         "ethereumjs-abi": "^0.6.8",
         "ethers": "~5.7.0",
-        "hardhat": "^2.12.4",
+        "hardhat": "=2.16.0",
         "jest": "^29.0.3",
         "jest-matcher-utils": "^29.0.3",
         "node-fetch": "^2.6.1",
diff --git a/core/tests/ts-integration/scripts/compile-yul.ts b/core/tests/ts-integration/scripts/compile-yul.ts
index fed826c50689..26f779878ae2 100644
--- a/core/tests/ts-integration/scripts/compile-yul.ts
+++ b/core/tests/ts-integration/scripts/compile-yul.ts
@@ -1,23 +1,28 @@
 import * as hre from 'hardhat';
 import * as fs from 'fs';
-import { spawn as _spawn } from 'child_process';
+// eslint-disable-next-line @typescript-eslint/no-unused-vars
+import { exec as _exec, spawn as _spawn } from 'child_process';
 
-import { getZksolcPath, getZksolcUrl, saltFromUrl } from '@matterlabs/hardhat-zksync-solc';
+import { getZksolcUrl, saltFromUrl } from '@matterlabs/hardhat-zksync-solc';
+import { getCompilersDir } from 'hardhat/internal/util/global-dir';
+import path from 'path';
 
 const COMPILER_VERSION = '1.3.16';
 const IS_COMPILER_PRE_RELEASE = false;
 
 async function compilerLocation(): Promise<string> {
+    const compilersCache = await getCompilersDir();
+
+    let salt = '';
+
     if (IS_COMPILER_PRE_RELEASE) {
         const url = getZksolcUrl('https://github.com/matter-labs/zksolc-prerelease', hre.config.zksolc.version);
-        const salt = saltFromUrl(url);
-        return await getZksolcPath(COMPILER_VERSION, salt);
-    } else {
-        return await getZksolcPath(COMPILER_VERSION, '');
+        salt = saltFromUrl(url);
     }
+
+    return path.join(compilersCache, 'zksolc', `zksolc-v${COMPILER_VERSION}${salt ? '-' : ''}${salt}`);
 }
 
-// executes a command in a new shell
 // but pipes data to parent's stdout/stderr
 export function spawn(command: string) {
     command = command.replace(/\n/g, ' ');
diff --git a/core/tests/ts-integration/src/system.ts b/core/tests/ts-integration/src/system.ts
index 631a752c9342..6e29f71f7ca7 100644
--- a/core/tests/ts-integration/src/system.ts
+++ b/core/tests/ts-integration/src/system.ts
@@ -1,13 +1,15 @@
-import { BigNumber, BytesLike } from 'ethers';
-import { ethers } from 'ethers';
+import { BigNumber, BytesLike, ethers } from 'ethers';
 import { Provider, utils } from 'zksync-web3';
 
 const L1_CONTRACTS_FOLDER = `${process.env.ZKSYNC_HOME}/contracts/ethereum/artifacts/cache/solpp-generated-contracts`;
 const DIAMOND_UPGRADE_INIT_ABI = new ethers.utils.Interface(
     require(`${L1_CONTRACTS_FOLDER}/zksync/upgrade-initializers/DiamondUpgradeInit1.sol/DiamondUpgradeInit1.json`).abi
 );
-const DIAMOND_CUT_FACET_ABI = new ethers.utils.Interface(
-    require(`${L1_CONTRACTS_FOLDER}/zksync/facets/DiamondCut.sol/DiamondCutFacet.json`).abi
+const GOVERNANCE_ABI = new ethers.utils.Interface(
+    require(`${L1_CONTRACTS_FOLDER}/governance/Governance.sol/Governance.json`).abi
+);
+const ADMIN_FACET_ABI = new ethers.utils.Interface(
+    require(`${L1_CONTRACTS_FOLDER}/zksync/facets/Admin.sol/AdminFacet.json`).abi
 );
 
 export interface ForceDeployment {
@@ -61,13 +63,7 @@ export async function deployOnAnyLocalAddress(
     const zkSyncContract = await l2Provider.getMainContractAddress();
 
     const zkSync = new ethers.Contract(zkSyncContract, utils.ZKSYNC_MAIN_ABI, govWallet);
-
-    // In case there is some pending upgrade there, we cancel it
-    const upgradeProposalState = await zkSync.getUpgradeProposalState();
-    if (upgradeProposalState != 0) {
-        const currentProposalHash = await zkSync.getProposedUpgradeHash();
-        await zkSync.connect(govWallet).cancelUpgradeProposal(currentProposalHash);
-    }
+    const governanceContractAddr = await zkSync.getGovernor();
 
     // Encode data for the upgrade call
     const encodedParams = utils.CONTRACT_DEPLOYER.encodeFunctionData('forceDeployOnAddresses', [deployments]);
@@ -80,24 +76,35 @@ export async function deployOnAnyLocalAddress(
     ]);
 
     const upgradeParam = diamondCut([], diamondUpgradeInitAddress, upgradeInitData);
-    const currentProposalId = (await zkSync.getCurrentProposalId()).add(1);
-    // Get transaction data of the `proposeTransparentUpgrade`
-    const proposeTransparentUpgrade = DIAMOND_CUT_FACET_ABI.encodeFunctionData('proposeTransparentUpgrade', [
-        upgradeParam,
-        currentProposalId
-    ]);
 
-    // Get transaction data of the `executeUpgrade`
-    const executeUpgrade = DIAMOND_CUT_FACET_ABI.encodeFunctionData('executeUpgrade', [
-        upgradeParam,
-        ethers.constants.HashZero
+    // Prepare calldata for upgrading diamond proxy
+    const diamondProxyUpgradeCalldata = ADMIN_FACET_ABI.encodeFunctionData('executeUpgrade', [upgradeParam]);
+
+    const call = {
+        target: zkSyncContract,
+        value: 0,
+        data: diamondProxyUpgradeCalldata
+    };
+    const governanceOperation = {
+        calls: [call],
+        predecessor: ethers.constants.HashZero,
+        salt: ethers.constants.HashZero
+    };
+
+    // Get transaction data of the `scheduleTransparent`
+    const scheduleTransparentOperation = GOVERNANCE_ABI.encodeFunctionData('scheduleTransparent', [
+        governanceOperation,
+        0 // delay
     ]);
 
+    // Get transaction data of the `execute`
+    const executeOperation = GOVERNANCE_ABI.encodeFunctionData('execute', [governanceOperation]);
+
     // Proposing the upgrade
     await (
         await govWallet.sendTransaction({
-            to: zkSyncContract,
-            data: proposeTransparentUpgrade,
+            to: governanceContractAddr,
+            data: scheduleTransparentOperation,
             gasLimit: BigNumber.from(10000000)
         })
     ).wait();
@@ -105,8 +112,8 @@ export async function deployOnAnyLocalAddress(
     // Finalize the upgrade
     const receipt = await (
         await govWallet.sendTransaction({
-            to: zkSyncContract,
-            data: executeUpgrade,
+            to: governanceContractAddr,
+            data: executeOperation,
             gasLimit: BigNumber.from(10000000)
         })
     ).wait();
diff --git a/core/tests/ts-integration/tests/contracts.test.ts b/core/tests/ts-integration/tests/contracts.test.ts
index 535c7c0bbe54..fea1b15845a5 100644
--- a/core/tests/ts-integration/tests/contracts.test.ts
+++ b/core/tests/ts-integration/tests/contracts.test.ts
@@ -75,7 +75,7 @@ describe('Smart contract behavior checks', () => {
         const expensiveContract = await deployContract(alice, contracts.expensive, []);
 
         // First, check that the transaction that is too expensive would be rejected by the API server.
-        await expect(expensiveContract.expensive(2000)).toBeRejected();
+        await expect(expensiveContract.expensive(3000)).toBeRejected();
 
         // 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".
diff --git a/core/tests/ts-integration/tests/fees.test.ts b/core/tests/ts-integration/tests/fees.test.ts
index f2525cc4d1ad..41016d447ac6 100644
--- a/core/tests/ts-integration/tests/fees.test.ts
+++ b/core/tests/ts-integration/tests/fees.test.ts
@@ -191,7 +191,7 @@ async function setInternalL1GasPrice(provider: zksync.Provider, newPrice?: strin
 
     // Run server in background.
     let command = 'zk server --components api,tree,eth,data_fetcher,state_keeper';
-    command = `DATABASE_MERKLE_TREE_MODE=lightweight ${command}`;
+    command = `DATABASE_MERKLE_TREE_MODE=full ${command}`;
     if (newPrice) {
         command = `ETH_SENDER_GAS_ADJUSTER_INTERNAL_ENFORCED_L1_GAS_PRICE=${newPrice} ${command}`;
     }
diff --git a/core/tests/ts-integration/tests/l1.test.ts b/core/tests/ts-integration/tests/l1.test.ts
index c4cf0b669cb7..a1ef9564bd98 100644
--- a/core/tests/ts-integration/tests/l1.test.ts
+++ b/core/tests/ts-integration/tests/l1.test.ts
@@ -206,7 +206,7 @@ describe('Tests for L1 behavior', () => {
         // 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 = 7000;
+        const repeatedWritesInOneTx = 8500;
         const gasLimit = await contract.estimateGas.writes(0, initialWritesInOneTx, 1);
 
         let proms = [];
@@ -251,7 +251,7 @@ describe('Tests for L1 behavior', () => {
         const contract = await deployContract(alice, contracts.writesAndMessages, []);
         // 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', [500]);
+        const calldata = contract.interface.encodeFunctionData('l2_l1_messages', [1000]);
         const gasPrice = scaledGasPrice(alice);
 
         const l2GasLimit = maxL2GasLimitForPriorityTxs();
@@ -278,11 +278,11 @@ describe('Tests for L1 behavior', () => {
         }
 
         const contract = await deployContract(alice, contracts.writesAndMessages, []);
-        const MAX_PUBDATA_PER_BLOCK = ethers.BigNumber.from(SYSTEM_CONFIG['MAX_PUBDATA_PER_BLOCK']);
+        const MAX_PUBDATA_PER_BATCH = ethers.BigNumber.from(SYSTEM_CONFIG['MAX_PUBDATA_PER_BATCH']);
         // We check that we will run out of gas if we send a bit
-        // smaller than `MAX_PUBDATA_PER_BLOCK` amount of pubdata in a single tx.
+        // 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_BLOCK.mul(9).div(10)
+            MAX_PUBDATA_PER_BATCH.mul(9).div(10)
         ]);
         const gasPrice = scaledGasPrice(alice);
 
@@ -352,21 +352,21 @@ function getOverheadForTransaction(
     gasPricePerPubdata: ethers.BigNumber,
     encodingLength: ethers.BigNumber
 ): number {
-    const BLOCK_OVERHEAD_L2_GAS = ethers.BigNumber.from(SYSTEM_CONFIG['BLOCK_OVERHEAD_L2_GAS']);
+    const BATCH_OVERHEAD_L2_GAS = ethers.BigNumber.from(SYSTEM_CONFIG['BATCH_OVERHEAD_L2_GAS']);
     const L1_GAS_PER_PUBDATA_BYTE = ethers.BigNumber.from(SYSTEM_CONFIG['L1_GAS_PER_PUBDATA_BYTE']);
-    const BLOCK_OVERHEAD_L1_GAS = ethers.BigNumber.from(SYSTEM_CONFIG['BLOCK_OVERHEAD_L1_GAS']);
-    const BLOCK_OVERHEAD_PUBDATA = BLOCK_OVERHEAD_L1_GAS.div(L1_GAS_PER_PUBDATA_BYTE);
+    const BATCH_OVERHEAD_L1_GAS = ethers.BigNumber.from(SYSTEM_CONFIG['BATCH_OVERHEAD_L1_GAS']);
+    const BATCH_OVERHEAD_PUBDATA = BATCH_OVERHEAD_L1_GAS.div(L1_GAS_PER_PUBDATA_BYTE);
 
-    const MAX_TRANSACTIONS_IN_BLOCK = ethers.BigNumber.from(SYSTEM_CONFIG['MAX_TRANSACTIONS_IN_BLOCK']);
+    const MAX_TRANSACTIONS_IN_BATCH = ethers.BigNumber.from(SYSTEM_CONFIG['MAX_TRANSACTIONS_IN_BATCH']);
     const BOOTLOADER_TX_ENCODING_SPACE = ethers.BigNumber.from(SYSTEM_CONFIG['BOOTLOADER_TX_ENCODING_SPACE']);
     // TODO (EVM-67): possibly charge overhead for pubdata
-    // const MAX_PUBDATA_PER_BLOCK = ethers.BigNumber.from(SYSTEM_CONFIG['MAX_PUBDATA_PER_BLOCK']);
+    // const MAX_PUBDATA_PER_BATCH = ethers.BigNumber.from(SYSTEM_CONFIG['MAX_PUBDATA_PER_BATCH']);
     const L2_TX_MAX_GAS_LIMIT = ethers.BigNumber.from(SYSTEM_CONFIG['L2_TX_MAX_GAS_LIMIT']);
 
-    const maxBlockOverhead = BLOCK_OVERHEAD_L2_GAS.add(BLOCK_OVERHEAD_PUBDATA.mul(gasPricePerPubdata));
+    const maxBlockOverhead = BATCH_OVERHEAD_L2_GAS.add(BATCH_OVERHEAD_PUBDATA.mul(gasPricePerPubdata));
 
     // The overhead from taking up the transaction's slot
-    const txSlotOverhead = ceilDiv(maxBlockOverhead, MAX_TRANSACTIONS_IN_BLOCK);
+    const txSlotOverhead = ceilDiv(maxBlockOverhead, MAX_TRANSACTIONS_IN_BATCH);
     let blockOverheadForTransaction = txSlotOverhead;
 
     // The overhead for occupying the bootloader memory can be derived from encoded_len
@@ -378,7 +378,7 @@ function getOverheadForTransaction(
     // The overhead for possible published public data
     // TODO (EVM-67): possibly charge overhead for pubdata
     // let maxPubdataInTx = ceilDiv(bodyGasLimit, gasPricePerPubdata);
-    // let overheadForPublicData = ceilDiv(maxPubdataInTx.mul(maxBlockOverhead), MAX_PUBDATA_PER_BLOCK);
+    // let overheadForPublicData = ceilDiv(maxPubdataInTx.mul(maxBlockOverhead), MAX_PUBDATA_PER_BATCH);
     // if (overheadForPublicData.gt(blockOverheadForTransaction)) {
     //     blockOverheadForTransaction = overheadForPublicData;
     // }
diff --git a/core/tests/upgrade-test/tests/upgrade.test.ts b/core/tests/upgrade-test/tests/upgrade.test.ts
index 14b57bee4832..80e2c96c4b43 100644
--- a/core/tests/upgrade-test/tests/upgrade.test.ts
+++ b/core/tests/upgrade-test/tests/upgrade.test.ts
@@ -12,8 +12,11 @@ const L1_CONTRACTS_FOLDER = `${process.env.ZKSYNC_HOME}/contracts/ethereum/artif
 const L1_DEFAULT_UPGRADE_ABI = new ethers.utils.Interface(
     require(`${L1_CONTRACTS_FOLDER}/upgrades/DefaultUpgrade.sol/DefaultUpgrade.json`).abi
 );
-const DIAMOND_CUT_FACET_ABI = new ethers.utils.Interface(
-    require(`${L1_CONTRACTS_FOLDER}/zksync/facets/DiamondCut.sol/DiamondCutFacet.json`).abi
+const GOVERNANCE_ABI = new ethers.utils.Interface(
+    require(`${L1_CONTRACTS_FOLDER}/governance/Governance.sol/Governance.json`).abi
+);
+const ADMIN_FACET_ABI = new ethers.utils.Interface(
+    require(`${L1_CONTRACTS_FOLDER}/zksync/facets/Admin.sol/AdminFacet.json`).abi
 );
 const L2_FORCE_DEPLOY_UPGRADER_ABI = new ethers.utils.Interface(
     require(`${process.env.ZKSYNC_HOME}/contracts/zksync/artifacts-zk/cache-zk/solpp-generated-contracts/ForceDeployUpgrader.sol/ForceDeployUpgrader.json`).abi
@@ -30,9 +33,10 @@ describe('Upgrade test', function () {
     let alice: zkweb3.Wallet;
     let govWallet: ethers.Wallet;
     let mainContract: ethers.Contract;
+    let governanceContract: ethers.Contract;
     let bootloaderHash: string;
-    let proposeUpgradeCalldata: string;
-    let executeUpgradeCalldata: string;
+    let scheduleTransparentOperation: string;
+    let executeOperation: string;
     let forceDeployAddress: string;
     let forceDeployBytecode: string;
     let logs: fs.WriteStream;
@@ -78,6 +82,8 @@ describe('Upgrade test', function () {
         if (!mainContract) {
             throw new Error('Server did not start');
         }
+        const governanceContractAddr = await mainContract.getGovernor();
+        governanceContract = new zkweb3.Contract(governanceContractAddr, GOVERNANCE_ABI, tester.syncWallet);
         let blocksCommitted = await mainContract.getTotalBlocksCommitted();
 
         const initialL1BatchNumber = await tester.web3Provider.getL1BatchNumber();
@@ -140,7 +146,7 @@ describe('Upgrade test', function () {
         await waitForNewL1Batch(alice);
     });
 
-    step('Propose upgrade', async () => {
+    step('Schedule governance call', async () => {
         forceDeployAddress = '0xf04ce00000000000000000000000000000000000';
         forceDeployBytecode = COUNTER_BYTECODE;
 
@@ -180,13 +186,13 @@ describe('Upgrade test', function () {
             upgradeTimestamp: 0,
             newProtocolVersion
         });
-        proposeUpgradeCalldata = calldata.proposeTransparentUpgrade;
-        executeUpgradeCalldata = calldata.executeUpgrade;
+        scheduleTransparentOperation = calldata.scheduleTransparentOperation;
+        executeOperation = calldata.executeOperation;
 
         await (
             await govWallet.sendTransaction({
-                to: mainContract.address,
-                data: proposeUpgradeCalldata
+                to: governanceContract.address,
+                data: scheduleTransparentOperation
             })
         ).wait();
 
@@ -224,8 +230,8 @@ describe('Upgrade test', function () {
         // Send execute tx.
         await (
             await govWallet.sendTransaction({
-                to: mainContract.address,
-                data: executeUpgradeCalldata
+                to: governanceContract.address,
+                data: executeOperation
             })
         ).wait();
 
@@ -251,7 +257,7 @@ describe('Upgrade test', function () {
 
         // Run again.
         utils.background(
-            'cd $ZKSYNC_HOME && cargo run --bin zksync_server --release -- --components=api,tree,eth,data_fetcher,state_keeper &>> upgrade.log',
+            'cd $ZKSYNC_HOME && cargo run --bin zksync_server --release -- --components=api,tree,eth,data_fetcher,state_keeper &> upgrade.log',
             [null, logs, logs]
         );
         await utils.sleep(10);
@@ -366,13 +372,6 @@ async function prepareUpgradeCalldata(
     const zkSyncContract = await l2Provider.getMainContractAddress();
     const zkSync = new ethers.Contract(zkSyncContract, zkweb3.utils.ZKSYNC_MAIN_ABI, govWallet);
 
-    // In case there is some pending upgrade there, we cancel it
-    const upgradeProposalState = await zkSync.getUpgradeProposalState();
-    if (upgradeProposalState != 0) {
-        const currentProposalHash = await zkSync.getProposedUpgradeHash();
-        await (await zkSync.connect(govWallet).cancelUpgradeProposal(currentProposalHash)).wait();
-    }
-
     const newProtocolVersion = params.newProtocolVersion ?? (await zkSync.getProtocolVersion()).add(1);
     params.l2ProtocolUpgradeTx.nonce ??= newProtocolVersion;
     const upgradeInitData = L1_DEFAULT_UPGRADE_ABI.encodeFunctionData('upgrade', [
@@ -397,21 +396,32 @@ async function prepareUpgradeCalldata(
         initAddress: upgradeAddress,
         initCalldata: upgradeInitData
     };
-    const currentProposalId = (await zkSync.getCurrentProposalId()).add(1);
-    // Get transaction data of the `proposeTransparentUpgrade`
-    const proposeTransparentUpgrade = DIAMOND_CUT_FACET_ABI.encodeFunctionData('proposeTransparentUpgrade', [
-        upgradeParam,
-        currentProposalId
-    ]);
 
-    // Get transaction data of the `executeUpgrade`
-    const executeUpgrade = DIAMOND_CUT_FACET_ABI.encodeFunctionData('executeUpgrade', [
-        upgradeParam,
-        ethers.constants.HashZero
+    // Prepare calldata for upgrading diamond proxy
+    const diamondProxyUpgradeCalldata = ADMIN_FACET_ABI.encodeFunctionData('executeUpgrade', [upgradeParam]);
+
+    const call = {
+        target: zkSyncContract,
+        value: 0,
+        data: diamondProxyUpgradeCalldata
+    };
+    const governanceOperation = {
+        calls: [call],
+        predecessor: ethers.constants.HashZero,
+        salt: ethers.constants.HashZero
+    };
+
+    // Get transaction data of the `scheduleTransparent`
+    const scheduleTransparentOperation = GOVERNANCE_ABI.encodeFunctionData('scheduleTransparent', [
+        governanceOperation,
+        0 // delay
     ]);
 
+    // Get transaction data of the `execute`
+    const executeOperation = GOVERNANCE_ABI.encodeFunctionData('execute', [governanceOperation]);
+
     return {
-        proposeTransparentUpgrade,
-        executeUpgrade
+        scheduleTransparentOperation,
+        executeOperation
     };
 }
diff --git a/core/tests/vm-benchmark/harness/src/lib.rs b/core/tests/vm-benchmark/harness/src/lib.rs
index eaa08a2b84b2..b7da44aed928 100644
--- a/core/tests/vm-benchmark/harness/src/lib.rs
+++ b/core/tests/vm-benchmark/harness/src/lib.rs
@@ -113,7 +113,7 @@ pub fn get_deploy_tx(code: &[u8]) -> Transaction {
         calldata,
         Nonce(0),
         Fee {
-            gas_limit: U256::from(10000000u32),
+            gas_limit: U256::from(30000000u32),
             max_fee_per_gas: U256::from(250_000_000),
             max_priority_fee_per_gas: U256::from(0),
             gas_per_pubdata_limit: U256::from(MAX_GAS_PER_PUBDATA_BYTE),
diff --git a/docs/advanced/03_withdrawals.md b/docs/advanced/03_withdrawals.md
index ddccdcc5b8d6..003121d86467 100644
--- a/docs/advanced/03_withdrawals.md
+++ b/docs/advanced/03_withdrawals.md
@@ -95,7 +95,7 @@ bytes memory message = _getL1WithdrawMessage(_l1Receiver, amount);
 L1_MESSENGER_CONTRACT.sendToL1(message);
 ```
 
-And `L1MessagerContract` (that is deployed at 0x8008).
+And `L1MessengerContract` (that is deployed at 0x8008).
 
 ### Committing to L1
 
diff --git a/docs/advanced/bytecode_compression.md b/docs/advanced/bytecode_compression.md
index a7457695dff5..6f94277f8017 100644
--- a/docs/advanced/bytecode_compression.md
+++ b/docs/advanced/bytecode_compression.md
@@ -10,7 +10,7 @@ bytecode is chunked into opcodes (which have a size of 8 bytes), assigned a 2 by
 sequence (indexes) are verified and sent to L1. This process is split into 2 different parts: (1)
 [the server side operator](https://github.com/matter-labs/zksync-era/blob/main/core/lib/utils/src/bytecode.rs#L31)
 handling the compression and (2)
-[the system contract](https://github.com/matter-labs/system-contracts/blob/main/contracts/BytecodeCompressor.sol)
+[the system contract](https://github.com/matter-labs/era-system-contracts/blob/main/contracts/BytecodeCompressor.sol)
 verifying that the compression is correct before sending to L1.
 
 ## Example
@@ -90,7 +90,8 @@ return [len(dictionary), dictionary.keys(order=index asc), encoded_data]
 
 ## System Contract Compression Verification & Publishing
 
-The [Bytecode Compressor](https://github.com/matter-labs/system-contracts/blob/main/contracts/BytecodeCompressor.sol)
+The
+[Bytecode Compressor](https://github.com/matter-labs/era-system-contracts/blob/main/contracts/BytecodeCompressor.sol)
 contract performs validation on the compressed bytecode generated on the server side. At the current moment, publishing
 bytecode to L1 may only be called by the bootloader but in the future anyone will be able to publish compressed bytecode
 with no change to the underlying algorithm.
diff --git a/docs/advanced/zk_intuition.md b/docs/advanced/zk_intuition.md
index f29d03991eec..7ea7dad0a449 100644
--- a/docs/advanced/zk_intuition.md
+++ b/docs/advanced/zk_intuition.md
@@ -146,9 +146,8 @@ version 1.4.0.
 [example ecrecover circuit]:
   https://github.com/matter-labs/sync_vm/blob/683ade0bbb445f3e2ceb82dd3f4346a0c5d16a78/src/glue/ecrecover_circuit/mod.rs#L157
 [zksync core witness]:
-  https://github.com/matter-labs/zksync-2-dev/blob/847e7e099175052ccdcad90ea8b3f92c443cc8cd/core/bin/zksync_core/src/witness_generator/mod.rs#L18
-[separate witness binary]:
-  https://github.com/matter-labs/zksync-2-dev/blob/847e7e099175052ccdcad90ea8b3f92c443cc8cd/core/bin/witness_generator/src/main.rs#L37
+  https://github.com/matter-labs/zksync-era/blob/main/core/lib/zksync_core/src/witness_generator/mod.rs
+[separate witness binary]: https://github.com/matter-labs/zksync-era/blob/main/prover/witness_generator/src/main.rs
 [zkevm_test_harness witness]:
   https://github.com/matter-labs/zkevm_test_harness/blob/0c17bc7baa4e0b64634d414942ef4200d8613bbd/src/external_calls.rs#L575
 [heavy_ops_service repo]: https://github.com/matter-labs/heavy-ops-service/tree/v1.3.2
diff --git a/etc/ERC20/hardhat.config.ts b/etc/ERC20/hardhat.config.ts
index 59080306c84e..fc3896ab87c6 100644
--- a/etc/ERC20/hardhat.config.ts
+++ b/etc/ERC20/hardhat.config.ts
@@ -2,7 +2,7 @@ import '@matterlabs/hardhat-zksync-solc';
 
 export default {
     zksolc: {
-        version: '1.3.1',
+        version: '1.3.16',
         compilerSource: 'binary',
         settings: {
             isSystem: true
@@ -14,6 +14,6 @@ export default {
         }
     },
     solidity: {
-        version: '0.8.16'
+        version: '0.8.20'
     }
 };
diff --git a/etc/ERC20/package.json b/etc/ERC20/package.json
index ef16d6baebf5..502aa873da56 100644
--- a/etc/ERC20/package.json
+++ b/etc/ERC20/package.json
@@ -4,7 +4,11 @@
   "main": "index.js",
   "license": "MIT",
   "devDependencies": {
-    "@matterlabs/hardhat-zksync-solc": "^0.3.15",
-    "hardhat": "=2.12.4"
+    "@matterlabs/hardhat-zksync-deploy": "^0.6.1",
+    "@matterlabs/hardhat-zksync-solc": "0.4.2",
+    "hardhat": "=2.16.0"
+  },
+  "scripts": {
+      "build": "hardhat compile"
   }
 }
diff --git a/etc/contracts-test-data/package.json b/etc/contracts-test-data/package.json
index 7ba728af6580..e5d278874a55 100644
--- a/etc/contracts-test-data/package.json
+++ b/etc/contracts-test-data/package.json
@@ -4,7 +4,7 @@
   "license": "MIT",
   "dependencies": {
     "@openzeppelin/contracts": "^4.8.0",
-    "hardhat": "2.12.4"
+    "hardhat": "=2.16.0"
   },
   "devDependencies": {
     "@matterlabs/hardhat-zksync-solc": "^0.3.15"
diff --git a/etc/env/base/contracts.toml b/etc/env/base/contracts.toml
index d31c124d30ff..b7229e8e4e48 100644
--- a/etc/env/base/contracts.toml
+++ b/etc/env/base/contracts.toml
@@ -2,13 +2,13 @@
 # Values of this file are updated automatically by the contract deploy script.
 
 [contracts]
+ADMIN_FACET_ADDR="0x5E6D086F5eC079ADFF4FB3774CDf3e8D6a34F7E9"
 DIAMOND_INIT_ADDR="0x5E6D086F5eC079ADFF4FB3774CDf3e8D6a34F7E9"
 DIAMOND_UPGRADE_INIT_ADDR="0x5E6D086F5eC079ADFF4FB3774CDf3e8D6a34F7E9"
 DEFAULT_UPGRADE_ADDR="0x5E6D086F5eC079ADFF4FB3774CDf3e8D6a34F7E9"
 MAILBOX_FACET_ADDR="0x5E6D086F5eC079ADFF4FB3774CDf3e8D6a34F7E9"
-DIAMOND_CUT_FACET_ADDR="0x5E6D086F5eC079ADFF4FB3774CDf3e8D6a34F7E9"
 EXECUTOR_FACET_ADDR="0x5E6D086F5eC079ADFF4FB3774CDf3e8D6a34F7E9"
-GOVERNANCE_FACET_ADDR="0x5E6D086F5eC079ADFF4FB3774CDf3e8D6a34F7E9"
+GOVERNANCE_ADDR="0x5E6D086F5eC079ADFF4FB3774CDf3e8D6a34F7E9"
 GETTERS_FACET_ADDR="0x5E6D086F5eC079ADFF4FB3774CDf3e8D6a34F7E9"
 VERIFIER_ADDR="0xDAbb67b676F5b01FcC8997Cc8439846D0d8078ca"
 DIAMOND_PROXY_ADDR="0xFC073319977e314F251EAE6ae6bE76B0B3BAeeCF"
@@ -21,15 +21,15 @@ L1_ALLOW_LIST_ADDR="0xFC073319977e314F251EAE6ae6bE76B0B3BAeeCF"
 CREATE2_FACTORY_ADDR="0xce0042B868300000d44A59004Da54A005ffdcf9f"
 VALIDATOR_TIMELOCK_ADDR="0xFC073319977e314F251EAE6ae6bE76B0B3BAeeCF"
 VALIDATOR_TIMELOCK_EXECUTION_DELAY=0
-RECURSION_SCHEDULER_LEVEL_VK_HASH="0x2b53d65c2b3310daa4b3b747f3b5c73881469197d1d2c3f29b2033d4b947a427"
+RECURSION_SCHEDULER_LEVEL_VK_HASH="0x18518ce15be02847459f304b1567cb914ae357eca82af07c09582e78592b987b"
 RECURSION_NODE_LEVEL_VK_HASH="0x1186ec268d49f1905f8d9c1e9d39fc33e98c74f91d91a21b8f7ef78bd09a8db8"
 RECURSION_LEAF_LEVEL_VK_HASH="0x101e08b00193e529145ee09823378ef51a3bc8966504064f1f6ba3f1ba863210"
-RECURSION_CIRCUITS_SET_VKS_HASH="0x236c97bfbe75ff507e03909fae32a78be3a70d1b468b183f430010810284ed45"
+RECURSION_CIRCUITS_SET_VKS_HASH="0x18c1639094f58177409186e8c48d9f577c9410901d2f1d486b3e7d6cf553ae4c"
 GENESIS_TX_HASH="0xb99ebfea46cbe05a21cd80fe5597d97b204befc52a16303f579c607dc1ac2e2e"
 GENESIS_ROOT="0x2d5ab622df708ab44944bb02377be85b6f27812e9ae520734873b7a193898ba4"
 PRIORITY_TX_MAX_GAS_LIMIT=72000000
 DEPLOY_L2_BRIDGE_COUNTERPART_GAS_LIMIT=10000000
-GENESIS_BLOCK_COMMITMENT="0x6c7f89335e3ade24a7768ed73c425afd9fac92a094e0681f76cb6feabf8b6223"
+GENESIS_BATCH_COMMITMENT="0x6c7f89335e3ade24a7768ed73c425afd9fac92a094e0681f76cb6feabf8b6223"
 # Current rollup leaf index after genesis
 GENESIS_ROLLUP_LEAF_INDEX="21"
 L1_WETH_BRIDGE_IMPL_ADDR="0x5E6D086F5eC079ADFF4FB3774CDf3e8D6a34F7E9"
@@ -41,7 +41,12 @@ L2_WETH_TOKEN_PROXY_ADDR="0x5E6D086F5eC079ADFF4FB3774CDf3e8D6a34F7E9"
 FRI_RECURSION_LEAF_LEVEL_VK_HASH ="0x72167c43a46cf38875b267d67716edc4563861364a3c03ab7aee73498421e828"
 FRI_RECURSION_NODE_LEVEL_VK_HASH ="0x5a3ef282b21e12fe1f4438e5bb158fc5060b160559c5158c6389d62d9fe3d080"
 FRI_RECURSION_SCHEDULER_LEVEL_VK_HASH ="0x201d4c7d8e781d51a3bbd451a43a8f45240bb765b565ae6ce69192d918c3563d"
-SNARK_WRAPPER_VK_HASH="0x4be443afd605a782b6e56d199df2460a025c81b3dea144e135bece83612563f2"
+SNARK_WRAPPER_VK_HASH = "0x4be443afd605a782b6e56d199df2460a025c81b3dea144e135bece83612563f2"
+
+# Prover that should be used at genesis. 'fri' or 'snark'
+PROVER_AT_GENESIS="fri"
+
+INITIAL_PROTOCOL_VERSION=18
 
 [contracts.test]
 dummy_verifier=true
diff --git a/etc/lint-config/sol.js b/etc/lint-config/sol.js
index 2d29c78f9477..57da967ea4a1 100644
--- a/etc/lint-config/sol.js
+++ b/etc/lint-config/sol.js
@@ -8,6 +8,7 @@ module.exports = {
     //
     // TODO (ZKS-329): Turn on the majority of the rules and make the solhint comply with them.
     "state-visibility": "off",
+    "func-visibility": ["warn", { "ignoreConstructors": true }],
     "var-name-mixedcase": "off",
     "avoid-call-value": "off",
     "no-empty-blocks": "off",
@@ -20,6 +21,6 @@ module.exports = {
     "func-name-mixedcase": "off",
     "no-unused-vars": "off",
     "max-states-count": "off",
-    "compiler-version": ["warn", "^0.7.0"]
+    "compiler-version": ["warn", "^0.8.0"]
   }
 };
diff --git a/etc/multivm_bootloaders/vm_boojum_integration/commit b/etc/multivm_bootloaders/vm_boojum_integration/commit
new file mode 100644
index 000000000000..71a26269cfdc
--- /dev/null
+++ b/etc/multivm_bootloaders/vm_boojum_integration/commit
@@ -0,0 +1 @@
+ef5e5f7a7ddbf887bfb93c32b633a15c6f604196
diff --git a/etc/multivm_bootloaders/vm_boojum_integration/fee_estimate.yul/fee_estimate.yul.zbin b/etc/multivm_bootloaders/vm_boojum_integration/fee_estimate.yul/fee_estimate.yul.zbin
new file mode 100644
index 000000000000..b0de84dc0764
Binary files /dev/null and b/etc/multivm_bootloaders/vm_boojum_integration/fee_estimate.yul/fee_estimate.yul.zbin differ
diff --git a/etc/multivm_bootloaders/vm_boojum_integration/gas_test.yul/gas_test.yul.zbin b/etc/multivm_bootloaders/vm_boojum_integration/gas_test.yul/gas_test.yul.zbin
new file mode 100644
index 000000000000..ed145c83b18f
Binary files /dev/null and b/etc/multivm_bootloaders/vm_boojum_integration/gas_test.yul/gas_test.yul.zbin differ
diff --git a/etc/multivm_bootloaders/vm_boojum_integration/playground_batch.yul/playground_batch.yul.zbin b/etc/multivm_bootloaders/vm_boojum_integration/playground_batch.yul/playground_batch.yul.zbin
new file mode 100644
index 000000000000..1c67a2941abb
Binary files /dev/null and b/etc/multivm_bootloaders/vm_boojum_integration/playground_batch.yul/playground_batch.yul.zbin differ
diff --git a/etc/multivm_bootloaders/vm_boojum_integration/proved_batch.yul/proved_batch.yul.zbin b/etc/multivm_bootloaders/vm_boojum_integration/proved_batch.yul/proved_batch.yul.zbin
new file mode 100644
index 000000000000..82d318b24560
Binary files /dev/null and b/etc/multivm_bootloaders/vm_boojum_integration/proved_batch.yul/proved_batch.yul.zbin differ
diff --git a/etc/system-contracts b/etc/system-contracts
index 66899a675d50..3377d27d7dc2 160000
--- a/etc/system-contracts
+++ b/etc/system-contracts
@@ -1 +1 @@
-Subproject commit 66899a675d5072a3a7ad9c4a51b5360a95e83f6e
+Subproject commit 3377d27d7dc26b9f0e1ec0637af34dbc4cb8c2e3
diff --git a/etc/upgrades/1698390925-c4-circuit-fixes/common.json b/etc/upgrades/1698390925-c4-circuit-fixes/common.json
new file mode 100644
index 000000000000..f521d6b85945
--- /dev/null
+++ b/etc/upgrades/1698390925-c4-circuit-fixes/common.json
@@ -0,0 +1,5 @@
+{
+  "name": "circuit-fixes",
+  "creationTimestamp": 1698390925,
+  "protocolVersion": "17"
+}
\ No newline at end of file
diff --git a/etc/upgrades/1698390925-c4-circuit-fixes/mainnet2/crypto.json b/etc/upgrades/1698390925-c4-circuit-fixes/mainnet2/crypto.json
new file mode 100644
index 000000000000..c66cc2547dca
--- /dev/null
+++ b/etc/upgrades/1698390925-c4-circuit-fixes/mainnet2/crypto.json
@@ -0,0 +1,7 @@
+{
+  "keys": {
+    "recursionNodeLevelVkHash": "0x1186ec268d49f1905f8d9c1e9d39fc33e98c74f91d91a21b8f7ef78bd09a8db8",
+    "recursionLeafLevelVkHash": "0x101e08b00193e529145ee09823378ef51a3bc8966504064f1f6ba3f1ba863210",
+    "recursionCircuitsSetVksHash": "0x18c1639094f58177409186e8c48d9f577c9410901d2f1d486b3e7d6cf553ae4c"
+  }
+}
\ No newline at end of file
diff --git a/etc/upgrades/1698390925-c4-circuit-fixes/mainnet2/transactions.json b/etc/upgrades/1698390925-c4-circuit-fixes/mainnet2/transactions.json
new file mode 100644
index 000000000000..13015513ec8e
--- /dev/null
+++ b/etc/upgrades/1698390925-c4-circuit-fixes/mainnet2/transactions.json
@@ -0,0 +1,59 @@
+{
+  "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": "0x0000000000000000000000000000000000000000",
+    "verifierParams": {
+      "recursionNodeLevelVkHash": "0x1186ec268d49f1905f8d9c1e9d39fc33e98c74f91d91a21b8f7ef78bd09a8db8",
+      "recursionLeafLevelVkHash": "0x101e08b00193e529145ee09823378ef51a3bc8966504064f1f6ba3f1ba863210",
+      "recursionCircuitsSetVksHash": "0x18c1639094f58177409186e8c48d9f577c9410901d2f1d486b3e7d6cf553ae4c"
+    },
+    "l1ContractsUpgradeCalldata": "0x",
+    "postUpgradeCalldata": "0x",
+    "upgradeTimestamp": {
+      "type": "BigNumber",
+      "hex": "0x654221a0"
+    },
+    "factoryDeps": [],
+    "newProtocolVersion": "17",
+    "newAllowList": "0x0000000000000000000000000000000000000000"
+  },
+  "l1upgradeCalldata": "0x1ed824a0000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000001a000000000000000000000000000000000000000000000000000000000000004a00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001186ec268d49f1905f8d9c1e9d39fc33e98c74f91d91a21b8f7ef78bd09a8db8101e08b00193e529145ee09823378ef51a3bc8966504064f1f6ba3f1ba86321018c1639094f58177409186e8c48d9f577c9410901d2f1d486b3e7d6cf553ae4c00000000000000000000000000000000000000000000000000000000000004c000000000000000000000000000000000000000000000000000000000000004e000000000000000000000000000000000000000000000000000000000654221a000000000000000000000000000000000000000000000000000000000000000110000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000260000000000000000000000000000000000000000000000000000000000000028000000000000000000000000000000000000000000000000000000000000002a000000000000000000000000000000000000000000000000000000000000002c000000000000000000000000000000000000000000000000000000000000002e000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+  "upgradeAddress": "0x91Ca046daD8c3Db41f296267E1720d9C940f613d",
+  "protocolVersion": "17",
+  "diamondUpgradeProposalId": {
+    "type": "BigNumber",
+    "hex": "0x0a"
+  },
+  "upgradeTimestamp": "1698832800",
+  "proposeTransparentUpgradeCalldata": "0x8043760a0000000000000000000000000000000000000000000000000000000000000040000000000000000000000000000000000000000000000000000000000000000a000000000000000000000000000000000000000000000000000000000000006000000000000000000000000091ca046dad8c3db41f296267e1720d9c940f613d0000000000000000000000000000000000000000000000000000000000000080000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000005241ed824a0000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000001a000000000000000000000000000000000000000000000000000000000000004a00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001186ec268d49f1905f8d9c1e9d39fc33e98c74f91d91a21b8f7ef78bd09a8db8101e08b00193e529145ee09823378ef51a3bc8966504064f1f6ba3f1ba86321018c1639094f58177409186e8c48d9f577c9410901d2f1d486b3e7d6cf553ae4c00000000000000000000000000000000000000000000000000000000000004c000000000000000000000000000000000000000000000000000000000000004e000000000000000000000000000000000000000000000000000000000654221a000000000000000000000000000000000000000000000000000000000000000110000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000260000000000000000000000000000000000000000000000000000000000000028000000000000000000000000000000000000000000000000000000000000002a000000000000000000000000000000000000000000000000000000000000002c000000000000000000000000000000000000000000000000000000000000002e00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+  "transparentUpgrade": {
+    "facetCuts": [],
+    "initAddress": "0x91Ca046daD8c3Db41f296267E1720d9C940f613d",
+    "initCalldata": "0x1ed824a0000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000001a000000000000000000000000000000000000000000000000000000000000004a00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001186ec268d49f1905f8d9c1e9d39fc33e98c74f91d91a21b8f7ef78bd09a8db8101e08b00193e529145ee09823378ef51a3bc8966504064f1f6ba3f1ba86321018c1639094f58177409186e8c48d9f577c9410901d2f1d486b3e7d6cf553ae4c00000000000000000000000000000000000000000000000000000000000004c000000000000000000000000000000000000000000000000000000000000004e000000000000000000000000000000000000000000000000000000000654221a000000000000000000000000000000000000000000000000000000000000000110000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000260000000000000000000000000000000000000000000000000000000000000028000000000000000000000000000000000000000000000000000000000000002a000000000000000000000000000000000000000000000000000000000000002c000000000000000000000000000000000000000000000000000000000000002e000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000"
+  },
+  "executeUpgradeCalldata": "0x36d4eb8400000000000000000000000000000000000000000000000000000000000000400000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000006000000000000000000000000091ca046dad8c3db41f296267e1720d9c940f613d0000000000000000000000000000000000000000000000000000000000000080000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000005241ed824a0000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000001a000000000000000000000000000000000000000000000000000000000000004a00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001186ec268d49f1905f8d9c1e9d39fc33e98c74f91d91a21b8f7ef78bd09a8db8101e08b00193e529145ee09823378ef51a3bc8966504064f1f6ba3f1ba86321018c1639094f58177409186e8c48d9f577c9410901d2f1d486b3e7d6cf553ae4c00000000000000000000000000000000000000000000000000000000000004c000000000000000000000000000000000000000000000000000000000000004e000000000000000000000000000000000000000000000000000000000654221a000000000000000000000000000000000000000000000000000000000000000110000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000260000000000000000000000000000000000000000000000000000000000000028000000000000000000000000000000000000000000000000000000000000002a000000000000000000000000000000000000000000000000000000000000002c000000000000000000000000000000000000000000000000000000000000002e00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000"
+}
\ No newline at end of file
diff --git a/etc/upgrades/1698390925-c4-circuit-fixes/stage2/crypto.json b/etc/upgrades/1698390925-c4-circuit-fixes/stage2/crypto.json
new file mode 100644
index 000000000000..c66cc2547dca
--- /dev/null
+++ b/etc/upgrades/1698390925-c4-circuit-fixes/stage2/crypto.json
@@ -0,0 +1,7 @@
+{
+  "keys": {
+    "recursionNodeLevelVkHash": "0x1186ec268d49f1905f8d9c1e9d39fc33e98c74f91d91a21b8f7ef78bd09a8db8",
+    "recursionLeafLevelVkHash": "0x101e08b00193e529145ee09823378ef51a3bc8966504064f1f6ba3f1ba863210",
+    "recursionCircuitsSetVksHash": "0x18c1639094f58177409186e8c48d9f577c9410901d2f1d486b3e7d6cf553ae4c"
+  }
+}
\ No newline at end of file
diff --git a/etc/upgrades/1698390925-c4-circuit-fixes/stage2/transactions.json b/etc/upgrades/1698390925-c4-circuit-fixes/stage2/transactions.json
new file mode 100644
index 000000000000..fbe169507964
--- /dev/null
+++ b/etc/upgrades/1698390925-c4-circuit-fixes/stage2/transactions.json
@@ -0,0 +1,59 @@
+{
+  "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": "0x0000000000000000000000000000000000000000",
+    "verifierParams": {
+      "recursionNodeLevelVkHash": "0x1186ec268d49f1905f8d9c1e9d39fc33e98c74f91d91a21b8f7ef78bd09a8db8",
+      "recursionLeafLevelVkHash": "0x101e08b00193e529145ee09823378ef51a3bc8966504064f1f6ba3f1ba863210",
+      "recursionCircuitsSetVksHash": "0x18c1639094f58177409186e8c48d9f577c9410901d2f1d486b3e7d6cf553ae4c"
+    },
+    "l1ContractsUpgradeCalldata": "0x",
+    "postUpgradeCalldata": "0x",
+    "upgradeTimestamp": {
+      "type": "BigNumber",
+      "hex": "0x653b7c10"
+    },
+    "factoryDeps": [],
+    "newProtocolVersion": "17",
+    "newAllowList": "0x0000000000000000000000000000000000000000"
+  },
+  "l1upgradeCalldata": "0x1ed824a0000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000001a000000000000000000000000000000000000000000000000000000000000004a00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001186ec268d49f1905f8d9c1e9d39fc33e98c74f91d91a21b8f7ef78bd09a8db8101e08b00193e529145ee09823378ef51a3bc8966504064f1f6ba3f1ba86321018c1639094f58177409186e8c48d9f577c9410901d2f1d486b3e7d6cf553ae4c00000000000000000000000000000000000000000000000000000000000004c000000000000000000000000000000000000000000000000000000000000004e000000000000000000000000000000000000000000000000000000000653b7c1000000000000000000000000000000000000000000000000000000000000000110000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000260000000000000000000000000000000000000000000000000000000000000028000000000000000000000000000000000000000000000000000000000000002a000000000000000000000000000000000000000000000000000000000000002c000000000000000000000000000000000000000000000000000000000000002e000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+  "upgradeAddress": "0xdb876240F01A6dd38F5EFC4EcEFe52e5C13dB3C7",
+  "protocolVersion": "17",
+  "diamondUpgradeProposalId": {
+    "type": "BigNumber",
+    "hex": "0x08"
+  },
+  "upgradeTimestamp": "1698397200",
+  "proposeTransparentUpgradeCalldata": "0x8043760a000000000000000000000000000000000000000000000000000000000000004000000000000000000000000000000000000000000000000000000000000000080000000000000000000000000000000000000000000000000000000000000060000000000000000000000000db876240f01a6dd38f5efc4ecefe52e5c13db3c70000000000000000000000000000000000000000000000000000000000000080000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000005241ed824a0000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000001a000000000000000000000000000000000000000000000000000000000000004a00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001186ec268d49f1905f8d9c1e9d39fc33e98c74f91d91a21b8f7ef78bd09a8db8101e08b00193e529145ee09823378ef51a3bc8966504064f1f6ba3f1ba86321018c1639094f58177409186e8c48d9f577c9410901d2f1d486b3e7d6cf553ae4c00000000000000000000000000000000000000000000000000000000000004c000000000000000000000000000000000000000000000000000000000000004e000000000000000000000000000000000000000000000000000000000653b7c1000000000000000000000000000000000000000000000000000000000000000110000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000260000000000000000000000000000000000000000000000000000000000000028000000000000000000000000000000000000000000000000000000000000002a000000000000000000000000000000000000000000000000000000000000002c000000000000000000000000000000000000000000000000000000000000002e00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+  "transparentUpgrade": {
+    "facetCuts": [],
+    "initAddress": "0xdb876240F01A6dd38F5EFC4EcEFe52e5C13dB3C7",
+    "initCalldata": "0x1ed824a0000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000001a000000000000000000000000000000000000000000000000000000000000004a00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001186ec268d49f1905f8d9c1e9d39fc33e98c74f91d91a21b8f7ef78bd09a8db8101e08b00193e529145ee09823378ef51a3bc8966504064f1f6ba3f1ba86321018c1639094f58177409186e8c48d9f577c9410901d2f1d486b3e7d6cf553ae4c00000000000000000000000000000000000000000000000000000000000004c000000000000000000000000000000000000000000000000000000000000004e000000000000000000000000000000000000000000000000000000000653b7c1000000000000000000000000000000000000000000000000000000000000000110000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000260000000000000000000000000000000000000000000000000000000000000028000000000000000000000000000000000000000000000000000000000000002a000000000000000000000000000000000000000000000000000000000000002c000000000000000000000000000000000000000000000000000000000000002e000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000"
+  },
+  "executeUpgradeCalldata": "0x36d4eb84000000000000000000000000000000000000000000000000000000000000004000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000060000000000000000000000000db876240f01a6dd38f5efc4ecefe52e5c13db3c70000000000000000000000000000000000000000000000000000000000000080000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000005241ed824a0000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000001a000000000000000000000000000000000000000000000000000000000000004a00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001186ec268d49f1905f8d9c1e9d39fc33e98c74f91d91a21b8f7ef78bd09a8db8101e08b00193e529145ee09823378ef51a3bc8966504064f1f6ba3f1ba86321018c1639094f58177409186e8c48d9f577c9410901d2f1d486b3e7d6cf553ae4c00000000000000000000000000000000000000000000000000000000000004c000000000000000000000000000000000000000000000000000000000000004e000000000000000000000000000000000000000000000000000000000653b7c1000000000000000000000000000000000000000000000000000000000000000110000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000260000000000000000000000000000000000000000000000000000000000000028000000000000000000000000000000000000000000000000000000000000002a000000000000000000000000000000000000000000000000000000000000002c000000000000000000000000000000000000000000000000000000000000002e00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000"
+}
\ No newline at end of file
diff --git a/etc/upgrades/1698390925-c4-circuit-fixes/testnet2/crypto.json b/etc/upgrades/1698390925-c4-circuit-fixes/testnet2/crypto.json
new file mode 100644
index 000000000000..c66cc2547dca
--- /dev/null
+++ b/etc/upgrades/1698390925-c4-circuit-fixes/testnet2/crypto.json
@@ -0,0 +1,7 @@
+{
+  "keys": {
+    "recursionNodeLevelVkHash": "0x1186ec268d49f1905f8d9c1e9d39fc33e98c74f91d91a21b8f7ef78bd09a8db8",
+    "recursionLeafLevelVkHash": "0x101e08b00193e529145ee09823378ef51a3bc8966504064f1f6ba3f1ba863210",
+    "recursionCircuitsSetVksHash": "0x18c1639094f58177409186e8c48d9f577c9410901d2f1d486b3e7d6cf553ae4c"
+  }
+}
\ No newline at end of file
diff --git a/etc/upgrades/1698390925-c4-circuit-fixes/testnet2/transactions.json b/etc/upgrades/1698390925-c4-circuit-fixes/testnet2/transactions.json
new file mode 100644
index 000000000000..16accbfb6772
--- /dev/null
+++ b/etc/upgrades/1698390925-c4-circuit-fixes/testnet2/transactions.json
@@ -0,0 +1,59 @@
+{
+  "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": "0x0000000000000000000000000000000000000000",
+    "verifierParams": {
+      "recursionNodeLevelVkHash": "0x1186ec268d49f1905f8d9c1e9d39fc33e98c74f91d91a21b8f7ef78bd09a8db8",
+      "recursionLeafLevelVkHash": "0x101e08b00193e529145ee09823378ef51a3bc8966504064f1f6ba3f1ba863210",
+      "recursionCircuitsSetVksHash": "0x18c1639094f58177409186e8c48d9f577c9410901d2f1d486b3e7d6cf553ae4c"
+    },
+    "l1ContractsUpgradeCalldata": "0x",
+    "postUpgradeCalldata": "0x",
+    "upgradeTimestamp": {
+      "type": "BigNumber",
+      "hex": "0x6540d020"
+    },
+    "factoryDeps": [],
+    "newProtocolVersion": "17",
+    "newAllowList": "0x0000000000000000000000000000000000000000"
+  },
+  "l1upgradeCalldata": "0x1ed824a0000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000001a000000000000000000000000000000000000000000000000000000000000004a00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001186ec268d49f1905f8d9c1e9d39fc33e98c74f91d91a21b8f7ef78bd09a8db8101e08b00193e529145ee09823378ef51a3bc8966504064f1f6ba3f1ba86321018c1639094f58177409186e8c48d9f577c9410901d2f1d486b3e7d6cf553ae4c00000000000000000000000000000000000000000000000000000000000004c000000000000000000000000000000000000000000000000000000000000004e0000000000000000000000000000000000000000000000000000000006540d02000000000000000000000000000000000000000000000000000000000000000110000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000260000000000000000000000000000000000000000000000000000000000000028000000000000000000000000000000000000000000000000000000000000002a000000000000000000000000000000000000000000000000000000000000002c000000000000000000000000000000000000000000000000000000000000002e000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+  "upgradeAddress": "0x70EEdd750Ce140c6320a721D3e6Ff62c80e29DB8",
+  "protocolVersion": "17",
+  "diamondUpgradeProposalId": {
+    "type": "BigNumber",
+    "hex": "0x0c"
+  },
+  "upgradeTimestamp": "1698746400",
+  "proposeTransparentUpgradeCalldata": "0x8043760a0000000000000000000000000000000000000000000000000000000000000040000000000000000000000000000000000000000000000000000000000000000c000000000000000000000000000000000000000000000000000000000000006000000000000000000000000070eedd750ce140c6320a721d3e6ff62c80e29db80000000000000000000000000000000000000000000000000000000000000080000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000005241ed824a0000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000001a000000000000000000000000000000000000000000000000000000000000004a00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001186ec268d49f1905f8d9c1e9d39fc33e98c74f91d91a21b8f7ef78bd09a8db8101e08b00193e529145ee09823378ef51a3bc8966504064f1f6ba3f1ba86321018c1639094f58177409186e8c48d9f577c9410901d2f1d486b3e7d6cf553ae4c00000000000000000000000000000000000000000000000000000000000004c000000000000000000000000000000000000000000000000000000000000004e0000000000000000000000000000000000000000000000000000000006540d02000000000000000000000000000000000000000000000000000000000000000110000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000260000000000000000000000000000000000000000000000000000000000000028000000000000000000000000000000000000000000000000000000000000002a000000000000000000000000000000000000000000000000000000000000002c000000000000000000000000000000000000000000000000000000000000002e00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+  "transparentUpgrade": {
+    "facetCuts": [],
+    "initAddress": "0x70EEdd750Ce140c6320a721D3e6Ff62c80e29DB8",
+    "initCalldata": "0x1ed824a0000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000001a000000000000000000000000000000000000000000000000000000000000004a00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001186ec268d49f1905f8d9c1e9d39fc33e98c74f91d91a21b8f7ef78bd09a8db8101e08b00193e529145ee09823378ef51a3bc8966504064f1f6ba3f1ba86321018c1639094f58177409186e8c48d9f577c9410901d2f1d486b3e7d6cf553ae4c00000000000000000000000000000000000000000000000000000000000004c000000000000000000000000000000000000000000000000000000000000004e0000000000000000000000000000000000000000000000000000000006540d02000000000000000000000000000000000000000000000000000000000000000110000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000260000000000000000000000000000000000000000000000000000000000000028000000000000000000000000000000000000000000000000000000000000002a000000000000000000000000000000000000000000000000000000000000002c000000000000000000000000000000000000000000000000000000000000002e000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000"
+  },
+  "executeUpgradeCalldata": "0x36d4eb8400000000000000000000000000000000000000000000000000000000000000400000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000006000000000000000000000000070eedd750ce140c6320a721d3e6ff62c80e29db80000000000000000000000000000000000000000000000000000000000000080000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000005241ed824a0000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000001a000000000000000000000000000000000000000000000000000000000000004a00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001186ec268d49f1905f8d9c1e9d39fc33e98c74f91d91a21b8f7ef78bd09a8db8101e08b00193e529145ee09823378ef51a3bc8966504064f1f6ba3f1ba86321018c1639094f58177409186e8c48d9f577c9410901d2f1d486b3e7d6cf553ae4c00000000000000000000000000000000000000000000000000000000000004c000000000000000000000000000000000000000000000000000000000000004e0000000000000000000000000000000000000000000000000000000006540d02000000000000000000000000000000000000000000000000000000000000000110000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000260000000000000000000000000000000000000000000000000000000000000028000000000000000000000000000000000000000000000000000000000000002a000000000000000000000000000000000000000000000000000000000000002c000000000000000000000000000000000000000000000000000000000000002e00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000"
+}
\ No newline at end of file
diff --git a/infrastructure/protocol-upgrade/package.json b/infrastructure/protocol-upgrade/package.json
index e49df2d0888b..00ed57e05de8 100644
--- a/infrastructure/protocol-upgrade/package.json
+++ b/infrastructure/protocol-upgrade/package.json
@@ -20,7 +20,7 @@
     "@types/node": "^14.6.1",
     "@types/node-fetch": "^2.5.7",
     "@types/tabtab": "^3.0.1",
-    "hardhat": "=2.12.4",
+    "hardhat": "=2.16.0",
     "typescript": "^4.3.5",
     "l2-zksync-contracts": "link:../../contracts/zksync",
     "l1-zksync-contracts": "link:../../contracts/ethereum",
diff --git a/infrastructure/protocol-upgrade/src/l1upgrade/deployer.ts b/infrastructure/protocol-upgrade/src/l1upgrade/deployer.ts
index e0f8765ba21c..babcbb5b195f 100644
--- a/infrastructure/protocol-upgrade/src/l1upgrade/deployer.ts
+++ b/infrastructure/protocol-upgrade/src/l1upgrade/deployer.ts
@@ -7,8 +7,7 @@ export async function callFacetDeployer(
     create2Address: string,
     nonce: string,
     executor: boolean,
-    governance: boolean,
-    diamondCut: boolean,
+    admin: boolean,
     getters: boolean,
     mailbox: boolean,
     file: string
@@ -19,11 +18,8 @@ export async function callFacetDeployer(
     if (executor) {
         argsString += ' --executor';
     }
-    if (governance) {
-        argsString += ' --governance';
-    }
-    if (diamondCut) {
-        argsString += ' --diamondCut';
+    if (admin) {
+        argsString += ' --admin';
     }
     if (getters) {
         argsString += ' --getters';
diff --git a/infrastructure/protocol-upgrade/src/l1upgrade/facets.ts b/infrastructure/protocol-upgrade/src/l1upgrade/facets.ts
index 2d72fbd415bd..77dc913f7b91 100644
--- a/infrastructure/protocol-upgrade/src/l1upgrade/facets.ts
+++ b/infrastructure/protocol-upgrade/src/l1upgrade/facets.ts
@@ -13,19 +13,7 @@ async function deployAllFacets(
     environment: string
 ) {
     const file = getFacetsFileName(environment);
-    await callFacetDeployer(
-        l1RpcProvider,
-        privateKey,
-        gasPrice,
-        create2Address,
-        nonce,
-        true,
-        true,
-        true,
-        true,
-        true,
-        file
-    );
+    await callFacetDeployer(l1RpcProvider, privateKey, gasPrice, create2Address, nonce, true, true, true, true, file);
 }
 
 async function deployFacetsAndMergeFiles(
@@ -35,8 +23,7 @@ async function deployFacetsAndMergeFiles(
     create2Address: string,
     nonce: string,
     executor: boolean,
-    governance: boolean,
-    diamondCut: boolean,
+    admin: boolean,
     getters: boolean,
     mailbox: boolean,
     environment
@@ -51,8 +38,7 @@ async function deployFacetsAndMergeFiles(
         create2Address,
         nonce,
         executor,
-        governance,
-        diamondCut,
+        admin,
         getters,
         mailbox,
         tmpFacetsFile
@@ -77,9 +63,9 @@ async function generateFacetCuts(l1RpcProvider?: string, zksyncAddress?: string,
     if (gettersAddress) {
         gettersAddress = gettersAddress['address'];
     }
-    let diamondCutAddress = facets['DiamondCutFacet'];
-    if (diamondCutAddress) {
-        diamondCutAddress = diamondCutAddress['address'];
+    let adminAddress = facets['AdminFacet'];
+    if (adminAddress) {
+        adminAddress = adminAddress['address'];
     }
     let mailboxAddress = facets['MailboxFacet'];
     if (mailboxAddress) {
@@ -89,20 +75,15 @@ async function generateFacetCuts(l1RpcProvider?: string, zksyncAddress?: string,
     if (executorAddress) {
         executorAddress = executorAddress['address'];
     }
-    let governanceAddress = facets['GovernanceFacet'];
-    if (governanceAddress) {
-        governanceAddress = governanceAddress['address'];
-    }
 
     await callGenerateFacetCuts(
         zksyncAddress,
         getFacetCutsFileName(environment),
         l1RpcProvider,
-        diamondCutAddress,
+        adminAddress,
         gettersAddress,
         mailboxAddress,
-        executorAddress,
-        governanceAddress
+        executorAddress
     );
 }
 
@@ -110,11 +91,10 @@ async function callGenerateFacetCuts(
     zksyncAddress: string,
     file: string,
     l1RpcProvider?: string,
-    diamondCutAddress?: string,
+    adminAddress?: string,
     gettersAddress?: string,
     mailboxAddress?: string,
-    executorAddress?: string,
-    governanceAddress?: string
+    executorAddress?: string
 ) {
     const cwd = process.cwd();
     process.chdir(`${process.env.ZKSYNC_HOME}/contracts/ethereum/`);
@@ -122,8 +102,8 @@ async function callGenerateFacetCuts(
     if (l1RpcProvider) {
         argsString += ` --l1Rpc ${l1RpcProvider}`;
     }
-    if (diamondCutAddress) {
-        argsString += ` --diamond-cut-facet-address ${diamondCutAddress}`;
+    if (adminAddress) {
+        argsString += ` --admin-address ${adminAddress}`;
     }
     if (gettersAddress) {
         argsString += ` --getters-address ${gettersAddress}`;
@@ -134,9 +114,6 @@ async function callGenerateFacetCuts(
     if (executorAddress) {
         argsString += ` --executor-address ${executorAddress}`;
     }
-    if (governanceAddress) {
-        argsString += ` --governance-address ${governanceAddress}`;
-    }
 
     argsString += ` --zkSyncAddress ${zksyncAddress}`;
     argsString += ` --file ${file}`;
@@ -196,8 +173,7 @@ command
     .option('--nonce <nonce>')
     .option('--l1rpc <l1Rpc>')
     .option('--executor')
-    .option('--governance')
-    .option('--diamond-cut')
+    .option('--admin')
     .option('--getters')
     .option('--mailbox')
     .action(async (cmd) => {
@@ -208,8 +184,7 @@ command
             cmd.create2Address,
             cmd.nonce,
             cmd.executor,
-            cmd.governance,
-            cmd.diamondCut,
+            cmd.admin,
             cmd.getters,
             cmd.mailbox,
             cmd.environment
diff --git a/infrastructure/zk/package.json b/infrastructure/zk/package.json
index df55a3282aa4..2240c96a2b72 100644
--- a/infrastructure/zk/package.json
+++ b/infrastructure/zk/package.json
@@ -18,6 +18,7 @@
         "ethers": "~5.5.0",
         "handlebars": "^4.7.8",
         "node-fetch": "^2.6.1",
+        "pg": "^8.11.3",
         "tabtab": "^3.0.2",
         "zksync-web3": "^0.15.5"
     },
@@ -26,8 +27,9 @@
         "@types/deep-extend": "^0.4.31",
         "@types/node": "^14.6.1",
         "@types/node-fetch": "^2.5.7",
+        "@types/pg": "^8.10.3",
         "@types/tabtab": "^3.0.1",
-        "hardhat": "=2.12.4",
+        "hardhat": "=2.16.0",
         "typescript": "^4.3.5"
     }
-}
+}
\ No newline at end of file
diff --git a/infrastructure/zk/src/compiler.ts b/infrastructure/zk/src/compiler.ts
index c8dca3851ade..271bfdcd0be3 100644
--- a/infrastructure/zk/src/compiler.ts
+++ b/infrastructure/zk/src/compiler.ts
@@ -2,22 +2,15 @@ import { Command } from 'commander';
 import * as utils from './utils';
 
 export async function compileTestContracts() {
-    await utils.spawn('yarn --cwd etc/contracts-test-data hardhat compile');
-    process.chdir('core/tests/ts-integration');
-    await utils.spawn('yarn hardhat compile');
-    await utils.spawn('yarn hardhat run ./scripts/compile-yul.ts');
-    process.chdir('../../..');
+    await utils.spawn('yarn workspace contracts-test-data build');
+    await utils.spawn('yarn ts-integration build');
+    await utils.spawn('yarn ts-integration build-yul');
 }
 
 export async function compileSystemContracts() {
-    await utils.spawn('yarn --cwd etc/ERC20 hardhat compile');
+    await utils.spawn('yarn workspace zksync-erc20 build');
 
-    process.chdir('etc/system-contracts');
-    await utils.spawn('yarn');
-    await utils.spawn('yarn hardhat compile');
-    await utils.spawn('yarn preprocess');
-    await utils.spawn('yarn hardhat run ./scripts/compile-yul.ts');
-    process.chdir('../..');
+    await utils.spawn('yarn workspace system-contracts build');
 }
 
 export async function compileAll() {
diff --git a/infrastructure/zk/src/contract.ts b/infrastructure/zk/src/contract.ts
index 2063810d4e6c..51037259228d 100644
--- a/infrastructure/zk/src/contract.ts
+++ b/infrastructure/zk/src/contract.ts
@@ -42,6 +42,15 @@ export async function initializeValidator(args: any[] = []) {
     await utils.spawn(`${baseCommandL1} initialize-validator ${args.join(' ')} | tee initializeValidator.log`);
 }
 
+export async function initializeGovernance(args: any[] = []) {
+    await utils.confirmAction();
+
+    const isLocalSetup = process.env.ZKSYNC_LOCAL_SETUP;
+    const baseCommandL1 = isLocalSetup ? `yarn --cwd /contracts/ethereum` : `yarn l1-contracts`;
+
+    await utils.spawn(`${baseCommandL1} initialize-governance ${args.join(' ')} | tee initializeGovernance.log`);
+}
+
 export async function initializeL1AllowList(args: any[] = []) {
     await utils.confirmAction();
 
@@ -117,10 +126,10 @@ export async function deployL1(args: any[]) {
     const deployLog = fs.readFileSync('deployL1.log').toString();
     const envVars = [
         'CONTRACTS_CREATE2_FACTORY_ADDR',
-        'CONTRACTS_DIAMOND_CUT_FACET_ADDR',
+        'CONTRACTS_ADMIN_FACET_ADDR',
         'CONTRACTS_DIAMOND_UPGRADE_INIT_ADDR',
         'CONTRACTS_DEFAULT_UPGRADE_ADDR',
-        'CONTRACTS_GOVERNANCE_FACET_ADDR',
+        'CONTRACTS_GOVERNANCE_ADDR',
         'CONTRACTS_MAILBOX_FACET_ADDR',
         'CONTRACTS_EXECUTOR_FACET_ADDR',
         'CONTRACTS_GETTERS_FACET_ADDR',
diff --git a/infrastructure/zk/src/fmt.ts b/infrastructure/zk/src/fmt.ts
index de6ed41ac55d..4bb46dba7608 100644
--- a/infrastructure/zk/src/fmt.ts
+++ b/infrastructure/zk/src/fmt.ts
@@ -20,6 +20,18 @@ export async function prettier(extension: string, check: boolean = false) {
     await utils.spawn(`yarn --silent prettier --config ${CONFIG_PATH}/${extension}.js --${command} ${files}`);
 }
 
+async function prettierL1Contracts(check: boolean = false) {
+    await utils.spawn(`yarn --silent --cwd contracts/ethereum prettier:${check ? 'check' : 'fix'}`);
+}
+
+async function prettierL2Contracts(check: boolean = false) {
+    await utils.spawn(`yarn --silent --cwd contracts/zksync prettier:${check ? 'check' : 'fix'}`);
+}
+
+async function prettierSystemContracts(check: boolean = false) {
+    await utils.spawn(`yarn --silent --cwd etc/system-contracts prettier:${check ? 'check' : 'fix'}`);
+}
+
 export async function rustfmt(check: boolean = false) {
     process.chdir(process.env.ZKSYNC_HOME as string);
     const command = check ? 'cargo fmt -- --check' : 'cargo fmt';
@@ -28,21 +40,38 @@ export async function rustfmt(check: boolean = false) {
     await utils.spawn(command);
 }
 
+const ARGS = [...EXTENSIONS, 'rust', 'l1-contracts', 'l2-contracts', 'system-contracts'];
+
 export const command = new Command('fmt')
     .description('format code with prettier & rustfmt')
     .option('--check')
-    .arguments('[extension]')
+    .arguments(`[extension] ${ARGS.join('|')}`)
     .action(async (extension: string | null, cmd: Command) => {
         if (extension) {
-            if (extension == 'rust') {
-                await rustfmt(cmd.check);
-            } else {
-                await prettier(extension, cmd.check);
+            switch (extension) {
+                case 'rust':
+                    await rustfmt(cmd.check);
+                    break;
+                case 'l1-contracts':
+                    await prettierL1Contracts(cmd.check);
+                    break;
+                case 'l2-contracts':
+                    await prettierL2Contracts(cmd.check);
+                    break;
+                case 'system-contracts':
+                    await prettierSystemContracts(cmd.check);
+                    break;
+                default:
+                    await prettier(extension, cmd.check);
+                    break;
             }
         } else {
             // Run all the checks concurrently.
             const promises = EXTENSIONS.map((ext) => prettier(ext, cmd.check));
             promises.push(rustfmt(cmd.check));
+            promises.push(prettierL1Contracts(cmd.check));
+            promises.push(prettierL2Contracts(cmd.check));
+            promises.push(prettierSystemContracts(cmd.check));
             await Promise.all(promises);
         }
     });
diff --git a/infrastructure/zk/src/index.ts b/infrastructure/zk/src/index.ts
index 479a0889317f..ea06029609e1 100644
--- a/infrastructure/zk/src/index.ts
+++ b/infrastructure/zk/src/index.ts
@@ -20,6 +20,7 @@ import { command as config } from './config';
 import { command as clean } from './clean';
 import { command as db } from './database';
 import { command as verifyUpgrade } from './verify-upgrade';
+import { command as status } from './status';
 import * as env from './env';
 
 const COMMANDS = [
@@ -44,6 +45,7 @@ const COMMANDS = [
     compiler,
     verifyUpgrade,
     env.command,
+    status,
     completion(program as Command)
 ];
 
diff --git a/infrastructure/zk/src/init.ts b/infrastructure/zk/src/init.ts
index e2c65168461d..b3753e62aefa 100644
--- a/infrastructure/zk/src/init.ts
+++ b/infrastructure/zk/src/init.ts
@@ -1,15 +1,15 @@
-import { Command } from 'commander';
 import chalk from 'chalk';
+import { Command } from 'commander';
 import * as utils from './utils';
 
-import * as server from './server';
-import * as contract from './contract';
-import * as run from './run/run';
+import { clean } from './clean';
 import * as compiler from './compiler';
+import * as contract from './contract';
 import * as db from './database';
-import { clean } from './clean';
-import * as env from './env';
 import * as docker from './docker';
+import * as env from './env';
+import * as run from './run/run';
+import * as server from './server';
 import { up } from './up';
 
 const entry = chalk.bold.yellow;
@@ -22,6 +22,7 @@ export async function init(initArgs: InitArgs = DEFAULT_ARGS) {
         skipSubmodulesCheckout,
         skipEnvSetup,
         testTokens,
+        // eslint-disable-next-line @typescript-eslint/no-unused-vars
         deployerL1ContractInputArgs,
         governorPrivateKeyArgs,
         deployerL2ContractInput
@@ -51,9 +52,9 @@ export async function init(initArgs: InitArgs = DEFAULT_ARGS) {
     await announced('Deploying L1 verifier', contract.deployVerifier([]));
     await announced('Reloading env', env.reload());
     await announced('Running server genesis setup', server.genesisFromSources());
-    await announced('Deploying L1 contracts', contract.redeployL1(deployerL1ContractInputArgs));
+    await announced('Deploying L1 contracts', contract.redeployL1(governorPrivateKeyArgs));
     await announced('Initializing validator', contract.initializeValidator(governorPrivateKeyArgs));
-    await announced('Initialize L1 allow list ', contract.initializeL1AllowList(governorPrivateKeyArgs));
+    await announced('Initialize L1 allow list', contract.initializeL1AllowList(governorPrivateKeyArgs));
     await announced(
         'Deploying L2 contracts',
         contract.deployL2(
@@ -66,6 +67,7 @@ export async function init(initArgs: InitArgs = DEFAULT_ARGS) {
     if (deployerL2ContractInput.includeL2WETH) {
         await announced('Initializing L2 WETH token', contract.initializeWethToken(governorPrivateKeyArgs));
     }
+    await announced('Initializing governance', contract.initializeGovernance(governorPrivateKeyArgs));
 }
 
 // A smaller version of `init` that "resets" the localhost environment, for which `init` was already called before.
@@ -83,10 +85,11 @@ export async function reinit() {
     await announced('Reloading env', env.reload());
     await announced('Running server genesis setup', server.genesisFromSources());
     await announced('Deploying L1 contracts', contract.redeployL1([]));
-    await announced('Initializing validator', contract.initializeValidator());
     await announced('Initializing L1 Allow list', contract.initializeL1AllowList());
     await announced('Deploying L2 contracts', contract.deployL2([], true, true));
     await announced('Initializing L2 WETH token', contract.initializeWethToken());
+    await announced('Initializing governance', contract.initializeGovernance());
+    await announced('Initializing validator', contract.initializeValidator());
 }
 
 // A lightweight version of `init` that sets up local databases, generates genesis and deploys precompiled contracts
@@ -100,6 +103,7 @@ export async function lightweightInit() {
     await announced('Initializing validator', contract.initializeValidator());
     await announced('Initializing L1 Allow list', contract.initializeL1AllowList());
     await announced('Deploying L2 contracts', contract.deployL2([], true, false));
+    await announced('Initializing governance', contract.initializeGovernance());
 }
 
 // Wrapper that writes an announcement and completion notes for each executed task.
diff --git a/infrastructure/zk/src/lint.ts b/infrastructure/zk/src/lint.ts
index adf2758b65ed..b34cd1000312 100644
--- a/infrastructure/zk/src/lint.ts
+++ b/infrastructure/zk/src/lint.ts
@@ -13,16 +13,6 @@ const EXTENSIONS = Object.keys(LINT_COMMANDS);
 const CONFIG_PATH = 'etc/lint-config';
 
 export async function lint(extension: string, check: boolean = false) {
-    if (extension == 'rust') {
-        await clippy();
-        return;
-    }
-
-    if (extension == 'prover') {
-        await proverClippy();
-        return;
-    }
-
     if (!EXTENSIONS.includes(extension)) {
         throw new Error('Unsupported extension');
     }
@@ -34,6 +24,18 @@ export async function lint(extension: string, check: boolean = false) {
     await utils.spawn(`yarn --silent ${command} ${fixOption} --config ${CONFIG_PATH}/${extension}.js ${files}`);
 }
 
+async function lintL1Contracts(check: boolean = false) {
+    await utils.spawn(`yarn --silent --cwd contracts/ethereum lint:${check ? 'check' : 'fix'}`);
+}
+
+async function lintL2Contracts(check: boolean = false) {
+    await utils.spawn(`yarn --silent --cwd contracts/zksync lint:${check ? 'check' : 'fix'}`);
+}
+
+async function lintSystemContracts(check: boolean = false) {
+    await utils.spawn(`yarn --silent --cwd etc/system-contracts lint:${check ? 'check' : 'fix'}`);
+}
+
 async function clippy() {
     process.chdir(process.env.ZKSYNC_HOME!);
     await utils.spawn('cargo clippy --tests -- -D warnings');
@@ -44,18 +46,39 @@ async function proverClippy() {
     await utils.spawn('cargo clippy --tests -- -D warnings -A incomplete_features');
 }
 
+const ARGS = [...EXTENSIONS, 'rust', 'prover', 'l1-contracts', 'l2-contracts', 'system-contracts'];
+
 export const command = new Command('lint')
     .description('lint code')
     .option('--check')
-    .arguments('[extension] rust|md|sol|js|ts|prover')
+    .arguments(`[extension] ${ARGS.join('|')}`)
     .action(async (extension: string | null, cmd: Command) => {
         if (extension) {
-            await lint(extension, cmd.check);
-        } else {
-            for (const ext of EXTENSIONS) {
-                await lint(ext, cmd.check);
+            switch (extension) {
+                case 'rust':
+                    await clippy();
+                    break;
+                case 'prover':
+                    await proverClippy();
+                    break;
+                case 'l1-contracts':
+                    await lintL1Contracts(cmd.check);
+                    break;
+                case 'l2-contracts':
+                    await lintL2Contracts(cmd.check);
+                    break;
+                case 'system-contracts':
+                    await lintSystemContracts(cmd.check);
+                    break;
+                default:
+                    await lint(extension, cmd.check);
             }
-
-            await clippy();
+        } else {
+            const promises = EXTENSIONS.map((ext) => lint(ext, cmd.check));
+            promises.push(lintL1Contracts(cmd.check));
+            promises.push(lintL2Contracts(cmd.check));
+            promises.push(lintSystemContracts(cmd.check));
+            promises.push(clippy());
+            await Promise.all(promises);
         }
     });
diff --git a/infrastructure/zk/src/server.ts b/infrastructure/zk/src/server.ts
index 70674bda03c7..290605df27e6 100644
--- a/infrastructure/zk/src/server.ts
+++ b/infrastructure/zk/src/server.ts
@@ -52,7 +52,7 @@ async function create_genesis(cmd: string) {
     await utils.confirmAction();
     await utils.spawn(`${cmd} | tee genesis.log`);
     const genesisContents = fs.readFileSync('genesis.log').toString().split('\n');
-    const genesisBlockCommitment = genesisContents.find((line) => line.includes('CONTRACTS_GENESIS_BLOCK_COMMITMENT='));
+    const genesisBlockCommitment = genesisContents.find((line) => line.includes('CONTRACTS_GENESIS_BATCH_COMMITMENT='));
     const genesisBootloaderHash = genesisContents.find((line) => line.includes('CHAIN_STATE_KEEPER_BOOTLOADER_HASH='));
     const genesisDefaultAAHash = genesisContents.find((line) => line.includes('CHAIN_STATE_KEEPER_DEFAULT_AA_HASH='));
     const genesisRoot = genesisContents.find((line) => line.includes('CONTRACTS_GENESIS_ROOT='));
@@ -79,7 +79,7 @@ async function create_genesis(cmd: string) {
 
     if (
         genesisBlockCommitment == null ||
-        !/^CONTRACTS_GENESIS_BLOCK_COMMITMENT=0x[a-fA-F0-9]{64}$/.test(genesisBlockCommitment)
+        !/^CONTRACTS_GENESIS_BATCH_COMMITMENT=0x[a-fA-F0-9]{64}$/.test(genesisBlockCommitment)
     ) {
         throw Error(`Genesis is not needed (either Postgres DB or tree's Rocks DB is not empty)`);
     }
@@ -106,7 +106,7 @@ async function create_genesis(cmd: string) {
     env.modify('CONTRACTS_GENESIS_ROOT', genesisRoot);
     env.modify('CHAIN_STATE_KEEPER_BOOTLOADER_HASH', genesisBootloaderHash);
     env.modify('CHAIN_STATE_KEEPER_DEFAULT_AA_HASH', genesisDefaultAAHash);
-    env.modify('CONTRACTS_GENESIS_BLOCK_COMMITMENT', genesisBlockCommitment);
+    env.modify('CONTRACTS_GENESIS_BATCH_COMMITMENT', genesisBlockCommitment);
     env.modify('CONTRACTS_GENESIS_ROLLUP_LEAF_INDEX', genesisRollupLeafIndex);
 }
 
diff --git a/infrastructure/zk/src/status.ts b/infrastructure/zk/src/status.ts
new file mode 100644
index 000000000000..cd03e5748e64
--- /dev/null
+++ b/infrastructure/zk/src/status.ts
@@ -0,0 +1,220 @@
+import { Command } from 'commander';
+
+import { Pool } from 'pg';
+import { ethers } from 'ethers';
+import { assert } from 'console';
+
+// Postgres connection pool - must be intialized later - as the ENV variables are set later.
+let pool: Pool | null = null;
+
+const GETTER_ABI = [
+    'function getTotalBatchesCommitted() view returns (uint256)',
+    'function getTotalBatchesVerified() view returns (uint256)',
+    'function getVerifierParams() view returns (bytes32, bytes32, bytes32)'
+];
+
+const VERIFIER_ABI = ['function verificationKeyHash() view returns (bytes32)'];
+
+export async function query(text: string, params?: any[]): Promise<any> {
+    const res = await pool!.query(text, params);
+    return res;
+}
+
+async function queryAndReturnRows(text: string, params?: any[]): Promise<any> {
+    const result = await query(text, params);
+    return result.rows;
+}
+
+async function getProofProgress(l1_batch_number: number) {
+    const result = await query('select * from prover_jobs_fri where l1_batch_number = $1', [l1_batch_number]);
+
+    let successful = 0;
+    let failed = 0;
+    let in_progress = 0;
+    let queued = 0;
+
+    result.rows.forEach((element: { status: string; error: string | undefined }) => {
+        if (element.status == 'successful') {
+            successful += 1;
+        } else {
+            if (element.error != null) {
+                failed += 1;
+            } else {
+                if (element.status == 'queued') {
+                    queued += 1;
+                }
+                if (element.status == 'in_progress') {
+                    in_progress += 1;
+                }
+            }
+        }
+    });
+
+    const compression_results = await query('select * from proof_compression_jobs_fri where l1_batch_number = $1', [
+        l1_batch_number
+    ]);
+
+    let compression_result_string = '';
+    if (compression_results.rowCount == 0) {
+        compression_result_string = `${redStart}[No compression job found]${resetColor}`;
+    } else {
+        if (compression_results.rowCount > 1) {
+            compression_result_string = `${redStart}[${compression_results.rowCount} compression jobs found - expected just 1]${resetColor}`;
+        } else {
+            compression_result_string = `Compression job status: ${compression_results.rows[0].status}`;
+        }
+    }
+
+    console.log(
+        `Proof progress for ${l1_batch_number} : ${successful} successful, ${failed} failed, ${in_progress} in progress, ${queued} queued.  ${compression_result_string}`
+    );
+}
+
+async function getL1ValidatorStatus(): Promise<[number, number]> {
+    // Setup a provider
+    let provider = new ethers.providers.JsonRpcProvider(process.env.ETH_CLIENT_WEB3_URL);
+
+    // Create a contract instance
+    let contract = new ethers.Contract(process.env.CONTRACTS_DIAMOND_PROXY_ADDR!, GETTER_ABI, provider);
+
+    try {
+        const blocksCommitted = await contract.getTotalBatchesCommitted();
+        const blocksVerified = await contract.getTotalBatchesVerified();
+        return [Number(blocksCommitted), Number(blocksVerified)];
+    } catch (error) {
+        console.error(`Error calling L1 contract: ${error}`);
+        return [-1, -1];
+    }
+}
+
+async function compareVerificationKeys() {
+    // Setup a provider
+    let provider = new ethers.providers.JsonRpcProvider(process.env.ETH_CLIENT_WEB3_URL);
+
+    // Create a contract instance (diamond proxy doesn't expose this one)
+    let contract = new ethers.Contract(process.env.CONTRACTS_VERIFIER_ADDR!, VERIFIER_ABI, provider);
+    let verificationKeyHash;
+    try {
+        verificationKeyHash = await contract.verificationKeyHash();
+        console.log(`Verification key hash on contract is ${verificationKeyHash}`);
+    } catch (error) {
+        console.error(`Error calling L1 contract: ${error}`);
+        return;
+    }
+
+    let protocol_version = await query('select recursion_scheduler_level_vk_hash from prover_protocol_versions');
+    if (protocol_version.rowCount != 1) {
+        console.log(`${redStart}Got ${protocol_version.rowCount} rows with protocol versions, expected 1${resetColor}`);
+        return;
+    }
+    let dbHash = ethers.utils.hexlify(protocol_version.rows[0].recursion_scheduler_level_vk_hash);
+
+    console.log(`Verification key in database is ${dbHash}`);
+    if (dbHash != verificationKeyHash) {
+        console.log(
+            `${redStart}Verification hash in DB differs from the one in contract.${resetColor} State keeper might not send prove requests.`
+        );
+    } else {
+        console.log(`${greenStart}Verifier hash matches.${resetColor}`);
+    }
+}
+
+async function compareVerificationParams() {
+    // Setup a provider
+    let provider = new ethers.providers.JsonRpcProvider(process.env.ETH_CLIENT_WEB3_URL);
+
+    // Create a contract instance (diamond proxy doesn't expose this one)
+    let contract = new ethers.Contract(process.env.CONTRACTS_DIAMOND_PROXY_ADDR!, GETTER_ABI, provider);
+    let node, leaf, circuits;
+    try {
+        [node, leaf, circuits] = await contract.getVerifierParams();
+        console.log(`Verifier params on contract are ${node}, ${leaf}, ${circuits}`);
+    } catch (error) {
+        console.error(`Error calling L1 contract: ${error}`);
+        return;
+    }
+
+    let protocol_version = await query(
+        'select recursion_node_level_vk_hash, recursion_leaf_level_vk_hash, recursion_circuits_set_vks_hash from prover_fri_protocol_versions'
+    );
+    if (protocol_version.rowCount != 1) {
+        console.log(`${redStart}Got ${protocol_version.rowCount} rows with protocol versions, expected 1${resetColor}`);
+        return;
+    }
+    let dbNode = ethers.utils.hexlify(protocol_version.rows[0].recursion_node_level_vk_hash);
+    let dbLeaf = ethers.utils.hexlify(protocol_version.rows[0].recursion_leaf_level_vk_hash);
+    let dbCircuit = ethers.utils.hexlify(protocol_version.rows[0].recursion_circuits_set_vks_hash);
+
+    let fail = false;
+
+    if (dbNode != node) {
+        fail = true;
+        console.log(
+            `${redStart}Verification node in DB differs from the one in contract ${dbNode} vs ${node}.${resetColor}`
+        );
+    }
+    if (dbLeaf != leaf) {
+        fail = true;
+        console.log(
+            `${redStart}Verification leaf in DB differs from the one in contract ${dbLeaf} vs ${leaf}.${resetColor}`
+        );
+    }
+    if (dbCircuit != circuits) {
+        fail = true;
+        console.log(
+            `${redStart}Verification circuits in DB differs from the one in contract ${dbCircuit} vs ${circuits}.${resetColor}`
+        );
+    }
+
+    if (fail == false) {
+        console.log(`${greenStart}Verifcation params match.${resetColor}`);
+    }
+}
+
+const redStart = '\x1b[31m';
+const greenStart = '\x1b[32m';
+const resetColor = '\x1b[0m';
+
+export async function statusProver() {
+    console.log('==== FRI Prover status ====');
+
+    pool = new Pool({ connectionString: process.env.DATABASE_URL });
+
+    if (process.env.ETH_SENDER_SENDER_PROOF_LOADING_MODE != 'FriProofFromGcs') {
+        console.log(`${redStart}Can only show status for FRI provers.${resetColor}`);
+        return;
+    }
+    const stateKeeperStatus = (await queryAndReturnRows('select min(number), max(number) from l1_batches'))[0];
+
+    console.log(`State keeper: First batch: ${stateKeeperStatus['min']}, recent batch: ${stateKeeperStatus['max']}`);
+    const [blockCommited, blockVerified] = await getL1ValidatorStatus();
+    console.log(`L1 state: block verified: ${blockVerified}, block committed: ${blockCommited}`);
+
+    assert(blockCommited >= 0);
+    assert(blockCommited <= stateKeeperStatus['max']);
+
+    if (blockCommited < stateKeeperStatus['max']) {
+        console.log(
+            `${redStart}Eth sender is behind - block commited ${blockCommited} is smaller than most recent state keeper batch ${stateKeeperStatus['max']}.${resetColor}`
+        );
+        return;
+    }
+    await compareVerificationKeys();
+    await compareVerificationParams();
+
+    const nextBlockForVerification = blockVerified + 1;
+
+    console.log(`Next block that should be verified is: ${nextBlockForVerification}`);
+    console.log(`Checking status of the proofs...`);
+    for (
+        let i = nextBlockForVerification;
+        i <= Math.min(nextBlockForVerification + 5, Number(stateKeeperStatus['max']));
+        i += 1
+    ) {
+        getProofProgress(i);
+    }
+}
+
+export const command = new Command('status').description('show status of the local system');
+
+command.command('prover').action(statusProver);
diff --git a/package.json b/package.json
index 728d150d6196..f256abbc4c66 100644
--- a/package.json
+++ b/package.json
@@ -9,6 +9,7 @@
       "contracts/zksync",
       "etc/contracts-test-data",
       "etc/ERC20",
+      "etc/system-contracts",
       "infrastructure/zk",
       "infrastructure/local-setup-preparation",
       "core/tests/revert-test",
@@ -32,7 +33,7 @@
   },
   "devDependencies": {
     "@ethersproject/bignumber": "~5.5.0",
-    "@typescript-eslint/eslint-plugin": "^4.10.0",
+    "@typescript-eslint/eslint-plugin": "^6.7.4",
     "@typescript-eslint/parser": "^4.10.0",
     "babel-eslint": "^10.1.0",
     "eslint": "^7.16.0",
diff --git a/prover/CHANGELOG.md b/prover/CHANGELOG.md
index f23785e95c95..e48ee4edcb79 100644
--- a/prover/CHANGELOG.md
+++ b/prover/CHANGELOG.md
@@ -1,5 +1,30 @@
 # Changelog
 
+## [8.1.0](https://github.com/matter-labs/zksync-era/compare/prover-v7.2.0...prover-v8.1.0) (2023-11-03)
+
+
+### ⚠ BREAKING CHANGES
+
+* Update to protocol version 17 ([#384](https://github.com/matter-labs/zksync-era/issues/384))
+
+### Features
+
+* **boojum:** Adding README to prover directory ([#189](https://github.com/matter-labs/zksync-era/issues/189)) ([c175033](https://github.com/matter-labs/zksync-era/commit/c175033b48a8da4969d88b6850dd0247c4004794))
+* **config:** Extract everything not related to the env config from zksync_config crate ([#245](https://github.com/matter-labs/zksync-era/issues/245)) ([42c64e9](https://github.com/matter-labs/zksync-era/commit/42c64e91e13b6b37619f1459f927fa046ef01097))
+* **fri-prover:** In witness - panic if protocol version is not available ([#192](https://github.com/matter-labs/zksync-era/issues/192)) ([0403749](https://github.com/matter-labs/zksync-era/commit/040374900656c854a7b9de32e5dbaf47c1c47889))
+* **merkle tree:** Snapshot recovery for Merkle tree ([#163](https://github.com/matter-labs/zksync-era/issues/163)) ([9e20703](https://github.com/matter-labs/zksync-era/commit/9e2070380e6720d84563a14a2246fc18fdb1f8f9))
+* Rewrite server binary to use `vise` metrics ([#120](https://github.com/matter-labs/zksync-era/issues/120)) ([26ee1fb](https://github.com/matter-labs/zksync-era/commit/26ee1fbb16cbd7c4fad334cbc6804e7d779029b6))
+* Update to protocol version 17 ([#384](https://github.com/matter-labs/zksync-era/issues/384)) ([ba271a5](https://github.com/matter-labs/zksync-era/commit/ba271a5f34d64d04c0135b8811685b80f26a8c32))
+* **vm:** Move all vm versions to the one crate ([#249](https://github.com/matter-labs/zksync-era/issues/249)) ([e3fb489](https://github.com/matter-labs/zksync-era/commit/e3fb4894d08aa98a84e64eaa95b51001055cf911))
+
+
+### Bug Fixes
+
+* **crypto:** update snark-vk to be used in server and update args for proof wrapping ([#240](https://github.com/matter-labs/zksync-era/issues/240)) ([4a5c54c](https://github.com/matter-labs/zksync-era/commit/4a5c54c48bbc100c29fa719c4b1dc3535743003d))
+* **docs:** Add links to setup-data keys ([#360](https://github.com/matter-labs/zksync-era/issues/360)) ([1d4fe69](https://github.com/matter-labs/zksync-era/commit/1d4fe697e4e98a8e64642cde4fe202338ce5ec61))
+* **prover-fri:** Update setup loading for node agg circuit ([#323](https://github.com/matter-labs/zksync-era/issues/323)) ([d1034b0](https://github.com/matter-labs/zksync-era/commit/d1034b05754219b603508ef79c114d908c94c1e9))
+* **prover-logging:** tasks_allowed_to_finish set to true for 1 off jobs ([#227](https://github.com/matter-labs/zksync-era/issues/227)) ([0fac66f](https://github.com/matter-labs/zksync-era/commit/0fac66f5ff86cc801ea0bb6f9272cb397cd03a95))
+
 ## [7.2.0](https://github.com/matter-labs/zksync-era/compare/prover-v7.1.1...prover-v7.2.0) (2023-10-17)
 
 
diff --git a/prover/Cargo.lock b/prover/Cargo.lock
index 73ecf49890f2..6b6585aef324 100644
--- a/prover/Cargo.lock
+++ b/prover/Cargo.lock
@@ -1302,7 +1302,7 @@ dependencies = [
 [[package]]
 name = "cs_derive"
 version = "0.1.0"
-source = "git+https://github.com/matter-labs/era-sync_vm.git?branch=v1.3.3#dad50e7eb7462a3819af8d5209d6ca243395bf51"
+source = "git+https://github.com/matter-labs/era-sync_vm.git?branch=v1.3.3#ed8ab8984cae05d00d9d62196753c8d40df47c7d"
 dependencies = [
  "proc-macro-error",
  "proc-macro2 1.0.69",
@@ -5430,7 +5430,7 @@ dependencies = [
 [[package]]
 name = "sync_vm"
 version = "1.3.3"
-source = "git+https://github.com/matter-labs/era-sync_vm.git?branch=v1.3.3#dad50e7eb7462a3819af8d5209d6ca243395bf51"
+source = "git+https://github.com/matter-labs/era-sync_vm.git?branch=v1.3.3#ed8ab8984cae05d00d9d62196753c8d40df47c7d"
 dependencies = [
  "arrayvec 0.7.4",
  "cs_derive 0.1.0 (git+https://github.com/matter-labs/era-sync_vm.git?branch=v1.3.3)",
@@ -6549,7 +6549,7 @@ dependencies = [
 [[package]]
 name = "zkevm_test_harness"
 version = "1.3.3"
-source = "git+https://github.com/matter-labs/era-zkevm_test_harness.git?branch=v1.3.3#d26aa4133f2b5e114c0bf084b8c3f1eca9aa9929"
+source = "git+https://github.com/matter-labs/era-zkevm_test_harness.git?branch=v1.3.3#d52b56d6ba8196c8a3c74c4933654469e6f27a5a"
 dependencies = [
  "bincode",
  "circuit_testing",
diff --git a/prover/rust-toolchain b/prover/rust-toolchain
index cd9bf832ae2a..9a87fb21ccf9 100644
--- a/prover/rust-toolchain
+++ b/prover/rust-toolchain
@@ -1 +1 @@
-nightly-2023-07-21
+nightly-2023-08-21
diff --git a/sdk/zksync-rs/src/abi/IZkSync.json b/sdk/zksync-rs/src/abi/IZkSync.json
index afb3698e7c62..0d66ed3ff721 100644
--- a/sdk/zksync-rs/src/abi/IZkSync.json
+++ b/sdk/zksync-rs/src/abi/IZkSync.json
@@ -726,7 +726,7 @@
           "type": "tuple[]"
         }
       ],
-      "name": "commitBlocks",
+      "name": "commitBatches",
       "outputs": [],
       "stateMutability": "nonpayable",
       "type": "function"
@@ -781,7 +781,7 @@
           "type": "tuple[]"
         }
       ],
-      "name": "executeBlocks",
+      "name": "executeBatches",
       "outputs": [],
       "stateMutability": "nonpayable",
       "type": "function"
@@ -1565,7 +1565,7 @@
           "type": "tuple"
         }
       ],
-      "name": "proveBlocks",
+      "name": "proveBatches",
       "outputs": [],
       "stateMutability": "nonpayable",
       "type": "function"
diff --git a/yarn.lock b/yarn.lock
index 0f07f27fd12f..6877daf3fa2b 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -2,12 +2,17 @@
 # yarn lockfile v1
 
 
-"@ampproject/remapping@^2.1.0":
-  version "2.2.0"
-  resolved "https://registry.yarnpkg.com/@ampproject/remapping/-/remapping-2.2.0.tgz#56c133824780de3174aed5ab6834f3026790154d"
-  integrity sha512-qRmjj8nj9qmLTQXXmaR1cck3UXSRMPrbsLJAasZpF+t3riI71BXed5ebIOYwQntykeZuhjsdweEc9BxH5Jc26w==
+"@aashutoshrathi/word-wrap@^1.2.3":
+  version "1.2.6"
+  resolved "https://registry.yarnpkg.com/@aashutoshrathi/word-wrap/-/word-wrap-1.2.6.tgz#bd9154aec9983f77b3a034ecaa015c2e4201f6cf"
+  integrity sha512-1Yjs2SvM8TflER/OD3cOjhWWOZb58A2t7wpE2S9XfBYTiIl+XFhQG2bjy4Pu1I+EAlCNUzRDYDdFwFYUKvXcIA==
+
+"@ampproject/remapping@^2.2.0":
+  version "2.2.1"
+  resolved "https://registry.yarnpkg.com/@ampproject/remapping/-/remapping-2.2.1.tgz#99e8e11851128b8702cd57c33684f1d0f260b630"
+  integrity sha512-lFMjJTrFL3j7L9yBxwYfCq2k6qqwHyzuUl/XBnif78PWTJYyL/dfowQHWE3sp6U6ZzqWiiIZnpTMO96zhkjwtg==
   dependencies:
-    "@jridgewell/gen-mapping" "^0.1.0"
+    "@jridgewell/gen-mapping" "^0.3.0"
     "@jridgewell/trace-mapping" "^0.3.9"
 
 "@babel/code-frame@7.12.11":
@@ -17,155 +22,155 @@
   dependencies:
     "@babel/highlight" "^7.10.4"
 
-"@babel/code-frame@^7.0.0", "@babel/code-frame@^7.12.13", "@babel/code-frame@^7.18.6":
-  version "7.18.6"
-  resolved "https://registry.yarnpkg.com/@babel/code-frame/-/code-frame-7.18.6.tgz#3b25d38c89600baa2dcc219edfa88a74eb2c427a"
-  integrity sha512-TDCmlK5eOvH+eH7cdAFlNXeVJqWIQ7gW9tY1GJIpUtFb6CmjVyq2VM3u71bOyR8CRihcCgMUYoDNyLXao3+70Q==
+"@babel/code-frame@^7.0.0", "@babel/code-frame@^7.12.13", "@babel/code-frame@^7.22.13":
+  version "7.22.13"
+  resolved "https://registry.yarnpkg.com/@babel/code-frame/-/code-frame-7.22.13.tgz#e3c1c099402598483b7a8c46a721d1038803755e"
+  integrity sha512-XktuhWlJ5g+3TJXc5upd9Ks1HutSArik6jf2eAjYFyIOf4ej3RN+184cZbzDvbPnuTJIUhPKKJE3cIsYTiAT3w==
   dependencies:
-    "@babel/highlight" "^7.18.6"
+    "@babel/highlight" "^7.22.13"
+    chalk "^2.4.2"
 
-"@babel/compat-data@^7.20.0":
-  version "7.20.1"
-  resolved "https://registry.yarnpkg.com/@babel/compat-data/-/compat-data-7.20.1.tgz#f2e6ef7790d8c8dbf03d379502dcc246dcce0b30"
-  integrity sha512-EWZ4mE2diW3QALKvDMiXnbZpRvlj+nayZ112nK93SnhqOtpdsbVD4W+2tEoT3YNBAG9RBR0ISY758ZkOgsn6pQ==
+"@babel/compat-data@^7.22.9":
+  version "7.23.2"
+  resolved "https://registry.yarnpkg.com/@babel/compat-data/-/compat-data-7.23.2.tgz#6a12ced93455827037bfb5ed8492820d60fc32cc"
+  integrity sha512-0S9TQMmDHlqAZ2ITT95irXKfxN9bncq8ZCoJhun3nHL/lLUxd2NKBJYoNGWH7S0hz6fRQwWlAWn/ILM0C70KZQ==
 
 "@babel/core@^7.11.6", "@babel/core@^7.12.3":
-  version "7.19.6"
-  resolved "https://registry.yarnpkg.com/@babel/core/-/core-7.19.6.tgz#7122ae4f5c5a37c0946c066149abd8e75f81540f"
-  integrity sha512-D2Ue4KHpc6Ys2+AxpIx1BZ8+UegLLLE2p3KJEuJRKmokHOtl49jQ5ny1773KsGLZs8MQvBidAF6yWUJxRqtKtg==
-  dependencies:
-    "@ampproject/remapping" "^2.1.0"
-    "@babel/code-frame" "^7.18.6"
-    "@babel/generator" "^7.19.6"
-    "@babel/helper-compilation-targets" "^7.19.3"
-    "@babel/helper-module-transforms" "^7.19.6"
-    "@babel/helpers" "^7.19.4"
-    "@babel/parser" "^7.19.6"
-    "@babel/template" "^7.18.10"
-    "@babel/traverse" "^7.19.6"
-    "@babel/types" "^7.19.4"
-    convert-source-map "^1.7.0"
+  version "7.23.2"
+  resolved "https://registry.yarnpkg.com/@babel/core/-/core-7.23.2.tgz#ed10df0d580fff67c5f3ee70fd22e2e4c90a9f94"
+  integrity sha512-n7s51eWdaWZ3vGT2tD4T7J6eJs3QoBXydv7vkUM06Bf1cbVD2Kc2UrkzhiQwobfV7NwOnQXYL7UBJ5VPU+RGoQ==
+  dependencies:
+    "@ampproject/remapping" "^2.2.0"
+    "@babel/code-frame" "^7.22.13"
+    "@babel/generator" "^7.23.0"
+    "@babel/helper-compilation-targets" "^7.22.15"
+    "@babel/helper-module-transforms" "^7.23.0"
+    "@babel/helpers" "^7.23.2"
+    "@babel/parser" "^7.23.0"
+    "@babel/template" "^7.22.15"
+    "@babel/traverse" "^7.23.2"
+    "@babel/types" "^7.23.0"
+    convert-source-map "^2.0.0"
     debug "^4.1.0"
     gensync "^1.0.0-beta.2"
-    json5 "^2.2.1"
-    semver "^6.3.0"
+    json5 "^2.2.3"
+    semver "^6.3.1"
 
-"@babel/generator@^7.19.6", "@babel/generator@^7.20.1", "@babel/generator@^7.7.2":
-  version "7.20.1"
-  resolved "https://registry.yarnpkg.com/@babel/generator/-/generator-7.20.1.tgz#ef32ecd426222624cbd94871a7024639cf61a9fa"
-  integrity sha512-u1dMdBUmA7Z0rBB97xh8pIhviK7oItYOkjbsCxTWMknyvbQRBwX7/gn4JXurRdirWMFh+ZtYARqkA6ydogVZpg==
+"@babel/generator@^7.23.0", "@babel/generator@^7.7.2":
+  version "7.23.0"
+  resolved "https://registry.yarnpkg.com/@babel/generator/-/generator-7.23.0.tgz#df5c386e2218be505b34837acbcb874d7a983420"
+  integrity sha512-lN85QRR+5IbYrMWM6Y4pE/noaQtg4pNiqeNGX60eqOfo6gtEj6uw/JagelB8vVztSd7R6M5n1+PQkDbHbBRU4g==
   dependencies:
-    "@babel/types" "^7.20.0"
+    "@babel/types" "^7.23.0"
     "@jridgewell/gen-mapping" "^0.3.2"
+    "@jridgewell/trace-mapping" "^0.3.17"
     jsesc "^2.5.1"
 
-"@babel/helper-compilation-targets@^7.19.3":
-  version "7.20.0"
-  resolved "https://registry.yarnpkg.com/@babel/helper-compilation-targets/-/helper-compilation-targets-7.20.0.tgz#6bf5374d424e1b3922822f1d9bdaa43b1a139d0a"
-  integrity sha512-0jp//vDGp9e8hZzBc6N/KwA5ZK3Wsm/pfm4CrY7vzegkVxc65SgSn6wYOnwHe9Js9HRQ1YTCKLGPzDtaS3RoLQ==
+"@babel/helper-compilation-targets@^7.22.15":
+  version "7.22.15"
+  resolved "https://registry.yarnpkg.com/@babel/helper-compilation-targets/-/helper-compilation-targets-7.22.15.tgz#0698fc44551a26cf29f18d4662d5bf545a6cfc52"
+  integrity sha512-y6EEzULok0Qvz8yyLkCvVX+02ic+By2UdOhylwUOvOn9dvYc9mKICJuuU1n1XBI02YWsNsnrY1kc6DVbjcXbtw==
   dependencies:
-    "@babel/compat-data" "^7.20.0"
-    "@babel/helper-validator-option" "^7.18.6"
-    browserslist "^4.21.3"
-    semver "^6.3.0"
-
-"@babel/helper-environment-visitor@^7.18.9":
-  version "7.18.9"
-  resolved "https://registry.yarnpkg.com/@babel/helper-environment-visitor/-/helper-environment-visitor-7.18.9.tgz#0c0cee9b35d2ca190478756865bb3528422f51be"
-  integrity sha512-3r/aACDJ3fhQ/EVgFy0hpj8oHyHpQc+LPtJoY9SzTThAsStm4Ptegq92vqKoE3vD706ZVFWITnMnxucw+S9Ipg==
-
-"@babel/helper-function-name@^7.19.0":
-  version "7.19.0"
-  resolved "https://registry.yarnpkg.com/@babel/helper-function-name/-/helper-function-name-7.19.0.tgz#941574ed5390682e872e52d3f38ce9d1bef4648c"
-  integrity sha512-WAwHBINyrpqywkUH0nTnNgI5ina5TFn85HKS0pbPDfxFfhyR/aNQEn4hGi1P1JyT//I0t4OgXUlofzWILRvS5w==
-  dependencies:
-    "@babel/template" "^7.18.10"
-    "@babel/types" "^7.19.0"
-
-"@babel/helper-hoist-variables@^7.18.6":
-  version "7.18.6"
-  resolved "https://registry.yarnpkg.com/@babel/helper-hoist-variables/-/helper-hoist-variables-7.18.6.tgz#d4d2c8fb4baeaa5c68b99cc8245c56554f926678"
-  integrity sha512-UlJQPkFqFULIcyW5sbzgbkxn2FKRgwWiRexcuaR8RNJRy8+LLveqPjwZV/bwrLZCN0eUHD/x8D0heK1ozuoo6Q==
-  dependencies:
-    "@babel/types" "^7.18.6"
-
-"@babel/helper-module-imports@^7.18.6":
-  version "7.18.6"
-  resolved "https://registry.yarnpkg.com/@babel/helper-module-imports/-/helper-module-imports-7.18.6.tgz#1e3ebdbbd08aad1437b428c50204db13c5a3ca6e"
-  integrity sha512-0NFvs3VkuSYbFi1x2Vd6tKrywq+z/cLeYC/RJNFrIX/30Bf5aiGYbtvGXolEktzJH8o5E5KJ3tT+nkxuuZFVlA==
-  dependencies:
-    "@babel/types" "^7.18.6"
-
-"@babel/helper-module-transforms@^7.19.6":
-  version "7.19.6"
-  resolved "https://registry.yarnpkg.com/@babel/helper-module-transforms/-/helper-module-transforms-7.19.6.tgz#6c52cc3ac63b70952d33ee987cbee1c9368b533f"
-  integrity sha512-fCmcfQo/KYr/VXXDIyd3CBGZ6AFhPFy1TfSEJ+PilGVlQT6jcbqtHAM4C1EciRqMza7/TpOUZliuSH+U6HAhJw==
-  dependencies:
-    "@babel/helper-environment-visitor" "^7.18.9"
-    "@babel/helper-module-imports" "^7.18.6"
-    "@babel/helper-simple-access" "^7.19.4"
-    "@babel/helper-split-export-declaration" "^7.18.6"
-    "@babel/helper-validator-identifier" "^7.19.1"
-    "@babel/template" "^7.18.10"
-    "@babel/traverse" "^7.19.6"
-    "@babel/types" "^7.19.4"
-
-"@babel/helper-plugin-utils@^7.0.0", "@babel/helper-plugin-utils@^7.10.4", "@babel/helper-plugin-utils@^7.12.13", "@babel/helper-plugin-utils@^7.14.5", "@babel/helper-plugin-utils@^7.18.6", "@babel/helper-plugin-utils@^7.19.0", "@babel/helper-plugin-utils@^7.8.0":
-  version "7.19.0"
-  resolved "https://registry.yarnpkg.com/@babel/helper-plugin-utils/-/helper-plugin-utils-7.19.0.tgz#4796bb14961521f0f8715990bee2fb6e51ce21bf"
-  integrity sha512-40Ryx7I8mT+0gaNxm8JGTZFUITNqdLAgdg0hXzeVZxVD6nFsdhQvip6v8dqkRHzsz1VFpFAaOCHNn0vKBL7Czw==
-
-"@babel/helper-simple-access@^7.19.4":
-  version "7.19.4"
-  resolved "https://registry.yarnpkg.com/@babel/helper-simple-access/-/helper-simple-access-7.19.4.tgz#be553f4951ac6352df2567f7daa19a0ee15668e7"
-  integrity sha512-f9Xq6WqBFqaDfbCzn2w85hwklswz5qsKlh7f08w4Y9yhJHpnNC0QemtSkK5YyOY8kPGvyiwdzZksGUhnGdaUIg==
-  dependencies:
-    "@babel/types" "^7.19.4"
-
-"@babel/helper-split-export-declaration@^7.18.6":
-  version "7.18.6"
-  resolved "https://registry.yarnpkg.com/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.18.6.tgz#7367949bc75b20c6d5a5d4a97bba2824ae8ef075"
-  integrity sha512-bde1etTx6ZyTmobl9LLMMQsaizFVZrquTEHOqKeQESMKo4PlObf+8+JA25ZsIpZhT/WEd39+vOdLXAFG/nELpA==
-  dependencies:
-    "@babel/types" "^7.18.6"
-
-"@babel/helper-string-parser@^7.19.4":
-  version "7.19.4"
-  resolved "https://registry.yarnpkg.com/@babel/helper-string-parser/-/helper-string-parser-7.19.4.tgz#38d3acb654b4701a9b77fb0615a96f775c3a9e63"
-  integrity sha512-nHtDoQcuqFmwYNYPz3Rah5ph2p8PFeFCsZk9A/48dPc/rGocJ5J3hAAZ7pb76VWX3fZKu+uEr/FhH5jLx7umrw==
-
-"@babel/helper-validator-identifier@^7.18.6", "@babel/helper-validator-identifier@^7.19.1":
-  version "7.19.1"
-  resolved "https://registry.yarnpkg.com/@babel/helper-validator-identifier/-/helper-validator-identifier-7.19.1.tgz#7eea834cf32901ffdc1a7ee555e2f9c27e249ca2"
-  integrity sha512-awrNfaMtnHUr653GgGEs++LlAvW6w+DcPrOliSMXWCKo597CwL5Acf/wWdNkf/tfEQE3mjkeD1YOVZOUV/od1w==
-
-"@babel/helper-validator-option@^7.18.6":
-  version "7.18.6"
-  resolved "https://registry.yarnpkg.com/@babel/helper-validator-option/-/helper-validator-option-7.18.6.tgz#bf0d2b5a509b1f336099e4ff36e1a63aa5db4db8"
-  integrity sha512-XO7gESt5ouv/LRJdrVjkShckw6STTaB7l9BrpBaAHDeF5YZT+01PCwmR0SJHnkW6i8OwW/EVWRShfi4j2x+KQw==
-
-"@babel/helpers@^7.19.4":
-  version "7.20.1"
-  resolved "https://registry.yarnpkg.com/@babel/helpers/-/helpers-7.20.1.tgz#2ab7a0fcb0a03b5bf76629196ed63c2d7311f4c9"
-  integrity sha512-J77mUVaDTUJFZ5BpP6mMn6OIl3rEWymk2ZxDBQJUG3P+PbmyMcF3bYWvz0ma69Af1oobDqT/iAsvzhB58xhQUg==
-  dependencies:
-    "@babel/template" "^7.18.10"
-    "@babel/traverse" "^7.20.1"
-    "@babel/types" "^7.20.0"
-
-"@babel/highlight@^7.10.4", "@babel/highlight@^7.18.6":
-  version "7.18.6"
-  resolved "https://registry.yarnpkg.com/@babel/highlight/-/highlight-7.18.6.tgz#81158601e93e2563795adcbfbdf5d64be3f2ecdf"
-  integrity sha512-u7stbOuYjaPezCuLj29hNW1v64M2Md2qupEKP1fHc7WdOA3DgLh37suiSrZYY7haUB7iBeQZ9P1uiRF359do3g==
-  dependencies:
-    "@babel/helper-validator-identifier" "^7.18.6"
-    chalk "^2.0.0"
+    "@babel/compat-data" "^7.22.9"
+    "@babel/helper-validator-option" "^7.22.15"
+    browserslist "^4.21.9"
+    lru-cache "^5.1.1"
+    semver "^6.3.1"
+
+"@babel/helper-environment-visitor@^7.22.20":
+  version "7.22.20"
+  resolved "https://registry.yarnpkg.com/@babel/helper-environment-visitor/-/helper-environment-visitor-7.22.20.tgz#96159db61d34a29dba454c959f5ae4a649ba9167"
+  integrity sha512-zfedSIzFhat/gFhWfHtgWvlec0nqB9YEIVrpuwjruLlXfUSnA8cJB0miHKwqDnQ7d32aKo2xt88/xZptwxbfhA==
+
+"@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"
+  integrity sha512-OErEqsrxjZTJciZ4Oo+eoZqeW9UIiOcuYKRJA4ZAgV9myA+pOXhhmpfNCKjEH/auVfEYVFJ6y1Tc4r0eIApqiw==
+  dependencies:
+    "@babel/template" "^7.22.15"
+    "@babel/types" "^7.23.0"
+
+"@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"
+  integrity sha512-wGjk9QZVzvknA6yKIUURb8zY3grXCcOZt+/7Wcy8O2uctxhplmUPkOdlgoNhmdVee2c92JXbf1xpMtVNbfoxRw==
+  dependencies:
+    "@babel/types" "^7.22.5"
+
+"@babel/helper-module-imports@^7.22.15":
+  version "7.22.15"
+  resolved "https://registry.yarnpkg.com/@babel/helper-module-imports/-/helper-module-imports-7.22.15.tgz#16146307acdc40cc00c3b2c647713076464bdbf0"
+  integrity sha512-0pYVBnDKZO2fnSPCrgM/6WMc7eS20Fbok+0r88fp+YtWVLZrp4CkafFGIp+W0VKw4a22sgebPT99y+FDNMdP4w==
+  dependencies:
+    "@babel/types" "^7.22.15"
+
+"@babel/helper-module-transforms@^7.23.0":
+  version "7.23.0"
+  resolved "https://registry.yarnpkg.com/@babel/helper-module-transforms/-/helper-module-transforms-7.23.0.tgz#3ec246457f6c842c0aee62a01f60739906f7047e"
+  integrity sha512-WhDWw1tdrlT0gMgUJSlX0IQvoO1eN279zrAUbVB+KpV2c3Tylz8+GnKOLllCS6Z/iZQEyVYxhZVUdPTqs2YYPw==
+  dependencies:
+    "@babel/helper-environment-visitor" "^7.22.20"
+    "@babel/helper-module-imports" "^7.22.15"
+    "@babel/helper-simple-access" "^7.22.5"
+    "@babel/helper-split-export-declaration" "^7.22.6"
+    "@babel/helper-validator-identifier" "^7.22.20"
+
+"@babel/helper-plugin-utils@^7.0.0", "@babel/helper-plugin-utils@^7.10.4", "@babel/helper-plugin-utils@^7.12.13", "@babel/helper-plugin-utils@^7.14.5", "@babel/helper-plugin-utils@^7.22.5", "@babel/helper-plugin-utils@^7.8.0":
+  version "7.22.5"
+  resolved "https://registry.yarnpkg.com/@babel/helper-plugin-utils/-/helper-plugin-utils-7.22.5.tgz#dd7ee3735e8a313b9f7b05a773d892e88e6d7295"
+  integrity sha512-uLls06UVKgFG9QD4OeFYLEGteMIAa5kpTPcFL28yuCIIzsf6ZyKZMllKVOCZFhiZ5ptnwX4mtKdWCBE/uT4amg==
+
+"@babel/helper-simple-access@^7.22.5":
+  version "7.22.5"
+  resolved "https://registry.yarnpkg.com/@babel/helper-simple-access/-/helper-simple-access-7.22.5.tgz#4938357dc7d782b80ed6dbb03a0fba3d22b1d5de"
+  integrity sha512-n0H99E/K+Bika3++WNL17POvo4rKWZ7lZEp1Q+fStVbUi8nxPQEBOlTmCOxW/0JsS56SKKQ+ojAe2pHKJHN35w==
+  dependencies:
+    "@babel/types" "^7.22.5"
+
+"@babel/helper-split-export-declaration@^7.22.6":
+  version "7.22.6"
+  resolved "https://registry.yarnpkg.com/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.22.6.tgz#322c61b7310c0997fe4c323955667f18fcefb91c"
+  integrity sha512-AsUnxuLhRYsisFiaJwvp1QF+I3KjD5FOxut14q/GzovUe6orHLesW2C7d754kRm53h5gqrz6sFl6sxc4BVtE/g==
+  dependencies:
+    "@babel/types" "^7.22.5"
+
+"@babel/helper-string-parser@^7.22.5":
+  version "7.22.5"
+  resolved "https://registry.yarnpkg.com/@babel/helper-string-parser/-/helper-string-parser-7.22.5.tgz#533f36457a25814cf1df6488523ad547d784a99f"
+  integrity sha512-mM4COjgZox8U+JcXQwPijIZLElkgEpO5rsERVDJTc2qfCDfERyob6k5WegS14SX18IIjv+XD+GrqNumY5JRCDw==
+
+"@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-option@^7.22.15":
+  version "7.22.15"
+  resolved "https://registry.yarnpkg.com/@babel/helper-validator-option/-/helper-validator-option-7.22.15.tgz#694c30dfa1d09a6534cdfcafbe56789d36aba040"
+  integrity sha512-bMn7RmyFjY/mdECUbgn9eoSY4vqvacUnS9i9vGAGttgFWesO6B4CYWA7XlpbWgBt71iv/hfbPlynohStqnu5hA==
+
+"@babel/helpers@^7.23.2":
+  version "7.23.2"
+  resolved "https://registry.yarnpkg.com/@babel/helpers/-/helpers-7.23.2.tgz#2832549a6e37d484286e15ba36a5330483cac767"
+  integrity sha512-lzchcp8SjTSVe/fPmLwtWVBFC7+Tbn8LGHDVfDp9JGxpAY5opSaEFgt8UQvrnECWOTdji2mOWMz1rOhkHscmGQ==
+  dependencies:
+    "@babel/template" "^7.22.15"
+    "@babel/traverse" "^7.23.2"
+    "@babel/types" "^7.23.0"
+
+"@babel/highlight@^7.10.4", "@babel/highlight@^7.22.13":
+  version "7.22.20"
+  resolved "https://registry.yarnpkg.com/@babel/highlight/-/highlight-7.22.20.tgz#4ca92b71d80554b01427815e06f2df965b9c1f54"
+  integrity sha512-dkdMCN3py0+ksCgYmGG8jKeGA/8Tk+gJwSYYlFGxG5lmhfKNoAy004YpLxpS1W2J8m/EK2Ew+yOs9pVRwO89mg==
+  dependencies:
+    "@babel/helper-validator-identifier" "^7.22.20"
+    chalk "^2.4.2"
     js-tokens "^4.0.0"
 
-"@babel/parser@^7.1.0", "@babel/parser@^7.14.7", "@babel/parser@^7.18.10", "@babel/parser@^7.19.6", "@babel/parser@^7.20.1", "@babel/parser@^7.7.0":
-  version "7.20.1"
-  resolved "https://registry.yarnpkg.com/@babel/parser/-/parser-7.20.1.tgz#3e045a92f7b4623cafc2425eddcb8cf2e54f9cc5"
-  integrity sha512-hp0AYxaZJhxULfM1zyp7Wgr+pSUKBcP3M+PHnSzWGdXOzg/kHWIgiUWARvubhUKGOEw3xqY4x+lyZ9ytBVcELw==
+"@babel/parser@^7.1.0", "@babel/parser@^7.14.7", "@babel/parser@^7.20.7", "@babel/parser@^7.22.15", "@babel/parser@^7.23.0", "@babel/parser@^7.7.0":
+  version "7.23.0"
+  resolved "https://registry.yarnpkg.com/@babel/parser/-/parser-7.23.0.tgz#da950e622420bf96ca0d0f2909cdddac3acd8719"
+  integrity sha512-vvPKKdMemU85V9WE/l5wZEmImpCtLqbnTvqDS2U1fJ96KrxoW7KrXhNsNCblQlg8Ck4b85yxdTyelsMUgFUXiw==
 
 "@babel/plugin-syntax-async-generators@^7.8.4":
   version "7.8.4"
@@ -203,11 +208,11 @@
     "@babel/helper-plugin-utils" "^7.8.0"
 
 "@babel/plugin-syntax-jsx@^7.7.2":
-  version "7.18.6"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-jsx/-/plugin-syntax-jsx-7.18.6.tgz#a8feef63b010150abd97f1649ec296e849943ca0"
-  integrity sha512-6mmljtAedFGTWu2p/8WIORGwy+61PLgOMPOdazc7YoJ9ZCWUyFy3A6CpPkRKLKD1ToAesxX8KGEViAiLo9N+7Q==
+  version "7.22.5"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-jsx/-/plugin-syntax-jsx-7.22.5.tgz#a6b68e84fb76e759fc3b93e901876ffabbe1d918"
+  integrity sha512-gvyP4hZrgrs/wWMaocvxZ44Hw0b3W8Pe+cMxc8V1ULQ07oh8VNbIRaoD1LRZVTvD+0nieDKjfgKg89sD7rrKrg==
   dependencies:
-    "@babel/helper-plugin-utils" "^7.18.6"
+    "@babel/helper-plugin-utils" "^7.22.5"
 
 "@babel/plugin-syntax-logical-assignment-operators@^7.8.3":
   version "7.10.4"
@@ -259,44 +264,44 @@
     "@babel/helper-plugin-utils" "^7.14.5"
 
 "@babel/plugin-syntax-typescript@^7.7.2":
-  version "7.20.0"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-typescript/-/plugin-syntax-typescript-7.20.0.tgz#4e9a0cfc769c85689b77a2e642d24e9f697fc8c7"
-  integrity sha512-rd9TkG+u1CExzS4SM1BlMEhMXwFLKVjOAFFCDx9PbX5ycJWDoWMcwdJH9RhkPu1dOgn5TrxLot/Gx6lWFuAUNQ==
-  dependencies:
-    "@babel/helper-plugin-utils" "^7.19.0"
-
-"@babel/template@^7.18.10", "@babel/template@^7.3.3":
-  version "7.18.10"
-  resolved "https://registry.yarnpkg.com/@babel/template/-/template-7.18.10.tgz#6f9134835970d1dbf0835c0d100c9f38de0c5e71"
-  integrity sha512-TI+rCtooWHr3QJ27kJxfjutghu44DLnasDMwpDqCXVTal9RLp3RSYNh4NdBrRP2cQAoG9A8juOQl6P6oZG4JxA==
-  dependencies:
-    "@babel/code-frame" "^7.18.6"
-    "@babel/parser" "^7.18.10"
-    "@babel/types" "^7.18.10"
-
-"@babel/traverse@^7.19.6", "@babel/traverse@^7.20.1", "@babel/traverse@^7.7.0", "@babel/traverse@^7.7.2":
-  version "7.20.1"
-  resolved "https://registry.yarnpkg.com/@babel/traverse/-/traverse-7.20.1.tgz#9b15ccbf882f6d107eeeecf263fbcdd208777ec8"
-  integrity sha512-d3tN8fkVJwFLkHkBN479SOsw4DMZnz8cdbL/gvuDuzy3TS6Nfw80HuQqhw1pITbIruHyh7d1fMA47kWzmcUEGA==
-  dependencies:
-    "@babel/code-frame" "^7.18.6"
-    "@babel/generator" "^7.20.1"
-    "@babel/helper-environment-visitor" "^7.18.9"
-    "@babel/helper-function-name" "^7.19.0"
-    "@babel/helper-hoist-variables" "^7.18.6"
-    "@babel/helper-split-export-declaration" "^7.18.6"
-    "@babel/parser" "^7.20.1"
-    "@babel/types" "^7.20.0"
+  version "7.22.5"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-typescript/-/plugin-syntax-typescript-7.22.5.tgz#aac8d383b062c5072c647a31ef990c1d0af90272"
+  integrity sha512-1mS2o03i7t1c6VzH6fdQ3OA8tcEIxwG18zIPRp+UY1Ihv6W+XZzBCVxExF9upussPXJ0xE9XRHwMoNs1ep/nRQ==
+  dependencies:
+    "@babel/helper-plugin-utils" "^7.22.5"
+
+"@babel/template@^7.22.15", "@babel/template@^7.3.3":
+  version "7.22.15"
+  resolved "https://registry.yarnpkg.com/@babel/template/-/template-7.22.15.tgz#09576efc3830f0430f4548ef971dde1350ef2f38"
+  integrity sha512-QPErUVm4uyJa60rkI73qneDacvdvzxshT3kksGqlGWYdOTIUOwJ7RDUL8sGqslY1uXWSL6xMFKEXDS3ox2uF0w==
+  dependencies:
+    "@babel/code-frame" "^7.22.13"
+    "@babel/parser" "^7.22.15"
+    "@babel/types" "^7.22.15"
+
+"@babel/traverse@^7.23.2", "@babel/traverse@^7.7.0":
+  version "7.23.2"
+  resolved "https://registry.yarnpkg.com/@babel/traverse/-/traverse-7.23.2.tgz#329c7a06735e144a506bdb2cad0268b7f46f4ad8"
+  integrity sha512-azpe59SQ48qG6nu2CzcMLbxUudtN+dOM9kDbUqGq3HXUJRlo7i8fvPoxQUzYgLZ4cMVmuZgm8vvBpNeRhd6XSw==
+  dependencies:
+    "@babel/code-frame" "^7.22.13"
+    "@babel/generator" "^7.23.0"
+    "@babel/helper-environment-visitor" "^7.22.20"
+    "@babel/helper-function-name" "^7.23.0"
+    "@babel/helper-hoist-variables" "^7.22.5"
+    "@babel/helper-split-export-declaration" "^7.22.6"
+    "@babel/parser" "^7.23.0"
+    "@babel/types" "^7.23.0"
     debug "^4.1.0"
     globals "^11.1.0"
 
-"@babel/types@^7.0.0", "@babel/types@^7.18.10", "@babel/types@^7.18.6", "@babel/types@^7.19.0", "@babel/types@^7.19.4", "@babel/types@^7.20.0", "@babel/types@^7.3.0", "@babel/types@^7.3.3", "@babel/types@^7.7.0":
-  version "7.20.0"
-  resolved "https://registry.yarnpkg.com/@babel/types/-/types-7.20.0.tgz#52c94cf8a7e24e89d2a194c25c35b17a64871479"
-  integrity sha512-Jlgt3H0TajCW164wkTOTzHkZb075tMQMULzrLUoUeKmO7eFL96GgDxf7/Axhc5CAuKE3KFyVW1p6ysKsi2oXAg==
+"@babel/types@^7.0.0", "@babel/types@^7.20.7", "@babel/types@^7.22.15", "@babel/types@^7.22.5", "@babel/types@^7.23.0", "@babel/types@^7.3.3", "@babel/types@^7.7.0":
+  version "7.23.0"
+  resolved "https://registry.yarnpkg.com/@babel/types/-/types-7.23.0.tgz#8c1f020c9df0e737e4e247c0619f58c68458aaeb"
+  integrity sha512-0oIyUfKoI3mSqMvsxBdclDwxXKXAUA8v/apZbc+iSyARYou1o8ZGDxbUYyLFoW2arqS2jDGqJuZvv1d/io1axg==
   dependencies:
-    "@babel/helper-string-parser" "^7.19.4"
-    "@babel/helper-validator-identifier" "^7.19.1"
+    "@babel/helper-string-parser" "^7.22.5"
+    "@babel/helper-validator-identifier" "^7.22.20"
     to-fast-properties "^2.0.0"
 
 "@balena/dockerignore@^1.0.2":
@@ -309,6 +314,55 @@
   resolved "https://registry.yarnpkg.com/@bcoe/v8-coverage/-/v8-coverage-0.2.3.tgz#75a2e8b51cb758a7553d6804a5932d7aace75c39"
   integrity sha512-0hYQ8SB4Db5zvZB4axdMHGwEaQjkZzFjQiN9LVYvIFB2nSUHW9tYpxWriPrWDASIxiaXax83REcLxuSdnGPZtw==
 
+"@blakek/curry@^2.0.2":
+  version "2.0.2"
+  resolved "https://registry.yarnpkg.com/@blakek/curry/-/curry-2.0.2.tgz#979e927bcf5fa0426d2af681d7131df5791d1cd4"
+  integrity sha512-B/KkDnZqm9Y92LwETU80BaxbQ61bYTR2GaAY41mKisaICwBoC8lcuw7lwQLl52InMhviCTJBO39GJOA8d+BrVw==
+
+"@blakek/deep@^2.2.0":
+  version "2.2.0"
+  resolved "https://registry.yarnpkg.com/@blakek/deep/-/deep-2.2.0.tgz#eb97488e4a0943df4da09ad50efba4a98789f5e5"
+  integrity sha512-aRq/qF1yrlhCWNk2tI4epXNpo+cA8/MrxsR5oIkpKKNYtYOQKjAxRMbgnhASPx+b328MkDN+T706yFKJg8VZkQ==
+  dependencies:
+    "@blakek/curry" "^2.0.2"
+    pathington "^1.1.7"
+
+"@chainsafe/as-sha256@^0.3.1":
+  version "0.3.1"
+  resolved "https://registry.yarnpkg.com/@chainsafe/as-sha256/-/as-sha256-0.3.1.tgz#3639df0e1435cab03f4d9870cc3ac079e57a6fc9"
+  integrity sha512-hldFFYuf49ed7DAakWVXSJODuq3pzJEguD8tQ7h+sGkM18vja+OFoJI9krnGmgzyuZC2ETX0NOIcCTy31v2Mtg==
+
+"@chainsafe/persistent-merkle-tree@^0.4.2":
+  version "0.4.2"
+  resolved "https://registry.yarnpkg.com/@chainsafe/persistent-merkle-tree/-/persistent-merkle-tree-0.4.2.tgz#4c9ee80cc57cd3be7208d98c40014ad38f36f7ff"
+  integrity sha512-lLO3ihKPngXLTus/L7WHKaw9PnNJWizlOF1H9NNzHP6Xvh82vzg9F2bzkXhYIFshMZ2gTCEz8tq6STe7r5NDfQ==
+  dependencies:
+    "@chainsafe/as-sha256" "^0.3.1"
+
+"@chainsafe/persistent-merkle-tree@^0.5.0":
+  version "0.5.0"
+  resolved "https://registry.yarnpkg.com/@chainsafe/persistent-merkle-tree/-/persistent-merkle-tree-0.5.0.tgz#2b4a62c9489a5739dedd197250d8d2f5427e9f63"
+  integrity sha512-l0V1b5clxA3iwQLXP40zYjyZYospQLZXzBVIhhr9kDg/1qHZfzzHw0jj4VPBijfYCArZDlPkRi1wZaV2POKeuw==
+  dependencies:
+    "@chainsafe/as-sha256" "^0.3.1"
+
+"@chainsafe/ssz@^0.10.0":
+  version "0.10.2"
+  resolved "https://registry.yarnpkg.com/@chainsafe/ssz/-/ssz-0.10.2.tgz#c782929e1bb25fec66ba72e75934b31fd087579e"
+  integrity sha512-/NL3Lh8K+0q7A3LsiFq09YXS9fPE+ead2rr7vM2QK8PLzrNsw3uqrif9bpRX5UxgeRjM+vYi+boCM3+GM4ovXg==
+  dependencies:
+    "@chainsafe/as-sha256" "^0.3.1"
+    "@chainsafe/persistent-merkle-tree" "^0.5.0"
+
+"@chainsafe/ssz@^0.9.2":
+  version "0.9.4"
+  resolved "https://registry.yarnpkg.com/@chainsafe/ssz/-/ssz-0.9.4.tgz#696a8db46d6975b600f8309ad3a12f7c0e310497"
+  integrity sha512-77Qtg2N1ayqs4Bg/wvnWfg5Bta7iy7IRh8XqXh7oNMeP2HBbBwx8m6yTpA8p0EHItWPEBkgZd5S5/LSlp3GXuQ==
+  dependencies:
+    "@chainsafe/as-sha256" "^0.3.1"
+    "@chainsafe/persistent-merkle-tree" "^0.4.2"
+    case "^1.6.3"
+
 "@colors/colors@1.5.0":
   version "1.5.0"
   resolved "https://registry.yarnpkg.com/@colors/colors/-/colors-1.5.0.tgz#bb504579c1cae923e6576a4f5da43d25f97bdbd9"
@@ -337,6 +391,18 @@
   resolved "https://registry.yarnpkg.com/@ensdomains/resolver/-/resolver-0.2.4.tgz#c10fe28bf5efbf49bff4666d909aed0265efbc89"
   integrity sha512-bvaTH34PMCbv6anRa9I/0zjLJgY4EuznbEMgbV77JBCQ9KNC46rzi0avuxpOfu+xDjPEtSFGqVEOr5GlUSGudA==
 
+"@eslint-community/eslint-utils@^4.2.0", "@eslint-community/eslint-utils@^4.4.0":
+  version "4.4.0"
+  resolved "https://registry.yarnpkg.com/@eslint-community/eslint-utils/-/eslint-utils-4.4.0.tgz#a23514e8fb9af1269d5f7788aa556798d61c6b59"
+  integrity sha512-1/sA4dwrzBAyeUoQ6oxahHKmrZvsnLCg4RfxW3ZFGGmQkSNQPFNLV9CUEFQP1x9EYXHTo5p6xdhZM1Ne9p/AfA==
+  dependencies:
+    eslint-visitor-keys "^3.3.0"
+
+"@eslint-community/regexpp@^4.5.1", "@eslint-community/regexpp@^4.6.1":
+  version "4.10.0"
+  resolved "https://registry.yarnpkg.com/@eslint-community/regexpp/-/regexpp-4.10.0.tgz#548f6de556857c8bb73bbee70c35dc82a2e74d63"
+  integrity sha512-Cu96Sd2By9mCNTx2iyKOmq10v22jUVQv0lQnlGNy16oE9589yE+QADPbrMGCkA51cKZSg3Pu/aTJVTGfL/qjUA==
+
 "@eslint/eslintrc@^0.4.3":
   version "0.4.3"
   resolved "https://registry.yarnpkg.com/@eslint/eslintrc/-/eslintrc-0.4.3.tgz#9e42981ef035beb3dd49add17acb96e8ff6f394c"
@@ -352,6 +418,26 @@
     minimatch "^3.0.4"
     strip-json-comments "^3.1.1"
 
+"@eslint/eslintrc@^2.1.2":
+  version "2.1.2"
+  resolved "https://registry.yarnpkg.com/@eslint/eslintrc/-/eslintrc-2.1.2.tgz#c6936b4b328c64496692f76944e755738be62396"
+  integrity sha512-+wvgpDsrB1YqAMdEUCcnTlpfVBH7Vqn6A/NT3D8WVXFIaKMlErPIZT3oCIAVCOtarRpMtelZLqJeU3t7WY6X6g==
+  dependencies:
+    ajv "^6.12.4"
+    debug "^4.3.2"
+    espree "^9.6.0"
+    globals "^13.19.0"
+    ignore "^5.2.0"
+    import-fresh "^3.2.1"
+    js-yaml "^4.1.0"
+    minimatch "^3.1.2"
+    strip-json-comments "^3.1.1"
+
+"@eslint/js@8.52.0":
+  version "8.52.0"
+  resolved "https://registry.yarnpkg.com/@eslint/js/-/js-8.52.0.tgz#78fe5f117840f69dc4a353adf9b9cd926353378c"
+  integrity sha512-mjZVbpaeMZludF2fsWLD0Z9gCref1Tk4i9+wddjRvpUNqqcndPkBD09N/Mapey0b3jaXbLm2kICwFv2E64QinA==
+
 "@ethereum-waffle/chai@^3.4.4":
   version "3.4.4"
   resolved "https://registry.yarnpkg.com/@ethereum-waffle/chai/-/chai-3.4.4.tgz#16c4cc877df31b035d6d92486dfdf983df9138ff"
@@ -405,6 +491,20 @@
     patch-package "^6.2.2"
     postinstall-postinstall "^2.1.0"
 
+"@ethereumjs/rlp@^4.0.1":
+  version "4.0.1"
+  resolved "https://registry.yarnpkg.com/@ethereumjs/rlp/-/rlp-4.0.1.tgz#626fabfd9081baab3d0a3074b0c7ecaf674aaa41"
+  integrity sha512-tqsQiBQDQdmPWE1xkkBq4rlSW5QZpLOUJ5RJh2/9fug+q9tnUhuZoVLk7s0scUIKTOzEtR72DFBXI4WiZcMpvw==
+
+"@ethereumjs/util@^8.1.0":
+  version "8.1.0"
+  resolved "https://registry.yarnpkg.com/@ethereumjs/util/-/util-8.1.0.tgz#299df97fb6b034e0577ce9f94c7d9d1004409ed4"
+  integrity sha512-zQ0IqbdX8FZ9aw11vP+dZkKDkS+kgIvQPHnSAXzP9pLu+Rfu3D3XEeLbicvoXJTYnhZiPmsZUxgdzXwNKxRPbA==
+  dependencies:
+    "@ethereumjs/rlp" "^4.0.1"
+    ethereum-cryptography "^2.0.0"
+    micro-ftch "^0.3.1"
+
 "@ethersproject/abi@5.0.0-beta.153":
   version "5.0.0-beta.153"
   resolved "https://registry.yarnpkg.com/@ethersproject/abi/-/abi-5.0.0-beta.153.tgz#43a37172b33794e4562999f6e2d555b7599a8eee"
@@ -435,7 +535,7 @@
     "@ethersproject/properties" "^5.5.0"
     "@ethersproject/strings" "^5.5.0"
 
-"@ethersproject/abi@5.7.0", "@ethersproject/abi@^5.0.0-beta.146", "@ethersproject/abi@^5.0.9", "@ethersproject/abi@^5.1.2", "@ethersproject/abi@^5.5.0", "@ethersproject/abi@^5.7.0":
+"@ethersproject/abi@5.7.0", "@ethersproject/abi@^5.0.9", "@ethersproject/abi@^5.1.2", "@ethersproject/abi@^5.5.0", "@ethersproject/abi@^5.7.0":
   version "5.7.0"
   resolved "https://registry.yarnpkg.com/@ethersproject/abi/-/abi-5.7.0.tgz#b3f3e045bbbeed1af3947335c247ad625a44e449"
   integrity sha512-351ktp42TiRcYB3H1OP8yajPeAQstMW/yCFokj/AthP9bLHzQFPlOrxOcwYEDkUAICmOHljvN4K39OMTMUa9RA==
@@ -826,7 +926,7 @@
     bech32 "1.1.4"
     ws "7.4.6"
 
-"@ethersproject/providers@5.7.2":
+"@ethersproject/providers@5.7.2", "@ethersproject/providers@^5.7.1", "@ethersproject/providers@^5.7.2":
   version "5.7.2"
   resolved "https://registry.yarnpkg.com/@ethersproject/providers/-/providers-5.7.2.tgz#f8b1a4f275d7ce58cf0a2eec222269a08beb18cb"
   integrity sha512-g34EWZ1WWAVgr4aptGlVBF8mhl3VWjv+8hoAnzStu8Ah22VHBsuGzP17eb6xDVRzw895G4W7vvx60lFFur/1Rg==
@@ -1102,6 +1202,20 @@
     "@ethersproject/properties" "^5.7.0"
     "@ethersproject/strings" "^5.7.0"
 
+"@fastify/busboy@^2.0.0":
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/@fastify/busboy/-/busboy-2.0.0.tgz#f22824caff3ae506b18207bad4126dbc6ccdb6b8"
+  integrity sha512-JUFJad5lv7jxj926GPgymrWQxxjPYuJNiNjNMzqT+HiuP6Vl3dk5xzG+8sTX96np0ZAluvaMzPsjhHZ5rNuNQQ==
+
+"@humanwhocodes/config-array@^0.11.13":
+  version "0.11.13"
+  resolved "https://registry.yarnpkg.com/@humanwhocodes/config-array/-/config-array-0.11.13.tgz#075dc9684f40a531d9b26b0822153c1e832ee297"
+  integrity sha512-JSBDMiDKSzQVngfRjOdFXgFfklaXI4K9nLF49Auh21lmBWRLIK3+xTErTWD4KU54pb6coM6ESE7Awz/FNU3zgQ==
+  dependencies:
+    "@humanwhocodes/object-schema" "^2.0.1"
+    debug "^4.1.1"
+    minimatch "^3.0.5"
+
 "@humanwhocodes/config-array@^0.5.0":
   version "0.5.0"
   resolved "https://registry.yarnpkg.com/@humanwhocodes/config-array/-/config-array-0.5.0.tgz#1407967d4c6eecd7388f83acf1eaf4d0c6e58ef9"
@@ -1111,11 +1225,21 @@
     debug "^4.1.1"
     minimatch "^3.0.4"
 
+"@humanwhocodes/module-importer@^1.0.1":
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/@humanwhocodes/module-importer/-/module-importer-1.0.1.tgz#af5b2691a22b44be847b0ca81641c5fb6ad0172c"
+  integrity sha512-bxveV4V8v5Yb4ncFTT3rPSgZBOpCkjfK0y4oVVVJwIuDVBRMDXrPyXRL988i5ap9m9bnyEEjWfm5WkBmtffLfA==
+
 "@humanwhocodes/object-schema@^1.2.0":
   version "1.2.1"
   resolved "https://registry.yarnpkg.com/@humanwhocodes/object-schema/-/object-schema-1.2.1.tgz#b520529ec21d8e5945a1851dfd1c32e94e39ff45"
   integrity sha512-ZnQMnLV4e7hDlUvw8H+U8ASL02SS2Gn6+9Ac3wGGLIe7+je2AeAOxPY+izIPJDfFDb7eDjev0Us8MO1iFRN8hA==
 
+"@humanwhocodes/object-schema@^2.0.1":
+  version "2.0.1"
+  resolved "https://registry.yarnpkg.com/@humanwhocodes/object-schema/-/object-schema-2.0.1.tgz#e5211452df060fa8522b55c7b3c0c4d1981cb044"
+  integrity sha512-dvuCeX5fC9dXgJn9t+X5atfmgQAzUOWqS1254Gh0m6i8wKd10ebXkfNKiRK+1GWi/yTvvLDHpoxLr0xxxeslWw==
+
 "@iarna/toml@^2.2.5":
   version "2.2.5"
   resolved "https://registry.yarnpkg.com/@iarna/toml/-/toml-2.2.5.tgz#b32366c89b43c6f8cefbdefac778b9c828e3ba8c"
@@ -1137,110 +1261,110 @@
   resolved "https://registry.yarnpkg.com/@istanbuljs/schema/-/schema-0.1.3.tgz#e45e384e4b8ec16bce2fd903af78450f6bf7ec98"
   integrity sha512-ZXRY4jNvVgSVQ8DL3LTcakaAtXwTVUxE81hslsyD2AtoXW/wVob10HkOJ1X/pAlcI7D+2YoZKg5do8G/w6RYgA==
 
-"@jest/console@^29.2.1":
-  version "29.2.1"
-  resolved "https://registry.yarnpkg.com/@jest/console/-/console-29.2.1.tgz#5f2c62dcdd5ce66e94b6d6729e021758bceea090"
-  integrity sha512-MF8Adcw+WPLZGBiNxn76DOuczG3BhODTcMlDCA4+cFi41OkaY/lyI0XUUhi73F88Y+7IHoGmD80pN5CtxQUdSw==
+"@jest/console@^29.7.0":
+  version "29.7.0"
+  resolved "https://registry.yarnpkg.com/@jest/console/-/console-29.7.0.tgz#cd4822dbdb84529265c5a2bdb529a3c9cc950ffc"
+  integrity sha512-5Ni4CU7XHQi32IJ398EEP4RrB8eV09sXP2ROqD4bksHrnTree52PsxvX8tpL8LvTZ3pFzXyPbNQReSN41CAhOg==
   dependencies:
-    "@jest/types" "^29.2.1"
+    "@jest/types" "^29.6.3"
     "@types/node" "*"
     chalk "^4.0.0"
-    jest-message-util "^29.2.1"
-    jest-util "^29.2.1"
+    jest-message-util "^29.7.0"
+    jest-util "^29.7.0"
     slash "^3.0.0"
 
-"@jest/core@^29.2.2":
-  version "29.2.2"
-  resolved "https://registry.yarnpkg.com/@jest/core/-/core-29.2.2.tgz#207aa8973d9de8769f9518732bc5f781efc3ffa7"
-  integrity sha512-susVl8o2KYLcZhhkvSB+b7xX575CX3TmSvxfeDjpRko7KmT89rHkXj6XkDkNpSeFMBzIENw5qIchO9HC9Sem+A==
+"@jest/core@^29.7.0":
+  version "29.7.0"
+  resolved "https://registry.yarnpkg.com/@jest/core/-/core-29.7.0.tgz#b6cccc239f30ff36609658c5a5e2291757ce448f"
+  integrity sha512-n7aeXWKMnGtDA48y8TLWJPJmLmmZ642Ceo78cYWEpiD7FzDgmNDV/GCVRorPABdXLJZ/9wzzgZAlHjXjxDHGsg==
   dependencies:
-    "@jest/console" "^29.2.1"
-    "@jest/reporters" "^29.2.2"
-    "@jest/test-result" "^29.2.1"
-    "@jest/transform" "^29.2.2"
-    "@jest/types" "^29.2.1"
+    "@jest/console" "^29.7.0"
+    "@jest/reporters" "^29.7.0"
+    "@jest/test-result" "^29.7.0"
+    "@jest/transform" "^29.7.0"
+    "@jest/types" "^29.6.3"
     "@types/node" "*"
     ansi-escapes "^4.2.1"
     chalk "^4.0.0"
     ci-info "^3.2.0"
     exit "^0.1.2"
     graceful-fs "^4.2.9"
-    jest-changed-files "^29.2.0"
-    jest-config "^29.2.2"
-    jest-haste-map "^29.2.1"
-    jest-message-util "^29.2.1"
-    jest-regex-util "^29.2.0"
-    jest-resolve "^29.2.2"
-    jest-resolve-dependencies "^29.2.2"
-    jest-runner "^29.2.2"
-    jest-runtime "^29.2.2"
-    jest-snapshot "^29.2.2"
-    jest-util "^29.2.1"
-    jest-validate "^29.2.2"
-    jest-watcher "^29.2.2"
+    jest-changed-files "^29.7.0"
+    jest-config "^29.7.0"
+    jest-haste-map "^29.7.0"
+    jest-message-util "^29.7.0"
+    jest-regex-util "^29.6.3"
+    jest-resolve "^29.7.0"
+    jest-resolve-dependencies "^29.7.0"
+    jest-runner "^29.7.0"
+    jest-runtime "^29.7.0"
+    jest-snapshot "^29.7.0"
+    jest-util "^29.7.0"
+    jest-validate "^29.7.0"
+    jest-watcher "^29.7.0"
     micromatch "^4.0.4"
-    pretty-format "^29.2.1"
+    pretty-format "^29.7.0"
     slash "^3.0.0"
     strip-ansi "^6.0.0"
 
-"@jest/environment@^29.2.2":
-  version "29.2.2"
-  resolved "https://registry.yarnpkg.com/@jest/environment/-/environment-29.2.2.tgz#481e729048d42e87d04842c38aa4d09c507f53b0"
-  integrity sha512-OWn+Vhu0I1yxuGBJEFFekMYc8aGBGrY4rt47SOh/IFaI+D7ZHCk7pKRiSoZ2/Ml7b0Ony3ydmEHRx/tEOC7H1A==
+"@jest/environment@^29.7.0":
+  version "29.7.0"
+  resolved "https://registry.yarnpkg.com/@jest/environment/-/environment-29.7.0.tgz#24d61f54ff1f786f3cd4073b4b94416383baf2a7"
+  integrity sha512-aQIfHDq33ExsN4jP1NWGXhxgQ/wixs60gDiKO+XVMd8Mn0NWPWgc34ZQDTb2jKaUWQ7MuwoitXAsN2XVXNMpAw==
   dependencies:
-    "@jest/fake-timers" "^29.2.2"
-    "@jest/types" "^29.2.1"
+    "@jest/fake-timers" "^29.7.0"
+    "@jest/types" "^29.6.3"
     "@types/node" "*"
-    jest-mock "^29.2.2"
+    jest-mock "^29.7.0"
 
-"@jest/expect-utils@^29.2.2":
-  version "29.2.2"
-  resolved "https://registry.yarnpkg.com/@jest/expect-utils/-/expect-utils-29.2.2.tgz#460a5b5a3caf84d4feb2668677393dd66ff98665"
-  integrity sha512-vwnVmrVhTmGgQzyvcpze08br91OL61t9O0lJMDyb6Y/D8EKQ9V7rGUb/p7PDt0GPzK0zFYqXWFo4EO2legXmkg==
+"@jest/expect-utils@^29.7.0":
+  version "29.7.0"
+  resolved "https://registry.yarnpkg.com/@jest/expect-utils/-/expect-utils-29.7.0.tgz#023efe5d26a8a70f21677d0a1afc0f0a44e3a1c6"
+  integrity sha512-GlsNBWiFQFCVi9QVSx7f5AgMeLxe9YCCs5PuP2O2LdjDAA8Jh9eX7lA1Jq/xdXw3Wb3hyvlFNfZIfcRetSzYcA==
   dependencies:
-    jest-get-type "^29.2.0"
+    jest-get-type "^29.6.3"
 
-"@jest/expect@^29.2.2":
-  version "29.2.2"
-  resolved "https://registry.yarnpkg.com/@jest/expect/-/expect-29.2.2.tgz#81edbd33afbde7795ca07ff6b4753d15205032e4"
-  integrity sha512-zwblIZnrIVt8z/SiEeJ7Q9wKKuB+/GS4yZe9zw7gMqfGf4C5hBLGrVyxu1SzDbVSqyMSlprKl3WL1r80cBNkgg==
+"@jest/expect@^29.7.0":
+  version "29.7.0"
+  resolved "https://registry.yarnpkg.com/@jest/expect/-/expect-29.7.0.tgz#76a3edb0cb753b70dfbfe23283510d3d45432bf2"
+  integrity sha512-8uMeAMycttpva3P1lBHB8VciS9V0XAr3GymPpipdyQXbBcuhkLQOSe8E/p92RyAdToS6ZD1tFkX+CkhoECE0dQ==
   dependencies:
-    expect "^29.2.2"
-    jest-snapshot "^29.2.2"
+    expect "^29.7.0"
+    jest-snapshot "^29.7.0"
 
-"@jest/fake-timers@^29.2.2":
-  version "29.2.2"
-  resolved "https://registry.yarnpkg.com/@jest/fake-timers/-/fake-timers-29.2.2.tgz#d8332e6e3cfa99cde4bc87d04a17d6b699deb340"
-  integrity sha512-nqaW3y2aSyZDl7zQ7t1XogsxeavNpH6kkdq+EpXncIDvAkjvFD7hmhcIs1nWloengEWUoWqkqSA6MSbf9w6DgA==
+"@jest/fake-timers@^29.7.0":
+  version "29.7.0"
+  resolved "https://registry.yarnpkg.com/@jest/fake-timers/-/fake-timers-29.7.0.tgz#fd91bf1fffb16d7d0d24a426ab1a47a49881a565"
+  integrity sha512-q4DH1Ha4TTFPdxLsqDXK1d3+ioSL7yL5oCMJZgDYm6i+6CygW5E5xVr/D1HdsGxjt1ZWSfUAs9OxSB/BNelWrQ==
   dependencies:
-    "@jest/types" "^29.2.1"
-    "@sinonjs/fake-timers" "^9.1.2"
+    "@jest/types" "^29.6.3"
+    "@sinonjs/fake-timers" "^10.0.2"
     "@types/node" "*"
-    jest-message-util "^29.2.1"
-    jest-mock "^29.2.2"
-    jest-util "^29.2.1"
+    jest-message-util "^29.7.0"
+    jest-mock "^29.7.0"
+    jest-util "^29.7.0"
 
-"@jest/globals@^29.2.2":
-  version "29.2.2"
-  resolved "https://registry.yarnpkg.com/@jest/globals/-/globals-29.2.2.tgz#205ff1e795aa774301c2c0ba0be182558471b845"
-  integrity sha512-/nt+5YMh65kYcfBhj38B3Hm0Trk4IsuMXNDGKE/swp36yydBWfz3OXkLqkSvoAtPW8IJMSJDFCbTM2oj5SNprw==
+"@jest/globals@^29.7.0":
+  version "29.7.0"
+  resolved "https://registry.yarnpkg.com/@jest/globals/-/globals-29.7.0.tgz#8d9290f9ec47ff772607fa864ca1d5a2efae1d4d"
+  integrity sha512-mpiz3dutLbkW2MNFubUGUEVLkTGiqW6yLVTA+JbP6fI6J5iL9Y0Nlg8k95pcF8ctKwCS7WVxteBs29hhfAotzQ==
   dependencies:
-    "@jest/environment" "^29.2.2"
-    "@jest/expect" "^29.2.2"
-    "@jest/types" "^29.2.1"
-    jest-mock "^29.2.2"
+    "@jest/environment" "^29.7.0"
+    "@jest/expect" "^29.7.0"
+    "@jest/types" "^29.6.3"
+    jest-mock "^29.7.0"
 
-"@jest/reporters@^29.2.2":
-  version "29.2.2"
-  resolved "https://registry.yarnpkg.com/@jest/reporters/-/reporters-29.2.2.tgz#69b395f79c3a97ce969ce05ccf1a482e5d6de290"
-  integrity sha512-AzjL2rl2zJC0njIzcooBvjA4sJjvdoq98sDuuNs4aNugtLPSQ+91nysGKRF0uY1to5k0MdGMdOBggUsPqvBcpA==
+"@jest/reporters@^29.7.0":
+  version "29.7.0"
+  resolved "https://registry.yarnpkg.com/@jest/reporters/-/reporters-29.7.0.tgz#04b262ecb3b8faa83b0b3d321623972393e8f4c7"
+  integrity sha512-DApq0KJbJOEzAFYjHADNNxAE3KbhxQB1y5Kplb5Waqw6zVbuWatSnMjE5gs8FUgEPmNsnZA3NCWl9NG0ia04Pg==
   dependencies:
     "@bcoe/v8-coverage" "^0.2.3"
-    "@jest/console" "^29.2.1"
-    "@jest/test-result" "^29.2.1"
-    "@jest/transform" "^29.2.2"
-    "@jest/types" "^29.2.1"
-    "@jridgewell/trace-mapping" "^0.3.15"
+    "@jest/console" "^29.7.0"
+    "@jest/test-result" "^29.7.0"
+    "@jest/transform" "^29.7.0"
+    "@jest/types" "^29.6.3"
+    "@jridgewell/trace-mapping" "^0.3.18"
     "@types/node" "*"
     chalk "^4.0.0"
     collect-v8-coverage "^1.0.0"
@@ -1248,118 +1372,110 @@
     glob "^7.1.3"
     graceful-fs "^4.2.9"
     istanbul-lib-coverage "^3.0.0"
-    istanbul-lib-instrument "^5.1.0"
+    istanbul-lib-instrument "^6.0.0"
     istanbul-lib-report "^3.0.0"
     istanbul-lib-source-maps "^4.0.0"
     istanbul-reports "^3.1.3"
-    jest-message-util "^29.2.1"
-    jest-util "^29.2.1"
-    jest-worker "^29.2.1"
+    jest-message-util "^29.7.0"
+    jest-util "^29.7.0"
+    jest-worker "^29.7.0"
     slash "^3.0.0"
     string-length "^4.0.1"
     strip-ansi "^6.0.0"
     v8-to-istanbul "^9.0.1"
 
-"@jest/schemas@^29.0.0":
-  version "29.0.0"
-  resolved "https://registry.yarnpkg.com/@jest/schemas/-/schemas-29.0.0.tgz#5f47f5994dd4ef067fb7b4188ceac45f77fe952a"
-  integrity sha512-3Ab5HgYIIAnS0HjqJHQYZS+zXc4tUmTmBH3z83ajI6afXp8X3ZtdLX+nXx+I7LNkJD7uN9LAVhgnjDgZa2z0kA==
+"@jest/schemas@^29.6.3":
+  version "29.6.3"
+  resolved "https://registry.yarnpkg.com/@jest/schemas/-/schemas-29.6.3.tgz#430b5ce8a4e0044a7e3819663305a7b3091c8e03"
+  integrity sha512-mo5j5X+jIZmJQveBKeS/clAueipV7KgiX1vMgCxam1RNYiqE1w62n0/tJJnHtjW8ZHcQco5gY85jA3mi0L+nSA==
   dependencies:
-    "@sinclair/typebox" "^0.24.1"
+    "@sinclair/typebox" "^0.27.8"
 
-"@jest/source-map@^29.2.0":
-  version "29.2.0"
-  resolved "https://registry.yarnpkg.com/@jest/source-map/-/source-map-29.2.0.tgz#ab3420c46d42508dcc3dc1c6deee0b613c235744"
-  integrity sha512-1NX9/7zzI0nqa6+kgpSdKPK+WU1p+SJk3TloWZf5MzPbxri9UEeXX5bWZAPCzbQcyuAzubcdUHA7hcNznmRqWQ==
+"@jest/source-map@^29.6.3":
+  version "29.6.3"
+  resolved "https://registry.yarnpkg.com/@jest/source-map/-/source-map-29.6.3.tgz#d90ba772095cf37a34a5eb9413f1b562a08554c4"
+  integrity sha512-MHjT95QuipcPrpLM+8JMSzFx6eHp5Bm+4XeFDJlwsvVBjmKNiIAvasGK2fxz2WbGRlnvqehFbh07MMa7n3YJnw==
   dependencies:
-    "@jridgewell/trace-mapping" "^0.3.15"
+    "@jridgewell/trace-mapping" "^0.3.18"
     callsites "^3.0.0"
     graceful-fs "^4.2.9"
 
-"@jest/test-result@^29.2.1":
-  version "29.2.1"
-  resolved "https://registry.yarnpkg.com/@jest/test-result/-/test-result-29.2.1.tgz#f42dbf7b9ae465d0a93eee6131473b8bb3bd2edb"
-  integrity sha512-lS4+H+VkhbX6z64tZP7PAUwPqhwj3kbuEHcaLuaBuB+riyaX7oa1txe0tXgrFj5hRWvZKvqO7LZDlNWeJ7VTPA==
+"@jest/test-result@^29.7.0":
+  version "29.7.0"
+  resolved "https://registry.yarnpkg.com/@jest/test-result/-/test-result-29.7.0.tgz#8db9a80aa1a097bb2262572686734baed9b1657c"
+  integrity sha512-Fdx+tv6x1zlkJPcWXmMDAG2HBnaR9XPSd5aDWQVsfrZmLVT3lU1cwyxLgRmXR9yrq4NBoEm9BMsfgFzTQAbJYA==
   dependencies:
-    "@jest/console" "^29.2.1"
-    "@jest/types" "^29.2.1"
+    "@jest/console" "^29.7.0"
+    "@jest/types" "^29.6.3"
     "@types/istanbul-lib-coverage" "^2.0.0"
     collect-v8-coverage "^1.0.0"
 
-"@jest/test-sequencer@^29.2.2":
-  version "29.2.2"
-  resolved "https://registry.yarnpkg.com/@jest/test-sequencer/-/test-sequencer-29.2.2.tgz#4ac7487b237e517a1f55e7866fb5553f6e0168b9"
-  integrity sha512-Cuc1znc1pl4v9REgmmLf0jBd3Y65UXJpioGYtMr/JNpQEIGEzkmHhy6W6DLbSsXeUA13TDzymPv0ZGZ9jH3eIw==
+"@jest/test-sequencer@^29.7.0":
+  version "29.7.0"
+  resolved "https://registry.yarnpkg.com/@jest/test-sequencer/-/test-sequencer-29.7.0.tgz#6cef977ce1d39834a3aea887a1726628a6f072ce"
+  integrity sha512-GQwJ5WZVrKnOJuiYiAF52UNUJXgTZx1NHjFSEB0qEMmSZKAkdMoIzw/Cj6x6NF4AvV23AUqDpFzQkN/eYCYTxw==
   dependencies:
-    "@jest/test-result" "^29.2.1"
+    "@jest/test-result" "^29.7.0"
     graceful-fs "^4.2.9"
-    jest-haste-map "^29.2.1"
+    jest-haste-map "^29.7.0"
     slash "^3.0.0"
 
-"@jest/transform@^29.2.2":
-  version "29.2.2"
-  resolved "https://registry.yarnpkg.com/@jest/transform/-/transform-29.2.2.tgz#dfc03fc092b31ffea0c55917728e75bfcf8b5de6"
-  integrity sha512-aPe6rrletyuEIt2axxgdtxljmzH8O/nrov4byy6pDw9S8inIrTV+2PnjyP/oFHMSynzGxJ2s6OHowBNMXp/Jzg==
+"@jest/transform@^29.7.0":
+  version "29.7.0"
+  resolved "https://registry.yarnpkg.com/@jest/transform/-/transform-29.7.0.tgz#df2dd9c346c7d7768b8a06639994640c642e284c"
+  integrity sha512-ok/BTPFzFKVMwO5eOHRrvnBVHdRy9IrsrW1GpMaQ9MCnilNLXQKmAX8s1YXDFaai9xJpac2ySzV0YeRRECr2Vw==
   dependencies:
     "@babel/core" "^7.11.6"
-    "@jest/types" "^29.2.1"
-    "@jridgewell/trace-mapping" "^0.3.15"
+    "@jest/types" "^29.6.3"
+    "@jridgewell/trace-mapping" "^0.3.18"
     babel-plugin-istanbul "^6.1.1"
     chalk "^4.0.0"
-    convert-source-map "^1.4.0"
+    convert-source-map "^2.0.0"
     fast-json-stable-stringify "^2.1.0"
     graceful-fs "^4.2.9"
-    jest-haste-map "^29.2.1"
-    jest-regex-util "^29.2.0"
-    jest-util "^29.2.1"
+    jest-haste-map "^29.7.0"
+    jest-regex-util "^29.6.3"
+    jest-util "^29.7.0"
     micromatch "^4.0.4"
     pirates "^4.0.4"
     slash "^3.0.0"
-    write-file-atomic "^4.0.1"
+    write-file-atomic "^4.0.2"
 
-"@jest/types@^29.2.1":
-  version "29.2.1"
-  resolved "https://registry.yarnpkg.com/@jest/types/-/types-29.2.1.tgz#ec9c683094d4eb754e41e2119d8bdaef01cf6da0"
-  integrity sha512-O/QNDQODLnINEPAI0cl9U6zUIDXEWXt6IC1o2N2QENuos7hlGUIthlKyV4p6ki3TvXFX071blj8HUhgLGquPjw==
+"@jest/types@^29.6.3":
+  version "29.6.3"
+  resolved "https://registry.yarnpkg.com/@jest/types/-/types-29.6.3.tgz#1131f8cf634e7e84c5e77bab12f052af585fba59"
+  integrity sha512-u3UPsIilWKOM3F9CXtrG8LEJmNxwoCQC/XVj4IKYXvvpx7QIi/Kg1LI5uDmDpKlac62NUtX7eLjRh+jVZcLOzw==
   dependencies:
-    "@jest/schemas" "^29.0.0"
+    "@jest/schemas" "^29.6.3"
     "@types/istanbul-lib-coverage" "^2.0.0"
     "@types/istanbul-reports" "^3.0.0"
     "@types/node" "*"
     "@types/yargs" "^17.0.8"
     chalk "^4.0.0"
 
-"@jridgewell/gen-mapping@^0.1.0":
-  version "0.1.1"
-  resolved "https://registry.yarnpkg.com/@jridgewell/gen-mapping/-/gen-mapping-0.1.1.tgz#e5d2e450306a9491e3bd77e323e38d7aff315996"
-  integrity sha512-sQXCasFk+U8lWYEe66WxRDOE9PjVz4vSM51fTu3Hw+ClTpUSQb718772vH3pyS5pShp6lvQM7SxgIDXXXmOX7w==
-  dependencies:
-    "@jridgewell/set-array" "^1.0.0"
-    "@jridgewell/sourcemap-codec" "^1.4.10"
-
-"@jridgewell/gen-mapping@^0.3.2":
-  version "0.3.2"
-  resolved "https://registry.yarnpkg.com/@jridgewell/gen-mapping/-/gen-mapping-0.3.2.tgz#c1aedc61e853f2bb9f5dfe6d4442d3b565b253b9"
-  integrity sha512-mh65xKQAzI6iBcFzwv28KVWSmCkdRBWoOh+bYQGW3+6OZvbbN3TqMGo5hqYxQniRcH9F2VZIoJCm4pa3BPDK/A==
+"@jridgewell/gen-mapping@^0.3.0", "@jridgewell/gen-mapping@^0.3.2":
+  version "0.3.3"
+  resolved "https://registry.yarnpkg.com/@jridgewell/gen-mapping/-/gen-mapping-0.3.3.tgz#7e02e6eb5df901aaedb08514203b096614024098"
+  integrity sha512-HLhSWOLRi875zjjMG/r+Nv0oCW8umGb0BgEhyX3dDX3egwZtB8PqLnjz3yedt8R5StBrzcg4aBpnh8UA9D1BoQ==
   dependencies:
     "@jridgewell/set-array" "^1.0.1"
     "@jridgewell/sourcemap-codec" "^1.4.10"
     "@jridgewell/trace-mapping" "^0.3.9"
 
-"@jridgewell/resolve-uri@3.1.0", "@jridgewell/resolve-uri@^3.0.3":
-  version "3.1.0"
-  resolved "https://registry.yarnpkg.com/@jridgewell/resolve-uri/-/resolve-uri-3.1.0.tgz#2203b118c157721addfe69d47b70465463066d78"
-  integrity sha512-F2msla3tad+Mfht5cJq7LSXcdudKTWCVYUgw6pLFOOHSTtZlj6SWNYAp+AhuqLmWdBO2X5hPrLcu8cVP8fy28w==
+"@jridgewell/resolve-uri@^3.0.3", "@jridgewell/resolve-uri@^3.1.0":
+  version "3.1.1"
+  resolved "https://registry.yarnpkg.com/@jridgewell/resolve-uri/-/resolve-uri-3.1.1.tgz#c08679063f279615a3326583ba3a90d1d82cc721"
+  integrity sha512-dSYZh7HhCDtCKm4QakX0xFpsRDqjjtZf/kjI/v3T3Nwt5r8/qz/M19F9ySyOqU94SXBmeG9ttTul+YnR4LOxFA==
 
-"@jridgewell/set-array@^1.0.0", "@jridgewell/set-array@^1.0.1":
+"@jridgewell/set-array@^1.0.1":
   version "1.1.2"
   resolved "https://registry.yarnpkg.com/@jridgewell/set-array/-/set-array-1.1.2.tgz#7c6cf998d6d20b914c0a55a91ae928ff25965e72"
   integrity sha512-xnkseuNADM0gt2bs+BvhO0p78Mk762YnZdsuzFV018NoG1Sj1SCQvpSqa7XUaTam5vAGasABV9qXASMKnFMwMw==
 
-"@jridgewell/sourcemap-codec@1.4.14", "@jridgewell/sourcemap-codec@^1.4.10":
-  version "1.4.14"
-  resolved "https://registry.yarnpkg.com/@jridgewell/sourcemap-codec/-/sourcemap-codec-1.4.14.tgz#add4c98d341472a289190b424efbdb096991bb24"
-  integrity sha512-XPSJHWmi394fuUuzDnGz1wiKqWfo1yXecHQMRf2l6hztTO+nPru658AyDngaBe7isIxEkRsPR3FZh+s7iVa4Uw==
+"@jridgewell/sourcemap-codec@^1.4.10", "@jridgewell/sourcemap-codec@^1.4.14":
+  version "1.4.15"
+  resolved "https://registry.yarnpkg.com/@jridgewell/sourcemap-codec/-/sourcemap-codec-1.4.15.tgz#d7c6e6755c78567a951e04ab52ef0fd26de59f32"
+  integrity sha512-eF2rxCRulEKXHTRiDrDy6erMYWqNw4LPdQ8UQA4huuxaQsVeRPFl2oM8oDGxMFhJUWZf9McpLtJasDDZb/Bpeg==
 
 "@jridgewell/trace-mapping@0.3.9":
   version "0.3.9"
@@ -1369,59 +1485,105 @@
     "@jridgewell/resolve-uri" "^3.0.3"
     "@jridgewell/sourcemap-codec" "^1.4.10"
 
-"@jridgewell/trace-mapping@^0.3.12", "@jridgewell/trace-mapping@^0.3.15", "@jridgewell/trace-mapping@^0.3.9":
-  version "0.3.17"
-  resolved "https://registry.yarnpkg.com/@jridgewell/trace-mapping/-/trace-mapping-0.3.17.tgz#793041277af9073b0951a7fe0f0d8c4c98c36985"
-  integrity sha512-MCNzAp77qzKca9+W/+I0+sEpaUnZoeasnghNeVc41VZCEKaCH73Vq3BZZ/SzWIgrqE4H4ceI+p+b6C0mHf9T4g==
+"@jridgewell/trace-mapping@^0.3.12", "@jridgewell/trace-mapping@^0.3.17", "@jridgewell/trace-mapping@^0.3.18", "@jridgewell/trace-mapping@^0.3.9":
+  version "0.3.20"
+  resolved "https://registry.yarnpkg.com/@jridgewell/trace-mapping/-/trace-mapping-0.3.20.tgz#72e45707cf240fa6b081d0366f8265b0cd10197f"
+  integrity sha512-R8LcPeWZol2zR8mmH3JeKQ6QRCFb7XgUhV9ZlGhHLGyg4wpPiPZNQOOWhFZhxKw8u//yTbNGI42Bx/3paXEQ+Q==
   dependencies:
-    "@jridgewell/resolve-uri" "3.1.0"
-    "@jridgewell/sourcemap-codec" "1.4.14"
+    "@jridgewell/resolve-uri" "^3.1.0"
+    "@jridgewell/sourcemap-codec" "^1.4.14"
 
-"@matterlabs/hardhat-zksync-deploy@^0.6.1":
-  version "0.6.3"
-  resolved "https://registry.yarnpkg.com/@matterlabs/hardhat-zksync-deploy/-/hardhat-zksync-deploy-0.6.3.tgz#833b208373e7037bf43671054328d82511444e2a"
-  integrity sha512-FB+2xFL/80JJwlGna+aHA6dk4ONrMFqThTZATYVJUAKooA0Aw5qmpmM8B3qsNB4LLzHSO/EmVrHIcLaPv8hYwQ==
+"@ljharb/resumer@~0.0.1":
+  version "0.0.1"
+  resolved "https://registry.yarnpkg.com/@ljharb/resumer/-/resumer-0.0.1.tgz#8a940a9192dd31f6a1df17564bbd26dc6ad3e68d"
+  integrity sha512-skQiAOrCfO7vRTq53cxznMpks7wS1va95UCidALlOVWqvBAzwPVErwizDwoMqNVMEn1mDq0utxZd02eIrvF1lw==
+  dependencies:
+    "@ljharb/through" "^2.3.9"
+
+"@ljharb/through@^2.3.9", "@ljharb/through@~2.3.9":
+  version "2.3.11"
+  resolved "https://registry.yarnpkg.com/@ljharb/through/-/through-2.3.11.tgz#783600ff12c06f21a76cc26e33abd0b1595092f9"
+  integrity sha512-ccfcIDlogiXNq5KcbAwbaO7lMh3Tm1i3khMPYpxlK8hH/W53zN81KM9coerRLOnTGu3nfXIniAmQbRI9OxbC0w==
+  dependencies:
+    call-bind "^1.0.2"
+
+"@matterlabs/eslint-config-typescript@^1.1.2":
+  version "1.1.2"
+  resolved "https://registry.yarnpkg.com/@matterlabs/eslint-config-typescript/-/eslint-config-typescript-1.1.2.tgz#a9be4e56aedf298800f247c5049fc412f8b301a7"
+  integrity sha512-AhiWJQr+MSE3RVfgp5XwGoMK7kNSKh6a18+T7hkNJtyycP0306I6IGmuFA5ZVbcakGb+K32fQWzepSkrNCTAGg==
+
+"@matterlabs/hardhat-zksync-chai-matchers@^0.1.4":
+  version "0.1.4"
+  resolved "https://registry.yarnpkg.com/@matterlabs/hardhat-zksync-chai-matchers/-/hardhat-zksync-chai-matchers-0.1.4.tgz#105cb0ec1367c8fcd3ce7e3773f747c71fff675b"
+  integrity sha512-eGQWiImg51fmayoQ7smIK/T6QZkSu38PK7xjp1RIrewGzw2ZgqFWGp40jb5oomkf8yOQPk52Hu4TwE3Ntp8CtA==
+
+"@matterlabs/hardhat-zksync-deploy@^0.6.1", "@matterlabs/hardhat-zksync-deploy@^0.6.5":
+  version "0.6.5"
+  resolved "https://registry.yarnpkg.com/@matterlabs/hardhat-zksync-deploy/-/hardhat-zksync-deploy-0.6.5.tgz#fe56bf30850e71c8d328ac1a06a100c1a0af6e3e"
+  integrity sha512-EZpvn8pDslfO3UA2obT8FOi5jsHhxYS5ndIR7tjL2zXKbvkbpoJR5rgKoGTJJm0riaCud674sQcxMOybVQ+2gg==
   dependencies:
+    "@matterlabs/hardhat-zksync-solc" "0.4.2"
     chalk "4.1.2"
+    ts-morph "^19.0.0"
 
-"@matterlabs/hardhat-zksync-solc@0.3.17":
-  version "0.3.17"
-  resolved "https://registry.yarnpkg.com/@matterlabs/hardhat-zksync-solc/-/hardhat-zksync-solc-0.3.17.tgz#72f199544dc89b268d7bfc06d022a311042752fd"
-  integrity sha512-aZgQ0yfXW5xPkfuEH1d44ncWV4T2LzKZd0VVPo4PL5cUrYs2/II1FaEDp5zsf3FxOR1xT3mBsjuSrtJkk4AL8Q==
+"@matterlabs/hardhat-zksync-solc@0.4.1":
+  version "0.4.1"
+  resolved "https://registry.yarnpkg.com/@matterlabs/hardhat-zksync-solc/-/hardhat-zksync-solc-0.4.1.tgz#e8e67d947098d7bb8925f968544d34e522af5a9c"
+  integrity sha512-fdlGf/2yZR5ihVNc2ubea1R/nNFXRONL29Fgz5FwB3azB13rPb76fkQgcFIg9zSufHsEy6zUUT029NkxLNA9Sw==
   dependencies:
     "@nomiclabs/hardhat-docker" "^2.0.0"
     chalk "4.1.2"
     dockerode "^3.3.4"
+    fs-extra "^11.1.1"
+    semver "^7.5.1"
+
+"@matterlabs/hardhat-zksync-solc@0.4.2", "@matterlabs/hardhat-zksync-solc@^0.4.2":
+  version "0.4.2"
+  resolved "https://registry.yarnpkg.com/@matterlabs/hardhat-zksync-solc/-/hardhat-zksync-solc-0.4.2.tgz#64121082e88c5ab22eb4e9594d120e504f6af499"
+  integrity sha512-6NFWPSZiOAoo7wNuhMg4ztj7mMEH+tLrx09WuCbcURrHPijj/KxYNsJD6Uw5lapKr7G8H7SQISGid1/MTXVmXQ==
+  dependencies:
+    "@nomiclabs/hardhat-docker" "^2.0.0"
+    chalk "4.1.2"
+    dockerode "^3.3.4"
+    fs-extra "^11.1.1"
+    proper-lockfile "^4.1.2"
+    semver "^7.5.1"
 
 "@matterlabs/hardhat-zksync-solc@^0.3.15":
-  version "0.3.16"
-  resolved "https://registry.yarnpkg.com/@matterlabs/hardhat-zksync-solc/-/hardhat-zksync-solc-0.3.16.tgz#dd8ed44f1a580f282794a15fee995f418b040158"
-  integrity sha512-gw46yyiCfj49I/nbUcOlnF5xE80WyeW/i8i9ouHom4KWJNt1kioQIwOPkN7aJURhXpJJxKSdeWBrQHLWTZDnTA==
+  version "0.3.17"
+  resolved "https://registry.yarnpkg.com/@matterlabs/hardhat-zksync-solc/-/hardhat-zksync-solc-0.3.17.tgz#72f199544dc89b268d7bfc06d022a311042752fd"
+  integrity sha512-aZgQ0yfXW5xPkfuEH1d44ncWV4T2LzKZd0VVPo4PL5cUrYs2/II1FaEDp5zsf3FxOR1xT3mBsjuSrtJkk4AL8Q==
   dependencies:
     "@nomiclabs/hardhat-docker" "^2.0.0"
     chalk "4.1.2"
     dockerode "^3.3.4"
 
 "@matterlabs/hardhat-zksync-verify@^0.2.0":
-  version "0.2.0"
-  resolved "https://registry.yarnpkg.com/@matterlabs/hardhat-zksync-verify/-/hardhat-zksync-verify-0.2.0.tgz#a0c6b897202057873355b680244f72f573d86a97"
-  integrity sha512-iUwxhPlNk+HWe+UadLqQzdDb2fammbKYoz8wqVuyr9jygFUf8JNPLWDZOS0KCQgRn/dmT22+i9nSREOg66bAHA==
+  version "0.2.1"
+  resolved "https://registry.yarnpkg.com/@matterlabs/hardhat-zksync-verify/-/hardhat-zksync-verify-0.2.1.tgz#f52cbe3670b7a6b01c8c4d0bbf3e6e13583e5d99"
+  integrity sha512-6awofVwsGHlyFMNTZcp05DPHpriSmmhBw0q+OC/Kn9xbdqT8E7fMJa6irvJH590UugxGerKrZDIY6uM6rwAjqQ==
   dependencies:
-    "@matterlabs/hardhat-zksync-solc" "0.3.17"
+    "@matterlabs/hardhat-zksync-solc" "0.4.1"
+    "@nomicfoundation/hardhat-verify" "^1.0.2"
     axios "^1.4.0"
     chalk "4.1.2"
     dockerode "^3.3.4"
 
 "@matterlabs/hardhat-zksync-vyper@^0.2.0":
-  version "0.2.0"
-  resolved "https://registry.yarnpkg.com/@matterlabs/hardhat-zksync-vyper/-/hardhat-zksync-vyper-0.2.0.tgz#4cefe09cdceb9251faaa434f04cda018713c4545"
-  integrity sha512-buahDcREIMTYSwwvbRxw+qE3mSChJ8ll/Q1+BF/Tn0qjZGI67YRm6Wm/lh9up9I1mIlvcbTpLrY1odzc433KhA==
+  version "0.2.2"
+  resolved "https://registry.yarnpkg.com/@matterlabs/hardhat-zksync-vyper/-/hardhat-zksync-vyper-0.2.2.tgz#d42e171b58c7c3bfacc79817ff975fb3952587a9"
+  integrity sha512-FU22i4XrSR6WqISrsjVXDIY9BEEGUtb5ictOH4SR+EwzGgfSPm4C7cCTKXdtJ5ZHCOR99cwx/okVfKCwv7XVFw==
   dependencies:
     "@nomiclabs/hardhat-docker" "^2.0.0"
     chalk "4.1.2"
     dockerode "^3.3.4"
-    fs-extra "^7.0.1"
-    semver "^6.3.0"
+    fs-extra "^11.1.1"
+    semver "^7.5.4"
+
+"@matterlabs/prettier-config@^1.0.3":
+  version "1.0.3"
+  resolved "https://registry.yarnpkg.com/@matterlabs/prettier-config/-/prettier-config-1.0.3.tgz#3e2eb559c0112bbe9671895f935700dad2a15d38"
+  integrity sha512-JW7nHREPqEtjBWz3EfxLarkmJBD8vi7Kx/1AQ6eBZnz12eHc1VkOyrc6mpR5ogTf0dOUNXFAfZut+cDe2dn4kQ==
 
 "@metamask/eth-sig-util@^4.0.0":
   version "4.0.1"
@@ -1434,20 +1596,32 @@
     tweetnacl "^1.0.3"
     tweetnacl-util "^0.15.1"
 
-"@noble/hashes@1.1.2":
-  version "1.1.2"
-  resolved "https://registry.yarnpkg.com/@noble/hashes/-/hashes-1.1.2.tgz#e9e035b9b166ca0af657a7848eb2718f0f22f183"
-  integrity sha512-KYRCASVTv6aeUi1tsF8/vpyR7zpfs3FUzy2Jqm+MU+LmUKhQ0y2FpfwqkCcxSg2ua4GALJd8k2R76WxwZGbQpA==
+"@noble/curves@1.1.0", "@noble/curves@~1.1.0":
+  version "1.1.0"
+  resolved "https://registry.yarnpkg.com/@noble/curves/-/curves-1.1.0.tgz#f13fc667c89184bc04cccb9b11e8e7bae27d8c3d"
+  integrity sha512-091oBExgENk/kGj3AZmtBDMpxQPDtxQABR2B9lb1JbVTs6ytdzZNwvhxQ4MWasRNEzlbEH8jCWFCwhF/Obj5AA==
+  dependencies:
+    "@noble/hashes" "1.3.1"
 
-"@noble/hashes@~1.1.1":
-  version "1.1.3"
-  resolved "https://registry.yarnpkg.com/@noble/hashes/-/hashes-1.1.3.tgz#360afc77610e0a61f3417e497dcf36862e4f8111"
-  integrity sha512-CE0FCR57H2acVI5UOzIGSSIYxZ6v/HOhDR0Ro9VLyhnzLwx0o8W1mmgaqlEUx4049qJDlIBRztv5k+MM8vbO3A==
+"@noble/hashes@1.2.0", "@noble/hashes@~1.2.0":
+  version "1.2.0"
+  resolved "https://registry.yarnpkg.com/@noble/hashes/-/hashes-1.2.0.tgz#a3150eeb09cc7ab207ebf6d7b9ad311a9bdbed12"
+  integrity sha512-FZfhjEDbT5GRswV3C6uvLPHMiVD6lQBmpoX5+eSiPaMTXte/IKqI5dykDxzZB/WBeK/CDuQRBWarPdi3FNY2zQ==
 
-"@noble/secp256k1@1.6.3", "@noble/secp256k1@~1.6.0":
-  version "1.6.3"
-  resolved "https://registry.yarnpkg.com/@noble/secp256k1/-/secp256k1-1.6.3.tgz#7eed12d9f4404b416999d0c87686836c4c5c9b94"
-  integrity sha512-T04e4iTurVy7I8Sw4+c5OSN9/RkPlo1uKxAomtxQNLq8j1uPAqnsqG1bqvY3Jv7c13gyr6dui0zmh/I3+f/JaQ==
+"@noble/hashes@1.3.1":
+  version "1.3.1"
+  resolved "https://registry.yarnpkg.com/@noble/hashes/-/hashes-1.3.1.tgz#8831ef002114670c603c458ab8b11328406953a9"
+  integrity sha512-EbqwksQwz9xDRGfDST86whPBgM65E0OH/pCgqW0GBVzO22bNE+NuIbeTb714+IfSjU3aRk47EUvXIb5bTsenKA==
+
+"@noble/hashes@~1.3.0", "@noble/hashes@~1.3.1":
+  version "1.3.2"
+  resolved "https://registry.yarnpkg.com/@noble/hashes/-/hashes-1.3.2.tgz#6f26dbc8fbc7205873ce3cee2f690eba0d421b39"
+  integrity sha512-MVC8EAQp7MvEcm30KWENFjgR+Mkmf+D189XJTkFIlwohU5hcBbn1ZkKq7KVTi2Hme3PMGF390DaL52beVrIihQ==
+
+"@noble/secp256k1@1.7.1", "@noble/secp256k1@~1.7.0":
+  version "1.7.1"
+  resolved "https://registry.yarnpkg.com/@noble/secp256k1/-/secp256k1-1.7.1.tgz#b251c70f824ce3ca7f8dc3df08d58f005cc0507c"
+  integrity sha512-hOUk6AyBFmqVrv7k5WAw/LpszxVbj9gGN4JRkIX52fdFAj1UA61KXmZDvqVEm+pOyec3+fIeZB02LYa/pWOArw==
 
 "@nodelib/fs.scandir@2.1.5":
   version "2.1.5"
@@ -1462,7 +1636,7 @@
   resolved "https://registry.yarnpkg.com/@nodelib/fs.stat/-/fs.stat-2.0.5.tgz#5bd262af94e9d25bd1e71b05deed44876a222e8b"
   integrity sha512-RkhPPp2zrqDAQA/2jNhnztcPAlv64XdhIp7a7454A5ovI7Bukxgt7MX7udwAu3zg1DcpPU0rz3VV1SeaqvY4+A==
 
-"@nodelib/fs.walk@^1.2.3":
+"@nodelib/fs.walk@^1.2.3", "@nodelib/fs.walk@^1.2.8":
   version "1.2.8"
   resolved "https://registry.yarnpkg.com/@nodelib/fs.walk/-/fs.walk-1.2.8.tgz#e95737e8bb6746ddedf69c556953494f196fe69a"
   integrity sha512-oGB+UxlgWcgQkgwo8GcEGwemoTFt3FIO9ababBmaGwXIoBKZ+GTy0pP185beGg7Llih/NSHSV2XAs1lnznocSg==
@@ -1470,29 +1644,44 @@
     "@nodelib/fs.scandir" "2.1.5"
     fastq "^1.6.0"
 
-"@nomicfoundation/ethereumjs-block@^4.0.0":
-  version "4.0.0"
-  resolved "https://registry.yarnpkg.com/@nomicfoundation/ethereumjs-block/-/ethereumjs-block-4.0.0.tgz#fdd5c045e7baa5169abeed0e1202bf94e4481c49"
-  integrity sha512-bk8uP8VuexLgyIZAHExH1QEovqx0Lzhc9Ntm63nCRKLHXIZkobaFaeCVwTESV7YkPKUk7NiK11s8ryed4CS9yA==
-  dependencies:
-    "@nomicfoundation/ethereumjs-common" "^3.0.0"
-    "@nomicfoundation/ethereumjs-rlp" "^4.0.0"
-    "@nomicfoundation/ethereumjs-trie" "^5.0.0"
-    "@nomicfoundation/ethereumjs-tx" "^4.0.0"
-    "@nomicfoundation/ethereumjs-util" "^8.0.0"
+"@nomicfoundation/ethereumjs-block@5.0.1":
+  version "5.0.1"
+  resolved "https://registry.yarnpkg.com/@nomicfoundation/ethereumjs-block/-/ethereumjs-block-5.0.1.tgz#6f89664f55febbd723195b6d0974773d29ee133d"
+  integrity sha512-u1Yioemi6Ckj3xspygu/SfFvm8vZEO8/Yx5a1QLzi6nVU0jz3Pg2OmHKJ5w+D9Ogk1vhwRiqEBAqcb0GVhCyHw==
+  dependencies:
+    "@nomicfoundation/ethereumjs-common" "4.0.1"
+    "@nomicfoundation/ethereumjs-rlp" "5.0.1"
+    "@nomicfoundation/ethereumjs-trie" "6.0.1"
+    "@nomicfoundation/ethereumjs-tx" "5.0.1"
+    "@nomicfoundation/ethereumjs-util" "9.0.1"
     ethereum-cryptography "0.1.3"
+    ethers "^5.7.1"
 
-"@nomicfoundation/ethereumjs-blockchain@^6.0.0":
-  version "6.0.0"
-  resolved "https://registry.yarnpkg.com/@nomicfoundation/ethereumjs-blockchain/-/ethereumjs-blockchain-6.0.0.tgz#1a8c243a46d4d3691631f139bfb3a4a157187b0c"
-  integrity sha512-pLFEoea6MWd81QQYSReLlLfH7N9v7lH66JC/NMPN848ySPPQA5renWnE7wPByfQFzNrPBuDDRFFULMDmj1C0xw==
-  dependencies:
-    "@nomicfoundation/ethereumjs-block" "^4.0.0"
-    "@nomicfoundation/ethereumjs-common" "^3.0.0"
-    "@nomicfoundation/ethereumjs-ethash" "^2.0.0"
-    "@nomicfoundation/ethereumjs-rlp" "^4.0.0"
-    "@nomicfoundation/ethereumjs-trie" "^5.0.0"
-    "@nomicfoundation/ethereumjs-util" "^8.0.0"
+"@nomicfoundation/ethereumjs-block@5.0.2":
+  version "5.0.2"
+  resolved "https://registry.yarnpkg.com/@nomicfoundation/ethereumjs-block/-/ethereumjs-block-5.0.2.tgz#13a7968f5964f1697da941281b7f7943b0465d04"
+  integrity sha512-hSe6CuHI4SsSiWWjHDIzWhSiAVpzMUcDRpWYzN0T9l8/Rz7xNn3elwVOJ/tAyS0LqL6vitUD78Uk7lQDXZun7Q==
+  dependencies:
+    "@nomicfoundation/ethereumjs-common" "4.0.2"
+    "@nomicfoundation/ethereumjs-rlp" "5.0.2"
+    "@nomicfoundation/ethereumjs-trie" "6.0.2"
+    "@nomicfoundation/ethereumjs-tx" "5.0.2"
+    "@nomicfoundation/ethereumjs-util" "9.0.2"
+    ethereum-cryptography "0.1.3"
+    ethers "^5.7.1"
+
+"@nomicfoundation/ethereumjs-blockchain@7.0.1":
+  version "7.0.1"
+  resolved "https://registry.yarnpkg.com/@nomicfoundation/ethereumjs-blockchain/-/ethereumjs-blockchain-7.0.1.tgz#80e0bd3535bfeb9baa29836b6f25123dab06a726"
+  integrity sha512-NhzndlGg829XXbqJEYrF1VeZhAwSPgsK/OB7TVrdzft3y918hW5KNd7gIZ85sn6peDZOdjBsAXIpXZ38oBYE5A==
+  dependencies:
+    "@nomicfoundation/ethereumjs-block" "5.0.1"
+    "@nomicfoundation/ethereumjs-common" "4.0.1"
+    "@nomicfoundation/ethereumjs-ethash" "3.0.1"
+    "@nomicfoundation/ethereumjs-rlp" "5.0.1"
+    "@nomicfoundation/ethereumjs-trie" "6.0.1"
+    "@nomicfoundation/ethereumjs-tx" "5.0.1"
+    "@nomicfoundation/ethereumjs-util" "9.0.1"
     abstract-level "^1.0.3"
     debug "^4.3.3"
     ethereum-cryptography "0.1.3"
@@ -1500,109 +1689,249 @@
     lru-cache "^5.1.1"
     memory-level "^1.0.0"
 
-"@nomicfoundation/ethereumjs-common@^3.0.0":
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/@nomicfoundation/ethereumjs-common/-/ethereumjs-common-3.0.0.tgz#f6bcc7753994555e49ab3aa517fc8bcf89c280b9"
-  integrity sha512-WS7qSshQfxoZOpHG/XqlHEGRG1zmyjYrvmATvc4c62+gZXgre1ymYP8ZNgx/3FyZY0TWe9OjFlKOfLqmgOeYwA==
+"@nomicfoundation/ethereumjs-blockchain@7.0.2":
+  version "7.0.2"
+  resolved "https://registry.yarnpkg.com/@nomicfoundation/ethereumjs-blockchain/-/ethereumjs-blockchain-7.0.2.tgz#45323b673b3d2fab6b5008535340d1b8fea7d446"
+  integrity sha512-8UUsSXJs+MFfIIAKdh3cG16iNmWzWC/91P40sazNvrqhhdR/RtGDlFk2iFTGbBAZPs2+klZVzhRX8m2wvuvz3w==
+  dependencies:
+    "@nomicfoundation/ethereumjs-block" "5.0.2"
+    "@nomicfoundation/ethereumjs-common" "4.0.2"
+    "@nomicfoundation/ethereumjs-ethash" "3.0.2"
+    "@nomicfoundation/ethereumjs-rlp" "5.0.2"
+    "@nomicfoundation/ethereumjs-trie" "6.0.2"
+    "@nomicfoundation/ethereumjs-tx" "5.0.2"
+    "@nomicfoundation/ethereumjs-util" "9.0.2"
+    abstract-level "^1.0.3"
+    debug "^4.3.3"
+    ethereum-cryptography "0.1.3"
+    level "^8.0.0"
+    lru-cache "^5.1.1"
+    memory-level "^1.0.0"
+
+"@nomicfoundation/ethereumjs-common@4.0.1":
+  version "4.0.1"
+  resolved "https://registry.yarnpkg.com/@nomicfoundation/ethereumjs-common/-/ethereumjs-common-4.0.1.tgz#4702d82df35b07b5407583b54a45bf728e46a2f0"
+  integrity sha512-OBErlkfp54GpeiE06brBW/TTbtbuBJV5YI5Nz/aB2evTDo+KawyEzPjBlSr84z/8MFfj8wS2wxzQX1o32cev5g==
   dependencies:
-    "@nomicfoundation/ethereumjs-util" "^8.0.0"
+    "@nomicfoundation/ethereumjs-util" "9.0.1"
     crc-32 "^1.2.0"
 
-"@nomicfoundation/ethereumjs-ethash@^2.0.0":
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/@nomicfoundation/ethereumjs-ethash/-/ethereumjs-ethash-2.0.0.tgz#11539c32fe0990e1122ff987d1b84cfa34774e81"
-  integrity sha512-WpDvnRncfDUuXdsAXlI4lXbqUDOA+adYRQaEezIkxqDkc+LDyYDbd/xairmY98GnQzo1zIqsIL6GB5MoMSJDew==
+"@nomicfoundation/ethereumjs-common@4.0.2":
+  version "4.0.2"
+  resolved "https://registry.yarnpkg.com/@nomicfoundation/ethereumjs-common/-/ethereumjs-common-4.0.2.tgz#a15d1651ca36757588fdaf2a7d381a150662a3c3"
+  integrity sha512-I2WGP3HMGsOoycSdOTSqIaES0ughQTueOsddJ36aYVpI3SN8YSusgRFLwzDJwRFVIYDKx/iJz0sQ5kBHVgdDwg==
   dependencies:
-    "@nomicfoundation/ethereumjs-block" "^4.0.0"
-    "@nomicfoundation/ethereumjs-rlp" "^4.0.0"
-    "@nomicfoundation/ethereumjs-util" "^8.0.0"
+    "@nomicfoundation/ethereumjs-util" "9.0.2"
+    crc-32 "^1.2.0"
+
+"@nomicfoundation/ethereumjs-ethash@3.0.1":
+  version "3.0.1"
+  resolved "https://registry.yarnpkg.com/@nomicfoundation/ethereumjs-ethash/-/ethereumjs-ethash-3.0.1.tgz#65ca494d53e71e8415c9a49ef48bc921c538fc41"
+  integrity sha512-KDjGIB5igzWOp8Ik5I6QiRH5DH+XgILlplsHR7TEuWANZA759G6krQ6o8bvj+tRUz08YygMQu/sGd9mJ1DYT8w==
+  dependencies:
+    "@nomicfoundation/ethereumjs-block" "5.0.1"
+    "@nomicfoundation/ethereumjs-rlp" "5.0.1"
+    "@nomicfoundation/ethereumjs-util" "9.0.1"
     abstract-level "^1.0.3"
     bigint-crypto-utils "^3.0.23"
     ethereum-cryptography "0.1.3"
 
-"@nomicfoundation/ethereumjs-evm@^1.0.0":
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/@nomicfoundation/ethereumjs-evm/-/ethereumjs-evm-1.0.0.tgz#99cd173c03b59107c156a69c5e215409098a370b"
-  integrity sha512-hVS6qRo3V1PLKCO210UfcEQHvlG7GqR8iFzp0yyjTg2TmJQizcChKgWo8KFsdMw6AyoLgLhHGHw4HdlP8a4i+Q==
+"@nomicfoundation/ethereumjs-ethash@3.0.2":
+  version "3.0.2"
+  resolved "https://registry.yarnpkg.com/@nomicfoundation/ethereumjs-ethash/-/ethereumjs-ethash-3.0.2.tgz#da77147f806401ee996bfddfa6487500118addca"
+  integrity sha512-8PfoOQCcIcO9Pylq0Buijuq/O73tmMVURK0OqdjhwqcGHYC2PwhbajDh7GZ55ekB0Px197ajK3PQhpKoiI/UPg==
   dependencies:
-    "@nomicfoundation/ethereumjs-common" "^3.0.0"
-    "@nomicfoundation/ethereumjs-util" "^8.0.0"
-    "@types/async-eventemitter" "^0.2.1"
-    async-eventemitter "^0.2.4"
+    "@nomicfoundation/ethereumjs-block" "5.0.2"
+    "@nomicfoundation/ethereumjs-rlp" "5.0.2"
+    "@nomicfoundation/ethereumjs-util" "9.0.2"
+    abstract-level "^1.0.3"
+    bigint-crypto-utils "^3.0.23"
+    ethereum-cryptography "0.1.3"
+
+"@nomicfoundation/ethereumjs-evm@2.0.1":
+  version "2.0.1"
+  resolved "https://registry.yarnpkg.com/@nomicfoundation/ethereumjs-evm/-/ethereumjs-evm-2.0.1.tgz#f35681e203363f69ce2b3d3bf9f44d4e883ca1f1"
+  integrity sha512-oL8vJcnk0Bx/onl+TgQOQ1t/534GKFaEG17fZmwtPFeH8S5soiBYPCLUrvANOl4sCp9elYxIMzIiTtMtNNN8EQ==
+  dependencies:
+    "@ethersproject/providers" "^5.7.1"
+    "@nomicfoundation/ethereumjs-common" "4.0.1"
+    "@nomicfoundation/ethereumjs-tx" "5.0.1"
+    "@nomicfoundation/ethereumjs-util" "9.0.1"
     debug "^4.3.3"
     ethereum-cryptography "0.1.3"
     mcl-wasm "^0.7.1"
     rustbn.js "~0.2.0"
 
-"@nomicfoundation/ethereumjs-rlp@^4.0.0", "@nomicfoundation/ethereumjs-rlp@^4.0.0-beta.2":
-  version "4.0.0"
-  resolved "https://registry.yarnpkg.com/@nomicfoundation/ethereumjs-rlp/-/ethereumjs-rlp-4.0.0.tgz#d9a9c5f0f10310c8849b6525101de455a53e771d"
-  integrity sha512-GaSOGk5QbUk4eBP5qFbpXoZoZUj/NrW7MRa0tKY4Ew4c2HAS0GXArEMAamtFrkazp0BO4K5p2ZCG3b2FmbShmw==
+"@nomicfoundation/ethereumjs-evm@2.0.2":
+  version "2.0.2"
+  resolved "https://registry.yarnpkg.com/@nomicfoundation/ethereumjs-evm/-/ethereumjs-evm-2.0.2.tgz#4c2f4b84c056047102a4fa41c127454e3f0cfcf6"
+  integrity sha512-rBLcUaUfANJxyOx9HIdMX6uXGin6lANCulIm/pjMgRqfiCRMZie3WKYxTSd8ZE/d+qT+zTedBF4+VHTdTSePmQ==
+  dependencies:
+    "@ethersproject/providers" "^5.7.1"
+    "@nomicfoundation/ethereumjs-common" "4.0.2"
+    "@nomicfoundation/ethereumjs-tx" "5.0.2"
+    "@nomicfoundation/ethereumjs-util" "9.0.2"
+    debug "^4.3.3"
+    ethereum-cryptography "0.1.3"
+    mcl-wasm "^0.7.1"
+    rustbn.js "~0.2.0"
 
-"@nomicfoundation/ethereumjs-statemanager@^1.0.0":
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/@nomicfoundation/ethereumjs-statemanager/-/ethereumjs-statemanager-1.0.0.tgz#14a9d4e1c828230368f7ab520c144c34d8721e4b"
-  integrity sha512-jCtqFjcd2QejtuAMjQzbil/4NHf5aAWxUc+CvS0JclQpl+7M0bxMofR2AJdtz+P3u0ke2euhYREDiE7iSO31vQ==
+"@nomicfoundation/ethereumjs-rlp@5.0.1":
+  version "5.0.1"
+  resolved "https://registry.yarnpkg.com/@nomicfoundation/ethereumjs-rlp/-/ethereumjs-rlp-5.0.1.tgz#0b30c1cf77d125d390408e391c4bb5291ef43c28"
+  integrity sha512-xtxrMGa8kP4zF5ApBQBtjlSbN5E2HI8m8FYgVSYAnO6ssUoY5pVPGy2H8+xdf/bmMa22Ce8nWMH3aEW8CcqMeQ==
+
+"@nomicfoundation/ethereumjs-rlp@5.0.2":
+  version "5.0.2"
+  resolved "https://registry.yarnpkg.com/@nomicfoundation/ethereumjs-rlp/-/ethereumjs-rlp-5.0.2.tgz#4fee8dc58a53ac6ae87fb1fca7c15dc06c6b5dea"
+  integrity sha512-QwmemBc+MMsHJ1P1QvPl8R8p2aPvvVcKBbvHnQOKBpBztEo0omN0eaob6FeZS/e3y9NSe+mfu3nNFBHszqkjTA==
+
+"@nomicfoundation/ethereumjs-statemanager@2.0.1":
+  version "2.0.1"
+  resolved "https://registry.yarnpkg.com/@nomicfoundation/ethereumjs-statemanager/-/ethereumjs-statemanager-2.0.1.tgz#8824a97938db4471911e2d2f140f79195def5935"
+  integrity sha512-B5ApMOnlruVOR7gisBaYwFX+L/AP7i/2oAahatssjPIBVDF6wTX1K7Qpa39E/nzsH8iYuL3krkYeUFIdO3EMUQ==
   dependencies:
-    "@nomicfoundation/ethereumjs-common" "^3.0.0"
-    "@nomicfoundation/ethereumjs-rlp" "^4.0.0"
-    "@nomicfoundation/ethereumjs-trie" "^5.0.0"
-    "@nomicfoundation/ethereumjs-util" "^8.0.0"
+    "@nomicfoundation/ethereumjs-common" "4.0.1"
+    "@nomicfoundation/ethereumjs-rlp" "5.0.1"
     debug "^4.3.3"
     ethereum-cryptography "0.1.3"
-    functional-red-black-tree "^1.0.1"
+    ethers "^5.7.1"
+    js-sdsl "^4.1.4"
 
-"@nomicfoundation/ethereumjs-trie@^5.0.0":
-  version "5.0.0"
-  resolved "https://registry.yarnpkg.com/@nomicfoundation/ethereumjs-trie/-/ethereumjs-trie-5.0.0.tgz#dcfbe3be53a94bc061c9767a396c16702bc2f5b7"
-  integrity sha512-LIj5XdE+s+t6WSuq/ttegJzZ1vliwg6wlb+Y9f4RlBpuK35B9K02bO7xU+E6Rgg9RGptkWd6TVLdedTI4eNc2A==
+"@nomicfoundation/ethereumjs-statemanager@2.0.2":
+  version "2.0.2"
+  resolved "https://registry.yarnpkg.com/@nomicfoundation/ethereumjs-statemanager/-/ethereumjs-statemanager-2.0.2.tgz#3ba4253b29b1211cafe4f9265fee5a0d780976e0"
+  integrity sha512-dlKy5dIXLuDubx8Z74sipciZnJTRSV/uHG48RSijhgm1V7eXYFC567xgKtsKiVZB1ViTP9iFL4B6Je0xD6X2OA==
   dependencies:
-    "@nomicfoundation/ethereumjs-rlp" "^4.0.0"
-    "@nomicfoundation/ethereumjs-util" "^8.0.0"
+    "@nomicfoundation/ethereumjs-common" "4.0.2"
+    "@nomicfoundation/ethereumjs-rlp" "5.0.2"
+    debug "^4.3.3"
+    ethereum-cryptography "0.1.3"
+    ethers "^5.7.1"
+    js-sdsl "^4.1.4"
+
+"@nomicfoundation/ethereumjs-trie@6.0.1":
+  version "6.0.1"
+  resolved "https://registry.yarnpkg.com/@nomicfoundation/ethereumjs-trie/-/ethereumjs-trie-6.0.1.tgz#662c55f6b50659fd4b22ea9f806a7401cafb7717"
+  integrity sha512-A64It/IMpDVODzCgxDgAAla8jNjNtsoQZIzZUfIV5AY6Coi4nvn7+VReBn5itlxMiL2yaTlQr9TRWp3CSI6VoA==
+  dependencies:
+    "@nomicfoundation/ethereumjs-rlp" "5.0.1"
+    "@nomicfoundation/ethereumjs-util" "9.0.1"
+    "@types/readable-stream" "^2.3.13"
     ethereum-cryptography "0.1.3"
     readable-stream "^3.6.0"
 
-"@nomicfoundation/ethereumjs-tx@^4.0.0":
-  version "4.0.0"
-  resolved "https://registry.yarnpkg.com/@nomicfoundation/ethereumjs-tx/-/ethereumjs-tx-4.0.0.tgz#59dc7452b0862b30342966f7052ab9a1f7802f52"
-  integrity sha512-Gg3Lir2lNUck43Kp/3x6TfBNwcWC9Z1wYue9Nz3v4xjdcv6oDW9QSMJxqsKw9QEGoBBZ+gqwpW7+F05/rs/g1w==
+"@nomicfoundation/ethereumjs-trie@6.0.2":
+  version "6.0.2"
+  resolved "https://registry.yarnpkg.com/@nomicfoundation/ethereumjs-trie/-/ethereumjs-trie-6.0.2.tgz#9a6dbd28482dca1bc162d12b3733acab8cd12835"
+  integrity sha512-yw8vg9hBeLYk4YNg5MrSJ5H55TLOv2FSWUTROtDtTMMmDGROsAu+0tBjiNGTnKRi400M6cEzoFfa89Fc5k8NTQ==
   dependencies:
-    "@nomicfoundation/ethereumjs-common" "^3.0.0"
-    "@nomicfoundation/ethereumjs-rlp" "^4.0.0"
-    "@nomicfoundation/ethereumjs-util" "^8.0.0"
+    "@nomicfoundation/ethereumjs-rlp" "5.0.2"
+    "@nomicfoundation/ethereumjs-util" "9.0.2"
+    "@types/readable-stream" "^2.3.13"
     ethereum-cryptography "0.1.3"
+    readable-stream "^3.6.0"
 
-"@nomicfoundation/ethereumjs-util@^8.0.0":
-  version "8.0.0"
-  resolved "https://registry.yarnpkg.com/@nomicfoundation/ethereumjs-util/-/ethereumjs-util-8.0.0.tgz#deb2b15d2c308a731e82977aefc4e61ca0ece6c5"
-  integrity sha512-2emi0NJ/HmTG+CGY58fa+DQuAoroFeSH9gKu9O6JnwTtlzJtgfTixuoOqLEgyyzZVvwfIpRueuePb8TonL1y+A==
+"@nomicfoundation/ethereumjs-tx@5.0.1":
+  version "5.0.1"
+  resolved "https://registry.yarnpkg.com/@nomicfoundation/ethereumjs-tx/-/ethereumjs-tx-5.0.1.tgz#7629dc2036b4a33c34e9f0a592b43227ef4f0c7d"
+  integrity sha512-0HwxUF2u2hrsIM1fsasjXvlbDOq1ZHFV2dd1yGq8CA+MEYhaxZr8OTScpVkkxqMwBcc5y83FyPl0J9MZn3kY0w==
+  dependencies:
+    "@chainsafe/ssz" "^0.9.2"
+    "@ethersproject/providers" "^5.7.2"
+    "@nomicfoundation/ethereumjs-common" "4.0.1"
+    "@nomicfoundation/ethereumjs-rlp" "5.0.1"
+    "@nomicfoundation/ethereumjs-util" "9.0.1"
+    ethereum-cryptography "0.1.3"
+
+"@nomicfoundation/ethereumjs-tx@5.0.2":
+  version "5.0.2"
+  resolved "https://registry.yarnpkg.com/@nomicfoundation/ethereumjs-tx/-/ethereumjs-tx-5.0.2.tgz#117813b69c0fdc14dd0446698a64be6df71d7e56"
+  integrity sha512-T+l4/MmTp7VhJeNloMkM+lPU3YMUaXdcXgTGCf8+ZFvV9NYZTRLFekRwlG6/JMmVfIfbrW+dRRJ9A6H5Q/Z64g==
+  dependencies:
+    "@chainsafe/ssz" "^0.9.2"
+    "@ethersproject/providers" "^5.7.2"
+    "@nomicfoundation/ethereumjs-common" "4.0.2"
+    "@nomicfoundation/ethereumjs-rlp" "5.0.2"
+    "@nomicfoundation/ethereumjs-util" "9.0.2"
+    ethereum-cryptography "0.1.3"
+
+"@nomicfoundation/ethereumjs-util@9.0.1":
+  version "9.0.1"
+  resolved "https://registry.yarnpkg.com/@nomicfoundation/ethereumjs-util/-/ethereumjs-util-9.0.1.tgz#530cda8bae33f8b5020a8f199ed1d0a2ce48ec89"
+  integrity sha512-TwbhOWQ8QoSCFhV/DDfSmyfFIHjPjFBj957219+V3jTZYZ2rf9PmDtNOeZWAE3p3vlp8xb02XGpd0v6nTUPbsA==
   dependencies:
-    "@nomicfoundation/ethereumjs-rlp" "^4.0.0-beta.2"
+    "@chainsafe/ssz" "^0.10.0"
+    "@nomicfoundation/ethereumjs-rlp" "5.0.1"
     ethereum-cryptography "0.1.3"
 
-"@nomicfoundation/ethereumjs-vm@^6.0.0":
-  version "6.0.0"
-  resolved "https://registry.yarnpkg.com/@nomicfoundation/ethereumjs-vm/-/ethereumjs-vm-6.0.0.tgz#2bb50d332bf41790b01a3767ffec3987585d1de6"
-  integrity sha512-JMPxvPQ3fzD063Sg3Tp+UdwUkVxMoo1uML6KSzFhMH3hoQi/LMuXBoEHAoW83/vyNS9BxEe6jm6LmT5xdeEJ6w==
-  dependencies:
-    "@nomicfoundation/ethereumjs-block" "^4.0.0"
-    "@nomicfoundation/ethereumjs-blockchain" "^6.0.0"
-    "@nomicfoundation/ethereumjs-common" "^3.0.0"
-    "@nomicfoundation/ethereumjs-evm" "^1.0.0"
-    "@nomicfoundation/ethereumjs-rlp" "^4.0.0"
-    "@nomicfoundation/ethereumjs-statemanager" "^1.0.0"
-    "@nomicfoundation/ethereumjs-trie" "^5.0.0"
-    "@nomicfoundation/ethereumjs-tx" "^4.0.0"
-    "@nomicfoundation/ethereumjs-util" "^8.0.0"
-    "@types/async-eventemitter" "^0.2.1"
-    async-eventemitter "^0.2.4"
+"@nomicfoundation/ethereumjs-util@9.0.2":
+  version "9.0.2"
+  resolved "https://registry.yarnpkg.com/@nomicfoundation/ethereumjs-util/-/ethereumjs-util-9.0.2.tgz#16bdc1bb36f333b8a3559bbb4b17dac805ce904d"
+  integrity sha512-4Wu9D3LykbSBWZo8nJCnzVIYGvGCuyiYLIJa9XXNVt1q1jUzHdB+sJvx95VGCpPkCT+IbLecW6yfzy3E1bQrwQ==
+  dependencies:
+    "@chainsafe/ssz" "^0.10.0"
+    "@nomicfoundation/ethereumjs-rlp" "5.0.2"
+    ethereum-cryptography "0.1.3"
+
+"@nomicfoundation/ethereumjs-vm@7.0.1":
+  version "7.0.1"
+  resolved "https://registry.yarnpkg.com/@nomicfoundation/ethereumjs-vm/-/ethereumjs-vm-7.0.1.tgz#7d035e0993bcad10716c8b36e61dfb87fa3ca05f"
+  integrity sha512-rArhyn0jPsS/D+ApFsz3yVJMQ29+pVzNZ0VJgkzAZ+7FqXSRtThl1C1prhmlVr3YNUlfpZ69Ak+RUT4g7VoOuQ==
+  dependencies:
+    "@nomicfoundation/ethereumjs-block" "5.0.1"
+    "@nomicfoundation/ethereumjs-blockchain" "7.0.1"
+    "@nomicfoundation/ethereumjs-common" "4.0.1"
+    "@nomicfoundation/ethereumjs-evm" "2.0.1"
+    "@nomicfoundation/ethereumjs-rlp" "5.0.1"
+    "@nomicfoundation/ethereumjs-statemanager" "2.0.1"
+    "@nomicfoundation/ethereumjs-trie" "6.0.1"
+    "@nomicfoundation/ethereumjs-tx" "5.0.1"
+    "@nomicfoundation/ethereumjs-util" "9.0.1"
     debug "^4.3.3"
     ethereum-cryptography "0.1.3"
-    functional-red-black-tree "^1.0.1"
     mcl-wasm "^0.7.1"
     rustbn.js "~0.2.0"
 
-"@nomicfoundation/hardhat-verify@^1.1.0":
+"@nomicfoundation/ethereumjs-vm@7.0.2":
+  version "7.0.2"
+  resolved "https://registry.yarnpkg.com/@nomicfoundation/ethereumjs-vm/-/ethereumjs-vm-7.0.2.tgz#3b0852cb3584df0e18c182d0672a3596c9ca95e6"
+  integrity sha512-Bj3KZT64j54Tcwr7Qm/0jkeZXJMfdcAtRBedou+Hx0dPOSIgqaIr0vvLwP65TpHbak2DmAq+KJbW2KNtIoFwvA==
+  dependencies:
+    "@nomicfoundation/ethereumjs-block" "5.0.2"
+    "@nomicfoundation/ethereumjs-blockchain" "7.0.2"
+    "@nomicfoundation/ethereumjs-common" "4.0.2"
+    "@nomicfoundation/ethereumjs-evm" "2.0.2"
+    "@nomicfoundation/ethereumjs-rlp" "5.0.2"
+    "@nomicfoundation/ethereumjs-statemanager" "2.0.2"
+    "@nomicfoundation/ethereumjs-trie" "6.0.2"
+    "@nomicfoundation/ethereumjs-tx" "5.0.2"
+    "@nomicfoundation/ethereumjs-util" "9.0.2"
+    debug "^4.3.3"
+    ethereum-cryptography "0.1.3"
+    mcl-wasm "^0.7.1"
+    rustbn.js "~0.2.0"
+
+"@nomicfoundation/hardhat-chai-matchers@^1.0.3", "@nomicfoundation/hardhat-chai-matchers@^1.0.6":
+  version "1.0.6"
+  resolved "https://registry.yarnpkg.com/@nomicfoundation/hardhat-chai-matchers/-/hardhat-chai-matchers-1.0.6.tgz#72a2e312e1504ee5dd73fe302932736432ba96bc"
+  integrity sha512-f5ZMNmabZeZegEfuxn/0kW+mm7+yV7VNDxLpMOMGXWFJ2l/Ct3QShujzDRF9cOkK9Ui/hbDeOWGZqyQALDXVCQ==
+  dependencies:
+    "@ethersproject/abi" "^5.1.2"
+    "@types/chai-as-promised" "^7.1.3"
+    chai-as-promised "^7.1.1"
+    deep-eql "^4.0.1"
+    ordinal "^1.0.3"
+
+"@nomicfoundation/hardhat-ethers@^3.0.4":
+  version "3.0.4"
+  resolved "https://registry.yarnpkg.com/@nomicfoundation/hardhat-ethers/-/hardhat-ethers-3.0.4.tgz#6f0df2424e687e26d6574610de7a36bd69485cc1"
+  integrity sha512-k9qbLoY7qn6C6Y1LI0gk2kyHXil2Tauj4kGzQ8pgxYXIGw8lWn8tuuL72E11CrlKaXRUvOgF0EXrv/msPI2SbA==
+  dependencies:
+    debug "^4.1.1"
+    lodash.isequal "^4.5.0"
+
+"@nomicfoundation/hardhat-verify@^1.0.2", "@nomicfoundation/hardhat-verify@^1.1.0":
   version "1.1.1"
   resolved "https://registry.yarnpkg.com/@nomicfoundation/hardhat-verify/-/hardhat-verify-1.1.1.tgz#6a433d777ce0172d1f0edf7f2d3e1df14b3ecfc1"
   integrity sha512-9QsTYD7pcZaQFEA3tBb/D/oCStYDiEVDN7Dxeo/4SCyHRSm86APypxxdOMEPlGmXsAvd+p1j/dTODcpxb8aztA==
@@ -1617,71 +1946,71 @@
     table "^6.8.0"
     undici "^5.14.0"
 
-"@nomicfoundation/solidity-analyzer-darwin-arm64@0.1.0":
-  version "0.1.0"
-  resolved "https://registry.yarnpkg.com/@nomicfoundation/solidity-analyzer-darwin-arm64/-/solidity-analyzer-darwin-arm64-0.1.0.tgz#83a7367342bd053a76d04bbcf4f373fef07cf760"
-  integrity sha512-vEF3yKuuzfMHsZecHQcnkUrqm8mnTWfJeEVFHpg+cO+le96xQA4lAJYdUan8pXZohQxv1fSReQsn4QGNuBNuCw==
+"@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"
+  integrity sha512-KcTodaQw8ivDZyF+D76FokN/HdpgGpfjc/gFCImdLUyqB6eSWVaZPazMbeAjmfhx3R0zm/NYVzxwAokFKgrc0w==
 
-"@nomicfoundation/solidity-analyzer-darwin-x64@0.1.0":
-  version "0.1.0"
-  resolved "https://registry.yarnpkg.com/@nomicfoundation/solidity-analyzer-darwin-x64/-/solidity-analyzer-darwin-x64-0.1.0.tgz#1225f7da647ae1ad25a87125664704ecc0af6ccc"
-  integrity sha512-dlHeIg0pTL4dB1l9JDwbi/JG6dHQaU1xpDK+ugYO8eJ1kxx9Dh2isEUtA4d02cQAl22cjOHTvifAk96A+ItEHA==
+"@nomicfoundation/solidity-analyzer-darwin-x64@0.1.1":
+  version "0.1.1"
+  resolved "https://registry.yarnpkg.com/@nomicfoundation/solidity-analyzer-darwin-x64/-/solidity-analyzer-darwin-x64-0.1.1.tgz#6e25ccdf6e2d22389c35553b64fe6f3fdaec432c"
+  integrity sha512-XhQG4BaJE6cIbjAVtzGOGbK3sn1BO9W29uhk9J8y8fZF1DYz0Doj8QDMfpMu+A6TjPDs61lbsmeYodIDnfveSA==
 
-"@nomicfoundation/solidity-analyzer-freebsd-x64@0.1.0":
-  version "0.1.0"
-  resolved "https://registry.yarnpkg.com/@nomicfoundation/solidity-analyzer-freebsd-x64/-/solidity-analyzer-freebsd-x64-0.1.0.tgz#dbc052dcdfd50ae50fd5ae1788b69b4e0fa40040"
-  integrity sha512-WFCZYMv86WowDA4GiJKnebMQRt3kCcFqHeIomW6NMyqiKqhK1kIZCxSLDYsxqlx396kKLPN1713Q1S8tu68GKg==
+"@nomicfoundation/solidity-analyzer-freebsd-x64@0.1.1":
+  version "0.1.1"
+  resolved "https://registry.yarnpkg.com/@nomicfoundation/solidity-analyzer-freebsd-x64/-/solidity-analyzer-freebsd-x64-0.1.1.tgz#0a224ea50317139caeebcdedd435c28a039d169c"
+  integrity sha512-GHF1VKRdHW3G8CndkwdaeLkVBi5A9u2jwtlS7SLhBc8b5U/GcoL39Q+1CSO3hYqePNP+eV5YI7Zgm0ea6kMHoA==
 
-"@nomicfoundation/solidity-analyzer-linux-arm64-gnu@0.1.0":
-  version "0.1.0"
-  resolved "https://registry.yarnpkg.com/@nomicfoundation/solidity-analyzer-linux-arm64-gnu/-/solidity-analyzer-linux-arm64-gnu-0.1.0.tgz#e6b2eea633995b557e74e881d2a43eab4760903d"
-  integrity sha512-DTw6MNQWWlCgc71Pq7CEhEqkb7fZnS7oly13pujs4cMH1sR0JzNk90Mp1zpSCsCs4oKan2ClhMlLKtNat/XRKQ==
+"@nomicfoundation/solidity-analyzer-linux-arm64-gnu@0.1.1":
+  version "0.1.1"
+  resolved "https://registry.yarnpkg.com/@nomicfoundation/solidity-analyzer-linux-arm64-gnu/-/solidity-analyzer-linux-arm64-gnu-0.1.1.tgz#dfa085d9ffab9efb2e7b383aed3f557f7687ac2b"
+  integrity sha512-g4Cv2fO37ZsUENQ2vwPnZc2zRenHyAxHcyBjKcjaSmmkKrFr64yvzeNO8S3GBFCo90rfochLs99wFVGT/0owpg==
 
-"@nomicfoundation/solidity-analyzer-linux-arm64-musl@0.1.0":
-  version "0.1.0"
-  resolved "https://registry.yarnpkg.com/@nomicfoundation/solidity-analyzer-linux-arm64-musl/-/solidity-analyzer-linux-arm64-musl-0.1.0.tgz#af81107f5afa794f19988a368647727806e18dc4"
-  integrity sha512-wUpUnR/3GV5Da88MhrxXh/lhb9kxh9V3Jya2NpBEhKDIRCDmtXMSqPMXHZmOR9DfCwCvG6vLFPr/+YrPCnUN0w==
+"@nomicfoundation/solidity-analyzer-linux-arm64-musl@0.1.1":
+  version "0.1.1"
+  resolved "https://registry.yarnpkg.com/@nomicfoundation/solidity-analyzer-linux-arm64-musl/-/solidity-analyzer-linux-arm64-musl-0.1.1.tgz#c9e06b5d513dd3ab02a7ac069c160051675889a4"
+  integrity sha512-WJ3CE5Oek25OGE3WwzK7oaopY8xMw9Lhb0mlYuJl/maZVo+WtP36XoQTb7bW/i8aAdHW5Z+BqrHMux23pvxG3w==
 
-"@nomicfoundation/solidity-analyzer-linux-x64-gnu@0.1.0":
-  version "0.1.0"
-  resolved "https://registry.yarnpkg.com/@nomicfoundation/solidity-analyzer-linux-x64-gnu/-/solidity-analyzer-linux-x64-gnu-0.1.0.tgz#6877e1da1a06a9f08446070ab6e0a5347109f868"
-  integrity sha512-lR0AxK1x/MeKQ/3Pt923kPvwigmGX3OxeU5qNtQ9pj9iucgk4PzhbS3ruUeSpYhUxG50jN4RkIGwUMoev5lguw==
+"@nomicfoundation/solidity-analyzer-linux-x64-gnu@0.1.1":
+  version "0.1.1"
+  resolved "https://registry.yarnpkg.com/@nomicfoundation/solidity-analyzer-linux-x64-gnu/-/solidity-analyzer-linux-x64-gnu-0.1.1.tgz#8d328d16839e52571f72f2998c81e46bf320f893"
+  integrity sha512-5WN7leSr5fkUBBjE4f3wKENUy9HQStu7HmWqbtknfXkkil+eNWiBV275IOlpXku7v3uLsXTOKpnnGHJYI2qsdA==
 
-"@nomicfoundation/solidity-analyzer-linux-x64-musl@0.1.0":
-  version "0.1.0"
-  resolved "https://registry.yarnpkg.com/@nomicfoundation/solidity-analyzer-linux-x64-musl/-/solidity-analyzer-linux-x64-musl-0.1.0.tgz#bb6cd83a0c259eccef4183796b6329a66cf7ebd9"
-  integrity sha512-A1he/8gy/JeBD3FKvmI6WUJrGrI5uWJNr5Xb9WdV+DK0F8msuOqpEByLlnTdLkXMwW7nSl3awvLezOs9xBHJEg==
+"@nomicfoundation/solidity-analyzer-linux-x64-musl@0.1.1":
+  version "0.1.1"
+  resolved "https://registry.yarnpkg.com/@nomicfoundation/solidity-analyzer-linux-x64-musl/-/solidity-analyzer-linux-x64-musl-0.1.1.tgz#9b49d0634b5976bb5ed1604a1e1b736f390959bb"
+  integrity sha512-KdYMkJOq0SYPQMmErv/63CwGwMm5XHenEna9X9aB8mQmhDBrYrlAOSsIPgFCUSL0hjxE3xHP65/EPXR/InD2+w==
 
-"@nomicfoundation/solidity-analyzer-win32-arm64-msvc@0.1.0":
-  version "0.1.0"
-  resolved "https://registry.yarnpkg.com/@nomicfoundation/solidity-analyzer-win32-arm64-msvc/-/solidity-analyzer-win32-arm64-msvc-0.1.0.tgz#9d4bca1cc9a1333fde985675083b0b7d165f6076"
-  integrity sha512-7x5SXZ9R9H4SluJZZP8XPN+ju7Mx+XeUMWZw7ZAqkdhP5mK19I4vz3x0zIWygmfE8RT7uQ5xMap0/9NPsO+ykw==
+"@nomicfoundation/solidity-analyzer-win32-arm64-msvc@0.1.1":
+  version "0.1.1"
+  resolved "https://registry.yarnpkg.com/@nomicfoundation/solidity-analyzer-win32-arm64-msvc/-/solidity-analyzer-win32-arm64-msvc-0.1.1.tgz#e2867af7264ebbcc3131ef837878955dd6a3676f"
+  integrity sha512-VFZASBfl4qiBYwW5xeY20exWhmv6ww9sWu/krWSesv3q5hA0o1JuzmPHR4LPN6SUZj5vcqci0O6JOL8BPw+APg==
 
-"@nomicfoundation/solidity-analyzer-win32-ia32-msvc@0.1.0":
-  version "0.1.0"
-  resolved "https://registry.yarnpkg.com/@nomicfoundation/solidity-analyzer-win32-ia32-msvc/-/solidity-analyzer-win32-ia32-msvc-0.1.0.tgz#0db5bfc6aa952bea4098d8d2c8947b4e5c4337ee"
-  integrity sha512-m7w3xf+hnE774YRXu+2mGV7RiF3QJtUoiYU61FascCkQhX3QMQavh7saH/vzb2jN5D24nT/jwvaHYX/MAM9zUw==
+"@nomicfoundation/solidity-analyzer-win32-ia32-msvc@0.1.1":
+  version "0.1.1"
+  resolved "https://registry.yarnpkg.com/@nomicfoundation/solidity-analyzer-win32-ia32-msvc/-/solidity-analyzer-win32-ia32-msvc-0.1.1.tgz#0685f78608dd516c8cdfb4896ed451317e559585"
+  integrity sha512-JnFkYuyCSA70j6Si6cS1A9Gh1aHTEb8kOTBApp/c7NRTFGNMH8eaInKlyuuiIbvYFhlXW4LicqyYuWNNq9hkpQ==
 
-"@nomicfoundation/solidity-analyzer-win32-x64-msvc@0.1.0":
-  version "0.1.0"
-  resolved "https://registry.yarnpkg.com/@nomicfoundation/solidity-analyzer-win32-x64-msvc/-/solidity-analyzer-win32-x64-msvc-0.1.0.tgz#2e0f39a2924dcd77db6b419828595e984fabcb33"
-  integrity sha512-xCuybjY0sLJQnJhupiFAXaek2EqF0AP0eBjgzaalPXSNvCEN6ZYHvUzdA50ENDVeSYFXcUsYf3+FsD3XKaeptA==
+"@nomicfoundation/solidity-analyzer-win32-x64-msvc@0.1.1":
+  version "0.1.1"
+  resolved "https://registry.yarnpkg.com/@nomicfoundation/solidity-analyzer-win32-x64-msvc/-/solidity-analyzer-win32-x64-msvc-0.1.1.tgz#c9a44f7108646f083b82e851486e0f6aeb785836"
+  integrity sha512-HrVJr6+WjIXGnw3Q9u6KQcbZCtk0caVWhCdFADySvRyUxJ8PnzlaP+MhwNE8oyT8OZ6ejHBRrrgjSqDCFXGirw==
 
 "@nomicfoundation/solidity-analyzer@^0.1.0":
-  version "0.1.0"
-  resolved "https://registry.yarnpkg.com/@nomicfoundation/solidity-analyzer/-/solidity-analyzer-0.1.0.tgz#e5ddc43ad5c0aab96e5054520d8e16212e125f50"
-  integrity sha512-xGWAiVCGOycvGiP/qrlf9f9eOn7fpNbyJygcB0P21a1MDuVPlKt0Srp7rvtBEutYQ48ouYnRXm33zlRnlTOPHg==
+  version "0.1.1"
+  resolved "https://registry.yarnpkg.com/@nomicfoundation/solidity-analyzer/-/solidity-analyzer-0.1.1.tgz#f5f4d36d3f66752f59a57e7208cd856f3ddf6f2d"
+  integrity sha512-1LMtXj1puAxyFusBgUIy5pZk3073cNXYnXUpuNKFghHbIit/xZgbk0AokpUADbNm3gyD6bFWl3LRFh3dhVdREg==
   optionalDependencies:
-    "@nomicfoundation/solidity-analyzer-darwin-arm64" "0.1.0"
-    "@nomicfoundation/solidity-analyzer-darwin-x64" "0.1.0"
-    "@nomicfoundation/solidity-analyzer-freebsd-x64" "0.1.0"
-    "@nomicfoundation/solidity-analyzer-linux-arm64-gnu" "0.1.0"
-    "@nomicfoundation/solidity-analyzer-linux-arm64-musl" "0.1.0"
-    "@nomicfoundation/solidity-analyzer-linux-x64-gnu" "0.1.0"
-    "@nomicfoundation/solidity-analyzer-linux-x64-musl" "0.1.0"
-    "@nomicfoundation/solidity-analyzer-win32-arm64-msvc" "0.1.0"
-    "@nomicfoundation/solidity-analyzer-win32-ia32-msvc" "0.1.0"
-    "@nomicfoundation/solidity-analyzer-win32-x64-msvc" "0.1.0"
+    "@nomicfoundation/solidity-analyzer-darwin-arm64" "0.1.1"
+    "@nomicfoundation/solidity-analyzer-darwin-x64" "0.1.1"
+    "@nomicfoundation/solidity-analyzer-freebsd-x64" "0.1.1"
+    "@nomicfoundation/solidity-analyzer-linux-arm64-gnu" "0.1.1"
+    "@nomicfoundation/solidity-analyzer-linux-arm64-musl" "0.1.1"
+    "@nomicfoundation/solidity-analyzer-linux-x64-gnu" "0.1.1"
+    "@nomicfoundation/solidity-analyzer-linux-x64-musl" "0.1.1"
+    "@nomicfoundation/solidity-analyzer-win32-arm64-msvc" "0.1.1"
+    "@nomicfoundation/solidity-analyzer-win32-ia32-msvc" "0.1.1"
+    "@nomicfoundation/solidity-analyzer-win32-x64-msvc" "0.1.1"
 
 "@nomiclabs/hardhat-docker@^2.0.0":
   version "2.0.2"
@@ -1692,10 +2021,10 @@
     fs-extra "^7.0.1"
     node-fetch "^2.6.0"
 
-"@nomiclabs/hardhat-ethers@^2.0.0":
-  version "2.2.2"
-  resolved "https://registry.yarnpkg.com/@nomiclabs/hardhat-ethers/-/hardhat-ethers-2.2.2.tgz#812d48929c3bf8fe840ec29eab4b613693467679"
-  integrity sha512-NLDlDFL2us07C0jB/9wzvR0kuLivChJWCXTKcj3yqjZqMoYp7g7wwS157F70VHx/+9gHIBGzak5pKDwG8gEefA==
+"@nomiclabs/hardhat-ethers@^2.0.0", "@nomiclabs/hardhat-ethers@^2.0.6":
+  version "2.2.3"
+  resolved "https://registry.yarnpkg.com/@nomiclabs/hardhat-ethers/-/hardhat-ethers-2.2.3.tgz#b41053e360c31a32c2640c9a45ee981a7e603fe0"
+  integrity sha512-YhzPdzb612X591FOe68q+qXVXGG2ANZRvDo0RRUtimev85rCrAlv/TLMEZw5c+kq9AbzocLTVX/h2jVIFPL9Xg==
 
 "@nomiclabs/hardhat-etherscan@^3.1.0", "@nomiclabs/hardhat-etherscan@^3.1.7":
   version "3.1.7"
@@ -1713,7 +2042,7 @@
     table "^6.8.0"
     undici "^5.14.0"
 
-"@nomiclabs/hardhat-solpp@^2.0.0":
+"@nomiclabs/hardhat-solpp@^2.0.0", "@nomiclabs/hardhat-solpp@^2.0.1":
   version "2.0.1"
   resolved "https://registry.yarnpkg.com/@nomiclabs/hardhat-solpp/-/hardhat-solpp-2.0.1.tgz#04039b3745b8d2b48c9b8bec6509e9785631aaba"
   integrity sha512-aWYvB91GPJcnye4Ph26Jd9BfBNNisI1iRNSbHB2i09OpxucSHAPMvvqTfWDN1HE5EMjqlTJ2rQLdlDcYqQxPJw==
@@ -1722,9 +2051,9 @@
     solpp "^0.11.5"
 
 "@nomiclabs/hardhat-vyper@^3.0.3":
-  version "3.0.3"
-  resolved "https://registry.yarnpkg.com/@nomiclabs/hardhat-vyper/-/hardhat-vyper-3.0.3.tgz#f20474c585e4828b6ab5be9cb78405344a328012"
-  integrity sha512-WzpXACy7d1AsEmanAOmEqqxI4wrIvDx6q6k07Xb68Dc4JB/+9gKb6kz6UF0Qviq8vYUVfJ8YRpyAjHVZ2uQFlg==
+  version "3.0.4"
+  resolved "https://registry.yarnpkg.com/@nomiclabs/hardhat-vyper/-/hardhat-vyper-3.0.4.tgz#ebd5590812225bea63a2e8a297be07802ae707e6"
+  integrity sha512-VSmNCs0MQCn7qgWubfSkJkFEJmsTvbimPsbxknM5jLFi7pNeDVB5eO00GaoweuZiWKBVTHYJsylVK5686GoPrQ==
   dependencies:
     debug "^4.1.1"
     fs-extra "^7.0.1"
@@ -1733,23 +2062,20 @@
     semver "^6.3.0"
 
 "@nomiclabs/hardhat-waffle@^2.0.0":
-  version "2.0.3"
-  resolved "https://registry.yarnpkg.com/@nomiclabs/hardhat-waffle/-/hardhat-waffle-2.0.3.tgz#9c538a09c5ed89f68f5fd2dc3f78f16ed1d6e0b1"
-  integrity sha512-049PHSnI1CZq6+XTbrMbMv5NaL7cednTfPenx02k3cEh8wBMLa6ys++dBETJa6JjfwgA9nBhhHQ173LJv6k2Pg==
-  dependencies:
-    "@types/sinon-chai" "^3.2.3"
-    "@types/web3" "1.0.19"
+  version "2.0.6"
+  resolved "https://registry.yarnpkg.com/@nomiclabs/hardhat-waffle/-/hardhat-waffle-2.0.6.tgz#d11cb063a5f61a77806053e54009c40ddee49a54"
+  integrity sha512-+Wz0hwmJGSI17B+BhU/qFRZ1l6/xMW82QGXE/Gi+WTmwgJrQefuBs1lIf7hzQ1hLk6hpkvb/zwcNkpVKRYTQYg==
+
+"@openzeppelin/contracts-upgradeable@4.6.0":
+  version "4.6.0"
+  resolved "https://registry.yarnpkg.com/@openzeppelin/contracts-upgradeable/-/contracts-upgradeable-4.6.0.tgz#1bf55f230f008554d4c6fe25eb165b85112108b0"
+  integrity sha512-5OnVuO4HlkjSCJO165a4i2Pu1zQGzMs//o54LPrwUgxvEO2P3ax1QuaSI0cEHHTveA77guS0PnNugpR2JMsPfA==
 
 "@openzeppelin/contracts-upgradeable@4.8.0":
   version "4.8.0"
   resolved "https://registry.yarnpkg.com/@openzeppelin/contracts-upgradeable/-/contracts-upgradeable-4.8.0.tgz#26688982f46969018e3ed3199e72a07c8d114275"
   integrity sha512-5GeFgqMiDlqGT8EdORadp1ntGF0qzWZLmEY7Wbp/yVhN7/B3NNzCxujuI77ktlyG81N3CUZP8cZe3ZAQ/cW10w==
 
-"@openzeppelin/contracts-upgradeable@^4.6.0":
-  version "4.8.1"
-  resolved "https://registry.yarnpkg.com/@openzeppelin/contracts-upgradeable/-/contracts-upgradeable-4.8.1.tgz#363f7dd08f25f8f77e16d374350c3d6b43340a7a"
-  integrity sha512-1wTv+20lNiC0R07jyIAbHU7TNHKRwGiTGRfiNnA8jOWjKT98g5OgLpYWOi40Vgpk8SPLA9EvfJAbAeIyVn+7Bw==
-
 "@openzeppelin/contracts@4.6.0":
   version "4.6.0"
   resolved "https://registry.yarnpkg.com/@openzeppelin/contracts/-/contracts-4.6.0.tgz#c91cf64bc27f573836dba4122758b4743418c1b3"
@@ -1761,9 +2087,21 @@
   integrity sha512-AGuwhRRL+NaKx73WKRNzeCxOCOCxpaqF+kp8TJ89QzAipSwZy/NoflkWaL9bywXFRhIzXt8j38sfF7KBKCPWLw==
 
 "@openzeppelin/contracts@^4.8.0":
-  version "4.8.1"
-  resolved "https://registry.yarnpkg.com/@openzeppelin/contracts/-/contracts-4.8.1.tgz#709cfc4bbb3ca9f4460d60101f15dac6b7a2d5e4"
-  integrity sha512-xQ6eUZl+RDyb/FiZe1h+U7qr/f4p/SrTSQcTPH2bjur3C5DbuW/zFgCU/b1P/xcIaEqJep+9ju4xDRi3rmChdQ==
+  version "4.9.3"
+  resolved "https://registry.yarnpkg.com/@openzeppelin/contracts/-/contracts-4.9.3.tgz#00d7a8cf35a475b160b3f0293a6403c511099364"
+  integrity sha512-He3LieZ1pP2TNt5JbkPA4PNT9WC3gOTOlDcFGJW4Le4QKqwmiNJCRt44APfxMxvq7OugU/cqYuPcSBzOw38DAg==
+
+"@pkgr/utils@^2.3.1":
+  version "2.4.2"
+  resolved "https://registry.yarnpkg.com/@pkgr/utils/-/utils-2.4.2.tgz#9e638bbe9a6a6f165580dc943f138fd3309a2cbc"
+  integrity sha512-POgTXhjrTfbTV63DiFXav4lBHiICLKKwDeaKn9Nphwj7WH6m0hMMCaJkMyRWjgtPFyRKRVoMXXjczsTQRDEhYw==
+  dependencies:
+    cross-spawn "^7.0.3"
+    fast-glob "^3.3.0"
+    is-glob "^4.0.3"
+    open "^9.1.0"
+    picocolors "^1.0.0"
+    tslib "^2.6.0"
 
 "@resolver-engine/core@^0.3.3":
   version "0.3.3"
@@ -1803,25 +2141,42 @@
     url "^0.11.0"
 
 "@scure/base@~1.1.0":
-  version "1.1.1"
-  resolved "https://registry.yarnpkg.com/@scure/base/-/base-1.1.1.tgz#ebb651ee52ff84f420097055f4bf46cfba403938"
-  integrity sha512-ZxOhsSyxYwLJj3pLZCefNitxsj093tb2vq90mp2txoYeBqbcjDjqFhyM8eUjq/uFm6zJ+mUuqxlS2FkuSY1MTA==
+  version "1.1.3"
+  resolved "https://registry.yarnpkg.com/@scure/base/-/base-1.1.3.tgz#8584115565228290a6c6c4961973e0903bb3df2f"
+  integrity sha512-/+SgoRjLq7Xlf0CWuLHq2LUZeL/w65kfzAPG5NH9pcmBhs+nunQTn4gvdwgMTIXnt9b2C/1SeL2XiysZEyIC9Q==
 
-"@scure/bip32@1.1.0":
-  version "1.1.0"
-  resolved "https://registry.yarnpkg.com/@scure/bip32/-/bip32-1.1.0.tgz#dea45875e7fbc720c2b4560325f1cf5d2246d95b"
-  integrity sha512-ftTW3kKX54YXLCxH6BB7oEEoJfoE2pIgw7MINKAs5PsS6nqKPuKk1haTF/EuHmYqG330t5GSrdmtRuHaY1a62Q==
+"@scure/bip32@1.1.5":
+  version "1.1.5"
+  resolved "https://registry.yarnpkg.com/@scure/bip32/-/bip32-1.1.5.tgz#d2ccae16dcc2e75bc1d75f5ef3c66a338d1ba300"
+  integrity sha512-XyNh1rB0SkEqd3tXcXMi+Xe1fvg+kUIcoRIEujP1Jgv7DqW2r9lg3Ah0NkFaCs9sTkQAQA8kw7xiRXzENi9Rtw==
   dependencies:
-    "@noble/hashes" "~1.1.1"
-    "@noble/secp256k1" "~1.6.0"
+    "@noble/hashes" "~1.2.0"
+    "@noble/secp256k1" "~1.7.0"
     "@scure/base" "~1.1.0"
 
-"@scure/bip39@1.1.0":
-  version "1.1.0"
-  resolved "https://registry.yarnpkg.com/@scure/bip39/-/bip39-1.1.0.tgz#92f11d095bae025f166bef3defcc5bf4945d419a"
-  integrity sha512-pwrPOS16VeTKg98dYXQyIjJEcWfz7/1YJIwxUEPFfQPtc86Ym/1sVgQ2RLoD43AazMk2l/unK4ITySSpW2+82w==
+"@scure/bip32@1.3.1":
+  version "1.3.1"
+  resolved "https://registry.yarnpkg.com/@scure/bip32/-/bip32-1.3.1.tgz#7248aea723667f98160f593d621c47e208ccbb10"
+  integrity sha512-osvveYtyzdEVbt3OfwwXFr4P2iVBL5u1Q3q4ONBfDY/UpOuXmOlbgwc1xECEboY8wIays8Yt6onaWMUdUbfl0A==
+  dependencies:
+    "@noble/curves" "~1.1.0"
+    "@noble/hashes" "~1.3.1"
+    "@scure/base" "~1.1.0"
+
+"@scure/bip39@1.1.1":
+  version "1.1.1"
+  resolved "https://registry.yarnpkg.com/@scure/bip39/-/bip39-1.1.1.tgz#b54557b2e86214319405db819c4b6a370cf340c5"
+  integrity sha512-t+wDck2rVkh65Hmv280fYdVdY25J9YeEUIgn2LG1WM6gxFkGzcksoDiUkWVpVp3Oex9xGC68JU2dSbUfwZ2jPg==
+  dependencies:
+    "@noble/hashes" "~1.2.0"
+    "@scure/base" "~1.1.0"
+
+"@scure/bip39@1.2.1":
+  version "1.2.1"
+  resolved "https://registry.yarnpkg.com/@scure/bip39/-/bip39-1.2.1.tgz#5cee8978656b272a917b7871c981e0541ad6ac2a"
+  integrity sha512-Z3/Fsz1yr904dduJD0NpiyRHhRYHdcnyh73FZWiV+/qhWi83wNJ3NWolYqCEN+ZWsUz2TWwajJggcRE9r1zUYg==
   dependencies:
-    "@noble/hashes" "~1.1.1"
+    "@noble/hashes" "~1.3.0"
     "@scure/base" "~1.1.0"
 
 "@sentry/core@5.30.0":
@@ -1892,10 +2247,10 @@
     "@sentry/types" "5.30.0"
     tslib "^1.9.3"
 
-"@sinclair/typebox@^0.24.1":
-  version "0.24.51"
-  resolved "https://registry.yarnpkg.com/@sinclair/typebox/-/typebox-0.24.51.tgz#645f33fe4e02defe26f2f5c0410e1c094eac7f5f"
-  integrity sha512-1P1OROm/rdubP5aFDSZQILU0vrLCJ4fvHt6EoqHEM+2D/G5MK3bIaymUKLit8Js9gbns5UyJnkP/TZROLw4tUA==
+"@sinclair/typebox@^0.27.8":
+  version "0.27.8"
+  resolved "https://registry.yarnpkg.com/@sinclair/typebox/-/typebox-0.27.8.tgz#6667fac16c436b5434a387a34dedb013198f6e6e"
+  integrity sha512-+Fj43pSMwJs4KRrH/938Uf+uAELIgVBmQzg/q1YG10djyfA3TnrU8N8XzqCh/okZdszqBQTZf96idMfE5lnwTA==
 
 "@sindresorhus/is@^0.14.0":
   version "0.14.0"
@@ -1907,21 +2262,21 @@
   resolved "https://registry.yarnpkg.com/@sindresorhus/is/-/is-4.6.0.tgz#3c7c9c46e678feefe7a2e5bb609d3dbd665ffb3f"
   integrity sha512-t09vSN3MdfsyCHoFcTRCH/iUtG7OJ0CsjzB8cjAmKc/va/kIgeDI/TxsigdncE/4be734m0cvIYwNaV4i2XqAw==
 
-"@sinonjs/commons@^1.7.0":
-  version "1.8.4"
-  resolved "https://registry.yarnpkg.com/@sinonjs/commons/-/commons-1.8.4.tgz#d1f2d80f1bd0f2520873f161588bd9b7f8567120"
-  integrity sha512-RpmQdHVo8hCEHDVpO39zToS9jOhR6nw+/lQAzRNq9ErrGV9IeHM71XCn68svVl/euFeVW6BWX4p35gkhbOcSIQ==
+"@sinonjs/commons@^3.0.0":
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/@sinonjs/commons/-/commons-3.0.0.tgz#beb434fe875d965265e04722ccfc21df7f755d72"
+  integrity sha512-jXBtWAF4vmdNmZgD5FoKsVLv3rPgDnLgPbU84LIJ3otV44vJlDRokVng5v8NFJdCf/da9legHcKaRuZs4L7faA==
   dependencies:
     type-detect "4.0.8"
 
-"@sinonjs/fake-timers@^9.1.2":
-  version "9.1.2"
-  resolved "https://registry.yarnpkg.com/@sinonjs/fake-timers/-/fake-timers-9.1.2.tgz#4eaab737fab77332ab132d396a3c0d364bd0ea8c"
-  integrity sha512-BPS4ynJW/o92PUR4wgriz2Ud5gpST5vz6GQfMixEDK0Z8ZCUv2M7SkBLykH56T++Xs+8ln9zTGbOvNGIe02/jw==
+"@sinonjs/fake-timers@^10.0.2":
+  version "10.3.0"
+  resolved "https://registry.yarnpkg.com/@sinonjs/fake-timers/-/fake-timers-10.3.0.tgz#55fdff1ecab9f354019129daf4df0dd4d923ea66"
+  integrity sha512-V4BG07kuYSUkTCSBHG8G8TNhM+F19jXFWnQtzj+we8DrkpSBCee9Z3Ms8yiGer/dlmhe35/Xdgyo3/0rQKg7YA==
   dependencies:
-    "@sinonjs/commons" "^1.7.0"
+    "@sinonjs/commons" "^3.0.0"
 
-"@solidity-parser/parser@^0.14.0", "@solidity-parser/parser@^0.14.1", "@solidity-parser/parser@^0.14.2":
+"@solidity-parser/parser@^0.14.0", "@solidity-parser/parser@^0.14.2":
   version "0.14.5"
   resolved "https://registry.yarnpkg.com/@solidity-parser/parser/-/parser-0.14.5.tgz#87bc3cc7b068e08195c219c91cd8ddff5ef1a804"
   integrity sha512-6dKnHZn7fg/iQATVEzqyUOyEidbn05q7YA2mQ9hC0MMXhhV3/JrsxmFSYZAcr7j1yUP700LLhTruvJ3MiQmjJg==
@@ -1949,6 +2304,16 @@
   dependencies:
     defer-to-connect "^2.0.0"
 
+"@ts-morph/common@~0.20.0":
+  version "0.20.0"
+  resolved "https://registry.yarnpkg.com/@ts-morph/common/-/common-0.20.0.tgz#3f161996b085ba4519731e4d24c35f6cba5b80af"
+  integrity sha512-7uKjByfbPpwuzkstL3L5MQyuXPSKdoNG93Fmi2JoDcTf3pEP731JdRFAduRVkOs8oqxPsXKA+ScrWkdQ8t/I+Q==
+  dependencies:
+    fast-glob "^3.2.12"
+    minimatch "^7.4.3"
+    mkdirp "^2.1.6"
+    path-browserify "^1.0.1"
+
 "@tsconfig/node10@^1.0.7":
   version "1.0.9"
   resolved "https://registry.yarnpkg.com/@tsconfig/node10/-/node10-1.0.9.tgz#df4907fc07a886922637b15e02d4cebc4c0021b2"
@@ -1965,9 +2330,17 @@
   integrity sha512-ysT8mhdixWK6Hw3i1V2AeRqZ5WfXg1G43mqoYlM2nc6388Fq5jcXyr5mRsqViLx/GJYdoL0bfXD8nmF+Zn/Iow==
 
 "@tsconfig/node16@^1.0.2":
-  version "1.0.3"
-  resolved "https://registry.yarnpkg.com/@tsconfig/node16/-/node16-1.0.3.tgz#472eaab5f15c1ffdd7f8628bd4c4f753995ec79e"
-  integrity sha512-yOlFc+7UtL/89t2ZhjPvvB/DeAr3r+Dq58IgzsFkOAvVC6NMJXmCGjbptdXdR9qsX7pKcTL+s87FtYREi2dEEQ==
+  version "1.0.4"
+  resolved "https://registry.yarnpkg.com/@tsconfig/node16/-/node16-1.0.4.tgz#0b92dcc0cc1c81f6f306a381f28e31b1a56536e9"
+  integrity sha512-vxhUy4J8lyeyinH7Azl1pdd43GJhZH/tP2weN8TntQblOY+A0XbT8DJk1/oCPuOOyg/Ja757rG0CgHcWC8OfMA==
+
+"@typechain/ethers-v5@^10.0.0":
+  version "10.2.1"
+  resolved "https://registry.yarnpkg.com/@typechain/ethers-v5/-/ethers-v5-10.2.1.tgz#50241e6957683281ecfa03fb5a6724d8a3ce2391"
+  integrity sha512-n3tQmCZjRE6IU4h6lqUGiQ1j866n5MTCBJreNEHHVWXa2u9GJTaeYyU1/k+1qLutkyw+sS6VAN+AbeiTqsxd/A==
+  dependencies:
+    lodash "^4.17.15"
+    ts-essentials "^7.0.1"
 
 "@typechain/ethers-v5@^2.0.0":
   version "2.0.0"
@@ -1976,55 +2349,50 @@
   dependencies:
     ethers "^5.0.2"
 
+"@typechain/hardhat@^7.0.0":
+  version "7.0.0"
+  resolved "https://registry.yarnpkg.com/@typechain/hardhat/-/hardhat-7.0.0.tgz#ffa7465328150e793007fee616ae7b76ed20784d"
+  integrity sha512-XB79i5ewg9Met7gMVGfgVkmypicbnI25T5clJBEooMoW2161p4zvKFpoS2O+lBppQyMrPIZkdvl2M3LMDayVcA==
+  dependencies:
+    fs-extra "^9.1.0"
+
 "@types/argparse@^1.0.36":
   version "1.0.38"
   resolved "https://registry.yarnpkg.com/@types/argparse/-/argparse-1.0.38.tgz#a81fd8606d481f873a3800c6ebae4f1d768a56a9"
   integrity sha512-ebDJ9b0e702Yr7pWgB0jzm+CX4Srzz8RcXtLJDJB+BSccqMa36uyH/zUsSYao5+BD1ytv3k3rPYCq4mAE1hsXA==
 
-"@types/async-eventemitter@^0.2.1":
-  version "0.2.1"
-  resolved "https://registry.yarnpkg.com/@types/async-eventemitter/-/async-eventemitter-0.2.1.tgz#f8e6280e87e8c60b2b938624b0a3530fb3e24712"
-  integrity sha512-M2P4Ng26QbAeITiH7w1d7OxtldgfAe0wobpyJzVK/XOb0cUGKU2R4pfAhqcJBXAe2ife5ZOhSv4wk7p+ffURtg==
-
 "@types/babel__core@^7.1.14":
-  version "7.1.19"
-  resolved "https://registry.yarnpkg.com/@types/babel__core/-/babel__core-7.1.19.tgz#7b497495b7d1b4812bdb9d02804d0576f43ee460"
-  integrity sha512-WEOTgRsbYkvA/KCsDwVEGkd7WAr1e3g31VHQ8zy5gul/V1qKullU/BU5I68X5v7V3GnB9eotmom4v5a5gjxorw==
+  version "7.20.3"
+  resolved "https://registry.yarnpkg.com/@types/babel__core/-/babel__core-7.20.3.tgz#d5625a50b6f18244425a1359a858c73d70340778"
+  integrity sha512-54fjTSeSHwfan8AyHWrKbfBWiEUrNTZsUwPTDSNaaP1QDQIZbeNUg3a59E9D+375MzUw/x1vx2/0F5LBz+AeYA==
   dependencies:
-    "@babel/parser" "^7.1.0"
-    "@babel/types" "^7.0.0"
+    "@babel/parser" "^7.20.7"
+    "@babel/types" "^7.20.7"
     "@types/babel__generator" "*"
     "@types/babel__template" "*"
     "@types/babel__traverse" "*"
 
 "@types/babel__generator@*":
-  version "7.6.4"
-  resolved "https://registry.yarnpkg.com/@types/babel__generator/-/babel__generator-7.6.4.tgz#1f20ce4c5b1990b37900b63f050182d28c2439b7"
-  integrity sha512-tFkciB9j2K755yrTALxD44McOrk+gfpIpvC3sxHjRawj6PfnQxrse4Clq5y/Rq+G3mrBurMax/lG8Qn2t9mSsg==
+  version "7.6.6"
+  resolved "https://registry.yarnpkg.com/@types/babel__generator/-/babel__generator-7.6.6.tgz#676f89f67dc8ddaae923f70ebc5f1fa800c031a8"
+  integrity sha512-66BXMKb/sUWbMdBNdMvajU7i/44RkrA3z/Yt1c7R5xejt8qh84iU54yUWCtm0QwGJlDcf/gg4zd/x4mpLAlb/w==
   dependencies:
     "@babel/types" "^7.0.0"
 
 "@types/babel__template@*":
-  version "7.4.1"
-  resolved "https://registry.yarnpkg.com/@types/babel__template/-/babel__template-7.4.1.tgz#3d1a48fd9d6c0edfd56f2ff578daed48f36c8969"
-  integrity sha512-azBFKemX6kMg5Io+/rdGT0dkGreboUVR0Cdm3fz9QJWpaQGJRQXl7C+6hOTCZcMll7KFyEQpgbYI2lHdsS4U7g==
+  version "7.4.3"
+  resolved "https://registry.yarnpkg.com/@types/babel__template/-/babel__template-7.4.3.tgz#db9ac539a2fe05cfe9e168b24f360701bde41f5f"
+  integrity sha512-ciwyCLeuRfxboZ4isgdNZi/tkt06m8Tw6uGbBSBgWrnnZGNXiEyM27xc/PjXGQLqlZ6ylbgHMnm7ccF9tCkOeQ==
   dependencies:
     "@babel/parser" "^7.1.0"
     "@babel/types" "^7.0.0"
 
 "@types/babel__traverse@*", "@types/babel__traverse@^7.0.6":
-  version "7.18.2"
-  resolved "https://registry.yarnpkg.com/@types/babel__traverse/-/babel__traverse-7.18.2.tgz#235bf339d17185bdec25e024ca19cce257cc7309"
-  integrity sha512-FcFaxOr2V5KZCviw1TnutEMVUVsGt4D2hP1TAfXZAMKuHYW3xQhe3jTxNPWutgCJ3/X1c5yX8ZoGVEItxKbwBg==
-  dependencies:
-    "@babel/types" "^7.3.0"
-
-"@types/bn.js@*", "@types/bn.js@^5.1.0":
-  version "5.1.1"
-  resolved "https://registry.yarnpkg.com/@types/bn.js/-/bn.js-5.1.1.tgz#b51e1b55920a4ca26e9285ff79936bbdec910682"
-  integrity sha512-qNrYbZqMx0uJAfKnKclPh+dTwK33KfLHYqtyODwd5HnXOjnkhc4qgn3BrK6RWyGZm5+sIFE7Q7Vz6QQtJB7w7g==
+  version "7.20.3"
+  resolved "https://registry.yarnpkg.com/@types/babel__traverse/-/babel__traverse-7.20.3.tgz#a971aa47441b28ef17884ff945d0551265a2d058"
+  integrity sha512-Lsh766rGEFbaxMIDH7Qa+Yha8cMVI3qAK6CHt3OR0YfxOIn5Z54iHiyDRycHrBqeIiqGa20Kpsv1cavfBKkRSw==
   dependencies:
-    "@types/node" "*"
+    "@babel/types" "^7.20.7"
 
 "@types/bn.js@^4.11.3", "@types/bn.js@^4.11.5":
   version "4.11.6"
@@ -2033,6 +2401,13 @@
   dependencies:
     "@types/node" "*"
 
+"@types/bn.js@^5.1.0":
+  version "5.1.3"
+  resolved "https://registry.yarnpkg.com/@types/bn.js/-/bn.js-5.1.3.tgz#0857f00da3bf888a26a44b4a477c7819b17dacc5"
+  integrity sha512-wT1B4iIO82ecXkdN6waCK8Ou7E71WU+mP1osDA5Q8c6Ur+ozU2vIKUIhSpUr6uE5L2YHocKS1Z2jG2fBC1YVeg==
+  dependencies:
+    "@types/node" "*"
+
 "@types/cacheable-request@^6.0.1":
   version "6.0.3"
   resolved "https://registry.yarnpkg.com/@types/cacheable-request/-/cacheable-request-6.0.3.tgz#a430b3260466ca7b5ca5bfd735693b36e7a9d183"
@@ -2043,22 +2418,17 @@
     "@types/node" "*"
     "@types/responselike" "^1.0.0"
 
-"@types/chai-as-promised@^7.1.4":
-  version "7.1.5"
-  resolved "https://registry.yarnpkg.com/@types/chai-as-promised/-/chai-as-promised-7.1.5.tgz#6e016811f6c7a64f2eed823191c3a6955094e255"
-  integrity sha512-jStwss93SITGBwt/niYrkf2C+/1KTeZCZl1LaeezTlqppAKeoQC7jxyqYuP72sxBGKCIbw7oHgbYssIRzT5FCQ==
+"@types/chai-as-promised@^7.1.3", "@types/chai-as-promised@^7.1.4":
+  version "7.1.7"
+  resolved "https://registry.yarnpkg.com/@types/chai-as-promised/-/chai-as-promised-7.1.7.tgz#fd16a981ba9542c83d4e1d2f40c7899aae82aa38"
+  integrity sha512-APucaP5rlmTRYKtRA6FE5QPP87x76ejw5t5guRJ4y5OgMnwtsvigw7HHhKZlx2MGXLeZd6R/GNZR/IqDHcbtQw==
   dependencies:
     "@types/chai" "*"
 
-"@types/chai@*":
-  version "4.3.4"
-  resolved "https://registry.yarnpkg.com/@types/chai/-/chai-4.3.4.tgz#e913e8175db8307d78b4e8fa690408ba6b65dee4"
-  integrity sha512-KnRanxnpfpjUTqTCXslZSEdLfXExwgNxYPdiO2WGUj8+HDjFi8R3k5RVKPeSCzLjCcshCAtVO2QBbVuAV4kTnw==
-
-"@types/chai@^4.2.21":
-  version "4.3.3"
-  resolved "https://registry.yarnpkg.com/@types/chai/-/chai-4.3.3.tgz#3c90752792660c4b562ad73b3fbd68bf3bc7ae07"
-  integrity sha512-hC7OMnszpxhZPduX+m+nrx+uFoLkWOMiR4oa/AZF3MuSETYTZmFfJAHqZEM8MVlvfG7BEUcgvtwoCTxBp6hm3g==
+"@types/chai@*", "@types/chai@^4.2.21", "@types/chai@^4.3.1":
+  version "4.3.9"
+  resolved "https://registry.yarnpkg.com/@types/chai/-/chai-4.3.9.tgz#144d762491967db8c6dea38e03d2206c2623feec"
+  integrity sha512-69TtiDzu0bcmKQv3yg1Zx409/Kd7r0b5F1PfpYJfSHzLGtB53547V4u+9iqKYsTu/O2ai6KTb0TInNpvuQ3qmg==
 
 "@types/concat-stream@^1.6.0":
   version "1.6.1"
@@ -2088,48 +2458,53 @@
     "@types/node" "*"
 
 "@types/graceful-fs@^4.1.3":
-  version "4.1.5"
-  resolved "https://registry.yarnpkg.com/@types/graceful-fs/-/graceful-fs-4.1.5.tgz#21ffba0d98da4350db64891f92a9e5db3cdb4e15"
-  integrity sha512-anKkLmZZ+xm4p8JWBf4hElkM4XR+EZeA2M9BAkkTldmcyDY4mbdIJnRghDJH3Ov5ooY7/UAoENtmdMSkaAd7Cw==
+  version "4.1.8"
+  resolved "https://registry.yarnpkg.com/@types/graceful-fs/-/graceful-fs-4.1.8.tgz#417e461e4dc79d957dc3107f45fe4973b09c2915"
+  integrity sha512-NhRH7YzWq8WiNKVavKPBmtLYZHxNY19Hh+az28O/phfp68CF45pMFud+ZzJ8ewnxnC5smIdF3dqFeiSUQ5I+pw==
   dependencies:
     "@types/node" "*"
 
 "@types/http-cache-semantics@*":
-  version "4.0.1"
-  resolved "https://registry.yarnpkg.com/@types/http-cache-semantics/-/http-cache-semantics-4.0.1.tgz#0ea7b61496902b95890dc4c3a116b60cb8dae812"
-  integrity sha512-SZs7ekbP8CN0txVG2xVRH6EgKmEm31BOxA07vkFaETzZz1xh+cbt8BcI0slpymvwhx5dlFnQG2rTlPVQn+iRPQ==
+  version "4.0.3"
+  resolved "https://registry.yarnpkg.com/@types/http-cache-semantics/-/http-cache-semantics-4.0.3.tgz#a3ff232bf7d5c55f38e4e45693eda2ebb545794d"
+  integrity sha512-V46MYLFp08Wf2mmaBhvgjStM3tPa+2GAdy/iqoX+noX1//zje2x4XmrIU0cAwyClATsTmahbtoQ2EwP7I5WSiA==
 
 "@types/istanbul-lib-coverage@*", "@types/istanbul-lib-coverage@^2.0.0", "@types/istanbul-lib-coverage@^2.0.1":
-  version "2.0.4"
-  resolved "https://registry.yarnpkg.com/@types/istanbul-lib-coverage/-/istanbul-lib-coverage-2.0.4.tgz#8467d4b3c087805d63580480890791277ce35c44"
-  integrity sha512-z/QT1XN4K4KYuslS23k62yDIDLwLFkzxOuMplDtObz0+y7VqJCaO2o+SPwHCvLFZh7xazvvoor2tA/hPz9ee7g==
+  version "2.0.5"
+  resolved "https://registry.yarnpkg.com/@types/istanbul-lib-coverage/-/istanbul-lib-coverage-2.0.5.tgz#fdfdd69fa16d530047d9963635bd77c71a08c068"
+  integrity sha512-zONci81DZYCZjiLe0r6equvZut0b+dBRPBN5kBDjsONnutYNtJMoWQ9uR2RkL1gLG9NMTzvf+29e5RFfPbeKhQ==
 
 "@types/istanbul-lib-report@*":
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/@types/istanbul-lib-report/-/istanbul-lib-report-3.0.0.tgz#c14c24f18ea8190c118ee7562b7ff99a36552686"
-  integrity sha512-plGgXAPfVKFoYfa9NpYDAkseG+g6Jr294RqeqcqDixSbU34MZVJRi/P+7Y8GDpzkEwLaGZZOpKIEmeVZNtKsrg==
+  version "3.0.2"
+  resolved "https://registry.yarnpkg.com/@types/istanbul-lib-report/-/istanbul-lib-report-3.0.2.tgz#394798d5f727402eb5ec99eb9618ffcd2b7645a1"
+  integrity sha512-8toY6FgdltSdONav1XtUHl4LN1yTmLza+EuDazb/fEmRNCwjyqNVIQWs2IfC74IqjHkREs/nQ2FWq5kZU9IC0w==
   dependencies:
     "@types/istanbul-lib-coverage" "*"
 
 "@types/istanbul-reports@^3.0.0":
-  version "3.0.1"
-  resolved "https://registry.yarnpkg.com/@types/istanbul-reports/-/istanbul-reports-3.0.1.tgz#9153fe98bba2bd565a63add9436d6f0d7f8468ff"
-  integrity sha512-c3mAZEuK0lvBp8tmuL74XRKn1+y2dcwOUpH7x4WrF6gk1GIgiluDRgMYQtw2OFcBvAJWlt6ASU3tSqxp0Uu0Aw==
+  version "3.0.3"
+  resolved "https://registry.yarnpkg.com/@types/istanbul-reports/-/istanbul-reports-3.0.3.tgz#0313e2608e6d6955d195f55361ddeebd4b74c6e7"
+  integrity sha512-1nESsePMBlf0RPRffLZi5ujYh7IH1BWL4y9pr+Bn3cJBdxz+RTP8bUFljLz9HvzhhOSWKdyBZ4DIivdL6rvgZg==
   dependencies:
     "@types/istanbul-lib-report" "*"
 
 "@types/jest@^29.0.3":
-  version "29.2.1"
-  resolved "https://registry.yarnpkg.com/@types/jest/-/jest-29.2.1.tgz#31fda30bdf2861706abc5f1730be78bed54f83ee"
-  integrity sha512-nKixEdnGDqFOZkMTF74avFNr3yRqB1ZJ6sRZv5/28D5x2oLN14KApv7F9mfDT/vUic0L3tRCsh3XWpWjtJisUQ==
+  version "29.5.6"
+  resolved "https://registry.yarnpkg.com/@types/jest/-/jest-29.5.6.tgz#f4cf7ef1b5b0bfc1aa744e41b24d9cc52533130b"
+  integrity sha512-/t9NnzkOpXb4Nfvg17ieHE6EeSjDS2SGSpNYfoLbUAeL/EOueU/RSdOWFpfQTXBEM7BguYW1XQ0EbM+6RlIh6w==
   dependencies:
     expect "^29.0.0"
     pretty-format "^29.0.0"
 
-"@types/json-schema@^7.0.7":
-  version "7.0.11"
-  resolved "https://registry.yarnpkg.com/@types/json-schema/-/json-schema-7.0.11.tgz#d421b6c527a3037f7c84433fd2c4229e016863d3"
-  integrity sha512-wOuvG1SN4Us4rez+tylwwwCV1psiNVOkJeM3AUWUNWg/jDQY2+HE/444y5gc+jBmRqASOm2Oeh5c1axHobwRKQ==
+"@types/json-schema@^7.0.12":
+  version "7.0.14"
+  resolved "https://registry.yarnpkg.com/@types/json-schema/-/json-schema-7.0.14.tgz#74a97a5573980802f32c8e47b663530ab3b6b7d1"
+  integrity sha512-U3PUjAudAdJBeC2pgN8uTIKgxrb4nlDF3SF0++EldXQvQBGkpFZMSnwQiIoDU77tv45VgNkl/L4ouD+rEomujw==
+
+"@types/json5@^0.0.29":
+  version "0.0.29"
+  resolved "https://registry.yarnpkg.com/@types/json5/-/json5-0.0.29.tgz#ee28707ae94e11d2b827bcbe5270bcea7f3e71ee"
+  integrity sha512-dRLjCWHYg4oaA77cxO64oO+7JwCwnIzkZPdrrC71jQmQtlhM556pwKo5bUzqvZndkVbeFLIIi+9TC40JNF5hNQ==
 
 "@types/keyv@^3.1.4":
   version "3.1.4"
@@ -2138,6 +2513,11 @@
   dependencies:
     "@types/node" "*"
 
+"@types/lodash@^4.14.199":
+  version "4.14.200"
+  resolved "https://registry.yarnpkg.com/@types/lodash/-/lodash-4.14.200.tgz#435b6035c7eba9cdf1e039af8212c9e9281e7149"
+  integrity sha512-YI/M/4HRImtNf3pJgbF+W6FrXovqj+T+/HpENLTooK9PnkacBsDpeP3IpHab40CClUfhNmdM2WTNP2sa2dni5Q==
+
 "@types/lru-cache@^5.1.0":
   version "5.1.1"
   resolved "https://registry.yarnpkg.com/@types/lru-cache/-/lru-cache-5.1.1.tgz#c48c2e27b65d2a153b19bfc1a317e30872e01eef"
@@ -2156,34 +2536,41 @@
     "@types/node" "*"
 
 "@types/mocha-steps@^1.3.0":
-  version "1.3.0"
-  resolved "https://registry.yarnpkg.com/@types/mocha-steps/-/mocha-steps-1.3.0.tgz#3086c74675f45359c514f80c5090f9bac23097aa"
-  integrity sha512-hI0P9rS20BhHSXWTqLYcRYy6PGYk9vMZFNX7UF0ZWUrDMuqawtVRuTkYq7rG25sBSpL28BZggABBecFDK6ZZyg==
+  version "1.3.2"
+  resolved "https://registry.yarnpkg.com/@types/mocha-steps/-/mocha-steps-1.3.2.tgz#0cbb227ca4328c892302e6aca55b3237ccdbd690"
+  integrity sha512-0k/IGS2Wax/TwNQ/rUnLPsaR/eaoVX4DgAxVhBeisTvecucTOCNSvgBu3VYL7xziO1qxC92WktC53sFmlGihkg==
   dependencies:
     "@types/mocha" "*"
 
 "@types/mocha@*":
-  version "10.0.1"
-  resolved "https://registry.yarnpkg.com/@types/mocha/-/mocha-10.0.1.tgz#2f4f65bb08bc368ac39c96da7b2f09140b26851b"
-  integrity sha512-/fvYntiO1GeICvqbQ3doGDIP97vWmvFt83GKguJ6prmQM2iXZfFcq6YE8KteFyRtX2/h5Hf91BYvPodJKFYv5Q==
+  version "10.0.3"
+  resolved "https://registry.yarnpkg.com/@types/mocha/-/mocha-10.0.3.tgz#4804fe9cd39da26eb62fa65c15ea77615a187812"
+  integrity sha512-RsOPImTriV/OE4A9qKjMtk2MnXiuLLbcO3nCXK+kvq4nr0iMfFgpjaX3MPLb6f7+EL1FGSelYvuJMV6REH+ZPQ==
 
 "@types/mocha@^8.2.3":
   version "8.2.3"
   resolved "https://registry.yarnpkg.com/@types/mocha/-/mocha-8.2.3.tgz#bbeb55fbc73f28ea6de601fbfa4613f58d785323"
   integrity sha512-ekGvFhFgrc2zYQoX4JeZPmVzZxw6Dtllga7iGHzfbYIYkAMUx/sAFP2GdFpLff+vdHXu5fl7WX9AT+TtqYcsyw==
 
+"@types/mocha@^9.1.1":
+  version "9.1.1"
+  resolved "https://registry.yarnpkg.com/@types/mocha/-/mocha-9.1.1.tgz#e7c4f1001eefa4b8afbd1eee27a237fee3bf29c4"
+  integrity sha512-Z61JK7DKDtdKTWwLeElSEBcWGRLY8g95ic5FoQqI9CMx0ns/Ghep3B4DfcEimiKMvtamNVULVNKEsiwV3aQmXw==
+
 "@types/node-fetch@^2.5.5", "@types/node-fetch@^2.5.7":
-  version "2.6.2"
-  resolved "https://registry.yarnpkg.com/@types/node-fetch/-/node-fetch-2.6.2.tgz#d1a9c5fd049d9415dce61571557104dec3ec81da"
-  integrity sha512-DHqhlq5jeESLy19TYhLakJ07kNumXWjcDdxXsLUMJZ6ue8VZJj4kLPQVE/2mdHh3xZziNF1xppu5lwmS53HR+A==
+  version "2.6.7"
+  resolved "https://registry.yarnpkg.com/@types/node-fetch/-/node-fetch-2.6.7.tgz#a1abe2ce24228b58ad97f99480fdcf9bbc6ab16d"
+  integrity sha512-lX17GZVpJ/fuCjguZ5b3TjEbSENxmEk1B2z02yoXSK9WMEWRivhdSY73wWMn6bpcCDAOh6qAdktpKHIlkDk2lg==
   dependencies:
     "@types/node" "*"
-    form-data "^3.0.0"
+    form-data "^4.0.0"
 
 "@types/node@*":
-  version "18.11.9"
-  resolved "https://registry.yarnpkg.com/@types/node/-/node-18.11.9.tgz#02d013de7058cea16d36168ef2fc653464cfbad4"
-  integrity sha512-CRpX21/kGdzjOpFsZSkcrXMGIBWMGNIHXXBVFSH+ggkftxg+XYP20TESbh+zFvFj3EQOl5byk0HTRn1IL6hbqg==
+  version "20.8.9"
+  resolved "https://registry.yarnpkg.com/@types/node/-/node-20.8.9.tgz#646390b4fab269abce59c308fc286dcd818a2b08"
+  integrity sha512-UzykFsT3FhHb1h7yD4CA4YhBHq545JC0YnEz41xkipN88eKQtL6rSgocL5tbAP6Ola9Izm/Aw4Ora8He4x0BHg==
+  dependencies:
+    undici-types "~5.26.4"
 
 "@types/node@^10.0.3":
   version "10.17.60"
@@ -2196,9 +2583,14 @@
   integrity sha512-J8xLz7q2OFulZ2cyGTLE1TbbZcjpno7FaN6zdJNrgAdrJ+DZzh/uFR6YrTb4C+nXakvud8Q4+rbhoIWlYQbUFQ==
 
 "@types/node@^14.14.5", "@types/node@^14.6.1":
-  version "14.18.33"
-  resolved "https://registry.yarnpkg.com/@types/node/-/node-14.18.33.tgz#8c29a0036771569662e4635790ffa9e057db379b"
-  integrity sha512-qelS/Ra6sacc4loe/3MSjXNL1dNQ/GjxNHVzuChwMfmk7HuycRLVQN2qNY3XahK+fZc5E2szqQSKUyAF0E+2bg==
+  version "14.18.63"
+  resolved "https://registry.yarnpkg.com/@types/node/-/node-14.18.63.tgz#1788fa8da838dbb5f9ea994b834278205db6ca2b"
+  integrity sha512-fAtCfv4jJg+ExtXhvCkCqUKZ+4ok/JQk01qDKhL5BDDoS3AxKXhV5/MAVUZyQnSEd2GT92fkgZl0pz0Q0AzcIQ==
+
+"@types/node@^17.0.34":
+  version "17.0.45"
+  resolved "https://registry.yarnpkg.com/@types/node/-/node-17.0.45.tgz#2c0fafd78705e7a18b7906b5201a522719dc5190"
+  integrity sha512-w+tIMs3rq2afQdsPJlODhoUEKzFP1ayaoyl1CcnwtIlsVe7K7bA1NGm4s3PraqTLlXnbIN84zuBlxBWo1u9BLw==
 
 "@types/node@^8.0.0":
   version "8.10.66"
@@ -2206,26 +2598,38 @@
   integrity sha512-tktOkFUA4kXx2hhhrB8bIFb5TbwzS4uOhKEmwiD+NoiL0qtP2OQ9mFldbgD4dV1djrlBYP6eBuQZiWjuHUpqFw==
 
 "@types/pbkdf2@^3.0.0":
-  version "3.1.0"
-  resolved "https://registry.yarnpkg.com/@types/pbkdf2/-/pbkdf2-3.1.0.tgz#039a0e9b67da0cdc4ee5dab865caa6b267bb66b1"
-  integrity sha512-Cf63Rv7jCQ0LaL8tNXmEyqTHuIJxRdlS5vMh1mj5voN4+QFhVZnlZruezqpWYDiJ8UTzhP0VmeLXCmBk66YrMQ==
+  version "3.1.1"
+  resolved "https://registry.yarnpkg.com/@types/pbkdf2/-/pbkdf2-3.1.1.tgz#c290c1f0d3dc364af94c2c5ee92046a13b7f89fd"
+  integrity sha512-4HCoGwR3221nOc7G0Z/6KgTNGgaaFGkbGrtUJsB+zlKX2LBVjFHHIUkieMBgHHXgBH5Gq6dZHJKdBYdtlhBQvw==
   dependencies:
     "@types/node" "*"
 
-"@types/prettier@^2.1.1":
-  version "2.7.2"
-  resolved "https://registry.yarnpkg.com/@types/prettier/-/prettier-2.7.2.tgz#6c2324641cc4ba050a8c710b2b251b377581fbf0"
-  integrity sha512-KufADq8uQqo1pYKVIYzfKbJfBAc0sOeXqGbFaSpv8MRmC/zXgowNZmFcbngndGk922QDmOASEXUZCaY48gs4cg==
+"@types/pg@^8.10.3":
+  version "8.10.7"
+  resolved "https://registry.yarnpkg.com/@types/pg/-/pg-8.10.7.tgz#2f172598272e581e72cba640026e5152b5a3d5c3"
+  integrity sha512-ksJqHipwYaSEHz9e1fr6H6erjoEdNNaOxwyJgPx9bNeaqOW3iWBQgVHfpwiSAoqGzchfc+ZyRLwEfeCcyYD3uQ==
+  dependencies:
+    "@types/node" "*"
+    pg-protocol "*"
+    pg-types "^4.0.1"
 
-"@types/prettier@^2.1.5":
-  version "2.7.1"
-  resolved "https://registry.yarnpkg.com/@types/prettier/-/prettier-2.7.1.tgz#dfd20e2dc35f027cdd6c1908e80a5ddc7499670e"
-  integrity sha512-ri0UmynRRvZiiUJdiz38MmIblKK+oH30MztdBVR95dv/Ubw6neWSb8u1XpRb72L4qsZOhz+L+z9JD40SJmfWow==
+"@types/prettier@^2.1.1":
+  version "2.7.3"
+  resolved "https://registry.yarnpkg.com/@types/prettier/-/prettier-2.7.3.tgz#3e51a17e291d01d17d3fc61422015a933af7a08f"
+  integrity sha512-+68kP9yzs4LMp7VNh8gdzMSPZFL44MLGqiHWvttYJe+6qnuVr4Ek9wSBQoveqY/r+LwjCcU29kNVkidwim+kYA==
 
 "@types/qs@^6.2.31":
-  version "6.9.7"
-  resolved "https://registry.yarnpkg.com/@types/qs/-/qs-6.9.7.tgz#63bb7d067db107cc1e457c303bc25d511febf6cb"
-  integrity sha512-FGa1F62FT09qcrueBA6qYTrJPVDzah9a+493+o2PCXsesWHIn27G98TsSMs3WPNbZIEj4+VJf6saSFpvD+3Zsw==
+  version "6.9.9"
+  resolved "https://registry.yarnpkg.com/@types/qs/-/qs-6.9.9.tgz#66f7b26288f6799d279edf13da7ccd40d2fa9197"
+  integrity sha512-wYLxw35euwqGvTDx6zfY1vokBFnsK0HNrzc6xNHchxfO2hpuRg74GbkEW7e3sSmPvj0TjCDT1VCa6OtHXnubsg==
+
+"@types/readable-stream@^2.3.13":
+  version "2.3.15"
+  resolved "https://registry.yarnpkg.com/@types/readable-stream/-/readable-stream-2.3.15.tgz#3d79c9ceb1b6a57d5f6e6976f489b9b5384321ae"
+  integrity sha512-oM5JSKQCcICF1wvGgmecmHldZ48OZamtMxcGGVICOJA8o8cahXC1zEVAif8iwoc5j8etxFaRFnf095+CDsuoFQ==
+  dependencies:
+    "@types/node" "*"
+    safe-buffer "~5.1.1"
 
 "@types/resolve@^0.0.8":
   version "0.0.8"
@@ -2235,101 +2639,64 @@
     "@types/node" "*"
 
 "@types/responselike@^1.0.0":
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/@types/responselike/-/responselike-1.0.0.tgz#251f4fe7d154d2bad125abe1b429b23afd262e29"
-  integrity sha512-85Y2BjiufFzaMIlvJDvTTB8Fxl2xfLo4HgmHzVBz08w4wDePCTjYw66PdrolO0kzli3yam/YCgRufyo1DdQVTA==
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/@types/responselike/-/responselike-1.0.2.tgz#8de1b0477fd7c12df77e50832fa51701a8414bd6"
+  integrity sha512-/4YQT5Kp6HxUDb4yhRkm0bJ7TbjvTddqX7PZ5hz6qV3pxSo72f/6YPRo+Mu2DU307tm9IioO69l7uAwn5XNcFA==
   dependencies:
     "@types/node" "*"
 
 "@types/secp256k1@^4.0.1":
-  version "4.0.3"
-  resolved "https://registry.yarnpkg.com/@types/secp256k1/-/secp256k1-4.0.3.tgz#1b8e55d8e00f08ee7220b4d59a6abe89c37a901c"
-  integrity sha512-Da66lEIFeIz9ltsdMZcpQvmrmmoqrfju8pm1BH8WbYjZSwUgCwXLb9C+9XYogwBITnbsSaMdVPb2ekf7TV+03w==
+  version "4.0.5"
+  resolved "https://registry.yarnpkg.com/@types/secp256k1/-/secp256k1-4.0.5.tgz#14b1766b4fbc198b0af5599d9fd21c89056633ce"
+  integrity sha512-aIonTBMErtE3T9MxDvTZRzcrT/mCqpEZBw3CCY/i+oG9n57N/+7obBkhFgavUAIrX21bU0LHg1XRgtaLdelBhA==
   dependencies:
     "@types/node" "*"
 
-"@types/sinon-chai@^3.2.3":
-  version "3.2.9"
-  resolved "https://registry.yarnpkg.com/@types/sinon-chai/-/sinon-chai-3.2.9.tgz#71feb938574bbadcb176c68e5ff1a6014c5e69d4"
-  integrity sha512-/19t63pFYU0ikrdbXKBWj9PCdnKyTd0Qkz0X91Ta081cYsq90OxYdcWwK/dwEoDa6dtXgj2HJfmzgq+QZTHdmQ==
-  dependencies:
-    "@types/chai" "*"
-    "@types/sinon" "*"
-
-"@types/sinon@*":
-  version "10.0.13"
-  resolved "https://registry.yarnpkg.com/@types/sinon/-/sinon-10.0.13.tgz#60a7a87a70d9372d0b7b38cc03e825f46981fb83"
-  integrity sha512-UVjDqJblVNQYvVNUsj0PuYYw0ELRmgt1Nt5Vk0pT5f16ROGfcKJY8o1HVuMOJOpD727RrGB9EGvoaTQE5tgxZQ==
-  dependencies:
-    "@types/sinonjs__fake-timers" "*"
-
-"@types/sinonjs__fake-timers@*":
-  version "8.1.2"
-  resolved "https://registry.yarnpkg.com/@types/sinonjs__fake-timers/-/sinonjs__fake-timers-8.1.2.tgz#bf2e02a3dbd4aecaf95942ecd99b7402e03fad5e"
-  integrity sha512-9GcLXF0/v3t80caGs5p2rRfkB+a8VBGLJZVih6CNFkx8IZ994wiKKLSRs9nuFwk1HevWs/1mnUmkApGrSGsShA==
+"@types/semver@^7.5.0":
+  version "7.5.4"
+  resolved "https://registry.yarnpkg.com/@types/semver/-/semver-7.5.4.tgz#0a41252ad431c473158b22f9bfb9a63df7541cff"
+  integrity sha512-MMzuxN3GdFwskAnb6fz0orFvhfqi752yjaXylr0Rp4oDg5H0Zn1IuyRhDVvYOwAXoJirx2xuS16I3WjxnAIHiQ==
 
 "@types/stack-utils@^2.0.0":
-  version "2.0.1"
-  resolved "https://registry.yarnpkg.com/@types/stack-utils/-/stack-utils-2.0.1.tgz#20f18294f797f2209b5f65c8e3b5c8e8261d127c"
-  integrity sha512-Hl219/BT5fLAaz6NDkSuhzasy49dwQS/DSdu4MdggFB8zcXv7vflBI3xp7FEmkmdDkBUI2bPUNeMttp2knYdxw==
+  version "2.0.2"
+  resolved "https://registry.yarnpkg.com/@types/stack-utils/-/stack-utils-2.0.2.tgz#01284dde9ef4e6d8cef6422798d9a3ad18a66f8b"
+  integrity sha512-g7CK9nHdwjK2n0ymT2CW698FuWJRIx+RP6embAzZ2Qi8/ilIrA1Imt2LVSeHUzKvpoi7BhmmQcXz95eS0f2JXw==
 
 "@types/tabtab@^3.0.1":
-  version "3.0.2"
-  resolved "https://registry.yarnpkg.com/@types/tabtab/-/tabtab-3.0.2.tgz#047657fdeb98a13bfd38c6d92d8327066759695c"
-  integrity sha512-d8aOSJPS3SEGZevyr7vbAVUNPWGFmdFlk13vbPPK87vz+gYGM57L8T11k4wK2mOgQYZjEVYQEqmCTvupPoQBWw==
+  version "3.0.3"
+  resolved "https://registry.yarnpkg.com/@types/tabtab/-/tabtab-3.0.3.tgz#094798b7e32d45acb5c808315b8363391e3d7db2"
+  integrity sha512-7oXhf9jSJ9vGvLWBp3dL+fhLdHaHUJ2Lyr+QxPifVutUN0FMvEVr0LI7MFLtRjlg33O71gFeQ9uE8zZmtind4A==
   dependencies:
     "@types/node" "*"
 
-"@types/underscore@*":
-  version "1.11.4"
-  resolved "https://registry.yarnpkg.com/@types/underscore/-/underscore-1.11.4.tgz#62e393f8bc4bd8a06154d110c7d042a93751def3"
-  integrity sha512-uO4CD2ELOjw8tasUrAhvnn2W4A0ZECOvMjCivJr4gA9pGgjv+qxKWY9GLTMVEK8ej85BxQOocUyE7hImmSQYcg==
-
-"@types/web3@1.0.19":
-  version "1.0.19"
-  resolved "https://registry.yarnpkg.com/@types/web3/-/web3-1.0.19.tgz#46b85d91d398ded9ab7c85a5dd57cb33ac558924"
-  integrity sha512-fhZ9DyvDYDwHZUp5/STa9XW2re0E8GxoioYJ4pEUZ13YHpApSagixj7IAdoYH5uAK+UalGq6Ml8LYzmgRA/q+A==
-  dependencies:
-    "@types/bn.js" "*"
-    "@types/underscore" "*"
-
 "@types/yargs-parser@*":
-  version "21.0.0"
-  resolved "https://registry.yarnpkg.com/@types/yargs-parser/-/yargs-parser-21.0.0.tgz#0c60e537fa790f5f9472ed2776c2b71ec117351b"
-  integrity sha512-iO9ZQHkZxHn4mSakYV0vFHAVDyEOIJQrV2uZ06HxEPcx+mt8swXoZHIbaaJ2crJYFfErySgktuTZ3BeLz+XmFA==
+  version "21.0.2"
+  resolved "https://registry.yarnpkg.com/@types/yargs-parser/-/yargs-parser-21.0.2.tgz#7bd04c5da378496ef1695a1008bf8f71847a8b8b"
+  integrity sha512-5qcvofLPbfjmBfKaLfj/+f+Sbd6pN4zl7w7VSVI5uz7m9QZTuB2aZAa2uo1wHFBNN2x6g/SoTkXmd8mQnQF2Cw==
 
 "@types/yargs@^17.0.8":
-  version "17.0.13"
-  resolved "https://registry.yarnpkg.com/@types/yargs/-/yargs-17.0.13.tgz#34cced675ca1b1d51fcf4d34c3c6f0fa142a5c76"
-  integrity sha512-9sWaruZk2JGxIQU+IhI1fhPYRcQ0UuTNuKuCW9bR5fp7qi2Llf7WDzNa17Cy7TKnh3cdxDOiyTu6gaLS0eDatg==
+  version "17.0.29"
+  resolved "https://registry.yarnpkg.com/@types/yargs/-/yargs-17.0.29.tgz#06aabc72497b798c643c812a8b561537fea760cf"
+  integrity sha512-nacjqA3ee9zRF/++a3FUY1suHTFKZeHba2n8WeDw9cCVdmzmHpIxyzOJBcpHvvEmS8E9KqWlSnWHUkOrkhWcvA==
   dependencies:
     "@types/yargs-parser" "*"
 
-"@typescript-eslint/eslint-plugin@^4.10.0":
-  version "4.33.0"
-  resolved "https://registry.yarnpkg.com/@typescript-eslint/eslint-plugin/-/eslint-plugin-4.33.0.tgz#c24dc7c8069c7706bc40d99f6fa87edcb2005276"
-  integrity sha512-aINiAxGVdOl1eJyVjaWn/YcVAq4Gi/Yo35qHGCnqbWVz61g39D0h23veY/MA0rFFGfxK7TySg2uwDeNv+JgVpg==
-  dependencies:
-    "@typescript-eslint/experimental-utils" "4.33.0"
-    "@typescript-eslint/scope-manager" "4.33.0"
-    debug "^4.3.1"
-    functional-red-black-tree "^1.0.1"
-    ignore "^5.1.8"
-    regexpp "^3.1.0"
-    semver "^7.3.5"
-    tsutils "^3.21.0"
-
-"@typescript-eslint/experimental-utils@4.33.0":
-  version "4.33.0"
-  resolved "https://registry.yarnpkg.com/@typescript-eslint/experimental-utils/-/experimental-utils-4.33.0.tgz#6f2a786a4209fa2222989e9380b5331b2810f7fd"
-  integrity sha512-zeQjOoES5JFjTnAhI5QY7ZviczMzDptls15GFsI6jyUOq0kOf9+WonkhtlIhh0RgHRnqj5gdNxW5j1EvAyYg6Q==
-  dependencies:
-    "@types/json-schema" "^7.0.7"
-    "@typescript-eslint/scope-manager" "4.33.0"
-    "@typescript-eslint/types" "4.33.0"
-    "@typescript-eslint/typescript-estree" "4.33.0"
-    eslint-scope "^5.1.1"
-    eslint-utils "^3.0.0"
+"@typescript-eslint/eslint-plugin@^6.7.4":
+  version "6.9.1"
+  resolved "https://registry.yarnpkg.com/@typescript-eslint/eslint-plugin/-/eslint-plugin-6.9.1.tgz#d8ce497dc0ed42066e195c8ecc40d45c7b1254f4"
+  integrity sha512-w0tiiRc9I4S5XSXXrMHOWgHgxbrBn1Ro+PmiYhSg2ZVdxrAJtQgzU5o2m1BfP6UOn7Vxcc6152vFjQfmZR4xEg==
+  dependencies:
+    "@eslint-community/regexpp" "^4.5.1"
+    "@typescript-eslint/scope-manager" "6.9.1"
+    "@typescript-eslint/type-utils" "6.9.1"
+    "@typescript-eslint/utils" "6.9.1"
+    "@typescript-eslint/visitor-keys" "6.9.1"
+    debug "^4.3.4"
+    graphemer "^1.4.0"
+    ignore "^5.2.4"
+    natural-compare "^1.4.0"
+    semver "^7.5.4"
+    ts-api-utils "^1.0.1"
 
 "@typescript-eslint/parser@^4.10.0":
   version "4.33.0"
@@ -2341,6 +2708,17 @@
     "@typescript-eslint/typescript-estree" "4.33.0"
     debug "^4.3.1"
 
+"@typescript-eslint/parser@^6.7.4":
+  version "6.9.1"
+  resolved "https://registry.yarnpkg.com/@typescript-eslint/parser/-/parser-6.9.1.tgz#4f685f672f8b9580beb38d5fb99d52fc3e34f7a3"
+  integrity sha512-C7AK2wn43GSaCUZ9do6Ksgi2g3mwFkMO3Cis96kzmgudoVaKyt62yNzJOktP0HDLb/iO2O0n2lBOzJgr6Q/cyg==
+  dependencies:
+    "@typescript-eslint/scope-manager" "6.9.1"
+    "@typescript-eslint/types" "6.9.1"
+    "@typescript-eslint/typescript-estree" "6.9.1"
+    "@typescript-eslint/visitor-keys" "6.9.1"
+    debug "^4.3.4"
+
 "@typescript-eslint/scope-manager@4.33.0":
   version "4.33.0"
   resolved "https://registry.yarnpkg.com/@typescript-eslint/scope-manager/-/scope-manager-4.33.0.tgz#d38e49280d983e8772e29121cf8c6e9221f280a3"
@@ -2349,11 +2727,34 @@
     "@typescript-eslint/types" "4.33.0"
     "@typescript-eslint/visitor-keys" "4.33.0"
 
+"@typescript-eslint/scope-manager@6.9.1":
+  version "6.9.1"
+  resolved "https://registry.yarnpkg.com/@typescript-eslint/scope-manager/-/scope-manager-6.9.1.tgz#e96afeb9a68ad1cd816dba233351f61e13956b75"
+  integrity sha512-38IxvKB6NAne3g/+MyXMs2Cda/Sz+CEpmm+KLGEM8hx/CvnSRuw51i8ukfwB/B/sESdeTGet1NH1Wj7I0YXswg==
+  dependencies:
+    "@typescript-eslint/types" "6.9.1"
+    "@typescript-eslint/visitor-keys" "6.9.1"
+
+"@typescript-eslint/type-utils@6.9.1":
+  version "6.9.1"
+  resolved "https://registry.yarnpkg.com/@typescript-eslint/type-utils/-/type-utils-6.9.1.tgz#efd5db20ed35a74d3c7d8fba51b830ecba09ce32"
+  integrity sha512-eh2oHaUKCK58qIeYp19F5V5TbpM52680sB4zNSz29VBQPTWIlE/hCj5P5B1AChxECe/fmZlspAWFuRniep1Skg==
+  dependencies:
+    "@typescript-eslint/typescript-estree" "6.9.1"
+    "@typescript-eslint/utils" "6.9.1"
+    debug "^4.3.4"
+    ts-api-utils "^1.0.1"
+
 "@typescript-eslint/types@4.33.0":
   version "4.33.0"
   resolved "https://registry.yarnpkg.com/@typescript-eslint/types/-/types-4.33.0.tgz#a1e59036a3b53ae8430ceebf2a919dc7f9af6d72"
   integrity sha512-zKp7CjQzLQImXEpLt2BUw1tvOMPfNoTAfb8l51evhYbOEEzdWyQNmHWWGPR6hwKJDAi+1VXSBmnhL9kyVTTOuQ==
 
+"@typescript-eslint/types@6.9.1":
+  version "6.9.1"
+  resolved "https://registry.yarnpkg.com/@typescript-eslint/types/-/types-6.9.1.tgz#a6cfc20db0fcedcb2f397ea728ef583e0ee72459"
+  integrity sha512-BUGslGOb14zUHOUmDB2FfT6SI1CcZEJYfF3qFwBeUrU6srJfzANonwRYHDpLBuzbq3HaoF2XL2hcr01c8f8OaQ==
+
 "@typescript-eslint/typescript-estree@4.33.0":
   version "4.33.0"
   resolved "https://registry.yarnpkg.com/@typescript-eslint/typescript-estree/-/typescript-estree-4.33.0.tgz#0dfb51c2908f68c5c08d82aefeaf166a17c24609"
@@ -2367,6 +2768,32 @@
     semver "^7.3.5"
     tsutils "^3.21.0"
 
+"@typescript-eslint/typescript-estree@6.9.1":
+  version "6.9.1"
+  resolved "https://registry.yarnpkg.com/@typescript-eslint/typescript-estree/-/typescript-estree-6.9.1.tgz#8c77910a49a04f0607ba94d78772da07dab275ad"
+  integrity sha512-U+mUylTHfcqeO7mLWVQ5W/tMLXqVpRv61wm9ZtfE5egz7gtnmqVIw9ryh0mgIlkKk9rZLY3UHygsBSdB9/ftyw==
+  dependencies:
+    "@typescript-eslint/types" "6.9.1"
+    "@typescript-eslint/visitor-keys" "6.9.1"
+    debug "^4.3.4"
+    globby "^11.1.0"
+    is-glob "^4.0.3"
+    semver "^7.5.4"
+    ts-api-utils "^1.0.1"
+
+"@typescript-eslint/utils@6.9.1":
+  version "6.9.1"
+  resolved "https://registry.yarnpkg.com/@typescript-eslint/utils/-/utils-6.9.1.tgz#763da41281ef0d16974517b5f0d02d85897a1c1e"
+  integrity sha512-L1T0A5nFdQrMVunpZgzqPL6y2wVreSyHhKGZryS6jrEN7bD9NplVAyMryUhXsQ4TWLnZmxc2ekar/lSGIlprCA==
+  dependencies:
+    "@eslint-community/eslint-utils" "^4.4.0"
+    "@types/json-schema" "^7.0.12"
+    "@types/semver" "^7.5.0"
+    "@typescript-eslint/scope-manager" "6.9.1"
+    "@typescript-eslint/types" "6.9.1"
+    "@typescript-eslint/typescript-estree" "6.9.1"
+    semver "^7.5.4"
+
 "@typescript-eslint/visitor-keys@4.33.0":
   version "4.33.0"
   resolved "https://registry.yarnpkg.com/@typescript-eslint/visitor-keys/-/visitor-keys-4.33.0.tgz#2a22f77a41604289b7a186586e9ec48ca92ef1dd"
@@ -2375,11 +2802,24 @@
     "@typescript-eslint/types" "4.33.0"
     eslint-visitor-keys "^2.0.0"
 
+"@typescript-eslint/visitor-keys@6.9.1":
+  version "6.9.1"
+  resolved "https://registry.yarnpkg.com/@typescript-eslint/visitor-keys/-/visitor-keys-6.9.1.tgz#6753a9225a0ba00459b15d6456b9c2780b66707d"
+  integrity sha512-MUaPUe/QRLEffARsmNfmpghuQkW436DvESW+h+M52w0coICHRfD6Np9/K6PdACwnrq1HmuLl+cSPZaJmeVPkSw==
+  dependencies:
+    "@typescript-eslint/types" "6.9.1"
+    eslint-visitor-keys "^3.4.1"
+
 "@ungap/promise-all-settled@1.1.2":
   version "1.1.2"
   resolved "https://registry.yarnpkg.com/@ungap/promise-all-settled/-/promise-all-settled-1.1.2.tgz#aa58042711d6e3275dd37dc597e5d31e8c290a44"
   integrity sha512-sL/cEvJWAnClXw0wHk85/2L0G6Sj8UB0Ctc1TEMbKSsmpRosqhwj9gWgFRZSrBr2f9tiXISwNhCPmlfqUqyb9Q==
 
+"@ungap/structured-clone@^1.2.0":
+  version "1.2.0"
+  resolved "https://registry.yarnpkg.com/@ungap/structured-clone/-/structured-clone-1.2.0.tgz#756641adb587851b5ccb3e095daf27ae581c8406"
+  integrity sha512-zuVdFrMJiuCDQUMCzQaD6KL28MjnqqN8XnAqiEq9PNm/hCPTSGfrXCOfwj1ow4LFb/tNymJPwsNbVePc1xFqrQ==
+
 "@yarnpkg/lockfile@^1.1.0":
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/@yarnpkg/lockfile/-/lockfile-1.1.0.tgz#e77a97fbd345b76d83245edcd17d393b1b41fb31"
@@ -2459,30 +2899,25 @@ accepts@~1.3.8:
     mime-types "~2.1.34"
     negotiator "0.6.3"
 
-acorn-jsx@^5.0.0, acorn-jsx@^5.3.1:
+acorn-jsx@^5.3.1, acorn-jsx@^5.3.2:
   version "5.3.2"
   resolved "https://registry.yarnpkg.com/acorn-jsx/-/acorn-jsx-5.3.2.tgz#7ed5bb55908b3b2f1bc55c6af1653bada7f07937"
   integrity sha512-rq9s+JNhf0IChjtDXxllJ7g41oZk5SlXtp0LHwyA5cejwn7vKmKp4pPri6YEePv2PU65sAsegbXtIinmDFDXgQ==
 
 acorn-walk@^8.1.1:
-  version "8.2.0"
-  resolved "https://registry.yarnpkg.com/acorn-walk/-/acorn-walk-8.2.0.tgz#741210f2e2426454508853a2f44d0ab83b7f69c1"
-  integrity sha512-k+iyHEuPgSw6SbuDpGQM+06HQUa04DZ3o+F6CSzXMvvI5KMvnaEqXe+YVe555R9nn6GPt404fos4wcgpw12SDA==
-
-acorn@^6.0.7:
-  version "6.4.2"
-  resolved "https://registry.yarnpkg.com/acorn/-/acorn-6.4.2.tgz#35866fd710528e92de10cf06016498e47e39e1e6"
-  integrity sha512-XtGIhXwF8YM8bJhGxG5kXgjkEuNGLTkoYqVE+KMR+aspr4KGYmKYg7yUe3KghyQ9yheNwLnjmzh/7+gfDBmHCQ==
+  version "8.3.0"
+  resolved "https://registry.yarnpkg.com/acorn-walk/-/acorn-walk-8.3.0.tgz#2097665af50fd0cf7a2dfccd2b9368964e66540f"
+  integrity sha512-FS7hV565M5l1R08MXqo8odwMTB02C2UqzB17RVgu9EyuYFBqJZ3/ZY97sQD5FewVu1UyDFc1yztUDrAwT0EypA==
 
 acorn@^7.4.0:
   version "7.4.1"
   resolved "https://registry.yarnpkg.com/acorn/-/acorn-7.4.1.tgz#feaed255973d2e77555b83dbc08851a6c63520fa"
   integrity sha512-nQyp0o1/mNdbTO1PO6kHkwSrmgZ0MT/jCCpNiwbUjGoRN4dlBhqJtoQuCnEOKzgTVwg0ZWiCoQy6SxMebQVh8A==
 
-acorn@^8.4.1:
-  version "8.8.1"
-  resolved "https://registry.yarnpkg.com/acorn/-/acorn-8.8.1.tgz#0a3f9cbecc4ec3bea6f0a80b66ae8dd2da250b73"
-  integrity sha512-7zFpHzhnqYKrkYdUjF1HI1bzd0VygEGX8lFk4k5zVMqHEoES+P+7TKI+EvLO9WVMJ8eekdO0aDEK044xTXwPPA==
+acorn@^8.4.1, acorn@^8.9.0:
+  version "8.11.2"
+  resolved "https://registry.yarnpkg.com/acorn/-/acorn-8.11.2.tgz#ca0d78b51895be5390a5903c5b3bdcdaf78ae40b"
+  integrity sha512-nc0Axzp/0FILLEVsm4fNwLCwMttvhEI263QtVPQcbpfZZ3ts0hLsZGOpE6czNlid7CJ9MlyH8reXkpsf3YUY4w==
 
 address@^1.0.1:
   version "1.2.2"
@@ -2519,7 +2954,7 @@ aggregate-error@^3.0.0:
     clean-stack "^2.0.0"
     indent-string "^4.0.0"
 
-ajv@^6.10.0, ajv@^6.10.2, ajv@^6.12.3, ajv@^6.12.4, ajv@^6.6.1, ajv@^6.9.1:
+ajv@^6.10.0, ajv@^6.12.3, ajv@^6.12.4, ajv@^6.12.6:
   version "6.12.6"
   resolved "https://registry.yarnpkg.com/ajv/-/ajv-6.12.6.tgz#baf5a62e802b07d977034586f8c3baf5adf26df4"
   integrity sha512-j3fVLgvTo527anyYyJOGTYJbG+vnnQYvE0m5mmkc1TK+nxAppkCLMIL0aZ4dblVCNoGShhm+kzE4ZUykBoMg4g==
@@ -2530,9 +2965,9 @@ ajv@^6.10.0, ajv@^6.10.2, ajv@^6.12.3, ajv@^6.12.4, ajv@^6.6.1, ajv@^6.9.1:
     uri-js "^4.2.2"
 
 ajv@^8.0.1:
-  version "8.11.0"
-  resolved "https://registry.yarnpkg.com/ajv/-/ajv-8.11.0.tgz#977e91dd96ca669f54a11e23e378e33b884a565f"
-  integrity sha512-wGgprdCvMalC0BztXvitD2hC04YffAvtsUn93JbGXYLAtCUO4xd17mCCZQxUOItiBwZvJScWo8NIvQMQ71rdpg==
+  version "8.12.0"
+  resolved "https://registry.yarnpkg.com/ajv/-/ajv-8.12.0.tgz#d1a0527323e22f53562c567c00991577dfbe19d1"
+  integrity sha512-sRu1kpcO9yLtYxBKvqfTeh9KzZEwO3STyX1HT+4CaDzC6HpTGYhIhPIzj9XuKU7KYDwnaeh5hcOwjy1QuJzBPA==
   dependencies:
     fast-deep-equal "^3.1.1"
     json-schema-traverse "^1.0.0"
@@ -2544,11 +2979,6 @@ amdefine@>=0.0.4:
   resolved "https://registry.yarnpkg.com/amdefine/-/amdefine-1.0.1.tgz#4a5282ac164729e93619bcfd3ad151f817ce91f5"
   integrity sha512-S2Hw0TtNkMJhIabBwIojKL9YHO5T0n5eNqWJ7Lrlel/zDbftQpxpapi8tZs3X1HWa+u+QeydGmzzNU0m09+Rcg==
 
-ansi-colors@3.2.3:
-  version "3.2.3"
-  resolved "https://registry.yarnpkg.com/ansi-colors/-/ansi-colors-3.2.3.tgz#57d35b8686e851e2cc04c403f1c00203976a1813"
-  integrity sha512-LEHHyuhlPY3TmuUYMh2oz89lTShfvgbmzaBcxve9t/9Wuy7Dwf4yoAKcND7KFT1HAQfqZ12qtc+DUrBMeKF9nw==
-
 ansi-colors@4.1.1:
   version "4.1.1"
   resolved "https://registry.yarnpkg.com/ansi-colors/-/ansi-colors-4.1.1.tgz#cbb9ae256bf750af1eab344f229aa27fe94ba348"
@@ -2596,7 +3026,7 @@ ansi-styles@^2.2.1:
   resolved "https://registry.yarnpkg.com/ansi-styles/-/ansi-styles-2.2.1.tgz#b432dd3358b634cf75e1e4664368240533c1ddbe"
   integrity sha512-kmCevFghRiWM7HB5zTPULl4r9bVFSWjz62MhqizDGUrq2NWuNMQyuv4tHHoKJHs69M/MF64lEcHdYIocrdWQYA==
 
-ansi-styles@^3.2.0, ansi-styles@^3.2.1:
+ansi-styles@^3.2.1:
   version "3.2.1"
   resolved "https://registry.yarnpkg.com/ansi-styles/-/ansi-styles-3.2.1.tgz#41fbb20243e50b12be0f04b8dedbf07520ce841d"
   integrity sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==
@@ -2615,10 +3045,10 @@ 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==
 
-antlr4@4.7.1:
-  version "4.7.1"
-  resolved "https://registry.yarnpkg.com/antlr4/-/antlr4-4.7.1.tgz#69984014f096e9e775f53dd9744bf994d8959773"
-  integrity sha512-haHyTW7Y9joE5MVs37P2lNYfU2RWBLfcRDD8OWldcdZm5TiCE91B5Xl1oWSwiDUSd4rlExpt2pu1fksYQjRBYQ==
+antlr4@^4.11.0:
+  version "4.13.1"
+  resolved "https://registry.yarnpkg.com/antlr4/-/antlr4-4.13.1.tgz#1e0a1830a08faeb86217cb2e6c34716004e4253d"
+  integrity sha512-kiXTspaRYvnIArgE97z5YVVf/cDVQABr3abFRR6mE7yesLMkgu4ujuyV/sgxafQ8wgve0DJQUJ38Z8tkgA2izA==
 
 antlr4@~4.8.0:
   version "4.8.0"
@@ -2636,14 +3066,6 @@ any-promise@^1.0.0:
   integrity sha512-7UvmKalWRt1wgjL1RrGxoSJW/0QZFIegpeGvZG9kjp8vrRu55XTHbwnqq2GpXm9uLbcuhxm3IqX9OB4MZR1b2A==
 
 anymatch@^3.0.3, anymatch@~3.1.2:
-  version "3.1.2"
-  resolved "https://registry.yarnpkg.com/anymatch/-/anymatch-3.1.2.tgz#c0557c096af32f106198f4f4e2a383537e378716"
-  integrity sha512-P43ePfOAIupkguHUycrc4qJ9kz8ZiuOUijaETwX7THt0Y/GNK7v0aa8rY816xWjZ7rJdA5XdMcpVFTKMq+RvWg==
-  dependencies:
-    normalize-path "^3.0.0"
-    picomatch "^2.0.4"
-
-anymatch@~3.1.1:
   version "3.1.3"
   resolved "https://registry.yarnpkg.com/anymatch/-/anymatch-3.1.3.tgz#790c58b19ba1720a84205b57c618d5ad8524973e"
   integrity sha512-KMReFUr0B4t+D+OBkjR3KYqvocp2XaSzO55UcB6mgQMd3KbcE+mWTyvVV7D/zsdEbNnV6acZUutkiHQXvTr1Rw==
@@ -2695,13 +3117,42 @@ array-back@^2.0.0:
   resolved "https://registry.yarnpkg.com/array-back/-/array-back-2.0.0.tgz#6877471d51ecc9c9bfa6136fb6c7d5fe69748022"
   integrity sha512-eJv4pLLufP3g5kcZry0j6WXpIbzYw9GUB4mVJZno9wfwiBxbizTnHCw3VJb07cBihbFX48Y7oSrW9y+gt4glyw==
   dependencies:
-    typical "^2.6.1"
+    typical "^2.6.1"
+
+array-back@^3.0.1, array-back@^3.1.0:
+  version "3.1.0"
+  resolved "https://registry.yarnpkg.com/array-back/-/array-back-3.1.0.tgz#b8859d7a508871c9a7b2cf42f99428f65e96bfb0"
+  integrity sha512-TkuxA4UCOvxuDK6NZYXCalszEzj+TLszyASooky+i742l9TqsOdYCMJJupxRic61hwquNtppB3hgcuq9SVSH1Q==
+
+array-back@^4.0.1, array-back@^4.0.2:
+  version "4.0.2"
+  resolved "https://registry.yarnpkg.com/array-back/-/array-back-4.0.2.tgz#8004e999a6274586beeb27342168652fdb89fa1e"
+  integrity sha512-NbdMezxqf94cnNfWLL7V/im0Ub+Anbb0IoZhvzie8+4HJ4nMQuzHuy49FkGYCJK2yAloZ3meiB6AVMClbrI1vg==
+
+array-buffer-byte-length@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/array-buffer-byte-length/-/array-buffer-byte-length-1.0.0.tgz#fabe8bc193fea865f317fe7807085ee0dee5aead"
+  integrity sha512-LPuwb2P+NrQw3XhxGc36+XSvuBPopovXYTR9Ew++Du9Yb/bx5AzBfrIsBoj0EZUifjQU+sHL21sseZ3jerWO/A==
+  dependencies:
+    call-bind "^1.0.2"
+    is-array-buffer "^3.0.1"
 
 array-flatten@1.1.1:
   version "1.1.1"
   resolved "https://registry.yarnpkg.com/array-flatten/-/array-flatten-1.1.1.tgz#9a5f699051b1e7073328f2a008968b64ea2955d2"
   integrity sha512-PCVAQswWemu6UdxsDFFX/+gVeYqKAod3D3UVm91jHwynguOwAvYPhx8nNlM++NqRcK6CxxpUafjmhIdKiHibqg==
 
+array-includes@^3.1.7:
+  version "3.1.7"
+  resolved "https://registry.yarnpkg.com/array-includes/-/array-includes-3.1.7.tgz#8cd2e01b26f7a3086cbc87271593fe921c62abda"
+  integrity sha512-dlcsNBIiWhPkHdOEEKnehA+RNUWDc4UqFtnIXU4uuYDPtA4LDkr7qip2p0VvFAEXNDr0yWZ9PJyIRiGjRLQzwQ==
+  dependencies:
+    call-bind "^1.0.2"
+    define-properties "^1.2.0"
+    es-abstract "^1.22.1"
+    get-intrinsic "^1.2.1"
+    is-string "^1.0.7"
+
 array-union@^2.1.0:
   version "2.1.0"
   resolved "https://registry.yarnpkg.com/array-union/-/array-union-2.1.0.tgz#b798420adbeb1de828d84acd8a2e23d3efe85e8d"
@@ -2717,17 +3168,61 @@ array-unique@^0.3.2:
   resolved "https://registry.yarnpkg.com/array-unique/-/array-unique-0.3.2.tgz#a894b75d4bc4f6cd679ef3244a9fd8f46ae2d428"
   integrity sha512-SleRWjh9JUud2wH1hPs9rZBZ33H6T9HOiL0uwGnGx9FpE6wKGyfWugmbkEOIs6qWrZhg0LWeLziLrEwQJhs5mQ==
 
-array.prototype.reduce@^1.0.5:
-  version "1.0.5"
-  resolved "https://registry.yarnpkg.com/array.prototype.reduce/-/array.prototype.reduce-1.0.5.tgz#6b20b0daa9d9734dd6bc7ea66b5bbce395471eac"
-  integrity sha512-kDdugMl7id9COE8R7MHF5jWk7Dqt/fs4Pv+JXoICnYwqpjjjbUurz6w5fT5IG6brLdJhv6/VoHB0H7oyIBXd+Q==
+array.prototype.findlastindex@^1.2.3:
+  version "1.2.3"
+  resolved "https://registry.yarnpkg.com/array.prototype.findlastindex/-/array.prototype.findlastindex-1.2.3.tgz#b37598438f97b579166940814e2c0493a4f50207"
+  integrity sha512-LzLoiOMAxvy+Gd3BAq3B7VeIgPdo+Q8hthvKtXybMvRV0jrXfJM/t8mw7nNlpEcVlVUnCnM2KSX4XU5HmpodOA==
   dependencies:
     call-bind "^1.0.2"
-    define-properties "^1.1.4"
-    es-abstract "^1.20.4"
+    define-properties "^1.2.0"
+    es-abstract "^1.22.1"
+    es-shim-unscopables "^1.0.0"
+    get-intrinsic "^1.2.1"
+
+array.prototype.flat@^1.3.2:
+  version "1.3.2"
+  resolved "https://registry.yarnpkg.com/array.prototype.flat/-/array.prototype.flat-1.3.2.tgz#1476217df8cff17d72ee8f3ba06738db5b387d18"
+  integrity sha512-djYB+Zx2vLewY8RWlNCUdHjDXs2XOgm602S9E7P/UpHgfeHL00cRiIF+IN/G/aUJ7kGPb6yO/ErDI5V2s8iycA==
+  dependencies:
+    call-bind "^1.0.2"
+    define-properties "^1.2.0"
+    es-abstract "^1.22.1"
+    es-shim-unscopables "^1.0.0"
+
+array.prototype.flatmap@^1.3.2:
+  version "1.3.2"
+  resolved "https://registry.yarnpkg.com/array.prototype.flatmap/-/array.prototype.flatmap-1.3.2.tgz#c9a7c6831db8e719d6ce639190146c24bbd3e527"
+  integrity sha512-Ewyx0c9PmpcsByhSW4r+9zDU7sGjFc86qf/kKtuSCRdhfbk0SNLLkaT5qvcHnRGgc5NP/ly/y+qkXkqONX54CQ==
+  dependencies:
+    call-bind "^1.0.2"
+    define-properties "^1.2.0"
+    es-abstract "^1.22.1"
+    es-shim-unscopables "^1.0.0"
+
+array.prototype.reduce@^1.0.6:
+  version "1.0.6"
+  resolved "https://registry.yarnpkg.com/array.prototype.reduce/-/array.prototype.reduce-1.0.6.tgz#63149931808c5fc1e1354814923d92d45f7d96d5"
+  integrity sha512-UW+Mz8LG/sPSU8jRDCjVr6J/ZKAGpHfwrZ6kWTG5qCxIEiXdVshqGnu5vEZA8S1y6X4aCSbQZ0/EEsfvEvBiSg==
+  dependencies:
+    call-bind "^1.0.2"
+    define-properties "^1.2.0"
+    es-abstract "^1.22.1"
     es-array-method-boxes-properly "^1.0.0"
     is-string "^1.0.7"
 
+arraybuffer.prototype.slice@^1.0.2:
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/arraybuffer.prototype.slice/-/arraybuffer.prototype.slice-1.0.2.tgz#98bd561953e3e74bb34938e77647179dfe6e9f12"
+  integrity sha512-yMBKppFur/fbHu9/6USUe03bZ4knMYiwFBcyiaXB8Go0qNehwX6inYPzK9U0NeQvGxKthcmHcaR8P5MStSRBAw==
+  dependencies:
+    array-buffer-byte-length "^1.0.0"
+    call-bind "^1.0.2"
+    define-properties "^1.2.0"
+    es-abstract "^1.22.1"
+    get-intrinsic "^1.2.1"
+    is-array-buffer "^3.0.2"
+    is-shared-array-buffer "^1.0.2"
+
 asap@~2.0.6:
   version "2.0.6"
   resolved "https://registry.yarnpkg.com/asap/-/asap-2.0.6.tgz#e50347611d7e690943208bbdafebcbc2fb866d46"
@@ -2743,7 +3238,7 @@ asn1.js@^5.2.0:
     minimalistic-assert "^1.0.0"
     safer-buffer "^2.1.0"
 
-asn1@^0.2.4, asn1@~0.2.3:
+asn1@^0.2.6, asn1@~0.2.3:
   version "0.2.6"
   resolved "https://registry.yarnpkg.com/asn1/-/asn1-0.2.6.tgz#0d3a7bb6e64e02a90c0303b31f292868ea09a08d"
   integrity sha512-ix/FxPn0MDjeyJ7i/yoHGFt/EX6LyNbxSEhPPXODPL+KB0VPk86UYfL0lMdy+KCnv+fmvIzySwaK5COwqVbWTQ==
@@ -2765,22 +3260,17 @@ assign-symbols@^1.0.0:
   resolved "https://registry.yarnpkg.com/assign-symbols/-/assign-symbols-1.0.0.tgz#59667f41fadd4f20ccbc2bb96b8d4f7f78ec0367"
   integrity sha512-Q+JC7Whu8HhmTdBph/Tq59IoRtoy6KAm5zzPv00WdujX82lbAL8K7WVjne7vdCsAmbF4AYaDOPyO3k0kl8qIrw==
 
-ast-parents@0.0.1:
+ast-parents@^0.0.1:
   version "0.0.1"
   resolved "https://registry.yarnpkg.com/ast-parents/-/ast-parents-0.0.1.tgz#508fd0f05d0c48775d9eccda2e174423261e8dd3"
   integrity sha512-XHusKxKz3zoYk1ic8Un640joHbFMhbqneyoZfoKnEGtf2ey9Uh/IdpcQplODdO/kENaMIWsD0nJm4+wX3UNLHA==
 
-astral-regex@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/astral-regex/-/astral-regex-1.0.0.tgz#6c8c3fb827dd43ee3918f27b82782ab7658a6fd9"
-  integrity sha512-+Ryf6g3BKoRc7jfp7ad8tM4TtMiaWvbF/1/sQcZPkkS7ag3D5nMBCe2UfOTONtAkaG0tO0ij3C5Lwmf1EiyjHg==
-
 astral-regex@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/astral-regex/-/astral-regex-2.0.0.tgz#483143c567aeed4785759c0865786dc77d7d2e31"
   integrity sha512-Z7tMw1ytTXt5jqMcOP+OQteU1VuNK9Y02uuJtKQ1Sv69jXQKKg5cibLwGJow8yzZP+eAc18EmLGPal0bp36rvQ==
 
-async-eventemitter@^0.2.2, async-eventemitter@^0.2.4:
+async-eventemitter@^0.2.2:
   version "0.2.4"
   resolved "https://registry.yarnpkg.com/async-eventemitter/-/async-eventemitter-0.2.4.tgz#f5e7c8ca7d3e46aab9ec40a292baf686a0bafaca"
   integrity sha512-pd20BwL7Yt1zwDFy+8MX8F1+WCT8aQeKj0kQnTrH9WaeRETlRamVhD0JtRPmrV4GfOJ2F9CvdQkZeZhnh2TuHw==
@@ -2848,10 +3338,10 @@ axios@^0.21.1:
   dependencies:
     follow-redirects "^1.14.0"
 
-axios@^1.4.0:
-  version "1.4.0"
-  resolved "https://registry.yarnpkg.com/axios/-/axios-1.4.0.tgz#38a7bf1224cd308de271146038b551d725f0be1f"
-  integrity sha512-S4XCWMEmzvo64T9GfvQDOXgYRDJ/wsSZc7Jvdgx5u1sd0JwsuPLqb3SYmusag+edF6ziyMensPVqLTSc1PiSEA==
+axios@^1.4.0, axios@^1.5.1:
+  version "1.6.0"
+  resolved "https://registry.yarnpkg.com/axios/-/axios-1.6.0.tgz#f1e5292f26b2fd5c2e66876adc5b06cdbd7d2102"
+  integrity sha512-EZ1DYihju9pwVB+jg67ogm+Tmqc6JmhamRN6I4Zt8DfZu5lbcQGw3ozH9lFejSJgs/ibaef3A9PMXPLeefFGJg==
   dependencies:
     follow-redirects "^1.15.0"
     form-data "^4.0.0"
@@ -3030,15 +3520,15 @@ babel-helpers@^6.24.1:
     babel-runtime "^6.22.0"
     babel-template "^6.24.1"
 
-babel-jest@^29.2.2:
-  version "29.2.2"
-  resolved "https://registry.yarnpkg.com/babel-jest/-/babel-jest-29.2.2.tgz#2c15abd8c2081293c9c3f4f80a4ed1d51542fee5"
-  integrity sha512-kkq2QSDIuvpgfoac3WZ1OOcHsQQDU5xYk2Ql7tLdJ8BVAYbefEXal+NfS45Y5LVZA7cxC8KYcQMObpCt1J025w==
+babel-jest@^29.7.0:
+  version "29.7.0"
+  resolved "https://registry.yarnpkg.com/babel-jest/-/babel-jest-29.7.0.tgz#f4369919225b684c56085998ac63dbd05be020d5"
+  integrity sha512-BrvGY3xZSwEcCzKvKsCi2GgHqDqsYkOP4/by5xCgIwGXQxIEh+8ew3gmrE1y7XRR6LHZIj6yLYnUi/mm2KXKBg==
   dependencies:
-    "@jest/transform" "^29.2.2"
+    "@jest/transform" "^29.7.0"
     "@types/babel__core" "^7.1.14"
     babel-plugin-istanbul "^6.1.1"
-    babel-preset-jest "^29.2.0"
+    babel-preset-jest "^29.6.3"
     chalk "^4.0.0"
     graceful-fs "^4.2.9"
     slash "^3.0.0"
@@ -3068,10 +3558,10 @@ babel-plugin-istanbul@^6.1.1:
     istanbul-lib-instrument "^5.0.4"
     test-exclude "^6.0.0"
 
-babel-plugin-jest-hoist@^29.2.0:
-  version "29.2.0"
-  resolved "https://registry.yarnpkg.com/babel-plugin-jest-hoist/-/babel-plugin-jest-hoist-29.2.0.tgz#23ee99c37390a98cfddf3ef4a78674180d823094"
-  integrity sha512-TnspP2WNiR3GLfCsUNHqeXw0RoQ2f9U5hQ5L3XFpwuO8htQmSrhh8qsB6vi5Yi8+kuynN1yjDjQsPfkebmB6ZA==
+babel-plugin-jest-hoist@^29.6.3:
+  version "29.6.3"
+  resolved "https://registry.yarnpkg.com/babel-plugin-jest-hoist/-/babel-plugin-jest-hoist-29.6.3.tgz#aadbe943464182a8922c3c927c3067ff40d24626"
+  integrity sha512-ESAc/RJvGTFEzRwOTT4+lNDk/GNHMkKbNzsvT0qKRfDyyYTskxB5rnU2njIDYVxXCBHHEI1c0YwHob3WaYujOg==
   dependencies:
     "@babel/template" "^7.3.3"
     "@babel/types" "^7.3.3"
@@ -3370,12 +3860,12 @@ babel-preset-env@^1.7.0:
     invariant "^2.2.2"
     semver "^5.3.0"
 
-babel-preset-jest@^29.2.0:
-  version "29.2.0"
-  resolved "https://registry.yarnpkg.com/babel-preset-jest/-/babel-preset-jest-29.2.0.tgz#3048bea3a1af222e3505e4a767a974c95a7620dc"
-  integrity sha512-z9JmMJppMxNv8N7fNRHvhMg9cvIkMxQBXgFkane3yKVEvEOP+kB50lk8DFRvF9PGqbyXxlmebKWhuDORO8RgdA==
+babel-preset-jest@^29.6.3:
+  version "29.6.3"
+  resolved "https://registry.yarnpkg.com/babel-preset-jest/-/babel-preset-jest-29.6.3.tgz#fa05fa510e7d493896d7b0dd2033601c840f171c"
+  integrity sha512-0B3bhxR6snWXJZtR/RliHTDPRgn1sNHOR0yVtq/IiQFyuOVjFS+wuio/R4gSNkyYmKmJB4wGZv2NZanmKmTnNA==
   dependencies:
-    babel-plugin-jest-hoist "^29.2.0"
+    babel-plugin-jest-hoist "^29.6.3"
     babel-preset-current-node-syntax "^1.0.0"
 
 babel-register@^6.26.0:
@@ -3497,22 +3987,20 @@ bech32@1.1.4:
   resolved "https://registry.yarnpkg.com/bech32/-/bech32-1.1.4.tgz#e38c9f37bf179b8eb16ae3a772b40c356d4832e9"
   integrity sha512-s0IrSOzLlbvX7yp4WBfPITzpAU8sqQcpsmwXDiKwrG4r491vwCO/XpejasRNl0piBMe/DvP4Tz0mIS/X1DPJBQ==
 
-bigint-crypto-utils@^3.0.23:
-  version "3.1.7"
-  resolved "https://registry.yarnpkg.com/bigint-crypto-utils/-/bigint-crypto-utils-3.1.7.tgz#c4c1b537c7c1ab7aadfaecf3edfd45416bf2c651"
-  integrity sha512-zpCQpIE2Oy5WIQpjC9iYZf8Uh9QqoS51ZCooAcNvzv1AQ3VWdT52D0ksr1+/faeK8HVIej1bxXcP75YcqH3KPA==
-  dependencies:
-    bigint-mod-arith "^3.1.0"
+big-integer@^1.6.44:
+  version "1.6.51"
+  resolved "https://registry.yarnpkg.com/big-integer/-/big-integer-1.6.51.tgz#0df92a5d9880560d3ff2d5fd20245c889d130686"
+  integrity sha512-GPEid2Y9QU1Exl1rpO9B2IPJGHPSupF5GnVIP0blYvNOMer2bTvSWs1jGOUg04hTmu67nmLsQ9TBo1puaotBHg==
 
-bigint-mod-arith@^3.1.0:
-  version "3.1.2"
-  resolved "https://registry.yarnpkg.com/bigint-mod-arith/-/bigint-mod-arith-3.1.2.tgz#658e416bc593a463d97b59766226d0a3021a76b1"
-  integrity sha512-nx8J8bBeiRR+NlsROFH9jHswW5HO8mgfOSqW0AmjicMMvaONDa8AO+5ViKDUUNytBPWiwfvZP4/Bj4Y3lUfvgQ==
+bigint-crypto-utils@^3.0.23:
+  version "3.3.0"
+  resolved "https://registry.yarnpkg.com/bigint-crypto-utils/-/bigint-crypto-utils-3.3.0.tgz#72ad00ae91062cf07f2b1def9594006c279c1d77"
+  integrity sha512-jOTSb+drvEDxEq6OuUybOAv/xxoh3cuYRUIPyu8sSHQNKM303UQ2R1DAo45o1AkcIXw6fzbaFI1+xGGdaXs2lg==
 
 bignumber.js@^9.0.0, bignumber.js@^9.0.1:
-  version "9.1.1"
-  resolved "https://registry.yarnpkg.com/bignumber.js/-/bignumber.js-9.1.1.tgz#c4df7dc496bd849d4c9464344c1aa74228b4dac6"
-  integrity sha512-pHm4LsMJ6lzgNGVfZHjMoO8sdoRhOzOH4MLmY65Jg70bpxCKu5iOHNJyfF6OyvYw7t8Fpf35RuzUyqnQsj8Vig==
+  version "9.1.2"
+  resolved "https://registry.yarnpkg.com/bignumber.js/-/bignumber.js-9.1.2.tgz#b7c4242259c008903b13707983b5f4bbd31eda0c"
+  integrity sha512-2/mKyZH9K85bzOEfhXDBFZTGd1CTs+5IHpeFQo9luiBG7hghdC851Pj2WAhb6E3R6b9tZj/XKhbg4fum+Kepug==
 
 binary-extensions@^2.0.0:
   version "2.2.0"
@@ -3575,12 +4063,12 @@ bn.js@^4.0.0, bn.js@^4.1.0, bn.js@^4.10.0, bn.js@^4.11.0, bn.js@^4.11.6, bn.js@^
   resolved "https://registry.yarnpkg.com/bn.js/-/bn.js-4.12.0.tgz#775b3f278efbb9718eec7361f483fb36fbbfea88"
   integrity sha512-c98Bf3tPniI+scsdk237ku1Dc3ujXQTSgyiPUDEOe7tRkhrqridvh8klBv0HCEso1OLOYcHuCv/cS6DNxKH+ZA==
 
-bn.js@^5.0.0, bn.js@^5.1.1, bn.js@^5.1.2, bn.js@^5.2.0, bn.js@^5.2.1:
+bn.js@^5.0.0, bn.js@^5.1.2, bn.js@^5.2.0, bn.js@^5.2.1:
   version "5.2.1"
   resolved "https://registry.yarnpkg.com/bn.js/-/bn.js-5.2.1.tgz#0bc527a6a0d18d0aa8d5b0538ce4a77dccfa7b70"
   integrity sha512-eXRvHzWyYPBuB4NBy0cmYQjGitUrtqwbvlzP3G6VFnNRbsZQIxQ10PbKKHt8gZ/HW/D/747aDl+QkDqg3KQLMQ==
 
-body-parser@1.20.1, body-parser@^1.16.0:
+body-parser@1.20.1:
   version "1.20.1"
   resolved "https://registry.yarnpkg.com/body-parser/-/body-parser-1.20.1.tgz#b1812a8912c195cd371a3ee5e66faa2338a5c668"
   integrity sha512-jWi7abTbYwajOytWCQc37VulmWiRae5RyTpaCyDcS5/lMdtwSz5lOpDE67srw/HYe35f1z3fDQw+3txg7gNtWw==
@@ -3598,6 +4086,31 @@ body-parser@1.20.1, body-parser@^1.16.0:
     type-is "~1.6.18"
     unpipe "1.0.0"
 
+body-parser@^1.16.0:
+  version "1.20.2"
+  resolved "https://registry.yarnpkg.com/body-parser/-/body-parser-1.20.2.tgz#6feb0e21c4724d06de7ff38da36dad4f57a747fd"
+  integrity sha512-ml9pReCu3M61kGlqoTm2umSXTlRTuGTx0bfYj+uIUKKYycG5NtSbeetV3faSU6R7ajOPw0g/J1PvK4qNy7s5bA==
+  dependencies:
+    bytes "3.1.2"
+    content-type "~1.0.5"
+    debug "2.6.9"
+    depd "2.0.0"
+    destroy "1.2.0"
+    http-errors "2.0.0"
+    iconv-lite "0.4.24"
+    on-finished "2.4.1"
+    qs "6.11.0"
+    raw-body "2.5.2"
+    type-is "~1.6.18"
+    unpipe "1.0.0"
+
+bplist-parser@^0.2.0:
+  version "0.2.0"
+  resolved "https://registry.yarnpkg.com/bplist-parser/-/bplist-parser-0.2.0.tgz#43a9d183e5bf9d545200ceac3e712f79ebbe8d0e"
+  integrity sha512-z0M+byMThzQmD9NILRniCUXYsYpjwnlO8N5uCFaCqIOpqRsJCrQL9NK3JsD67CN5a08nF5oIL2bD6loTdHOuKw==
+  dependencies:
+    big-integer "^1.6.44"
+
 brace-expansion@^1.1.7:
   version "1.1.11"
   resolved "https://registry.yarnpkg.com/brace-expansion/-/brace-expansion-1.1.11.tgz#3c7fcbf529d87226f3d2f52b966ff5271eb441dd"
@@ -3687,7 +4200,7 @@ browserify-des@^1.0.0:
     inherits "^2.0.1"
     safe-buffer "^5.1.2"
 
-browserify-rsa@^4.0.0, browserify-rsa@^4.0.1:
+browserify-rsa@^4.0.0, browserify-rsa@^4.1.0:
   version "4.1.0"
   resolved "https://registry.yarnpkg.com/browserify-rsa/-/browserify-rsa-4.1.0.tgz#b2fd06b5b75ae297f7ce2dc651f918f5be158c8d"
   integrity sha512-AdEER0Hkspgno2aR97SAf6vi0y0k8NuOpGnVH3O99rcA5Q6sh8QxcngtHuJ6uXwnfAXNM4Gn1Gb7/MV1+Ymbog==
@@ -3696,19 +4209,19 @@ browserify-rsa@^4.0.0, browserify-rsa@^4.0.1:
     randombytes "^2.0.1"
 
 browserify-sign@^4.0.0:
-  version "4.2.1"
-  resolved "https://registry.yarnpkg.com/browserify-sign/-/browserify-sign-4.2.1.tgz#eaf4add46dd54be3bb3b36c0cf15abbeba7956c3"
-  integrity sha512-/vrA5fguVAKKAVTNJjgSm1tRQDHUU6DbwO9IROu/0WAzC8PKhucDSh18J0RMvVeHAn5puMd+QHC2erPRNf8lmg==
+  version "4.2.2"
+  resolved "https://registry.yarnpkg.com/browserify-sign/-/browserify-sign-4.2.2.tgz#e78d4b69816d6e3dd1c747e64e9947f9ad79bc7e"
+  integrity sha512-1rudGyeYY42Dk6texmv7c4VcQ0EsvVbLwZkA+AQB7SxvXxmcD93jcHie8bzecJ+ChDlmAm2Qyu0+Ccg5uhZXCg==
   dependencies:
-    bn.js "^5.1.1"
-    browserify-rsa "^4.0.1"
+    bn.js "^5.2.1"
+    browserify-rsa "^4.1.0"
     create-hash "^1.2.0"
     create-hmac "^1.1.7"
-    elliptic "^6.5.3"
+    elliptic "^6.5.4"
     inherits "^2.0.4"
-    parse-asn1 "^5.1.5"
-    readable-stream "^3.6.0"
-    safe-buffer "^5.2.0"
+    parse-asn1 "^5.1.6"
+    readable-stream "^3.6.2"
+    safe-buffer "^5.2.1"
 
 browserslist@^3.2.6:
   version "3.2.8"
@@ -3718,15 +4231,15 @@ browserslist@^3.2.6:
     caniuse-lite "^1.0.30000844"
     electron-to-chromium "^1.3.47"
 
-browserslist@^4.21.3:
-  version "4.21.4"
-  resolved "https://registry.yarnpkg.com/browserslist/-/browserslist-4.21.4.tgz#e7496bbc67b9e39dd0f98565feccdcb0d4ff6987"
-  integrity sha512-CBHJJdDmgjl3daYjN5Cp5kbTf1mUhZoS+beLklHIvkOWscs83YAhLlF3Wsh/lciQYAcbBJgTOD44VtG31ZM4Hw==
+browserslist@^4.21.9:
+  version "4.22.1"
+  resolved "https://registry.yarnpkg.com/browserslist/-/browserslist-4.22.1.tgz#ba91958d1a59b87dab6fed8dfbcb3da5e2e9c619"
+  integrity sha512-FEVc202+2iuClEhZhrWy6ZiAcRLvNMyYcxZ8raemul1DYVOVdFsbqckWLdsixQZCpJlwe77Z3UTalE7jsjnKfQ==
   dependencies:
-    caniuse-lite "^1.0.30001400"
-    electron-to-chromium "^1.4.251"
-    node-releases "^2.0.6"
-    update-browserslist-db "^1.0.9"
+    caniuse-lite "^1.0.30001541"
+    electron-to-chromium "^1.4.535"
+    node-releases "^2.0.13"
+    update-browserslist-db "^1.0.13"
 
 bs-logger@0.x:
   version "0.2.6"
@@ -3796,6 +4309,11 @@ buffer-to-arraybuffer@^0.0.5:
   resolved "https://registry.yarnpkg.com/buffer-to-arraybuffer/-/buffer-to-arraybuffer-0.0.5.tgz#6064a40fa76eb43c723aba9ef8f6e1216d10511a"
   integrity sha512-3dthu5CYiVB1DEJp61FtApNnNndTckcqe4pFcLdvHtrpG+kcyekCJKg4MRiDcFW7A6AODnXB9U4dwQiCW5kzJQ==
 
+buffer-writer@2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/buffer-writer/-/buffer-writer-2.0.0.tgz#ce7eb81a38f7829db09c873f2fbb792c0c98ec04"
+  integrity sha512-a7ZpuTZU1TRtnwyCNW3I5dc0wWNC3VR9S++Ewyk2HHZdrO3CQJqSpd+95Us590V6AL7JqUAH2IwZ/398PmNFgw==
+
 buffer-xor@^1.0.3:
   version "1.0.3"
   resolved "https://registry.yarnpkg.com/buffer-xor/-/buffer-xor-1.0.3.tgz#26e61ed1422fb70dd42e6e36729ed51d855fe8d9"
@@ -3825,23 +4343,23 @@ buffer@^6.0.3:
     ieee754 "^1.2.1"
 
 bufferutil@^4.0.1:
-  version "4.0.7"
-  resolved "https://registry.yarnpkg.com/bufferutil/-/bufferutil-4.0.7.tgz#60c0d19ba2c992dd8273d3f73772ffc894c153ad"
-  integrity sha512-kukuqc39WOHtdxtw4UScxF/WVnMFVSQVKhtx3AjZJzhd0RGZZldcrfSEbVsWWe6KNH253574cq5F+wpv0G9pJw==
+  version "4.0.8"
+  resolved "https://registry.yarnpkg.com/bufferutil/-/bufferutil-4.0.8.tgz#1de6a71092d65d7766c4d8a522b261a6e787e8ea"
+  integrity sha512-4T53u4PdgsXqKaIctwF8ifXlRTTmEPJ8iEPWFdGZvcf7sbwYo6FKFEX9eNNAnzFZ7EzJAQ3CJeOtCRA4rDp7Pw==
   dependencies:
     node-gyp-build "^4.3.0"
 
-buildcheck@0.0.3:
-  version "0.0.3"
-  resolved "https://registry.yarnpkg.com/buildcheck/-/buildcheck-0.0.3.tgz#70451897a95d80f7807e68fc412eb2e7e35ff4d5"
-  integrity sha512-pziaA+p/wdVImfcbsZLNF32EiWyujlQLwolMqUQE8xpKNOH7KmZQaY8sXN7DGOEzPAElo9QTaeNRfGnf3iOJbA==
+buildcheck@~0.0.6:
+  version "0.0.6"
+  resolved "https://registry.yarnpkg.com/buildcheck/-/buildcheck-0.0.6.tgz#89aa6e417cfd1e2196e3f8fe915eb709d2fe4238"
+  integrity sha512-8f9ZJCUXyT1M35Jx7MkBgmBMo3oHTTBIPLiY9xyL0pl3T5RwcPEY8cUHr5LBNfu/fk6c2T4DJZuVM/8ZZT2D2A==
 
-busboy@^1.6.0:
-  version "1.6.0"
-  resolved "https://registry.yarnpkg.com/busboy/-/busboy-1.6.0.tgz#966ea36a9502e43cdb9146962523b92f531f6893"
-  integrity sha512-8SFQbg/0hQ9xy3UNTB0YEnsNBbWfhf7RtnzpL7TkBiTBRfrQ9Fxcnz7VJsleJpyp6rVLvXiuORqjlHi5q+PYuA==
+bundle-name@^3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/bundle-name/-/bundle-name-3.0.0.tgz#ba59bcc9ac785fb67ccdbf104a2bf60c099f0e1a"
+  integrity sha512-PKA4BeSvBpQKQ8iPOGCSiell+N8P+Tf1DlwqmYhpe2gAhKPHn8EYOxVT+ShuGmhg8lN8XiSlS80yiExKXrURlw==
   dependencies:
-    streamsearch "^1.1.0"
+    run-applescript "^5.0.0"
 
 bytes@3.1.2:
   version "3.1.2"
@@ -3897,9 +4415,9 @@ cacheable-request@^6.0.0:
     responselike "^1.0.2"
 
 cacheable-request@^7.0.2:
-  version "7.0.2"
-  resolved "https://registry.yarnpkg.com/cacheable-request/-/cacheable-request-7.0.2.tgz#ea0d0b889364a25854757301ca12b2da77f91d27"
-  integrity sha512-pouW8/FmiPQbuGpkXQ9BAPv/Mo5xDGANgSNXzTzJ8DrKGuXOssM4wIQRjfanNRh3Yu5cfYPvcorqbhg2KIJtew==
+  version "7.0.4"
+  resolved "https://registry.yarnpkg.com/cacheable-request/-/cacheable-request-7.0.4.tgz#7a33ebf08613178b403635be7b899d3e69bbe817"
+  integrity sha512-v+p6ongsrp0yTGbJXjgxPow2+DL93DASP4kXCDKb8/bwRtt9OEF3whggkkDkGNzgcWy2XaF4a8nZglC7uElscg==
   dependencies:
     clone-response "^1.0.2"
     get-stream "^5.1.0"
@@ -3917,32 +4435,14 @@ cachedown@1.0.0:
     abstract-leveldown "^2.4.1"
     lru-cache "^3.2.0"
 
-call-bind@^1.0.0, call-bind@^1.0.2, call-bind@~1.0.2:
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/call-bind/-/call-bind-1.0.2.tgz#b1d4e89e688119c3c9a903ad30abb2f6a919be3c"
-  integrity sha512-7O+FbCihrB5WGbFYesctwmTKae6rOiIzmz1icreWJ+0aA7LJfuqhEso2T9ncpcFtzMQtzXf2QGGueWJGTYsqrA==
-  dependencies:
-    function-bind "^1.1.1"
-    get-intrinsic "^1.0.2"
-
-caller-callsite@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/caller-callsite/-/caller-callsite-2.0.0.tgz#847e0fce0a223750a9a027c54b33731ad3154134"
-  integrity sha512-JuG3qI4QOftFsZyOn1qq87fq5grLIyk1JYd5lJmdA+fG7aQ9pA/i3JIJGcO3q0MrRcHlOt1U+ZeHW8Dq9axALQ==
-  dependencies:
-    callsites "^2.0.0"
-
-caller-path@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/caller-path/-/caller-path-2.0.0.tgz#468f83044e369ab2010fac5f06ceee15bb2cb1f4"
-  integrity sha512-MCL3sf6nCSXOwCTzvPKhN18TU7AHTvdtam8DAogxcrJ8Rjfbbg7Lgng64H9Iy+vUV6VGFClN/TyxBkAebLRR4A==
+call-bind@^1.0.0, call-bind@^1.0.2, call-bind@^1.0.4, call-bind@^1.0.5, call-bind@~1.0.2:
+  version "1.0.5"
+  resolved "https://registry.yarnpkg.com/call-bind/-/call-bind-1.0.5.tgz#6fa2b7845ce0ea49bf4d8b9ef64727a2c2e2e513"
+  integrity sha512-C3nQxfFZxFRVoJoGKKI8y3MOEo129NQ+FgQ08iye+Mk4zNZZGdjfs06bVTr+DBSlA66Q2VEcMki/cUCP4SercQ==
   dependencies:
-    caller-callsite "^2.0.0"
-
-callsites@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/callsites/-/callsites-2.0.0.tgz#06eb84f00eea413da86affefacbffb36093b3c50"
-  integrity sha512-ksWePWBloaWPxJYQ8TL0JHvtci6G5QTKwQ95RcWAa/lzoAKuAOflGdAK92hpHXjkwb8zLxoLNUoNYZgVsaJzvQ==
+    function-bind "^1.1.2"
+    get-intrinsic "^1.2.1"
+    set-function-length "^1.1.1"
 
 callsites@^3.0.0:
   version "3.1.0"
@@ -3954,7 +4454,7 @@ camelcase@^3.0.0:
   resolved "https://registry.yarnpkg.com/camelcase/-/camelcase-3.0.0.tgz#32fc4b9fcdaf845fcdf7e73bb97cac2261f0ab0a"
   integrity sha512-4nhGqUkc4BqbBBB4Q6zLuD7lzzrHYrjKGeYaEji/3tFR5VdJu9v+LilhGIVe8wxEJPPOeWo7eg8dwY13TZ1BNg==
 
-camelcase@^5.0.0, camelcase@^5.3.1:
+camelcase@^5.3.1:
   version "5.3.1"
   resolved "https://registry.yarnpkg.com/camelcase/-/camelcase-5.3.1.tgz#e3c9b31569e106811df242f715725a1f4c494320"
   integrity sha512-L28STB170nwWS63UjtlEOE3dldQApaJXZkOI1uMFfzf3rRuPegHaHesyee+YxQ+W6SvRDQV6UrdOdRiR153wJg==
@@ -3964,15 +4464,15 @@ camelcase@^6.0.0, camelcase@^6.2.0:
   resolved "https://registry.yarnpkg.com/camelcase/-/camelcase-6.3.0.tgz#5685b95eb209ac9c0c177467778c9c84df58ba9a"
   integrity sha512-Gmy6FhYlCY7uOElZUSbxo2UCDH8owEk996gkbrpsgGtrJLM3J7jGxl9Ic7Qwwj4ivOE5AWZWRMecDdF7hqGjFA==
 
-caniuse-lite@^1.0.30000844:
-  version "1.0.30001448"
-  resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30001448.tgz#ca7550b1587c92a392a2b377cd9c508b3b4395bf"
-  integrity sha512-tq2YI+MJnooG96XpbTRYkBxLxklZPOdLmNIOdIhvf7SNJan6u5vCKum8iT7ZfCt70m1GPkuC7P3TtX6UuhupuA==
+caniuse-lite@^1.0.30000844, caniuse-lite@^1.0.30001541:
+  version "1.0.30001558"
+  resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30001558.tgz#d2c6e21fdbfe83817f70feab902421a19b7983ee"
+  integrity sha512-/Et7DwLqpjS47JPEcz6VnxU9PwcIdVi0ciLXRWBQdj1XFye68pSQYpV0QtPTfUKWuOaEig+/Vez2l74eDc1tPQ==
 
-caniuse-lite@^1.0.30001400:
-  version "1.0.30001429"
-  resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30001429.tgz#70cdae959096756a85713b36dd9cb82e62325639"
-  integrity sha512-511ThLu1hF+5RRRt0zYCf2U2yRr9GPF6m5y90SBCWsvSoYoW7yAGlv/elyPaNfvGCkp6kj/KFZWU0BMA69Prsg==
+case@^1.6.3:
+  version "1.6.3"
+  resolved "https://registry.yarnpkg.com/case/-/case-1.6.3.tgz#0a4386e3e9825351ca2e6216c60467ff5f1ea1c9"
+  integrity sha512-mzDSXIPaFwVDvZAHqZ9VlbyF4yyXRuX6IvB06WvPYkqJVO24kX1PPhv9bfpKNFZyxYFmmgo03HUiD8iklmJYRQ==
 
 caseless@^0.12.0, caseless@~0.12.0:
   version "0.12.0"
@@ -3998,18 +4498,18 @@ chai-as-promised@^7.1.1:
   dependencies:
     check-error "^1.0.2"
 
-chai@^4.3.4:
-  version "4.3.6"
-  resolved "https://registry.yarnpkg.com/chai/-/chai-4.3.6.tgz#ffe4ba2d9fa9d6680cc0b370adae709ec9011e9c"
-  integrity sha512-bbcp3YfHCUzMOvKqsztczerVgBKSsEijCySNlHHbX3VG1nskvqjz5Rfso1gGwD6w6oOV3eI60pKuMOV5MV7p3Q==
+chai@^4.3.4, chai@^4.3.6:
+  version "4.3.10"
+  resolved "https://registry.yarnpkg.com/chai/-/chai-4.3.10.tgz#d784cec635e3b7e2ffb66446a63b4e33bd390384"
+  integrity sha512-0UXG04VuVbruMUYbJ6JctvH0YnC/4q3/AkT18q4NaITo91CUm0liMS9VqzT9vZhVQ/1eqPanMWjBM+Juhfb/9g==
   dependencies:
     assertion-error "^1.1.0"
-    check-error "^1.0.2"
-    deep-eql "^3.0.1"
-    get-func-name "^2.0.0"
-    loupe "^2.3.1"
+    check-error "^1.0.3"
+    deep-eql "^4.1.3"
+    get-func-name "^2.0.2"
+    loupe "^2.3.6"
     pathval "^1.1.1"
-    type-detect "^4.0.5"
+    type-detect "^4.0.8"
 
 chalk@4.1.2, chalk@^4.0.0, chalk@^4.1.0, chalk@^4.1.2:
   version "4.1.2"
@@ -4030,7 +4530,7 @@ chalk@^1.1.3:
     strip-ansi "^3.0.0"
     supports-color "^2.0.0"
 
-chalk@^2.0.0, chalk@^2.1.0, chalk@^2.4.1, chalk@^2.4.2:
+chalk@^2.4.1, chalk@^2.4.2:
   version "2.4.2"
   resolved "https://registry.yarnpkg.com/chalk/-/chalk-2.4.2.tgz#cd42541677a54333cf541a49108c1432b44c9424"
   integrity sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==
@@ -4054,10 +4554,12 @@ chardet@^0.7.0:
   resolved "https://registry.yarnpkg.com/charenc/-/charenc-0.0.2.tgz#c0a1d2f3a7092e03774bfa83f14c0fc5790a8667"
   integrity sha512-yrLQ/yVUFXkzg7EDQsPieE/53+0RlaWTs+wBrvW36cyilJ2SaDWfl4Yj7MtLTXleV9uEKefbAGUPv2/iWSooRA==
 
-check-error@^1.0.2:
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/check-error/-/check-error-1.0.2.tgz#574d312edd88bb5dd8912e9286dd6c0aed4aac82"
-  integrity sha512-BrgHpW9NURQgzoNyjfq0Wu6VFO6D7IZEmJNdtgNqpzGG8RuNFHt2jQxWlAs4HMe119chBnv+34syEZtc6IhLtA==
+check-error@^1.0.2, check-error@^1.0.3:
+  version "1.0.3"
+  resolved "https://registry.yarnpkg.com/check-error/-/check-error-1.0.3.tgz#a6502e4312a7ee969f646e83bb3ddd56281bd694"
+  integrity sha512-iKEoDYaRmd1mxM90a2OEfWhjsjPpYPuQ+lMYsoxB126+t8fw7ySEO48nmDg5COTjxDI65/Y2OWpeEHk3ZOe8zg==
+  dependencies:
+    get-func-name "^2.0.2"
 
 checkpoint-store@^1.1.0:
   version "1.1.0"
@@ -4066,21 +4568,6 @@ checkpoint-store@^1.1.0:
   dependencies:
     functional-red-black-tree "^1.0.1"
 
-chokidar@3.3.0:
-  version "3.3.0"
-  resolved "https://registry.yarnpkg.com/chokidar/-/chokidar-3.3.0.tgz#12c0714668c55800f659e262d4962a97faf554a6"
-  integrity sha512-dGmKLDdT3Gdl7fBUe8XK+gAtGmzy5Fn0XkkWQuYxGIgWVPPse2CxFA5mtrlD0TOHaHjEUqkWNyP1XdHoJES/4A==
-  dependencies:
-    anymatch "~3.1.1"
-    braces "~3.0.2"
-    glob-parent "~5.1.0"
-    is-binary-path "~2.1.0"
-    is-glob "~4.0.1"
-    normalize-path "~3.0.0"
-    readdirp "~3.2.0"
-  optionalDependencies:
-    fsevents "~2.1.1"
-
 chokidar@3.5.3, chokidar@^3.4.0:
   version "3.5.3"
   resolved "https://registry.yarnpkg.com/chokidar/-/chokidar-3.5.3.tgz#1cf37c8707b932bd1af1ae22c0432e2acd1903bd"
@@ -4107,9 +4594,9 @@ ci-info@^2.0.0:
   integrity sha512-5tK7EtrZ0N+OLFMthtqOj4fI2Jeb88C4CAZPu25LDVUgXJ0A3Js4PMGqrn0JU1W0Mh1/Z8wZzYPxqUrXeBboCQ==
 
 ci-info@^3.2.0:
-  version "3.5.0"
-  resolved "https://registry.yarnpkg.com/ci-info/-/ci-info-3.5.0.tgz#bfac2a29263de4c829d806b1ab478e35091e171f"
-  integrity sha512-yH4RezKOGlOhxkmhbeNuC4eYZKAUsEaGtBuBzDDP1eFUKiccDWzBABxBfOx31IDwDIXMTxWuwAxUGModvkbuVw==
+  version "3.9.0"
+  resolved "https://registry.yarnpkg.com/ci-info/-/ci-info-3.9.0.tgz#4279a62028a7b1f262f3473fc9605f5e218c59b4"
+  integrity sha512-NIxF55hv4nSqQswkAeiOi1r83xy8JldOFDTWiug55KBu9Jnblncd2U6ViHmYgHf01TPZS77NJBhBMKdWj9HQMQ==
 
 cids@^0.7.1:
   version "0.7.5"
@@ -4131,9 +4618,9 @@ cipher-base@^1.0.0, cipher-base@^1.0.1, cipher-base@^1.0.3:
     safe-buffer "^5.0.1"
 
 cjs-module-lexer@^1.0.0:
-  version "1.2.2"
-  resolved "https://registry.yarnpkg.com/cjs-module-lexer/-/cjs-module-lexer-1.2.2.tgz#9f84ba3244a512f3a54e5277e8eef4c489864e40"
-  integrity sha512-cOU9usZw8/dXIXKtwa8pM0OTJQuJkxMN6w30csNRUerHfeQ5R6U3kkU/FtJeIf3M202OHfY2U8ccInBG7/xogA==
+  version "1.2.3"
+  resolved "https://registry.yarnpkg.com/cjs-module-lexer/-/cjs-module-lexer-1.2.3.tgz#6c370ab19f8a3394e318fe682686ec0ac684d107"
+  integrity sha512-0TNiGstbQmCFwt4akjjBg5pLRTSyj/PkWQ1ZoO2zntmg9yLqSRxwEa4iCfQLGjqhiqBfOJa7W/E8wfGrTDmlZQ==
 
 class-is@^1.1.0:
   version "1.1.0"
@@ -4151,14 +4638,14 @@ class-utils@^0.3.5:
     static-extend "^0.1.1"
 
 classic-level@^1.2.0:
-  version "1.2.0"
-  resolved "https://registry.yarnpkg.com/classic-level/-/classic-level-1.2.0.tgz#2d52bdec8e7a27f534e67fdeb890abef3e643c27"
-  integrity sha512-qw5B31ANxSluWz9xBzklRWTUAJ1SXIdaVKTVS7HcTGKOAmExx65Wo5BUICW+YGORe2FOUaDghoI9ZDxj82QcFg==
+  version "1.3.0"
+  resolved "https://registry.yarnpkg.com/classic-level/-/classic-level-1.3.0.tgz#5e36680e01dc6b271775c093f2150844c5edd5c8"
+  integrity sha512-iwFAJQYtqRTRM0F6L8h4JCt00ZSGdOyqh7yVrhhjrOpFhmBjNlRUey64MCiyo6UmQHMJ+No3c81nujPv+n9yrg==
   dependencies:
     abstract-level "^1.0.2"
     catering "^2.1.0"
     module-error "^1.0.1"
-    napi-macros "~2.0.0"
+    napi-macros "^2.2.2"
     node-gyp-build "^4.3.0"
 
 clean-stack@^2.0.0:
@@ -4206,15 +4693,6 @@ cliui@^3.2.0:
     strip-ansi "^3.0.1"
     wrap-ansi "^2.0.0"
 
-cliui@^5.0.0:
-  version "5.0.0"
-  resolved "https://registry.yarnpkg.com/cliui/-/cliui-5.0.0.tgz#deefcfdb2e800784aa34f46fa08e06851c7bbbc5"
-  integrity sha512-PYeGSEmmHM6zvoef2w8TPzlrnNpXIjTipYK780YswmIP9vjxmd6Y2a3CB2Ks6/AU8NHjZugXvo8w3oWM2qnwXA==
-  dependencies:
-    string-width "^3.1.0"
-    strip-ansi "^5.2.0"
-    wrap-ansi "^5.1.0"
-
 cliui@^7.0.2:
   version "7.0.4"
   resolved "https://registry.yarnpkg.com/cliui/-/cliui-7.0.4.tgz#a0265ee655476fc807aea9df3df8df7783808b4f"
@@ -4250,15 +4728,20 @@ co@^4.6.0:
   resolved "https://registry.yarnpkg.com/co/-/co-4.6.0.tgz#6ea6bdf3d853ae54ccb8e47bfa0bf3f9031fb184"
   integrity sha512-QVb0dM5HvG+uaxitm8wONl7jltx8dqhfU33DcqtOZcLSVIKSDDLDi7+0LbAKiyI8hD9u42m2YxXSkMGWThaecQ==
 
+code-block-writer@^12.0.0:
+  version "12.0.0"
+  resolved "https://registry.yarnpkg.com/code-block-writer/-/code-block-writer-12.0.0.tgz#4dd58946eb4234105aff7f0035977b2afdc2a770"
+  integrity sha512-q4dMFMlXtKR3XNBHyMHt/3pwYNA69EDk00lloMOaaUMKPUXBw6lpXtbu3MMVG6/uOihGnRDOlkyqsONEUj60+w==
+
 code-point-at@^1.0.0:
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/code-point-at/-/code-point-at-1.1.0.tgz#0d070b4d043a5bea33a2f1a40e2edb3d9a4ccf77"
   integrity sha512-RpAVKQA5T63xEj6/giIbUEtZwJ4UFIc3ZtvEkiaUERylqe8xb5IvqcgOurZLahv93CLKfxcw5YI+DZcUBRyLXA==
 
 collect-v8-coverage@^1.0.0:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/collect-v8-coverage/-/collect-v8-coverage-1.0.1.tgz#cc2c8e94fc18bbdffe64d6534570c8a673b27f59"
-  integrity sha512-iBPtljfCNcTKNAto0KEtDfZ3qzjJvqE3aTGZsbhjSBlorqpXJlaWWtPO35D+ZImoC3KWejX64o+yPGxhWSTzfg==
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/collect-v8-coverage/-/collect-v8-coverage-1.0.2.tgz#c0b29bcd33bcd0779a1344c2136051e6afd3d9e9"
+  integrity sha512-lHl4d5/ONEbLlJvaJNtsF/Lz+WvB07u2ycqTYbdrq7UypDXailES4valYb2eWiJFxZlVmpGekfqoxQhzyFdT4Q==
 
 collection-visit@^1.0.0:
   version "1.0.0"
@@ -4325,16 +4808,36 @@ command-line-args@^4.0.7:
     find-replace "^1.0.3"
     typical "^2.6.1"
 
-commander@2.18.0:
-  version "2.18.0"
-  resolved "https://registry.yarnpkg.com/commander/-/commander-2.18.0.tgz#2bf063ddee7c7891176981a2cc798e5754bc6970"
-  integrity sha512-6CYPa+JP2ftfRU2qkDK+UTVeQYosOg/2GbcjIcKPHfinyOLPVGXu/ovN86RP49Re5ndJK1N0kuiidFFuepc4ZQ==
+command-line-args@^5.1.1:
+  version "5.2.1"
+  resolved "https://registry.yarnpkg.com/command-line-args/-/command-line-args-5.2.1.tgz#c44c32e437a57d7c51157696893c5909e9cec42e"
+  integrity sha512-H4UfQhZyakIjC74I9d34fGYDwk3XpSr17QhEd0Q3I9Xq1CETHo4Hcuo87WyWHpAF1aSLjLRf5lD9ZGX2qStUvg==
+  dependencies:
+    array-back "^3.1.0"
+    find-replace "^3.0.0"
+    lodash.camelcase "^4.3.0"
+    typical "^4.0.0"
+
+command-line-usage@^6.1.0:
+  version "6.1.3"
+  resolved "https://registry.yarnpkg.com/command-line-usage/-/command-line-usage-6.1.3.tgz#428fa5acde6a838779dfa30e44686f4b6761d957"
+  integrity sha512-sH5ZSPr+7UStsloltmDh7Ce5fb8XPlHyoPzTpyyMuYCtervL65+ubVZ6Q61cFtFl62UyJlc8/JwERRbAFPUqgw==
+  dependencies:
+    array-back "^4.0.2"
+    chalk "^2.4.2"
+    table-layout "^1.0.2"
+    typical "^5.2.0"
 
 commander@3.0.2:
   version "3.0.2"
   resolved "https://registry.yarnpkg.com/commander/-/commander-3.0.2.tgz#6837c3fb677ad9933d1cfba42dd14d5117d6b39e"
   integrity sha512-Gar0ASD4BDyKC4hl4DwHqDrmvjoxWKZigVnAbn5H1owvm4CxCPdb0HQDehwNYMJpla5+M2tPmPARzhtYuwpHow==
 
+commander@^10.0.0:
+  version "10.0.1"
+  resolved "https://registry.yarnpkg.com/commander/-/commander-10.0.1.tgz#881ee46b4f77d1c1dccc5823433aa39b022cbe06"
+  integrity sha512-y4Mg2tXshplEbSGzx7amzPwKKOCGuoSRP/CjEdwwk0FOGlUbq6lKuoyDZTNZkmxHdJtp54hdfY/JUrdL7Xfdug==
+
 commander@^2.19.0:
   version "2.20.3"
   resolved "https://registry.yarnpkg.com/commander/-/commander-2.20.3.tgz#fd485e84c03eb4881c20722ba48035e8531aeb33"
@@ -4350,6 +4853,11 @@ commander@^8.1.0, commander@^8.3.0:
   resolved "https://registry.yarnpkg.com/commander/-/commander-8.3.0.tgz#4837ea1b2da67b9c616a67afbb0fafee567bca66"
   integrity sha512-OkTL9umf+He2DZkUq8f8J9of7yL6RJKI24dVITBmNfZBmri9zYZQrKkuXiKhyfPSu8tUhnVBB1iKXevvnlR4Ww==
 
+commander@^9.4.1:
+  version "9.5.0"
+  resolved "https://registry.yarnpkg.com/commander/-/commander-9.5.0.tgz#bc08d1eb5cedf7ccb797a96199d41c7bc3e60d30"
+  integrity sha512-KRs7WVDKg86PWiuAqhDrAQnTXZKraVcCc6vFdL14qrZ/DcWwuRo7VoiYXalXO7S5GKpqYiVEwCbgFDfxNHKJBQ==
+
 commander@~2.9.0:
   version "2.9.0"
   resolved "https://registry.yarnpkg.com/commander/-/commander-2.9.0.tgz#9c99094176e12240cb22d6c5146098400fe0f7d4"
@@ -4357,6 +4865,11 @@ commander@~2.9.0:
   dependencies:
     graceful-readlink ">= 1.0.0"
 
+commander@~9.4.1:
+  version "9.4.1"
+  resolved "https://registry.yarnpkg.com/commander/-/commander-9.4.1.tgz#d1dd8f2ce6faf93147295c0df13c7c21141cfbdd"
+  integrity sha512-5EEkTNyHNGFPD2H+c/dXXfQZYa/scCKasxWcXJaWnNJ99pnQN9Vnmqow+p+PlFPE63Q6mThaZws1T+HxfpgtPw==
+
 component-emitter@^1.2.1:
   version "1.3.0"
   resolved "https://registry.yarnpkg.com/component-emitter/-/component-emitter-1.3.0.tgz#16e4070fba8ae29b679f2215853ee181ab2eabc0"
@@ -4393,16 +4906,21 @@ content-hash@^2.5.2:
     multicodec "^0.5.5"
     multihashes "^0.4.15"
 
-content-type@~1.0.4:
-  version "1.0.4"
-  resolved "https://registry.yarnpkg.com/content-type/-/content-type-1.0.4.tgz#e138cc75e040c727b1966fe5e5f8c9aee256fe3b"
-  integrity sha512-hIP3EEPs8tB9AT1L+NUqtwOAps4mk2Zob89MWXMHjHWg9milF/j4osnnQLXBCBFBk/tvIG/tUc9mOUJiPBhPXA==
+content-type@~1.0.4, content-type@~1.0.5:
+  version "1.0.5"
+  resolved "https://registry.yarnpkg.com/content-type/-/content-type-1.0.5.tgz#8b773162656d1d1086784c8f23a54ce6d73d7918"
+  integrity sha512-nTjqfcBFEipKdXCv4YDQWCfmcLZKm81ldF0pAopTvyrFGVbcR6P/VAAd5G7N+0tTr8QqiU0tFadD6FK4NtJwOA==
 
-convert-source-map@^1.4.0, convert-source-map@^1.5.1, convert-source-map@^1.6.0, convert-source-map@^1.7.0:
+convert-source-map@^1.5.1:
   version "1.9.0"
   resolved "https://registry.yarnpkg.com/convert-source-map/-/convert-source-map-1.9.0.tgz#7faae62353fb4213366d0ca98358d22e8368b05f"
   integrity sha512-ASFBup0Mz1uyiIjANan1jzLQami9z1PoYSZCiiYW2FczPbenXc45FZdBZLzOT+r6+iciuEModtmCti+hjaAk0A==
 
+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"
+  integrity sha512-Kvp459HrV2FEJ1CAsi1Ku+MY3kasH19TFykTz2xWmMeq6bk2NU3XXvfJ+Q61m0xktWwt+1HSYf3JZsTms3aRJg==
+
 cookie-signature@1.0.6:
   version "1.0.6"
   resolved "https://registry.yarnpkg.com/cookie-signature/-/cookie-signature-1.0.6.tgz#e303a882b342cc3ee8ca513a79999734dab3ae2c"
@@ -4429,9 +4947,9 @@ copy-descriptor@^0.1.0:
   integrity sha512-XgZ0pFcakEUlbwQEVNg3+QAis1FyTL3Qel9FYy8pSkQqoG3PNoT0bOCQtOXcOkur21r2Eq2kI+IE+gsmAEVlYw==
 
 core-js-pure@^3.0.1:
-  version "3.27.2"
-  resolved "https://registry.yarnpkg.com/core-js-pure/-/core-js-pure-3.27.2.tgz#47e9cc96c639eefc910da03c3ece26c5067c7553"
-  integrity sha512-Cf2jqAbXgWH3VVzjyaaFkY1EBazxugUepGymDoeteyYr9ByX51kD2jdHZlsEF/xnJMyN3Prua7mQuzwMg6Zc9A==
+  version "3.33.1"
+  resolved "https://registry.yarnpkg.com/core-js-pure/-/core-js-pure-3.33.1.tgz#7f27dd239da8eb97dbea30120071be8e5565cb0e"
+  integrity sha512-wCXGbLjnsP10PlK/thHSQlOLlLKNEkaWbTzVvHHZ79fZNeN1gUmw2gBlpItxPv/pvqldevEXFh/d5stdNvl6EQ==
 
 core-js@^2.4.0, core-js@^2.5.0:
   version "2.6.12"
@@ -4456,23 +4974,23 @@ cors@^2.8.1:
     object-assign "^4"
     vary "^1"
 
-cosmiconfig@^5.0.7:
-  version "5.2.1"
-  resolved "https://registry.yarnpkg.com/cosmiconfig/-/cosmiconfig-5.2.1.tgz#040f726809c591e77a17c0a3626ca45b4f168b1a"
-  integrity sha512-H65gsXo1SKjf8zmrJ67eJk8aIRKV5ff2D4uKZIBZShbhGSpEmsQOPW/SKMKYhSTrqR7ufy6RP69rPogdaPh/kA==
+cosmiconfig@^8.0.0:
+  version "8.3.6"
+  resolved "https://registry.yarnpkg.com/cosmiconfig/-/cosmiconfig-8.3.6.tgz#060a2b871d66dba6c8538ea1118ba1ac16f5fae3"
+  integrity sha512-kcZ6+W5QzcJ3P1Mt+83OUv/oHFqZHIx8DuxG6eZ5RGMERoLqp4BuGjhHLYGK+Kf5XVkQvqBSmAy/nGWN3qDgEA==
   dependencies:
-    import-fresh "^2.0.0"
-    is-directory "^0.3.1"
-    js-yaml "^3.13.1"
-    parse-json "^4.0.0"
+    import-fresh "^3.3.0"
+    js-yaml "^4.1.0"
+    parse-json "^5.2.0"
+    path-type "^4.0.0"
 
-cpu-features@~0.0.4:
-  version "0.0.4"
-  resolved "https://registry.yarnpkg.com/cpu-features/-/cpu-features-0.0.4.tgz#0023475bb4f4c525869c162e4108099e35bf19d8"
-  integrity sha512-fKiZ/zp1mUwQbnzb9IghXtHtDoTMtNeb8oYGx6kX2SYfhnG0HNdBEBIzB9b5KlXu5DQPhfy3mInbBxFcgwAr3A==
+cpu-features@~0.0.8:
+  version "0.0.9"
+  resolved "https://registry.yarnpkg.com/cpu-features/-/cpu-features-0.0.9.tgz#5226b92f0f1c63122b0a3eb84cb8335a4de499fc"
+  integrity sha512-AKjgn2rP2yJyfbepsmLfiYcmtNn/2eUvocUyM/09yB0YDiz39HteK/5/T4Onf0pmdYDMgkBoGvRLvEguzyL7wQ==
   dependencies:
-    buildcheck "0.0.3"
-    nan "^2.15.0"
+    buildcheck "~0.0.6"
+    nan "^2.17.0"
 
 crc-32@^1.2.0:
   version "1.2.2"
@@ -4510,6 +5028,19 @@ create-hmac@^1.1.0, create-hmac@^1.1.4, create-hmac@^1.1.7:
     safe-buffer "^5.0.1"
     sha.js "^2.4.8"
 
+create-jest@^29.7.0:
+  version "29.7.0"
+  resolved "https://registry.yarnpkg.com/create-jest/-/create-jest-29.7.0.tgz#a355c5b3cb1e1af02ba177fe7afd7feee49a5320"
+  integrity sha512-Adz2bdH0Vq3F53KEMJOoftQFutWCukm6J24wbPWRO4k1kMY7gS7ds/uoJkNuV8wDCtWWnuwGcJwpWcih+zEW1Q==
+  dependencies:
+    "@jest/types" "^29.6.3"
+    chalk "^4.0.0"
+    exit "^0.1.2"
+    graceful-fs "^4.2.9"
+    jest-config "^29.7.0"
+    jest-util "^29.7.0"
+    prompts "^2.0.1"
+
 create-require@^1.1.0:
   version "1.1.1"
   resolved "https://registry.yarnpkg.com/create-require/-/create-require-1.1.1.tgz#c1d7e8f1e5f6cfc9ff65f9cd352d37348756c333"
@@ -4604,7 +5135,7 @@ debug@3.2.6:
   dependencies:
     ms "^2.1.1"
 
-debug@4, debug@4.3.4, debug@^4.0.1, debug@^4.1.0, debug@^4.1.1, debug@^4.3.1, debug@^4.3.3:
+debug@4, debug@4.3.4, debug@^4.0.1, debug@^4.1.0, debug@^4.1.1, debug@^4.3.1, debug@^4.3.2, debug@^4.3.3, debug@^4.3.4:
   version "4.3.4"
   resolved "https://registry.yarnpkg.com/debug/-/debug-4.3.4.tgz#1319f6579357f2338d3337d2cdd4914bb5dcc865"
   integrity sha512-PRWFHuSU3eDtQJPvnNY7Jcket1j0t5OuOsFzPPzsekD52Zl8qUfFIPEiswXqIvHWGVHOgX+7G/vCNNhehwxfkQ==
@@ -4618,14 +5149,14 @@ debug@4.3.3:
   dependencies:
     ms "2.1.2"
 
-debug@^3.1.0, debug@^3.2.6:
+debug@^3.1.0, debug@^3.2.6, debug@^3.2.7:
   version "3.2.7"
   resolved "https://registry.yarnpkg.com/debug/-/debug-3.2.7.tgz#72580b7e9145fb39b6676f9c5e5fb100b934179a"
   integrity sha512-CFjzYYAi4ThfiQvizrFQevTTXHtnCqWfe7x1AhgEscTz6ZbLbfoLRLPugTQyBth6f8ZERVUSyWHFD/7Wu4t1XQ==
   dependencies:
     ms "^2.1.1"
 
-decamelize@^1.1.1, decamelize@^1.2.0:
+decamelize@^1.1.1:
   version "1.2.0"
   resolved "https://registry.yarnpkg.com/decamelize/-/decamelize-1.2.0.tgz#f6534d15148269b20352e7bee26f501f9a191290"
   integrity sha512-z2S+W9X73hAUUki+N+9Za2lBlun89zigOyGrsax+KUQ6wKW4ZoWpEYBkGhQjwAjjDCkWxhY0VKEhk8wzY7F5cA==
@@ -4659,15 +5190,15 @@ decompress-response@^6.0.0:
   dependencies:
     mimic-response "^3.1.0"
 
-dedent@^0.7.0:
-  version "0.7.0"
-  resolved "https://registry.yarnpkg.com/dedent/-/dedent-0.7.0.tgz#2495ddbaf6eb874abb0e1be9df22d2e5a544326c"
-  integrity sha512-Q6fKUPqnAHAyhiUgFU7BUzLiv0kd8saH9al7tnu5Q/okj6dnupxyTgFIBjVzJATdfIAm9NAsvXNzjaKa+bxVyA==
+dedent@^1.0.0:
+  version "1.5.1"
+  resolved "https://registry.yarnpkg.com/dedent/-/dedent-1.5.1.tgz#4f3fc94c8b711e9bb2800d185cd6ad20f2a90aff"
+  integrity sha512-+LxW+KLWxu3HW3M2w2ympwtqPrqYRzU8fqi6Fhd18fBALe15blJPI/I4+UHveMVG6lJqB4JNd4UG0S5cnVHwIg==
 
-deep-eql@^3.0.1:
-  version "3.0.1"
-  resolved "https://registry.yarnpkg.com/deep-eql/-/deep-eql-3.0.1.tgz#dfc9404400ad1c8fe023e7da1df1c147c4b444df"
-  integrity sha512-+QeIQyN5ZuO+3Uk5DYh6/1eKO0m0YmJFGNmFHGACpf1ClL1nmlV/p4gNgbl2pJGxgXb4faqo6UE+M5ACEMyVcw==
+deep-eql@^4.0.1, deep-eql@^4.1.3:
+  version "4.1.3"
+  resolved "https://registry.yarnpkg.com/deep-eql/-/deep-eql-4.1.3.tgz#7c7775513092f7df98d8df9996dd085eb668cc6d"
+  integrity sha512-WaEtAOpRA1MQ0eohqZjpGD8zdI0Ovsm8mmFhaDN8dvDZzyoUMcYDnf5Y6iu7HTXxf8JDS23qWa4a+hKCDyOPzw==
   dependencies:
     type-detect "^4.0.0"
 
@@ -4683,7 +5214,7 @@ deep-equal@~1.1.1:
     object-keys "^1.1.1"
     regexp.prototype.flags "^1.2.0"
 
-deep-extend@^0.6.0:
+deep-extend@^0.6.0, deep-extend@~0.6.0:
   version "0.6.0"
   resolved "https://registry.yarnpkg.com/deep-extend/-/deep-extend-0.6.0.tgz#c4fa7c95404a17a9c3e8ca7e1537312b736330ac"
   integrity sha512-LOHxIOaPYdHlJRtCQfDIVZtfw/ufM8+rVj649RIHzcm/vGwQRXFt6OPqIFWsm2XEMrNIEtWR64sY1LEKD2vAOA==
@@ -4699,9 +5230,27 @@ deep-is@^0.1.3, deep-is@~0.1.3:
   integrity sha512-oIPzksmTg4/MriiaYGO+okXDT7ztn/w3Eptv/+gSIdMdKsJo0u4CfYNFJPy+4SKMuCqGw2wxnA+URMg3t8a/bQ==
 
 deepmerge@^4.2.2:
-  version "4.2.2"
-  resolved "https://registry.yarnpkg.com/deepmerge/-/deepmerge-4.2.2.tgz#44d2ea3679b8f4d4ffba33f03d865fc1e7bf4955"
-  integrity sha512-FJ3UgI4gIl+PHZm53knsuSFpE+nESMr7M4v9QcgB7S63Kj/6WqMiFQJpBBYz1Pt+66bZpP3Q7Lye0Oo9MPKEdg==
+  version "4.3.1"
+  resolved "https://registry.yarnpkg.com/deepmerge/-/deepmerge-4.3.1.tgz#44b5f2147cd3b00d4b56137685966f26fd25dd4a"
+  integrity sha512-3sUqbMEc77XqpdNO7FRyRog+eW3ph+GYCbj+rK+uYyRMuwsVy0rMiVtPn+QJlKFvWP/1PYpapqYn0Me2knFn+A==
+
+default-browser-id@^3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/default-browser-id/-/default-browser-id-3.0.0.tgz#bee7bbbef1f4e75d31f98f4d3f1556a14cea790c"
+  integrity sha512-OZ1y3y0SqSICtE8DE4S8YOE9UZOJ8wO16fKWVP5J1Qz42kV9jcnMVFrEE/noXb/ss3Q4pZIH79kxofzyNNtUNA==
+  dependencies:
+    bplist-parser "^0.2.0"
+    untildify "^4.0.0"
+
+default-browser@^4.0.0:
+  version "4.0.0"
+  resolved "https://registry.yarnpkg.com/default-browser/-/default-browser-4.0.0.tgz#53c9894f8810bf86696de117a6ce9085a3cbc7da"
+  integrity sha512-wX5pXO1+BrhMkSbROFsyxUm0i/cJEScyNhA4PPxc41ICuv05ZZB/MX28s8aZx6xjmatvebIapF6hLEKEcpneUA==
+  dependencies:
+    bundle-name "^3.0.0"
+    default-browser-id "^3.0.0"
+    execa "^7.1.1"
+    titleize "^3.0.0"
 
 defer-to-connect@^1.0.1:
   version "1.1.3"
@@ -4728,19 +5277,26 @@ deferred-leveldown@~4.0.0:
     abstract-leveldown "~5.0.0"
     inherits "^2.0.3"
 
-define-properties@^1.1.2:
-  version "1.2.0"
-  resolved "https://registry.yarnpkg.com/define-properties/-/define-properties-1.2.0.tgz#52988570670c9eacedd8064f4a990f2405849bd5"
-  integrity sha512-xvqAVKGfT1+UAvPwKTVw/njhdQ8ZhXK4lI0bCIuCMrp2up9nPnaDftrLtmpTazqd1o+UY4zgzU+avtMbDP+ldA==
+define-data-property@^1.0.1, define-data-property@^1.1.1:
+  version "1.1.1"
+  resolved "https://registry.yarnpkg.com/define-data-property/-/define-data-property-1.1.1.tgz#c35f7cd0ab09883480d12ac5cb213715587800b3"
+  integrity sha512-E7uGkTzkk1d0ByLeSc6ZsFS79Axg+m1P/VsgYsxHgiuc3tFSj+MjMIwe90FC4lOAZzNBdY7kkO2P2wKdsQ1vgQ==
   dependencies:
+    get-intrinsic "^1.2.1"
+    gopd "^1.0.1"
     has-property-descriptors "^1.0.0"
-    object-keys "^1.1.1"
 
-define-properties@^1.1.3, define-properties@^1.1.4:
-  version "1.1.4"
-  resolved "https://registry.yarnpkg.com/define-properties/-/define-properties-1.1.4.tgz#0b14d7bd7fbeb2f3572c3a7eda80ea5d57fb05b1"
-  integrity sha512-uckOqKcfaVvtBdsVkdPv3XjveQJsNQqmhXgRi8uhvWWuPYZCNlzT8qAyblUgNoXdHdjMTzAqeGjAoli8f+bzPA==
+define-lazy-prop@^3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/define-lazy-prop/-/define-lazy-prop-3.0.0.tgz#dbb19adfb746d7fc6d734a06b72f4a00d021255f"
+  integrity sha512-N+MeXYoqr3pOgn8xfyRPREN7gHakLYjhsHhWGT3fWAiL4IkAt0iDw14QiiEm2bE30c5XX5q0FtAA3CK5f9/BUg==
+
+define-properties@^1.1.3, define-properties@^1.1.4, define-properties@^1.2.0:
+  version "1.2.1"
+  resolved "https://registry.yarnpkg.com/define-properties/-/define-properties-1.2.1.tgz#10781cc616eb951a80a034bafcaa7377f6af2b6c"
+  integrity sha512-8QmQKqEASLd5nx0U1B1okLElbUuuttJ/AnYmRXbbbGDWh6uS208EjD4Xqq/I9wK7u0v6O08XhTWnt5XtEbR6Dg==
   dependencies:
+    define-data-property "^1.0.1"
     has-property-descriptors "^1.0.0"
     object-keys "^1.1.1"
 
@@ -4782,9 +5338,9 @@ depd@2.0.0:
   integrity sha512-g7nH6P6dyDioJogAAGprGpCtVImJhpPk/roCzdb3fIh61/s/nPsfR6onyMwkCAR/OlC3yBC0lESvUoQEAssIrw==
 
 des.js@^1.0.0:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/des.js/-/des.js-1.0.1.tgz#5382142e1bdc53f85d86d53e5f4aa7deb91e0843"
-  integrity sha512-Q0I4pfFrv2VPd34/vfLrFOoRmlYj3OV50i7fskps1jZWK1kApMWWT9G6RRUeYedLcBDIhnSDaUvJMb3AhUlaEA==
+  version "1.1.0"
+  resolved "https://registry.yarnpkg.com/des.js/-/des.js-1.1.0.tgz#1d37f5766f3bbff4ee9638e871a8768c173b81da"
+  integrity sha512-r17GxjhUCjSRy8aiJpr8/UadFIzMzJGexI3Nmz4ADi9LYSFx4gTBp80+NaX/YsXWWLhpZ7v/v/ubEc/bCNfKwg==
   dependencies:
     inherits "^2.0.1"
     minimalistic-assert "^1.0.0"
@@ -4814,15 +5370,10 @@ detect-port@^1.3.0:
     address "^1.0.1"
     debug "4"
 
-diff-sequences@^29.2.0:
-  version "29.2.0"
-  resolved "https://registry.yarnpkg.com/diff-sequences/-/diff-sequences-29.2.0.tgz#4c55b5b40706c7b5d2c5c75999a50c56d214e8f6"
-  integrity sha512-413SY5JpYeSBZxmenGEmCVQ8mCgtFJF0w9PROdaS6z987XC2Pd2GOKqOITLtMftmyFZqgtCOb/QA7/Z3ZXfzIw==
-
-diff@3.5.0:
-  version "3.5.0"
-  resolved "https://registry.yarnpkg.com/diff/-/diff-3.5.0.tgz#800c0dd1e0a8bfbc95835c202ad220fe317e5a12"
-  integrity sha512-A46qtFgd+g7pDZinpnwiRJtxbC1hpgf0uzP3iG89scHk0AUC7A1TGxf5OiiOUv/JMZR8GOt8hL900hV0bOy5xA==
+diff-sequences@^29.6.3:
+  version "29.6.3"
+  resolved "https://registry.yarnpkg.com/diff-sequences/-/diff-sequences-29.6.3.tgz#4deaf894d11407c51efc8418012f9e70b84ea921"
+  integrity sha512-EjePK1srD3P08o2j4f0ExnylqRs5B9tJjcp9t1krH2qRi8CCdsYfwe9JgSLurFBWwq4uOlipzfk5fHNvwFKr8Q==
 
 diff@5.0.0:
   version "5.0.0"
@@ -4868,9 +5419,9 @@ docker-modem@^1.0.8:
     split-ca "^1.0.0"
 
 docker-modem@^3.0.0:
-  version "3.0.6"
-  resolved "https://registry.yarnpkg.com/docker-modem/-/docker-modem-3.0.6.tgz#8c76338641679e28ec2323abb65b3276fb1ce597"
-  integrity sha512-h0Ow21gclbYsZ3mkHDfsYNDqtRhXS8fXr51bU0qr1dxgTMJj0XufbzX+jhNOvA8KuEEzn6JbvLVhXyv+fny9Uw==
+  version "3.0.8"
+  resolved "https://registry.yarnpkg.com/docker-modem/-/docker-modem-3.0.8.tgz#ef62c8bdff6e8a7d12f0160988c295ea8705e77a"
+  integrity sha512-f0ReSURdM3pcKPNS30mxOHSbaFLcknGmQjwSfmbcdOw1XWKXVhukM3NJHhr7NpY9BIyyWQb0EBo3KQvvuU5egQ==
   dependencies:
     debug "^4.1.1"
     readable-stream "^3.5.0"
@@ -4887,14 +5438,21 @@ dockerode@^2.5.8:
     tar-fs "~1.16.3"
 
 dockerode@^3.3.4:
-  version "3.3.4"
-  resolved "https://registry.yarnpkg.com/dockerode/-/dockerode-3.3.4.tgz#875de614a1be797279caa9fe27e5637cf0e40548"
-  integrity sha512-3EUwuXnCU+RUlQEheDjmBE0B7q66PV9Rw5NiH1sXwINq0M9c5ERP9fxgkw36ZHOtzf4AGEEYySnkx/sACC9EgQ==
+  version "3.3.5"
+  resolved "https://registry.yarnpkg.com/dockerode/-/dockerode-3.3.5.tgz#7ae3f40f2bec53ae5e9a741ce655fff459745629"
+  integrity sha512-/0YNa3ZDNeLr/tSckmD69+Gq+qVNhvKfAHNeZJBnp7EOP6RGKV8ORrJHkUn20So5wU+xxT7+1n5u8PjHbfjbSA==
   dependencies:
     "@balena/dockerignore" "^1.0.2"
     docker-modem "^3.0.0"
     tar-fs "~2.0.1"
 
+doctrine@^2.1.0:
+  version "2.1.0"
+  resolved "https://registry.yarnpkg.com/doctrine/-/doctrine-2.1.0.tgz#5cd01fc101621b42c4cd7f5d1a66243716d3f39d"
+  integrity sha512-35mSku4ZXK0vfCuHEDAwt55dg2jNajHZ1odvF+8SSr82EsZY4QmXfuWso8oEd8zRhVObSN18aM0CjSdoBX7zIw==
+  dependencies:
+    esutils "^2.0.2"
+
 doctrine@^3.0.0:
   version "3.0.0"
   resolved "https://registry.yarnpkg.com/doctrine/-/doctrine-3.0.0.tgz#addebead72a6574db783639dc87a121773973961"
@@ -4908,9 +5466,9 @@ dom-walk@^0.1.0:
   integrity sha512-6QvTW9mrGeIegrFXdtQi9pk7O/nSK6lSdXW2eqUspN5LWD7UTji2Fqw5V2YLjBpHEoU9Xl/eUWNpDeZvoyOv2w==
 
 dotenv@^16.0.3:
-  version "16.0.3"
-  resolved "https://registry.yarnpkg.com/dotenv/-/dotenv-16.0.3.tgz#115aec42bac5053db3c456db30cc243a5a836a07"
-  integrity sha512-7GO6HghkA5fYG9TYnNxi14/7K9f5occMlp3zXAuSxn7CKCxt9xbNWG7yF8hTCSUchlfWSe3uLmlPfigevRItzQ==
+  version "16.3.1"
+  resolved "https://registry.yarnpkg.com/dotenv/-/dotenv-16.3.1.tgz#369034de7d7e5b120972693352a3bf112172cc3e"
+  integrity sha512-IPzF4w4/Rd94bA9imS68tZBaYyBWSCE47V1RGuMrB94iyTOIEwRmVL2x/4An+6mETpLrKJ5hQkB8W4kFAadeIQ==
 
 dotenv@^8.2.0:
   version "8.6.0"
@@ -4949,10 +5507,10 @@ ee-first@1.1.1:
   resolved "https://registry.yarnpkg.com/ee-first/-/ee-first-1.1.1.tgz#590c61156b0ae2f4f0255732a158b266bc56b21d"
   integrity sha512-WMwm9LhRUo+WUaRN+vRuETqG89IgZphVSNkdFgeb6sS/E4OrDIN7t48CAewSHXc6C8lefD8KKfr5vY61brQlow==
 
-electron-to-chromium@^1.3.47, electron-to-chromium@^1.4.251:
-  version "1.4.284"
-  resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.4.284.tgz#61046d1e4cab3a25238f6bf7413795270f125592"
-  integrity sha512-M8WEXFuKXMYMVr45fo8mq0wUrrJHheiKZf6BArTKk9ZBYCKJEOU5H8cdWgDT+qCVZf7Na4lVUaZsA+h6uA9+PA==
+electron-to-chromium@^1.3.47, electron-to-chromium@^1.4.535:
+  version "1.4.569"
+  resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.4.569.tgz#1298b67727187ffbaac005a7425490d157f3ad03"
+  integrity sha512-LsrJjZ0IbVy12ApW3gpYpcmHS3iRxH4bkKOW98y1/D+3cvDUWGcbzbsFinfUS8knpcZk/PG/2p/RnkMCYN7PVg==
 
 elliptic@6.5.4, elliptic@^6.4.0, elliptic@^6.5.2, elliptic@^6.5.3, elliptic@^6.5.4:
   version "6.5.4"
@@ -4973,14 +5531,9 @@ emittery@^0.13.1:
   integrity sha512-DeWwawk6r5yR9jFgnDKYt4sLS0LmHJJi3ZOnb5/JdbYwj3nW+FxQnHIjhBKz8YLC7oRNPVM9NQ47I3CVx34eqQ==
 
 emoji-regex@^10.1.0:
-  version "10.2.1"
-  resolved "https://registry.yarnpkg.com/emoji-regex/-/emoji-regex-10.2.1.tgz#a41c330d957191efd3d9dfe6e1e8e1e9ab048b3f"
-  integrity sha512-97g6QgOk8zlDRdgq1WxwgTMgEWGVAQvB5Fdpgc1MkNy56la5SKP9GsMXKDOdqwn90/41a8yPwIGk1Y6WVbeMQA==
-
-emoji-regex@^7.0.1:
-  version "7.0.3"
-  resolved "https://registry.yarnpkg.com/emoji-regex/-/emoji-regex-7.0.3.tgz#933a04052860c85e83c122479c4748a8e4c72156"
-  integrity sha512-CwBLREIQ7LvYFB0WyRvwhq5N5qPhc6PMjD6bYggFlI5YyDgl+0vxq5VHbMOFqLg7hfWzmu8T5Z1QofhmTIhItA==
+  version "10.3.0"
+  resolved "https://registry.yarnpkg.com/emoji-regex/-/emoji-regex-10.3.0.tgz#76998b9268409eb3dae3de989254d456e70cfe23"
+  integrity sha512-QpLs9D9v9kArv4lfDEgg1X/gN5XLnf/A6l9cs8SPZLRZR3ZkY9+kwIQTxm+fsSej5UMYGE8fdoaZVIBlqG0XTw==
 
 emoji-regex@^8.0.0:
   version "8.0.0"
@@ -5017,18 +5570,32 @@ end-of-stream@^1.0.0, end-of-stream@^1.1.0, end-of-stream@^1.4.1:
   dependencies:
     once "^1.4.0"
 
+enhanced-resolve@^5.12.0:
+  version "5.15.0"
+  resolved "https://registry.yarnpkg.com/enhanced-resolve/-/enhanced-resolve-5.15.0.tgz#1af946c7d93603eb88e9896cee4904dc012e9c35"
+  integrity sha512-LXYT42KJ7lpIKECr2mAXIaMldcNCh/7E0KBKOu4KSfkHmP+mZmSs+8V5gBAqisWBy0OO4W5Oyys0GO1Y8KtdKg==
+  dependencies:
+    graceful-fs "^4.2.4"
+    tapable "^2.2.0"
+
 enquirer@^2.3.0, enquirer@^2.3.5:
-  version "2.3.6"
-  resolved "https://registry.yarnpkg.com/enquirer/-/enquirer-2.3.6.tgz#2a7fe5dd634a1e4125a975ec994ff5456dc3734d"
-  integrity sha512-yjNnPr315/FjS4zIsUxYguYUPP2e1NK4d7E7ZOLiyYCcbFBiTMyID+2wvm2w6+pZ/odMA7cRkjhsPbltwBOrLg==
+  version "2.4.1"
+  resolved "https://registry.yarnpkg.com/enquirer/-/enquirer-2.4.1.tgz#93334b3fbd74fc7097b224ab4a8fb7e40bf4ae56"
+  integrity sha512-rRqJg/6gd538VHvR3PSrdRBb/1Vy2YfzHqzvbhGIQpDRKIa4FgV/54b5Q1xYSxOOwKvjXweS26E0Q+nAMwp2pQ==
   dependencies:
     ansi-colors "^4.1.1"
+    strip-ansi "^6.0.1"
 
 entities@~2.0.0:
   version "2.0.3"
   resolved "https://registry.yarnpkg.com/entities/-/entities-2.0.3.tgz#5c487e5742ab93c15abb5da22759b8590ec03b7f"
   integrity sha512-MyoZ0jgnLvB2X3Lg5HqpFmn1kybDiIfEQmKzTb5apr51Rb+T3KdmMiqa70T+bhGnyv7bQ6WMj2QMHpGMmlrUYQ==
 
+entities@~3.0.1:
+  version "3.0.1"
+  resolved "https://registry.yarnpkg.com/entities/-/entities-3.0.1.tgz#2b887ca62585e96db3903482d336c1006c3001d4"
+  integrity sha512-WiyBqoomrwMdFG1e0kqvASYfnlb0lp8M5o5Fw2OFq1hNZxxcNk8Ik0Xm7LxzBhuidnZB/UtBqVCgUz3kBOP51Q==
+
 env-paths@^2.2.0:
   version "2.2.1"
   resolved "https://registry.yarnpkg.com/env-paths/-/env-paths-2.2.1.tgz#420399d416ce1fbe9bc0a07c62fa68d67fd0f8f2"
@@ -5048,74 +5615,50 @@ error-ex@^1.2.0, error-ex@^1.3.1:
   dependencies:
     is-arrayish "^0.2.1"
 
-es-abstract@^1.19.0, es-abstract@^1.19.1, es-abstract@^1.19.5:
-  version "1.20.4"
-  resolved "https://registry.yarnpkg.com/es-abstract/-/es-abstract-1.20.4.tgz#1d103f9f8d78d4cf0713edcd6d0ed1a46eed5861"
-  integrity sha512-0UtvRN79eMe2L+UNEF1BwRe364sj/DXhQ/k5FmivgoSdpM90b8Jc0mDzKMGo7QS0BVbOP/bTwBKNnDc9rNzaPA==
-  dependencies:
-    call-bind "^1.0.2"
-    es-to-primitive "^1.2.1"
-    function-bind "^1.1.1"
-    function.prototype.name "^1.1.5"
-    get-intrinsic "^1.1.3"
-    get-symbol-description "^1.0.0"
-    has "^1.0.3"
-    has-property-descriptors "^1.0.0"
-    has-symbols "^1.0.3"
-    internal-slot "^1.0.3"
-    is-callable "^1.2.7"
-    is-negative-zero "^2.0.2"
-    is-regex "^1.1.4"
-    is-shared-array-buffer "^1.0.2"
-    is-string "^1.0.7"
-    is-weakref "^1.0.2"
-    object-inspect "^1.12.2"
-    object-keys "^1.1.1"
-    object.assign "^4.1.4"
-    regexp.prototype.flags "^1.4.3"
-    safe-regex-test "^1.0.0"
-    string.prototype.trimend "^1.0.5"
-    string.prototype.trimstart "^1.0.5"
-    unbox-primitive "^1.0.2"
-
-es-abstract@^1.20.4:
-  version "1.21.1"
-  resolved "https://registry.yarnpkg.com/es-abstract/-/es-abstract-1.21.1.tgz#e6105a099967c08377830a0c9cb589d570dd86c6"
-  integrity sha512-QudMsPOz86xYz/1dG1OuGBKOELjCh99IIWHLzy5znUB6j8xG2yMA7bfTV86VSqKF+Y/H08vQPR+9jyXpuC6hfg==
+es-abstract@^1.22.1:
+  version "1.22.3"
+  resolved "https://registry.yarnpkg.com/es-abstract/-/es-abstract-1.22.3.tgz#48e79f5573198de6dee3589195727f4f74bc4f32"
+  integrity sha512-eiiY8HQeYfYH2Con2berK+To6GrK2RxbPawDkGq4UiCQQfZHb6wX9qQqkbpPqaxQFcl8d9QzZqo0tGE0VcrdwA==
   dependencies:
+    array-buffer-byte-length "^1.0.0"
+    arraybuffer.prototype.slice "^1.0.2"
     available-typed-arrays "^1.0.5"
-    call-bind "^1.0.2"
+    call-bind "^1.0.5"
     es-set-tostringtag "^2.0.1"
     es-to-primitive "^1.2.1"
-    function-bind "^1.1.1"
-    function.prototype.name "^1.1.5"
-    get-intrinsic "^1.1.3"
+    function.prototype.name "^1.1.6"
+    get-intrinsic "^1.2.2"
     get-symbol-description "^1.0.0"
     globalthis "^1.0.3"
     gopd "^1.0.1"
-    has "^1.0.3"
     has-property-descriptors "^1.0.0"
     has-proto "^1.0.1"
     has-symbols "^1.0.3"
-    internal-slot "^1.0.4"
-    is-array-buffer "^3.0.1"
+    hasown "^2.0.0"
+    internal-slot "^1.0.5"
+    is-array-buffer "^3.0.2"
     is-callable "^1.2.7"
     is-negative-zero "^2.0.2"
     is-regex "^1.1.4"
     is-shared-array-buffer "^1.0.2"
     is-string "^1.0.7"
-    is-typed-array "^1.1.10"
+    is-typed-array "^1.1.12"
     is-weakref "^1.0.2"
-    object-inspect "^1.12.2"
+    object-inspect "^1.13.1"
     object-keys "^1.1.1"
     object.assign "^4.1.4"
-    regexp.prototype.flags "^1.4.3"
+    regexp.prototype.flags "^1.5.1"
+    safe-array-concat "^1.0.1"
     safe-regex-test "^1.0.0"
-    string.prototype.trimend "^1.0.6"
-    string.prototype.trimstart "^1.0.6"
+    string.prototype.trim "^1.2.8"
+    string.prototype.trimend "^1.0.7"
+    string.prototype.trimstart "^1.0.7"
+    typed-array-buffer "^1.0.0"
+    typed-array-byte-length "^1.0.0"
+    typed-array-byte-offset "^1.0.0"
     typed-array-length "^1.0.4"
     unbox-primitive "^1.0.2"
-    which-typed-array "^1.1.9"
+    which-typed-array "^1.1.13"
 
 es-array-method-boxes-properly@^1.0.0:
   version "1.0.0"
@@ -5123,13 +5666,20 @@ es-array-method-boxes-properly@^1.0.0:
   integrity sha512-wd6JXUmyHmt8T5a2xreUwKcGPq6f1f+WwIJkijUqiGcJz1qqnZgP6XIK+QyIWU5lT7imeNxUll48bziG+TSYcA==
 
 es-set-tostringtag@^2.0.1:
-  version "2.0.1"
-  resolved "https://registry.yarnpkg.com/es-set-tostringtag/-/es-set-tostringtag-2.0.1.tgz#338d502f6f674301d710b80c8592de8a15f09cd8"
-  integrity sha512-g3OMbtlwY3QewlqAiMLI47KywjWZoEytKr8pf6iTC8uJq5bIAH52Z9pnQ8pVL6whrCto53JZDuUIsifGeLorTg==
+  version "2.0.2"
+  resolved "https://registry.yarnpkg.com/es-set-tostringtag/-/es-set-tostringtag-2.0.2.tgz#11f7cc9f63376930a5f20be4915834f4bc74f9c9"
+  integrity sha512-BuDyupZt65P9D2D2vA/zqcI3G5xRsklm5N3xCwuiy+/vKy8i0ifdsQP1sLgO4tZDSCaQUSnmC48khknGMV3D2Q==
   dependencies:
-    get-intrinsic "^1.1.3"
-    has "^1.0.3"
+    get-intrinsic "^1.2.2"
     has-tostringtag "^1.0.0"
+    hasown "^2.0.0"
+
+es-shim-unscopables@^1.0.0:
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/es-shim-unscopables/-/es-shim-unscopables-1.0.2.tgz#1f6942e71ecc7835ed1c8a83006d8771a63a3763"
+  integrity sha512-J3yBRXCzDu4ULnQwxyToo/OjdMx6akgVC7K6few0a7F/0wLtmKKN7I73AH5T2836UuXRqN7Qg+IIUw/+YJksRw==
+  dependencies:
+    hasown "^2.0.0"
 
 es-to-primitive@^1.2.1:
   version "1.2.1"
@@ -5181,16 +5731,16 @@ escape-html@~1.0.3:
   resolved "https://registry.yarnpkg.com/escape-html/-/escape-html-1.0.3.tgz#0258eae4d3d0c0974de1c169188ef0051d1d1988"
   integrity sha512-NiSupZ4OeuGwr68lGIeym/ksIZMJodUGOSCZ/FSnTxcrekbvqrgdUxlJOMpijaKZVjAJrWrGs/6Jy8OMuyj9ow==
 
-escape-string-regexp@1.0.5, escape-string-regexp@^1.0.2, escape-string-regexp@^1.0.5:
-  version "1.0.5"
-  resolved "https://registry.yarnpkg.com/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz#1b61c0562190a8dff6ae3bb2cf0200ca130b86d4"
-  integrity sha512-vbRorB5FUQWvla16U8R/qgaFIya2qGzwDrNmCZuYKrbdSUMG6I1ZCGQRefkRVhuOkIGVne7BQ35DSfo1qvJqFg==
-
 escape-string-regexp@4.0.0, escape-string-regexp@^4.0.0:
   version "4.0.0"
   resolved "https://registry.yarnpkg.com/escape-string-regexp/-/escape-string-regexp-4.0.0.tgz#14ba83a5d373e3d311e5afca29cf5bfad965bf34"
   integrity sha512-TtpcNJ3XAzx3Gq8sWRzJaVajRs0uVxA2YAkdb1jm2YkPz4G6egUFAyA3n5vtEIZefPk5Wa4UXbKuS5fKkJWdgA==
 
+escape-string-regexp@^1.0.2, escape-string-regexp@^1.0.5:
+  version "1.0.5"
+  resolved "https://registry.yarnpkg.com/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz#1b61c0562190a8dff6ae3bb2cf0200ca130b86d4"
+  integrity sha512-vbRorB5FUQWvla16U8R/qgaFIya2qGzwDrNmCZuYKrbdSUMG6I1ZCGQRefkRVhuOkIGVne7BQ35DSfo1qvJqFg==
+
 escape-string-regexp@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/escape-string-regexp/-/escape-string-regexp-2.0.0.tgz#a30304e99daa32e23b2fd20f51babd07cffca344"
@@ -5213,13 +5763,65 @@ eslint-config-alloy@^3.8.2:
   resolved "https://registry.yarnpkg.com/eslint-config-alloy/-/eslint-config-alloy-3.10.0.tgz#b2d85ba3bd7dddcc6d7fc79088c192a646f4f246"
   integrity sha512-V34DUmW5n9NU2KbqKw6ow6qHt4RKksuvLKaAAC64ZMPnzwLH8ia7s0N4pEjeVzdtVL77jehCJkupLo8eUdKGYA==
 
-eslint-scope@^4.0.3:
-  version "4.0.3"
-  resolved "https://registry.yarnpkg.com/eslint-scope/-/eslint-scope-4.0.3.tgz#ca03833310f6889a3264781aa82e63eb9cfe7848"
-  integrity sha512-p7VutNr1O/QrxysMo3E45FjYDTeXBy0iTltPFNSqKAIfjDSXC+4dj+qfyuD8bfAXrW/y6lW3O76VaYNPKfpKrg==
+eslint-import-resolver-node@^0.3.9:
+  version "0.3.9"
+  resolved "https://registry.yarnpkg.com/eslint-import-resolver-node/-/eslint-import-resolver-node-0.3.9.tgz#d4eaac52b8a2e7c3cd1903eb00f7e053356118ac"
+  integrity sha512-WFj2isz22JahUv+B788TlO3N6zL3nNJGU8CcZbPZvVEkBPaJdCV4vy5wyghty5ROFbCRnm132v8BScu5/1BQ8g==
+  dependencies:
+    debug "^3.2.7"
+    is-core-module "^2.13.0"
+    resolve "^1.22.4"
+
+eslint-import-resolver-typescript@^3.6.1:
+  version "3.6.1"
+  resolved "https://registry.yarnpkg.com/eslint-import-resolver-typescript/-/eslint-import-resolver-typescript-3.6.1.tgz#7b983680edd3f1c5bce1a5829ae0bc2d57fe9efa"
+  integrity sha512-xgdptdoi5W3niYeuQxKmzVDTATvLYqhpwmykwsh7f6HIOStGWEIL9iqZgQDF9u9OEzrRwR8no5q2VT+bjAujTg==
+  dependencies:
+    debug "^4.3.4"
+    enhanced-resolve "^5.12.0"
+    eslint-module-utils "^2.7.4"
+    fast-glob "^3.3.1"
+    get-tsconfig "^4.5.0"
+    is-core-module "^2.11.0"
+    is-glob "^4.0.3"
+
+eslint-module-utils@^2.7.4, eslint-module-utils@^2.8.0:
+  version "2.8.0"
+  resolved "https://registry.yarnpkg.com/eslint-module-utils/-/eslint-module-utils-2.8.0.tgz#e439fee65fc33f6bba630ff621efc38ec0375c49"
+  integrity sha512-aWajIYfsqCKRDgUfjEXNN/JlrzauMuSEy5sbd7WXbtW3EH6A6MpwEh42c7qD+MqQo9QMJ6fWLAeIJynx0g6OAw==
+  dependencies:
+    debug "^3.2.7"
+
+eslint-plugin-import@^2.29.0:
+  version "2.29.0"
+  resolved "https://registry.yarnpkg.com/eslint-plugin-import/-/eslint-plugin-import-2.29.0.tgz#8133232e4329ee344f2f612885ac3073b0b7e155"
+  integrity sha512-QPOO5NO6Odv5lpoTkddtutccQjysJuFxoPS7fAHO+9m9udNHvTCPSAMW9zGAYj8lAIdr40I8yPCdUYrncXtrwg==
+  dependencies:
+    array-includes "^3.1.7"
+    array.prototype.findlastindex "^1.2.3"
+    array.prototype.flat "^1.3.2"
+    array.prototype.flatmap "^1.3.2"
+    debug "^3.2.7"
+    doctrine "^2.1.0"
+    eslint-import-resolver-node "^0.3.9"
+    eslint-module-utils "^2.8.0"
+    hasown "^2.0.0"
+    is-core-module "^2.13.1"
+    is-glob "^4.0.3"
+    minimatch "^3.1.2"
+    object.fromentries "^2.0.7"
+    object.groupby "^1.0.1"
+    object.values "^1.1.7"
+    semver "^6.3.1"
+    tsconfig-paths "^3.14.2"
+
+eslint-plugin-prettier@^5.0.1:
+  version "5.0.1"
+  resolved "https://registry.yarnpkg.com/eslint-plugin-prettier/-/eslint-plugin-prettier-5.0.1.tgz#a3b399f04378f79f066379f544e42d6b73f11515"
+  integrity sha512-m3u5RnR56asrwV/lDC4GHorlW75DsFfmUcjfCYylTUs85dBRnB7VM6xG8eCMJdeDRnppzmxZVf1GEPJvl1JmNg==
   dependencies:
-    esrecurse "^4.1.0"
-    estraverse "^4.1.1"
+    prettier-linter-helpers "^1.0.0"
+    synckit "^0.8.5"
 
 eslint-scope@^5.1.1:
   version "5.1.1"
@@ -5229,12 +5831,13 @@ eslint-scope@^5.1.1:
     esrecurse "^4.3.0"
     estraverse "^4.1.1"
 
-eslint-utils@^1.3.1:
-  version "1.4.3"
-  resolved "https://registry.yarnpkg.com/eslint-utils/-/eslint-utils-1.4.3.tgz#74fec7c54d0776b6f67e0251040b5806564e981f"
-  integrity sha512-fbBN5W2xdY45KulGXmLHZ3c3FHfVYmKg0IrAKGOkT/464PQsx2UeIzfz1RmEci+KLm1bBaAzZAh8+/E+XAeZ8Q==
+eslint-scope@^7.2.2:
+  version "7.2.2"
+  resolved "https://registry.yarnpkg.com/eslint-scope/-/eslint-scope-7.2.2.tgz#deb4f92563390f32006894af62a22dba1c46423f"
+  integrity sha512-dOt21O7lTMhDM+X9mB4GX+DZrZtCUJPL/wlcTqxyrx5IvO0IYtILdtrQGQp+8n5S0gwSVmOf9NQrjMOgfQZlIg==
   dependencies:
-    eslint-visitor-keys "^1.1.0"
+    esrecurse "^4.3.0"
+    estraverse "^5.2.0"
 
 eslint-utils@^2.1.0:
   version "2.1.0"
@@ -5243,13 +5846,6 @@ eslint-utils@^2.1.0:
   dependencies:
     eslint-visitor-keys "^1.1.0"
 
-eslint-utils@^3.0.0:
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/eslint-utils/-/eslint-utils-3.0.0.tgz#8aebaface7345bb33559db0a1f13a1d2d48c3672"
-  integrity sha512-uuQC43IGctw68pJA1RgbQS8/NP7rch6Cwd4j3ZBtgo4/8Flj4eGE7ZYSZRN3iq5pVUv6GPdW5Z1RFleo84uLDA==
-  dependencies:
-    eslint-visitor-keys "^2.0.0"
-
 eslint-visitor-keys@^1.0.0, eslint-visitor-keys@^1.1.0, eslint-visitor-keys@^1.3.0:
   version "1.3.0"
   resolved "https://registry.yarnpkg.com/eslint-visitor-keys/-/eslint-visitor-keys-1.3.0.tgz#30ebd1ef7c2fdff01c3a4f151044af25fab0523e"
@@ -5260,47 +5856,10 @@ eslint-visitor-keys@^2.0.0:
   resolved "https://registry.yarnpkg.com/eslint-visitor-keys/-/eslint-visitor-keys-2.1.0.tgz#f65328259305927392c938ed44eb0a5c9b2bd303"
   integrity sha512-0rSmRBzXgDzIsD6mGdJgevzgezI534Cer5L/vyMX0kHzT/jiB43jRhd9YUlMGYLQy2zprNmoT8qasCGtY+QaKw==
 
-eslint@^5.6.0:
-  version "5.16.0"
-  resolved "https://registry.yarnpkg.com/eslint/-/eslint-5.16.0.tgz#a1e3ac1aae4a3fbd8296fcf8f7ab7314cbb6abea"
-  integrity sha512-S3Rz11i7c8AA5JPv7xAH+dOyq/Cu/VXHiHXBPOU1k/JAM5dXqQPt3qcrhpHSorXmrpu2g0gkIBVXAqCpzfoZIg==
-  dependencies:
-    "@babel/code-frame" "^7.0.0"
-    ajv "^6.9.1"
-    chalk "^2.1.0"
-    cross-spawn "^6.0.5"
-    debug "^4.0.1"
-    doctrine "^3.0.0"
-    eslint-scope "^4.0.3"
-    eslint-utils "^1.3.1"
-    eslint-visitor-keys "^1.0.0"
-    espree "^5.0.1"
-    esquery "^1.0.1"
-    esutils "^2.0.2"
-    file-entry-cache "^5.0.1"
-    functional-red-black-tree "^1.0.1"
-    glob "^7.1.2"
-    globals "^11.7.0"
-    ignore "^4.0.6"
-    import-fresh "^3.0.0"
-    imurmurhash "^0.1.4"
-    inquirer "^6.2.2"
-    js-yaml "^3.13.0"
-    json-stable-stringify-without-jsonify "^1.0.1"
-    levn "^0.3.0"
-    lodash "^4.17.11"
-    minimatch "^3.0.4"
-    mkdirp "^0.5.1"
-    natural-compare "^1.4.0"
-    optionator "^0.8.2"
-    path-is-inside "^1.0.2"
-    progress "^2.0.0"
-    regexpp "^2.0.1"
-    semver "^5.5.1"
-    strip-ansi "^4.0.0"
-    strip-json-comments "^2.0.1"
-    table "^5.2.3"
-    text-table "^0.2.0"
+eslint-visitor-keys@^3.3.0, eslint-visitor-keys@^3.4.1, eslint-visitor-keys@^3.4.3:
+  version "3.4.3"
+  resolved "https://registry.yarnpkg.com/eslint-visitor-keys/-/eslint-visitor-keys-3.4.3.tgz#0cd72fe8550e3c2eae156a96a4dddcd1c8ac5800"
+  integrity sha512-wpc+LXeiyiisxPlEkUzU6svyS1frIO3Mgxj1fdy7Pm8Ygzguax2N3Fa/D/ag1WqbOprdI+uY6wMUl8/a2G+iag==
 
 eslint@^7.16.0:
   version "7.32.0"
@@ -5346,16 +5905,51 @@ eslint@^7.16.0:
     strip-json-comments "^3.1.0"
     table "^6.0.9"
     text-table "^0.2.0"
-    v8-compile-cache "^2.0.3"
-
-espree@^5.0.1:
-  version "5.0.1"
-  resolved "https://registry.yarnpkg.com/espree/-/espree-5.0.1.tgz#5d6526fa4fc7f0788a5cf75b15f30323e2f81f7a"
-  integrity sha512-qWAZcWh4XE/RwzLJejfcofscgMc9CamR6Tn1+XRXNzrvUSSbiAjGOI/fggztjIi7y9VLPqnICMIPiGyr8JaZ0A==
-  dependencies:
-    acorn "^6.0.7"
-    acorn-jsx "^5.0.0"
-    eslint-visitor-keys "^1.0.0"
+    v8-compile-cache "^2.0.3"
+
+eslint@^8.51.0:
+  version "8.52.0"
+  resolved "https://registry.yarnpkg.com/eslint/-/eslint-8.52.0.tgz#d0cd4a1fac06427a61ef9242b9353f36ea7062fc"
+  integrity sha512-zh/JHnaixqHZsolRB/w9/02akBk9EPrOs9JwcTP2ek7yL5bVvXuRariiaAjjoJ5DvuwQ1WAE/HsMz+w17YgBCg==
+  dependencies:
+    "@eslint-community/eslint-utils" "^4.2.0"
+    "@eslint-community/regexpp" "^4.6.1"
+    "@eslint/eslintrc" "^2.1.2"
+    "@eslint/js" "8.52.0"
+    "@humanwhocodes/config-array" "^0.11.13"
+    "@humanwhocodes/module-importer" "^1.0.1"
+    "@nodelib/fs.walk" "^1.2.8"
+    "@ungap/structured-clone" "^1.2.0"
+    ajv "^6.12.4"
+    chalk "^4.0.0"
+    cross-spawn "^7.0.2"
+    debug "^4.3.2"
+    doctrine "^3.0.0"
+    escape-string-regexp "^4.0.0"
+    eslint-scope "^7.2.2"
+    eslint-visitor-keys "^3.4.3"
+    espree "^9.6.1"
+    esquery "^1.4.2"
+    esutils "^2.0.2"
+    fast-deep-equal "^3.1.3"
+    file-entry-cache "^6.0.1"
+    find-up "^5.0.0"
+    glob-parent "^6.0.2"
+    globals "^13.19.0"
+    graphemer "^1.4.0"
+    ignore "^5.2.0"
+    imurmurhash "^0.1.4"
+    is-glob "^4.0.0"
+    is-path-inside "^3.0.3"
+    js-yaml "^4.1.0"
+    json-stable-stringify-without-jsonify "^1.0.1"
+    levn "^0.4.1"
+    lodash.merge "^4.6.2"
+    minimatch "^3.1.2"
+    natural-compare "^1.4.0"
+    optionator "^0.9.3"
+    strip-ansi "^6.0.1"
+    text-table "^0.2.0"
 
 espree@^7.3.0, espree@^7.3.1:
   version "7.3.1"
@@ -5366,6 +5960,15 @@ espree@^7.3.0, espree@^7.3.1:
     acorn-jsx "^5.3.1"
     eslint-visitor-keys "^1.3.0"
 
+espree@^9.6.0, espree@^9.6.1:
+  version "9.6.1"
+  resolved "https://registry.yarnpkg.com/espree/-/espree-9.6.1.tgz#a2a17b8e434690a5432f2f8018ce71d331a48c6f"
+  integrity sha512-oruZaFkjorTpF32kDSI5/75ViwGeZginGGy2NoOSg3Q9bnwlnmDm4HLnkl0RE3n+njDXR037aY1+x58Z/zFdwQ==
+  dependencies:
+    acorn "^8.9.0"
+    acorn-jsx "^5.3.2"
+    eslint-visitor-keys "^3.4.1"
+
 esprima@2.7.x, esprima@^2.7.1:
   version "2.7.3"
   resolved "https://registry.yarnpkg.com/esprima/-/esprima-2.7.3.tgz#96e3b70d5779f6ad49cd032673d1c312767ba581"
@@ -5376,14 +5979,14 @@ esprima@^4.0.0:
   resolved "https://registry.yarnpkg.com/esprima/-/esprima-4.0.1.tgz#13b04cdb3e6c5d19df91ab6987a8695619b0aa71"
   integrity sha512-eGuFFw7Upda+g4p+QHvnW0RyTX/SVeJBDM/gCtMARO0cLuT2HcEKnTPvhjV6aGeqrCB/sbNop0Kszm0jsaWU4A==
 
-esquery@^1.0.1, esquery@^1.4.0:
-  version "1.4.0"
-  resolved "https://registry.yarnpkg.com/esquery/-/esquery-1.4.0.tgz#2148ffc38b82e8c7057dfed48425b3e61f0f24a5"
-  integrity sha512-cCDispWt5vHHtwMY2YrAQ4ibFkAL8RbH5YGBnZBc90MolvvfkkQcJro/aZiAQUlQ3qgrYS6D6v8Gc5G5CQsc9w==
+esquery@^1.4.0, esquery@^1.4.2:
+  version "1.5.0"
+  resolved "https://registry.yarnpkg.com/esquery/-/esquery-1.5.0.tgz#6ce17738de8577694edd7361c57182ac8cb0db0b"
+  integrity sha512-YQLXUplAwJgCydQ78IMJywZCceoqk1oH01OERdSAJc/7U2AylwjhSCLDEtqwg811idIS/9fIU5GjG73IgjKMVg==
   dependencies:
     estraverse "^5.1.0"
 
-esrecurse@^4.1.0, esrecurse@^4.3.0:
+esrecurse@^4.3.0:
   version "4.3.0"
   resolved "https://registry.yarnpkg.com/esrecurse/-/esrecurse-4.3.0.tgz#7ad7964d679abb28bee72cec63758b1c5d2c9921"
   integrity sha512-KmfKL3b6G+RXvP8N1vr3Tq1kL/oCFgn2NYXEtqP8/L3pKapUA4G8cFVaoF3SU323CD4XypR/ffioHmkti6/Tag==
@@ -5437,23 +6040,21 @@ eth-ens-namehash@2.0.8, eth-ens-namehash@^2.0.8:
     js-sha3 "^0.5.7"
 
 eth-gas-reporter@^0.2.25:
-  version "0.2.25"
-  resolved "https://registry.yarnpkg.com/eth-gas-reporter/-/eth-gas-reporter-0.2.25.tgz#546dfa946c1acee93cb1a94c2a1162292d6ff566"
-  integrity sha512-1fRgyE4xUB8SoqLgN3eDfpDfwEfRxh2Sz1b7wzFbyQA+9TekMmvSjjoRu9SKcSVyK+vLkLIsVbJDsTWjw195OQ==
+  version "0.2.27"
+  resolved "https://registry.yarnpkg.com/eth-gas-reporter/-/eth-gas-reporter-0.2.27.tgz#928de8548a674ed64c7ba0bf5795e63079150d4e"
+  integrity sha512-femhvoAM7wL0GcI8ozTdxfuBtBFJ9qsyIAsmKVjlWAHUbdnnXHt+lKzz/kmldM5lA9jLuNHGwuIxorNpLbR1Zw==
   dependencies:
-    "@ethersproject/abi" "^5.0.0-beta.146"
     "@solidity-parser/parser" "^0.14.0"
+    axios "^1.5.1"
     cli-table3 "^0.5.0"
     colors "1.4.0"
     ethereum-cryptography "^1.0.3"
-    ethers "^4.0.40"
+    ethers "^5.7.2"
     fs-readdir-recursive "^1.1.0"
     lodash "^4.17.14"
     markdown-table "^1.1.3"
-    mocha "^7.1.1"
+    mocha "^10.2.0"
     req-cwd "^2.0.0"
-    request "^2.88.0"
-    request-promise-native "^1.0.5"
     sha1 "^1.1.1"
     sync-request "^6.0.0"
 
@@ -5600,14 +6201,24 @@ ethereum-cryptography@0.1.3, ethereum-cryptography@^0.1.3:
     setimmediate "^1.0.5"
 
 ethereum-cryptography@^1.0.3:
-  version "1.1.2"
-  resolved "https://registry.yarnpkg.com/ethereum-cryptography/-/ethereum-cryptography-1.1.2.tgz#74f2ac0f0f5fe79f012c889b3b8446a9a6264e6d"
-  integrity sha512-XDSJlg4BD+hq9N2FjvotwUET9Tfxpxc3kWGE2AqUG5vcbeunnbImVk3cj6e/xT3phdW21mE8R5IugU4fspQDcQ==
+  version "1.2.0"
+  resolved "https://registry.yarnpkg.com/ethereum-cryptography/-/ethereum-cryptography-1.2.0.tgz#5ccfa183e85fdaf9f9b299a79430c044268c9b3a"
+  integrity sha512-6yFQC9b5ug6/17CQpCyE3k9eKBMdhyVjzUy1WkiuY/E4vj/SXDBbCw8QEIaXqf0Mf2SnY6RmpDcwlUmBSS0EJw==
   dependencies:
-    "@noble/hashes" "1.1.2"
-    "@noble/secp256k1" "1.6.3"
-    "@scure/bip32" "1.1.0"
-    "@scure/bip39" "1.1.0"
+    "@noble/hashes" "1.2.0"
+    "@noble/secp256k1" "1.7.1"
+    "@scure/bip32" "1.1.5"
+    "@scure/bip39" "1.1.1"
+
+ethereum-cryptography@^2.0.0, ethereum-cryptography@^2.1.2:
+  version "2.1.2"
+  resolved "https://registry.yarnpkg.com/ethereum-cryptography/-/ethereum-cryptography-2.1.2.tgz#18fa7108622e56481157a5cb7c01c0c6a672eb67"
+  integrity sha512-Z5Ba0T0ImZ8fqXrJbpHcbpAvIswRte2wGNR/KePnu8GbbvgJ47lMxT/ZZPG6i9Jaht4azPDop4HaM00J0J59ug==
+  dependencies:
+    "@noble/curves" "1.1.0"
+    "@noble/hashes" "1.3.1"
+    "@scure/bip32" "1.3.1"
+    "@scure/bip39" "1.2.1"
 
 ethereum-waffle@^3.0.0:
   version "3.4.4"
@@ -5762,7 +6373,7 @@ ethereumjs-util@^5.0.0, ethereumjs-util@^5.0.1, ethereumjs-util@^5.1.1, ethereum
     rlp "^2.0.0"
     safe-buffer "^5.1.1"
 
-ethereumjs-util@^7.0.2, ethereumjs-util@^7.1.0:
+ethereumjs-util@^7.0.2:
   version "7.1.5"
   resolved "https://registry.yarnpkg.com/ethereumjs-util/-/ethereumjs-util-7.1.5.tgz#9ecf04861e4fbbeed7465ece5f23317ad1129181"
   integrity sha512-SDl5kKrQAudFBUe5OJM9Ac6WmMyYmXX/6sTmLZ3ffG2eY6ZIGBes3pEDxNN6V72WyOw4CPD5RomKdsa8DAAwLg==
@@ -5826,22 +6437,7 @@ ethereumjs-wallet@0.6.5:
     utf8 "^3.0.0"
     uuid "^3.3.2"
 
-ethers@^4.0.40:
-  version "4.0.49"
-  resolved "https://registry.yarnpkg.com/ethers/-/ethers-4.0.49.tgz#0eb0e9161a0c8b4761be547396bbe2fb121a8894"
-  integrity sha512-kPltTvWiyu+OktYy1IStSO16i2e7cS9D9OxZ81q2UUaiNPVrm/RTcbxamCXF9VUSKzJIdJV68EAIhTEVBalRWg==
-  dependencies:
-    aes-js "3.0.0"
-    bn.js "^4.11.9"
-    elliptic "6.5.4"
-    hash.js "1.1.3"
-    js-sha3 "0.5.7"
-    scrypt-js "2.0.4"
-    setimmediate "1.0.4"
-    uuid "2.0.1"
-    xmlhttprequest "1.8.0"
-
-ethers@^5.0.1, ethers@^5.0.2, ethers@^5.5.2, ethers@^5.7.0, ethers@~5.7.0:
+ethers@^5.0.1, ethers@^5.0.2, ethers@^5.5.2, ethers@^5.7.0, ethers@^5.7.1, ethers@^5.7.2, ethers@~5.7.0:
   version "5.7.2"
   resolved "https://registry.yarnpkg.com/ethers/-/ethers-5.7.2.tgz#3a7deeabbb8c030d4126b24f84e525466145872e"
   integrity sha512-wswUsmWo1aOK8rR7DIKiWSw9DbLWe6x98Jrn8wcTflTVvaXhAMaB5zGAXy0GYQEQp9iO1iSHWVyARQm11zUtyg==
@@ -6066,6 +6662,21 @@ execa@^5.0.0:
     signal-exit "^3.0.3"
     strip-final-newline "^2.0.0"
 
+execa@^7.1.1:
+  version "7.2.0"
+  resolved "https://registry.yarnpkg.com/execa/-/execa-7.2.0.tgz#657e75ba984f42a70f38928cedc87d6f2d4fe4e9"
+  integrity sha512-UduyVP7TLB5IcAQl+OzLyLcS/l32W/GLg+AhHJ+ow40FOk2U3SAllPwR44v4vmdFwIWqpdwxxpQbF1n5ta9seA==
+  dependencies:
+    cross-spawn "^7.0.3"
+    get-stream "^6.0.1"
+    human-signals "^4.3.0"
+    is-stream "^3.0.0"
+    merge-stream "^2.0.0"
+    npm-run-path "^5.1.0"
+    onetime "^6.0.0"
+    signal-exit "^3.0.7"
+    strip-final-newline "^3.0.0"
+
 exit@^0.1.2:
   version "0.1.2"
   resolved "https://registry.yarnpkg.com/exit/-/exit-0.1.2.tgz#0632638f8d877cc82107d30a0fff1a17cba1cd0c"
@@ -6084,16 +6695,16 @@ expand-brackets@^2.1.4:
     snapdragon "^0.8.1"
     to-regex "^3.0.1"
 
-expect@^29.0.0, expect@^29.2.2:
-  version "29.2.2"
-  resolved "https://registry.yarnpkg.com/expect/-/expect-29.2.2.tgz#ba2dd0d7e818727710324a6e7f13dd0e6d086106"
-  integrity sha512-hE09QerxZ5wXiOhqkXy5d2G9ar+EqOyifnCXCpMNu+vZ6DG9TJ6CO2c2kPDSLqERTTWrO7OZj8EkYHQqSd78Yw==
+expect@^29.0.0, expect@^29.7.0:
+  version "29.7.0"
+  resolved "https://registry.yarnpkg.com/expect/-/expect-29.7.0.tgz#578874590dcb3214514084c08115d8aee61e11bc"
+  integrity sha512-2Zks0hf1VLFYI1kbh0I5jP3KHHyCHpkfyHBzsSXRFgl/Bg9mWYfMW8oD+PdMPlEwy5HNsR9JutYy6pMeOh61nw==
   dependencies:
-    "@jest/expect-utils" "^29.2.2"
-    jest-get-type "^29.2.0"
-    jest-matcher-utils "^29.2.2"
-    jest-message-util "^29.2.1"
-    jest-util "^29.2.1"
+    "@jest/expect-utils" "^29.7.0"
+    jest-get-type "^29.6.3"
+    jest-matcher-utils "^29.7.0"
+    jest-message-util "^29.7.0"
+    jest-util "^29.7.0"
 
 express@^4.14.0:
   version "4.18.2"
@@ -6204,15 +6815,15 @@ fast-deep-equal@^3.1.1, fast-deep-equal@^3.1.3:
   resolved "https://registry.yarnpkg.com/fast-deep-equal/-/fast-deep-equal-3.1.3.tgz#3a7d56b559d6cbc3eb512325244e619a65c6c525"
   integrity sha512-f3qQ9oQy9j2AhBe/H9VC91wLmKBCCU/gDOnKNAYG5hswO7BLKj09Hc5HYNz9cGI++xlpDCIgDaitVs03ATR84Q==
 
-fast-diff@^1.1.2:
-  version "1.2.0"
-  resolved "https://registry.yarnpkg.com/fast-diff/-/fast-diff-1.2.0.tgz#73ee11982d86caaf7959828d519cfe927fac5f03"
-  integrity sha512-xJuoT5+L99XlZ8twedaRf6Ax2TgQVxvgZOYoPKqZufmJib0tL2tegPBOZb1pVNgIhlqDlA0eO0c3wBvQcmzx4w==
+fast-diff@^1.1.2, fast-diff@^1.2.0:
+  version "1.3.0"
+  resolved "https://registry.yarnpkg.com/fast-diff/-/fast-diff-1.3.0.tgz#ece407fa550a64d638536cd727e129c61616e0f0"
+  integrity sha512-VxPP4NqbUjj6MaAOafWeUn2cXWLcCtljklUtZf0Ind4XQ+QPtmA0b18zZy0jIQx+ExRVCR/ZQpBmik5lXshNsw==
 
-fast-glob@^3.0.3, fast-glob@^3.2.9:
-  version "3.2.12"
-  resolved "https://registry.yarnpkg.com/fast-glob/-/fast-glob-3.2.12.tgz#7f39ec99c2e6ab030337142da9e0c18f37afae80"
-  integrity sha512-DVj4CQIYYow0BlaelwK1pHl5n5cRSJfM60UA0zK891sVInoPri2Ekj7+e1CT3/3qxXenpI+nBBmQAcJPJgaj4w==
+fast-glob@^3.0.3, fast-glob@^3.2.12, fast-glob@^3.2.9, fast-glob@^3.3.0, fast-glob@^3.3.1:
+  version "3.3.1"
+  resolved "https://registry.yarnpkg.com/fast-glob/-/fast-glob-3.3.1.tgz#784b4e897340f3dbbef17413b3f11acf03c874c4"
+  integrity sha512-kNFPyjhh5cKjrUltxs+wFx+ZkbRaxxmZ+X0ZU31SOsxCEtP9VPgtq2teZw1DebupL5GmDaNQ6yKMMVcM41iqDg==
   dependencies:
     "@nodelib/fs.stat" "^2.0.2"
     "@nodelib/fs.walk" "^1.2.3"
@@ -6231,9 +6842,9 @@ fast-levenshtein@^2.0.6, fast-levenshtein@~2.0.6:
   integrity sha512-DCXu6Ifhqcks7TZKY3Hxp3y6qphY5SJZmrWMDrKcERSOXWQdMhU9Ig/PYrzyw/ul9jOIyh0N4M0tbC5hodg8dw==
 
 fastq@^1.6.0:
-  version "1.13.0"
-  resolved "https://registry.yarnpkg.com/fastq/-/fastq-1.13.0.tgz#616760f88a7526bdfc596b7cab8c18938c36b98c"
-  integrity sha512-YpkpUnK8od0o1hmeSc7UUs/eB/vIPWJYjKck2QKIzAf71Vm1AAQ3EbuZB3g2JIy+pg+ERD0vqI79KyZiB2e2Nw==
+  version "1.15.0"
+  resolved "https://registry.yarnpkg.com/fastq/-/fastq-1.15.0.tgz#d04d07c6a2a68fe4599fea8d2e103a937fae6b3a"
+  integrity sha512-wBrocU2LCXXa+lWBt8RoIRD89Fi8OdABODa/kEnyeyjS5aZO5/GNvI5sEINADqP/h8M29UHTHUb53sUu5Ihqdw==
   dependencies:
     reusify "^1.0.4"
 
@@ -6258,13 +6869,6 @@ figures@^2.0.0:
   dependencies:
     escape-string-regexp "^1.0.5"
 
-file-entry-cache@^5.0.1:
-  version "5.0.1"
-  resolved "https://registry.yarnpkg.com/file-entry-cache/-/file-entry-cache-5.0.1.tgz#ca0f6efa6dd3d561333fb14515065c2fafdf439c"
-  integrity sha512-bCg29ictuBaKUwwArK4ouCaqDgLZcysCFLmM/Yn/FDoqndh/9vNuQfXRDvTuXKLxfD/JtZQGKFT8MGcJBK644g==
-  dependencies:
-    flat-cache "^2.0.1"
-
 file-entry-cache@^6.0.1:
   version "6.0.1"
   resolved "https://registry.yarnpkg.com/file-entry-cache/-/file-entry-cache-6.0.1.tgz#211b2dd9659cb0394b073e7323ac3c933d522027"
@@ -6310,14 +6914,14 @@ find-replace@^1.0.3:
     array-back "^1.0.4"
     test-value "^2.1.0"
 
-find-up@3.0.0, find-up@^3.0.0:
+find-replace@^3.0.0:
   version "3.0.0"
-  resolved "https://registry.yarnpkg.com/find-up/-/find-up-3.0.0.tgz#49169f1d7993430646da61ecc5ae355c21c97b73"
-  integrity sha512-1yD6RmLI1XBfxugvORwlck6f75tYL+iR0jqwsOrOxMZyGYqUuDhJ0l4AXdO1iX/FTs9cBAMEk1gWSEx1kSbylg==
+  resolved "https://registry.yarnpkg.com/find-replace/-/find-replace-3.0.0.tgz#3e7e23d3b05167a76f770c9fbd5258b0def68c38"
+  integrity sha512-6Tb2myMioCAgv5kfvP5/PkZZ/ntTpVK39fHY7WkWBgvbeE+VHd/tZuZ4mrC+bxh4cfOZeYKVPaJIZtZXV7GNCQ==
   dependencies:
-    locate-path "^3.0.0"
+    array-back "^3.0.1"
 
-find-up@5.0.0:
+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"
   integrity sha512-78/PXT1wlLLDgTzDs7sjq9hzz0vXD+zn+7wypEe4fXQxCmdmqfGsEPQxmiCSQI3ajFV91bVSsvNtrJRiW6nGng==
@@ -6363,44 +6967,24 @@ find-yarn-workspace-root@^2.0.0:
   dependencies:
     micromatch "^4.0.2"
 
-flat-cache@^2.0.1:
-  version "2.0.1"
-  resolved "https://registry.yarnpkg.com/flat-cache/-/flat-cache-2.0.1.tgz#5d296d6f04bda44a4630a301413bdbc2ec085ec0"
-  integrity sha512-LoQe6yDuUMDzQAEH8sgmh4Md6oZnc/7PjtwjNFSzveXqSHt6ka9fPBuso7IGf9Rz4uqnSnWiFH2B/zj24a5ReA==
-  dependencies:
-    flatted "^2.0.0"
-    rimraf "2.6.3"
-    write "1.0.3"
-
 flat-cache@^3.0.4:
-  version "3.0.4"
-  resolved "https://registry.yarnpkg.com/flat-cache/-/flat-cache-3.0.4.tgz#61b0338302b2fe9f957dcc32fc2a87f1c3048b11"
-  integrity sha512-dm9s5Pw7Jc0GvMYbshN6zchCA9RgQlzzEZX3vylR9IqFfS8XciblUXOKfW6SiuJ0e13eDYZoZV5wdrev7P3Nwg==
+  version "3.1.1"
+  resolved "https://registry.yarnpkg.com/flat-cache/-/flat-cache-3.1.1.tgz#a02a15fdec25a8f844ff7cc658f03dd99eb4609b"
+  integrity sha512-/qM2b3LUIaIgviBQovTLvijfyOQXPtSRnRK26ksj2J7rzPIecePUIpJsZ4T02Qg+xiAEKIs5K8dsHEd+VaKa/Q==
   dependencies:
-    flatted "^3.1.0"
+    flatted "^3.2.9"
+    keyv "^4.5.3"
     rimraf "^3.0.2"
 
-flat@^4.1.0:
-  version "4.1.1"
-  resolved "https://registry.yarnpkg.com/flat/-/flat-4.1.1.tgz#a392059cc382881ff98642f5da4dde0a959f309b"
-  integrity sha512-FmTtBsHskrU6FJ2VxCnsDb84wu9zhmO3cUX2kGFb5tuwhfXxGciiT0oRY+cck35QmG+NmGh5eLz6lLCpWTqwpA==
-  dependencies:
-    is-buffer "~2.0.3"
-
 flat@^5.0.2:
   version "5.0.2"
   resolved "https://registry.yarnpkg.com/flat/-/flat-5.0.2.tgz#8ca6fe332069ffa9d324c327198c598259ceb241"
   integrity sha512-b6suED+5/3rTpUBdG1gupIl8MPFCAMA0QXwmljLhvCUKcUvdE4gWky9zpuGCcXHOsz4J9wPGNWq6OKpmIzz3hQ==
 
-flatted@^2.0.0:
-  version "2.0.2"
-  resolved "https://registry.yarnpkg.com/flatted/-/flatted-2.0.2.tgz#4575b21e2bcee7434aa9be662f4b7b5f9c2b5138"
-  integrity sha512-r5wGx7YeOwNWNlCA0wQ86zKyDLMQr+/RB8xy74M4hTphfmjlijTSSXGuH8rnvKZnfT9i+75zmd8jcKdMR4O6jA==
-
-flatted@^3.1.0:
-  version "3.2.7"
-  resolved "https://registry.yarnpkg.com/flatted/-/flatted-3.2.7.tgz#609f39207cb614b89d0765b477cb2d437fbf9787"
-  integrity sha512-5nqDSxl8nn5BSNxyR3n4I6eDmbolI6WT+QqR547RwxQapgjQBmtktdP+HTBb/a/zLsbzERTONyUB5pefh5TtjQ==
+flatted@^3.2.9:
+  version "3.2.9"
+  resolved "https://registry.yarnpkg.com/flatted/-/flatted-3.2.9.tgz#7eb4c67ca1ba34232ca9d2d93e9886e611ad7daf"
+  integrity sha512-36yxDn5H7OFZQla0/jFJmbIKTdZAQHngCedGxiMmpNfEZM0sdEeT+WczLQrjK6D7o2aiyLYDnkw0R3JK0Qv1RQ==
 
 flow-stoplight@^1.0.0:
   version "1.0.0"
@@ -6408,9 +6992,9 @@ flow-stoplight@^1.0.0:
   integrity sha512-rDjbZUKpN8OYhB0IE/vY/I8UWO/602IIJEU/76Tv4LvYnwHCk0BCsvz4eRr9n+FQcri7L5cyaXOo0+/Kh4HisA==
 
 follow-redirects@^1.12.1, follow-redirects@^1.14.0, follow-redirects@^1.15.0:
-  version "1.15.2"
-  resolved "https://registry.yarnpkg.com/follow-redirects/-/follow-redirects-1.15.2.tgz#b460864144ba63f2681096f274c4e57026da2c13"
-  integrity sha512-VQLG33o04KaQ8uYi2tVNbdrWp1QWxNNea+nmIB4EVM28v0hmP17z7aG1+wAkNzVq4KeXTq3221ye5qTJP91JwA==
+  version "1.15.3"
+  resolved "https://registry.yarnpkg.com/follow-redirects/-/follow-redirects-1.15.3.tgz#fe2f3ef2690afce7e82ed0b44db08165b207123a"
+  integrity sha512-1VzOtuEM8pC9SFU1E+8KfTjZyMztRsgEfwQl44z8A25uy13jSzTj6dyK2Df52iV0vgHCfBwLhDWevLn95w5v6Q==
 
 for-each@^0.3.3, for-each@~0.3.3:
   version "0.3.3"
@@ -6438,15 +7022,6 @@ form-data@^2.2.0:
     combined-stream "^1.0.6"
     mime-types "^2.1.12"
 
-form-data@^3.0.0:
-  version "3.0.1"
-  resolved "https://registry.yarnpkg.com/form-data/-/form-data-3.0.1.tgz#ebd53791b78356a99af9a300d4282c4d5eb9755f"
-  integrity sha512-RHkBKtLWUVwd7SqRIvCZMEvAMoGUp0XU+seQiZejj0COz3RI3hWP4sCv3gZWWLjJTd7rGwcsF5eKZGii0r/hbg==
-  dependencies:
-    asynckit "^0.4.0"
-    combined-stream "^1.0.8"
-    mime-types "^2.1.12"
-
 form-data@^4.0.0:
   version "4.0.0"
   resolved "https://registry.yarnpkg.com/form-data/-/form-data-4.0.0.tgz#93919daeaf361ee529584b9b31664dc12c9fa452"
@@ -6508,6 +7083,15 @@ fs-extra@^0.30.0:
     path-is-absolute "^1.0.0"
     rimraf "^2.2.8"
 
+fs-extra@^11.1.1:
+  version "11.1.1"
+  resolved "https://registry.yarnpkg.com/fs-extra/-/fs-extra-11.1.1.tgz#da69f7c39f3b002378b0954bb6ae7efdc0876e2d"
+  integrity sha512-MGIE4HOvQCeUCzmlHs0vXpih4ysz4wg9qiSAu6cd42lVwPbTM1TjV7RusoyQqMmk/95gdQZX72u+YW+c3eEpFQ==
+  dependencies:
+    graceful-fs "^4.2.0"
+    jsonfile "^6.0.1"
+    universalify "^2.0.0"
+
 fs-extra@^4.0.2, fs-extra@^4.0.3:
   version "4.0.3"
   resolved "https://registry.yarnpkg.com/fs-extra/-/fs-extra-4.0.3.tgz#0d852122e5bc5beb453fb028e9c0c9bf36340c94"
@@ -6535,7 +7119,7 @@ fs-extra@^8.1.0:
     jsonfile "^4.0.0"
     universalify "^0.1.0"
 
-fs-extra@^9.0.0:
+fs-extra@^9.0.0, fs-extra@^9.1.0:
   version "9.1.0"
   resolved "https://registry.yarnpkg.com/fs-extra/-/fs-extra-9.1.0.tgz#5954460c764a8da2094ba3554bf839e6b9a7c86d"
   integrity sha512-hcg3ZmepS30/7BSFqRvoo3DOMQu7IjqxO5nCDt+zM9XWjb33Wg7ziNT+Qvqbuc3+gWpzO02JubVyk2G4Zvo1OQ==
@@ -6568,36 +7152,31 @@ fs@^0.0.1-security:
   integrity sha512-3XY9e1pP0CVEUCdj5BmfIZxRBTSDycnbqhIOGec9QYtmVH2fbLpj86CFWkrNOkt/Fvty4KZG5lTglL9j/gJ87w==
 
 fsevents@^2.3.2, fsevents@~2.3.2:
-  version "2.3.2"
-  resolved "https://registry.yarnpkg.com/fsevents/-/fsevents-2.3.2.tgz#8a526f78b8fdf4623b709e0b975c52c24c02fd1a"
-  integrity sha512-xiqMQR4xAeHTuB9uWm+fFRcIOgKBMiOBP+eXiyT7jsgVCq1bkVygt00oASowB7EdtpOHaaPgKt812P9ab+DDKA==
-
-fsevents@~2.1.1:
-  version "2.1.3"
-  resolved "https://registry.yarnpkg.com/fsevents/-/fsevents-2.1.3.tgz#fb738703ae8d2f9fe900c33836ddebee8b97f23e"
-  integrity sha512-Auw9a4AxqWpa9GUfj370BMPzzyncfBABW8Mab7BGWBYDj4Isgq+cDKtx0i6u9jcX9pQDnswsaaOTgTmA5pEjuQ==
+  version "2.3.3"
+  resolved "https://registry.yarnpkg.com/fsevents/-/fsevents-2.3.3.tgz#cac6407785d03675a2a5e1a5305c697b347d90d6"
+  integrity sha512-5xoDfX+fL7faATnagmWPpbFtwh/R77WmMMqqHGS65C3vvB0YHrgF+B1YmZ3441tMj5n63k0212XNoJwzlhffQw==
 
-function-bind@^1.1.1:
-  version "1.1.1"
-  resolved "https://registry.yarnpkg.com/function-bind/-/function-bind-1.1.1.tgz#a56899d3ea3c9bab874bb9773b7c5ede92f4895d"
-  integrity sha512-yIovAzMX49sF8Yl58fSCWJ5svSLuaibPxXQJFLmBObTuCr0Mf1KiPopGM9NiFjiYBCbfaa2Fh6breQ6ANVTI0A==
+function-bind@^1.1.2:
+  version "1.1.2"
+  resolved "https://registry.yarnpkg.com/function-bind/-/function-bind-1.1.2.tgz#2c02d864d97f3ea6c8830c464cbd11ab6eab7a1c"
+  integrity sha512-7XHNxH7qX9xG5mIwxkhumTox/MIRNcOgDrxWsMt2pAr23WHp6MrRlN7FBSFpCpr+oVO0F744iUgR82nJMfG2SA==
 
-function.prototype.name@^1.1.5:
-  version "1.1.5"
-  resolved "https://registry.yarnpkg.com/function.prototype.name/-/function.prototype.name-1.1.5.tgz#cce0505fe1ffb80503e6f9e46cc64e46a12a9621"
-  integrity sha512-uN7m/BzVKQnCUF/iW8jYea67v++2u7m5UgENbHRtdDVclOUP+FMPlCNdmk0h/ysGyo2tavMJEDqJAkJdRa1vMA==
+function.prototype.name@^1.1.6:
+  version "1.1.6"
+  resolved "https://registry.yarnpkg.com/function.prototype.name/-/function.prototype.name-1.1.6.tgz#cdf315b7d90ee77a4c6ee216c3c3362da07533fd"
+  integrity sha512-Z5kx79swU5P27WEayXM1tBi5Ze/lbIyiNgU3qyXUOf9b2rgXYyF9Dy9Cx+IQv/Lc8WCG6L82zwUPpSS9hGehIg==
   dependencies:
     call-bind "^1.0.2"
-    define-properties "^1.1.3"
-    es-abstract "^1.19.0"
-    functions-have-names "^1.2.2"
+    define-properties "^1.2.0"
+    es-abstract "^1.22.1"
+    functions-have-names "^1.2.3"
 
 functional-red-black-tree@^1.0.1, functional-red-black-tree@~1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/functional-red-black-tree/-/functional-red-black-tree-1.0.1.tgz#1b0ab3bd553b2a0d6399d29c0e3ea0b252078327"
   integrity sha512-dsKNQNdj6xA3T+QlADDA7mOSlX0qiMINjn0cgr+eGHGsbSHzTabcIogz2+p/iqP1Xs6EP/sS2SbqH+brGTbq0g==
 
-functions-have-names@^1.2.2:
+functions-have-names@^1.2.3:
   version "1.2.3"
   resolved "https://registry.yarnpkg.com/functions-have-names/-/functions-have-names-1.2.3.tgz#0404fe4ee2ba2f607f0e0ec3c80bae994133b834"
   integrity sha512-xckBUXyTIqT97tq2x2AMb+g163b5JFysYk0x4qxNFwbfQkmNZoiRHb6sPzI9/QV33WeuvVYBUIiD4NzNIyqaRQ==
@@ -6649,24 +7228,25 @@ get-caller-file@^1.0.1:
   resolved "https://registry.yarnpkg.com/get-caller-file/-/get-caller-file-1.0.3.tgz#f978fa4c90d1dfe7ff2d6beda2a515e713bdcf4a"
   integrity sha512-3t6rVToeoZfYSGd8YoLFR2DJkiQrIiUrGcjvFX2mDw3bn6k2OtwHN0TNCLbBO+w8qTvimhDkv+LSscbJY1vE6w==
 
-get-caller-file@^2.0.1, get-caller-file@^2.0.5:
+get-caller-file@^2.0.5:
   version "2.0.5"
   resolved "https://registry.yarnpkg.com/get-caller-file/-/get-caller-file-2.0.5.tgz#4f94412a82db32f36e3b0b9741f8a97feb031f7e"
   integrity sha512-DyFP3BM/3YHTQOCUL/w0OZHR0lpKeGrxotcHWcqNEdnltqFwXVfhEBQ94eIo34AfQpo0rGki4cyIiftY06h2Fg==
 
-get-func-name@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/get-func-name/-/get-func-name-2.0.0.tgz#ead774abee72e20409433a066366023dd6887a41"
-  integrity sha512-Hm0ixYtaSZ/V7C8FJrtZIuBBI+iSgL+1Aq82zSu8VQNB4S3Gk8e7Qs3VwBDJAhmRZcFqkl3tQu36g/Foh5I5ig==
+get-func-name@^2.0.1, get-func-name@^2.0.2:
+  version "2.0.2"
+  resolved "https://registry.yarnpkg.com/get-func-name/-/get-func-name-2.0.2.tgz#0d7cf20cd13fda808669ffa88f4ffc7a3943fc41"
+  integrity sha512-8vXOvuE167CtIc3OyItco7N/dpRtBbYOsPsXCz7X/PMnlGjYjSGuZJgM1Y7mmew7BKf9BqvLX2tnOVy1BBUsxQ==
 
-get-intrinsic@^1.0.2, get-intrinsic@^1.1.0, get-intrinsic@^1.1.1, get-intrinsic@^1.1.3:
-  version "1.1.3"
-  resolved "https://registry.yarnpkg.com/get-intrinsic/-/get-intrinsic-1.1.3.tgz#063c84329ad93e83893c7f4f243ef63ffa351385"
-  integrity sha512-QJVz1Tj7MS099PevUG5jvnt9tSkXN8K14dxQlikJuPt4uD9hHAHjLyLBiLR5zELelBdD9QNRAXZzsJx0WaDL9A==
+get-intrinsic@^1.0.2, get-intrinsic@^1.1.1, get-intrinsic@^1.1.3, get-intrinsic@^1.2.0, get-intrinsic@^1.2.1, get-intrinsic@^1.2.2:
+  version "1.2.2"
+  resolved "https://registry.yarnpkg.com/get-intrinsic/-/get-intrinsic-1.2.2.tgz#281b7622971123e1ef4b3c90fd7539306da93f3b"
+  integrity sha512-0gSo4ml/0j98Y3lngkFEot/zhiCeWsbYIlZ+uZOVgzLyLaUw7wxUL+nCTP0XJvJg1AXulJRI3UJi8GsbDuxdGA==
   dependencies:
-    function-bind "^1.1.1"
-    has "^1.0.3"
+    function-bind "^1.1.2"
+    has-proto "^1.0.1"
     has-symbols "^1.0.3"
+    hasown "^2.0.0"
 
 get-package-type@^0.1.0:
   version "0.1.0"
@@ -6683,6 +7263,11 @@ get-stdin@~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@^4.1.0:
   version "4.1.0"
   resolved "https://registry.yarnpkg.com/get-stream/-/get-stream-4.1.0.tgz#c1b255575f3dc21d59bfc79cd3d2b46b1c3a54b5"
@@ -6697,7 +7282,7 @@ get-stream@^5.1.0:
   dependencies:
     pump "^3.0.0"
 
-get-stream@^6.0.0:
+get-stream@^6.0.0, get-stream@^6.0.1:
   version "6.0.1"
   resolved "https://registry.yarnpkg.com/get-stream/-/get-stream-6.0.1.tgz#a262d8eef67aced57c2852ad6167526a43cbf7b7"
   integrity sha512-ts6Wi+2j3jQjqi70w5AlN8DFnkSwC+MqmxEzdEALB2qXZYV3X/b1CTfgPLGJNMeAWxdPfU8FO1ms3NUfaHCPYg==
@@ -6710,6 +7295,13 @@ get-symbol-description@^1.0.0:
     call-bind "^1.0.2"
     get-intrinsic "^1.1.1"
 
+get-tsconfig@^4.5.0:
+  version "4.7.2"
+  resolved "https://registry.yarnpkg.com/get-tsconfig/-/get-tsconfig-4.7.2.tgz#0dcd6fb330391d46332f4c6c1bf89a6514c2ddce"
+  integrity sha512-wuMsz4leaj5hbGgg4IvDU0bqJagpftG5l5cXIAvo8uZrqn0NJqwtfupTN00VnkQJPcIRrxYrm1Ue24btpCha2A==
+  dependencies:
+    resolve-pkg-maps "^1.0.0"
+
 get-value@^2.0.3, get-value@^2.0.6:
   version "2.0.6"
   resolved "https://registry.yarnpkg.com/get-value/-/get-value-2.0.6.tgz#dc15ca1c672387ca76bd37ac0a395ba2042a2c28"
@@ -6730,17 +7322,24 @@ ghost-testrpc@^0.0.2:
     chalk "^2.4.2"
     node-emoji "^1.10.0"
 
-glob-parent@^5.1.2, glob-parent@~5.1.0, glob-parent@~5.1.2:
+glob-parent@^5.1.2, glob-parent@~5.1.2:
   version "5.1.2"
   resolved "https://registry.yarnpkg.com/glob-parent/-/glob-parent-5.1.2.tgz#869832c58034fe68a4093c17dc15e8340d8401c4"
   integrity sha512-AOIgSQCepiJYwP3ARnGx+5VnTu2HBYdzbGP45eLw1vr3zB3vZLeyed1sC9hnbcOc9/SrMyM5RPQrkGz4aS9Zow==
   dependencies:
     is-glob "^4.0.1"
 
-glob@7.1.3:
-  version "7.1.3"
-  resolved "https://registry.yarnpkg.com/glob/-/glob-7.1.3.tgz#3960832d3f1574108342dafd3a67b332c0969df1"
-  integrity sha512-vcfuiIxogLV4DlGBHIUOwI0IbrJ8HWPc4MU7HzviGeNho/UJDfi6B5p3sHeWIQ0KGIU0Jpxi5ZHxemQfLkkAwQ==
+glob-parent@^6.0.2:
+  version "6.0.2"
+  resolved "https://registry.yarnpkg.com/glob-parent/-/glob-parent-6.0.2.tgz#6d237d99083950c79290f24c7642a3de9a28f9e3"
+  integrity sha512-XxwI8EOhVQgWp6iDL+3b0r86f4d6AX6zSU55HfB4ydCEuXLXc5FcYeOu+nnGftS4TEju/11rt4KJPTMgbfmv4A==
+  dependencies:
+    is-glob "^4.0.3"
+
+glob@7.1.7, glob@~7.1.2:
+  version "7.1.7"
+  resolved "https://registry.yarnpkg.com/glob/-/glob-7.1.7.tgz#3b193e9233f01d42d0b3f78294bbeeb418f94a90"
+  integrity sha512-OvD9ENzPLbegENnYP5UUfJIirTg4+XwMWGaQfQTY0JenxNvvIKP3U3/tAQSPIu/lHxXYSZmpXlUHeqAIdKzBLQ==
   dependencies:
     fs.realpath "^1.0.0"
     inflight "^1.0.4"
@@ -6772,7 +7371,7 @@ glob@^5.0.15:
     once "^1.3.0"
     path-is-absolute "^1.0.0"
 
-glob@^7.0.0, glob@^7.1.2, glob@^7.1.3, glob@^7.1.4, glob@~7.2.3:
+glob@^7.0.0, glob@^7.1.2, glob@^7.1.3, glob@^7.1.4, glob@^7.1.6, glob@~7.2.3:
   version "7.2.3"
   resolved "https://registry.yarnpkg.com/glob/-/glob-7.2.3.tgz#b8df0fb802bbfa8e89bd1d938b4e16578ed44f2b"
   integrity sha512-nFR0zLpU2YCaRxwoCJvL6UvCH2JFyFVIvwTLsIf21AuHlMskA1hhTdk+LlYJtOlYt9v6dvszD2BGRqBL+iQK9Q==
@@ -6784,17 +7383,27 @@ glob@^7.0.0, glob@^7.1.2, glob@^7.1.3, glob@^7.1.4, glob@~7.2.3:
     once "^1.3.0"
     path-is-absolute "^1.0.0"
 
-glob@~7.1.2:
-  version "7.1.7"
-  resolved "https://registry.yarnpkg.com/glob/-/glob-7.1.7.tgz#3b193e9233f01d42d0b3f78294bbeeb418f94a90"
-  integrity sha512-OvD9ENzPLbegENnYP5UUfJIirTg4+XwMWGaQfQTY0JenxNvvIKP3U3/tAQSPIu/lHxXYSZmpXlUHeqAIdKzBLQ==
+glob@^8.0.3:
+  version "8.1.0"
+  resolved "https://registry.yarnpkg.com/glob/-/glob-8.1.0.tgz#d388f656593ef708ee3e34640fdfb99a9fd1c33e"
+  integrity sha512-r8hpEjiQEYlF2QU0df3dS+nxxSIreXQS1qRhMJM0Q5NDdR386C7jb7Hwwod8Fgiuex+k0GFjgft18yvxm5XoCQ==
   dependencies:
     fs.realpath "^1.0.0"
     inflight "^1.0.4"
     inherits "2"
-    minimatch "^3.0.4"
+    minimatch "^5.0.1"
+    once "^1.3.0"
+
+glob@~8.0.3:
+  version "8.0.3"
+  resolved "https://registry.yarnpkg.com/glob/-/glob-8.0.3.tgz#415c6eb2deed9e502c68fa44a272e6da6eeca42e"
+  integrity sha512-ull455NHSHI/Y1FqGaaYFaLGkNMMJbavMrEGFXG/PGrg6y7sutWHUHrz6gy6WEBH6akM1M414dWKCNs+IhKdiQ==
+  dependencies:
+    fs.realpath "^1.0.0"
+    inflight "^1.0.4"
+    inherits "2"
+    minimatch "^5.0.1"
     once "^1.3.0"
-    path-is-absolute "^1.0.0"
 
 global-modules@^2.0.0:
   version "2.0.0"
@@ -6820,15 +7429,15 @@ global@~4.4.0:
     min-document "^2.19.0"
     process "^0.11.10"
 
-globals@^11.1.0, globals@^11.7.0:
+globals@^11.1.0:
   version "11.12.0"
   resolved "https://registry.yarnpkg.com/globals/-/globals-11.12.0.tgz#ab8795338868a0babd8525758018c2a7eb95c42e"
   integrity sha512-WOBp/EEGUiIsJSp7wcv/y6MO+lV9UoncWqxuFfm8eBwzWNgyfBd6Gz+IeKQ9jCmyhoH99g15M3T+QaVHFjizVA==
 
-globals@^13.6.0, globals@^13.9.0:
-  version "13.17.0"
-  resolved "https://registry.yarnpkg.com/globals/-/globals-13.17.0.tgz#902eb1e680a41da93945adbdcb5a9f361ba69bd4"
-  integrity sha512-1C+6nQRb1GwGMKm2dH/E7enFAMxGTmGI7/dEdhy/DNelv85w9B72t3uc5frtMNXIbzrarJJ/lTCjcaZwbLJmyw==
+globals@^13.19.0, globals@^13.6.0, globals@^13.9.0:
+  version "13.23.0"
+  resolved "https://registry.yarnpkg.com/globals/-/globals-13.23.0.tgz#ef31673c926a0976e1f61dab4dca57e0c0a8af02"
+  integrity sha512-XAmF0RjlrjY23MA51q3HltdlGxUpXPvg0GioKiD9X6HD28iMjo2dKC8Vqwm7lne4GNr78+RHTfliktR6ZH09wA==
   dependencies:
     type-fest "^0.20.2"
 
@@ -6858,7 +7467,7 @@ globby@^10.0.1:
     merge2 "^1.2.3"
     slash "^3.0.0"
 
-globby@^11.0.3:
+globby@^11.0.3, globby@^11.1.0:
   version "11.1.0"
   resolved "https://registry.yarnpkg.com/globby/-/globby-11.1.0.tgz#bd4be98bb042f83d796f7e3811991fbe82a0d34b"
   integrity sha512-jhIXaOzy1sb8IyocaruWSn1TjmnBVs8Ayhcy83rmxNJ8q2uWKCAj3CnJY+KpGSXCueAPc0i05kVvVKtP1t9S3g==
@@ -6911,34 +7520,27 @@ got@^11.8.5:
     p-cancelable "^2.0.0"
     responselike "^2.0.0"
 
-graceful-fs@^4.1.11, graceful-fs@^4.1.2, graceful-fs@^4.1.6, graceful-fs@^4.1.9, graceful-fs@^4.2.0, graceful-fs@^4.2.9:
-  version "4.2.10"
-  resolved "https://registry.yarnpkg.com/graceful-fs/-/graceful-fs-4.2.10.tgz#147d3a006da4ca3ce14728c7aefc287c367d7a6c"
-  integrity sha512-9ByhssR2fPVsNZj478qUUbKfmL0+t5BDVyjShtyZZLiK7ZDAArFFfopyOTj0M05wE2tJPisA4iTnnXl2YoPvOA==
+graceful-fs@^4.1.11, 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==
 
 "graceful-readlink@>= 1.0.0":
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/graceful-readlink/-/graceful-readlink-1.0.1.tgz#4cafad76bc62f02fa039b2f94e9a3dd3a391a725"
   integrity sha512-8tLu60LgxF6XpdbK8OW3FA+IfTNBn1ZHGHKF4KQbEeSkajYw5PlYJcKluntgegDPTg8UkHjpet1T82vk6TQ68w==
 
+graphemer@^1.4.0:
+  version "1.4.0"
+  resolved "https://registry.yarnpkg.com/graphemer/-/graphemer-1.4.0.tgz#fb2f1d55e0e3a1849aeffc90c4fa0dd53a0e66c6"
+  integrity sha512-EtKwoO6kxCL9WO5xipiHTZlSzBm7WLT627TqC/uVRd0HKmq8NXyebnNYxDoBi7wt8eTWrUrKXCOVaFq9x1kgag==
+
 growl@1.10.5:
   version "1.10.5"
   resolved "https://registry.yarnpkg.com/growl/-/growl-1.10.5.tgz#f2735dc2283674fa67478b10181059355c369e5e"
   integrity sha512-qBr4OuELkhPenW6goKVXiv47US3clb3/IbuWF9KNKEijAy9oeHxU9IgzjvJhHkUzhaj7rOUD7+YGWqUjLp5oSA==
 
-handlebars@^4.0.1, handlebars@^4.7.6:
-  version "4.7.7"
-  resolved "https://registry.yarnpkg.com/handlebars/-/handlebars-4.7.7.tgz#9ce33416aad02dbd6c8fafa8240d5d98004945a1"
-  integrity sha512-aAcXm5OAfE/8IXkcZvCepKU3VzW1/39Fb5ZuqMtgI/hT8X2YgoMvBY5dLhq/cpOvw7Lk1nK/UF71aLG/ZnVYRA==
-  dependencies:
-    minimist "^1.2.5"
-    neo-async "^2.6.0"
-    source-map "^0.6.1"
-    wordwrap "^1.0.0"
-  optionalDependencies:
-    uglify-js "^3.1.4"
-
-handlebars@^4.7.8:
+handlebars@^4.0.1, handlebars@^4.7.6, handlebars@^4.7.8:
   version "4.7.8"
   resolved "https://registry.yarnpkg.com/handlebars/-/handlebars-4.7.8.tgz#41c42c18b1be2365439188c77c6afae71c0cd9e9"
   integrity sha512-vafaFqs8MZkRrSX7sFVUdo3ap/eNiLnb4IakshzvP56X5Nr1iGKAIqdX6tMlm6HcNRIkr6AxO5jFEoJzzpT8aQ==
@@ -6964,12 +7566,13 @@ har-validator@~5.1.3:
     har-schema "^2.0.0"
 
 hardhat-contract-sizer@^2.0.2:
-  version "2.7.0"
-  resolved "https://registry.yarnpkg.com/hardhat-contract-sizer/-/hardhat-contract-sizer-2.7.0.tgz#d892a741135628a77d25709a29ae164f2750b7eb"
-  integrity sha512-QcncKiEku9TInKH++frfCPaYaVvw6OR5C5dNUcb05WozeVOJGspbWbHOkOlfiaZUbEKTvHA6OY9LtMMvja9nzQ==
+  version "2.10.0"
+  resolved "https://registry.yarnpkg.com/hardhat-contract-sizer/-/hardhat-contract-sizer-2.10.0.tgz#72646f43bfe50e9a5702c9720c9bc3e77d93a2c9"
+  integrity sha512-QiinUgBD5MqJZJh1hl1jc9dNnpJg7eE/w4/4GEnrcmZJJTDbVFNe3+/3Ep24XqISSkYxRz36czcPHKHd/a0dwA==
   dependencies:
     chalk "^4.0.0"
     cli-table3 "^0.6.0"
+    strip-ansi "^6.0.0"
 
 hardhat-gas-reporter@^1.0.9:
   version "1.0.9"
@@ -6985,23 +7588,23 @@ 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.12.4, hardhat@=2.12.4, hardhat@^2.12.4:
-  version "2.12.4"
-  resolved "https://registry.yarnpkg.com/hardhat/-/hardhat-2.12.4.tgz#e539ba58bee9ba1a1ced823bfdcec0b3c5a3e70f"
-  integrity sha512-rc9S2U/4M+77LxW1Kg7oqMMmjl81tzn5rNFARhbXKUA1am/nhfMJEujOjuKvt+ZGMiZ11PYSe8gyIpB/aRNDgw==
+hardhat@=2.16.0:
+  version "2.16.0"
+  resolved "https://registry.yarnpkg.com/hardhat/-/hardhat-2.16.0.tgz#c5611d433416b31f6ce92f733b1f1b5236ad6230"
+  integrity sha512-7VQEJPQRAZdtrYUZaU9GgCpP3MBNy/pTdscARNJQMWKj5C+R7V32G5uIZKIqZ4QiqXa6CBfxxe+G+ahxUbHZHA==
   dependencies:
     "@ethersproject/abi" "^5.1.2"
     "@metamask/eth-sig-util" "^4.0.0"
-    "@nomicfoundation/ethereumjs-block" "^4.0.0"
-    "@nomicfoundation/ethereumjs-blockchain" "^6.0.0"
-    "@nomicfoundation/ethereumjs-common" "^3.0.0"
-    "@nomicfoundation/ethereumjs-evm" "^1.0.0"
-    "@nomicfoundation/ethereumjs-rlp" "^4.0.0"
-    "@nomicfoundation/ethereumjs-statemanager" "^1.0.0"
-    "@nomicfoundation/ethereumjs-trie" "^5.0.0"
-    "@nomicfoundation/ethereumjs-tx" "^4.0.0"
-    "@nomicfoundation/ethereumjs-util" "^8.0.0"
-    "@nomicfoundation/ethereumjs-vm" "^6.0.0"
+    "@nomicfoundation/ethereumjs-block" "5.0.1"
+    "@nomicfoundation/ethereumjs-blockchain" "7.0.1"
+    "@nomicfoundation/ethereumjs-common" "4.0.1"
+    "@nomicfoundation/ethereumjs-evm" "2.0.1"
+    "@nomicfoundation/ethereumjs-rlp" "5.0.1"
+    "@nomicfoundation/ethereumjs-statemanager" "2.0.1"
+    "@nomicfoundation/ethereumjs-trie" "6.0.1"
+    "@nomicfoundation/ethereumjs-tx" "5.0.1"
+    "@nomicfoundation/ethereumjs-util" "9.0.1"
+    "@nomicfoundation/ethereumjs-vm" "7.0.1"
     "@nomicfoundation/solidity-analyzer" "^0.1.0"
     "@sentry/node" "^5.18.1"
     "@types/bn.js" "^5.1.0"
@@ -7029,7 +7632,6 @@ hardhat@2.12.4, hardhat@=2.12.4, hardhat@^2.12.4:
     mnemonist "^0.38.0"
     mocha "^10.0.0"
     p-map "^4.0.0"
-    qs "^6.7.0"
     raw-body "^2.4.1"
     resolve "1.17.0"
     semver "^6.3.0"
@@ -7037,7 +7639,61 @@ hardhat@2.12.4, hardhat@=2.12.4, hardhat@^2.12.4:
     source-map-support "^0.5.13"
     stacktrace-parser "^0.1.10"
     tsort "0.0.1"
-    undici "^5.4.0"
+    undici "^5.14.0"
+    uuid "^8.3.2"
+    ws "^7.4.6"
+
+hardhat@^2.18.3:
+  version "2.19.0"
+  resolved "https://registry.yarnpkg.com/hardhat/-/hardhat-2.19.0.tgz#1e08658863550ba351788ea128e544ff80584a31"
+  integrity sha512-kMpwovOEfrFRQXEopCP+JTcKVwSYVj8rnXE0LynxDqnh06yvyKCQknmXL6IVYTHQL6Csysc/yNbCHQbjSeJGpA==
+  dependencies:
+    "@ethersproject/abi" "^5.1.2"
+    "@metamask/eth-sig-util" "^4.0.0"
+    "@nomicfoundation/ethereumjs-block" "5.0.2"
+    "@nomicfoundation/ethereumjs-blockchain" "7.0.2"
+    "@nomicfoundation/ethereumjs-common" "4.0.2"
+    "@nomicfoundation/ethereumjs-evm" "2.0.2"
+    "@nomicfoundation/ethereumjs-rlp" "5.0.2"
+    "@nomicfoundation/ethereumjs-statemanager" "2.0.2"
+    "@nomicfoundation/ethereumjs-trie" "6.0.2"
+    "@nomicfoundation/ethereumjs-tx" "5.0.2"
+    "@nomicfoundation/ethereumjs-util" "9.0.2"
+    "@nomicfoundation/ethereumjs-vm" "7.0.2"
+    "@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"
+    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"
 
@@ -7069,18 +7725,18 @@ has-flag@^4.0.0:
   integrity sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==
 
 has-property-descriptors@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/has-property-descriptors/-/has-property-descriptors-1.0.0.tgz#610708600606d36961ed04c196193b6a607fa861"
-  integrity sha512-62DVLZGoiEBDHQyqG4w9xCuZ7eJEwNmJRWw2VY84Oedb7WFcA27fiEVe8oUQx9hAUJ4ekurquucTGwsyO1XGdQ==
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/has-property-descriptors/-/has-property-descriptors-1.0.1.tgz#52ba30b6c5ec87fd89fa574bc1c39125c6f65340"
+  integrity sha512-VsX8eaIewvas0xnvinAe9bw4WfIeODpGYikiWYLH+dma0Jw6KHYqWiWfhQlgOVK8D6PvjubK5Uc4P0iIhIcNVg==
   dependencies:
-    get-intrinsic "^1.1.1"
+    get-intrinsic "^1.2.2"
 
 has-proto@^1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/has-proto/-/has-proto-1.0.1.tgz#1885c1305538958aff469fef37937c22795408e0"
   integrity sha512-7qE+iP+O+bgF9clE5+UoBFzE65mlBiVj3tKCrlNQ0Ogwm0BjpT/gK4SlLYDMybDh5I3TCTKnPPa0oMG7JDYrhg==
 
-has-symbols@^1.0.0, has-symbols@^1.0.1, has-symbols@^1.0.2, has-symbols@^1.0.3:
+has-symbols@^1.0.2, has-symbols@^1.0.3:
   version "1.0.3"
   resolved "https://registry.yarnpkg.com/has-symbols/-/has-symbols-1.0.3.tgz#bb7b2c4349251dce87b125f7bdf874aa7c8b39f8"
   integrity sha512-l3LCuF6MgDNwTDKkdYGEihYjt5pRPbEg46rtlmnSPlUbgmB8LOIrKJbYYFBSbnPaJexMKtiPO8hmeRjRz2Td+A==
@@ -7123,12 +7779,10 @@ has-values@^1.0.0:
     is-number "^3.0.0"
     kind-of "^4.0.0"
 
-has@^1.0.3, has@~1.0.3:
-  version "1.0.3"
-  resolved "https://registry.yarnpkg.com/has/-/has-1.0.3.tgz#722d7cbfc1f6aa8241f16dd814e011e1f41e8796"
-  integrity sha512-f2dvO0VU6Oej7RkWJGrehjbzMAjFp5/VKPp5tTpWIV4JHHZK1/BxbFRtf/siA2SWTe09caDmVtYYzWEIbBS4zw==
-  dependencies:
-    function-bind "^1.1.1"
+has@~1.0.3:
+  version "1.0.4"
+  resolved "https://registry.yarnpkg.com/has/-/has-1.0.4.tgz#2eb2860e000011dae4f1406a86fe80e530fb2ec6"
+  integrity sha512-qdSAmqLF6209RFj4VVItywPMbm3vWylknmB3nvNiUIs72xAimcM8nVYxYr7ncvZq5qzk9MKIZR8ijqD/1QuYjQ==
 
 hash-base@^3.0.0:
   version "3.1.0"
@@ -7139,14 +7793,6 @@ hash-base@^3.0.0:
     readable-stream "^3.6.0"
     safe-buffer "^5.2.0"
 
-hash.js@1.1.3:
-  version "1.1.3"
-  resolved "https://registry.yarnpkg.com/hash.js/-/hash.js-1.1.3.tgz#340dedbe6290187151c1ea1d777a3448935df846"
-  integrity sha512-/UETyP0W22QILqS+6HowevwhEFJ3MBJnwTf75Qob9Wz9t0DPuisL8kW8YZMK62dHAKE1c1p+gY1TtOLY+USEHA==
-  dependencies:
-    inherits "^2.0.3"
-    minimalistic-assert "^1.0.0"
-
 hash.js@1.1.7, hash.js@^1.0.0, hash.js@^1.0.3, hash.js@^1.1.7:
   version "1.1.7"
   resolved "https://registry.yarnpkg.com/hash.js/-/hash.js-1.1.7.tgz#0babca538e8d4ee4a0f8988d68866537a003cf42"
@@ -7155,6 +7801,13 @@ hash.js@1.1.7, hash.js@^1.0.0, hash.js@^1.0.3, hash.js@^1.1.7:
     inherits "^2.0.3"
     minimalistic-assert "^1.0.1"
 
+hasown@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/hasown/-/hasown-2.0.0.tgz#f4c513d454a57b7c7e1650778de226b11700546c"
+  integrity sha512-vUptKVTpIJhcczKBbgnS+RtcuYMB8+oNzPK2/Hp3hanz8JmpATdmmgLgSaadVREkDm+e2giHwY3ZRkyjSIDDFA==
+  dependencies:
+    function-bind "^1.1.2"
+
 he@1.2.0:
   version "1.2.0"
   resolved "https://registry.yarnpkg.com/he/-/he-1.2.0.tgz#84ae65fa7eafb165fddb61566ae14baf05664f0f"
@@ -7208,9 +7861,9 @@ http-basic@^8.1.1:
     parse-cache-control "^1.0.1"
 
 http-cache-semantics@^4.0.0:
-  version "4.1.0"
-  resolved "https://registry.yarnpkg.com/http-cache-semantics/-/http-cache-semantics-4.1.0.tgz#49e91c5cbf36c9b94bcfcd71c23d5249ec74e390"
-  integrity sha512-carPklcUh7ROWRK7Cv27RPtdhYhUsela/ue5/jKzjegVvXDqM2ILE9Q2BGn9JZJh1g87cp56su/FgQSzcWS8cQ==
+  version "4.1.1"
+  resolved "https://registry.yarnpkg.com/http-cache-semantics/-/http-cache-semantics-4.1.1.tgz#abe02fcb2985460bf0323be664436ec3476a6d5a"
+  integrity sha512-er295DKPVsV82j5kw1Gjt+ADA/XYHsajl82cGNQG2eyoPkvgUhX+nDIyelzhIWbbsXP39EHcI6l5tYs2FYqYXQ==
 
 http-errors@2.0.0:
   version "2.0.0"
@@ -7265,6 +7918,11 @@ human-signals@^2.1.0:
   resolved "https://registry.yarnpkg.com/human-signals/-/human-signals-2.1.0.tgz#dc91fcba42e4d06e4abaed33b3e7a3c02f514ea0"
   integrity sha512-B4FFZ6q/T2jhhksgkbEW3HBvWIfDW85snkQgawt07S7J5QXTk6BkNV+0yAeZrM5QpMAdYlocGoljn0sJ/WQkFw==
 
+human-signals@^4.3.0:
+  version "4.3.1"
+  resolved "https://registry.yarnpkg.com/human-signals/-/human-signals-4.3.1.tgz#ab7f811e851fca97ffbd2c1fe9a958964de321b2"
+  integrity sha512-nZXjEF2nbo7lIw3mgYjItAfgQXog3OjJogSbKa2CQIIvSGWcKgeJnQlNXip6NglNzYH45nSRiEVimMvYL8DDqQ==
+
 iconv-lite@0.4.24, iconv-lite@^0.4.24:
   version "0.4.24"
   resolved "https://registry.yarnpkg.com/iconv-lite/-/iconv-lite-0.4.24.tgz#2022b4b25fbddc21d2f524974a474aafe733908b"
@@ -7296,16 +7954,11 @@ ignore@^4.0.6:
   resolved "https://registry.yarnpkg.com/ignore/-/ignore-4.0.6.tgz#750e3db5862087b4737ebac8207ffd1ef27b25fc"
   integrity sha512-cyFDKrqc/YdcWFniJhzI42+AzS+gNwmUzOSFcRCQYwySuBBBy/KjuxWLZ/FHEH6Moq1NizMOBWyTcv8O4OZIMg==
 
-ignore@^5.1.1:
+ignore@^5.1.1, ignore@^5.2.0, ignore@^5.2.4, ignore@~5.2.4:
   version "5.2.4"
   resolved "https://registry.yarnpkg.com/ignore/-/ignore-5.2.4.tgz#a291c0c6178ff1b960befe47fcdec301674a6324"
   integrity sha512-MAb38BcSbH0eHNBxn7ql2NH/kX33OkB3lZ1BNdh7ENeRChHTYsTvWrMubiIAMNS2llXEEgZ1MUOBtXChP3kaFQ==
 
-ignore@^5.1.8, ignore@^5.2.0:
-  version "5.2.0"
-  resolved "https://registry.yarnpkg.com/ignore/-/ignore-5.2.0.tgz#6d3bac8fa7fe0d45d9f9be7bac2fc279577e345a"
-  integrity sha512-CmxgYGiEPCLhfLnpPp1MoRmifwEIOgjcHXxOBjv7mY96c+eWScsOP9c112ZyLdWHi0FxHjI+4uVhKYp/gcdRmQ==
-
 ignore@~5.1.4:
   version "5.1.9"
   resolved "https://registry.yarnpkg.com/ignore/-/ignore-5.1.9.tgz#9ec1a5cbe8e1446ec60d4420060d43aa6e7382fb"
@@ -7322,19 +7975,11 @@ immediate@~3.2.3:
   integrity sha512-RrGCXRm/fRVqMIhqXrGEX9rRADavPiDFSoMb/k64i9XMk8uH4r/Omi5Ctierj6XzNecwDbO4WuFbDD1zmpl3Tg==
 
 immutable@^4.0.0-rc.12:
-  version "4.1.0"
-  resolved "https://registry.yarnpkg.com/immutable/-/immutable-4.1.0.tgz#f795787f0db780183307b9eb2091fcac1f6fafef"
-  integrity sha512-oNkuqVTA8jqG1Q6c+UglTOD1xhC1BtjKI7XkCXRkZHrN5m18/XsnUp8Q89GkQO/z+0WjonSvl0FLhDYftp46nQ==
-
-import-fresh@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/import-fresh/-/import-fresh-2.0.0.tgz#d81355c15612d386c61f9ddd3922d4304822a546"
-  integrity sha512-eZ5H8rcgYazHbKC3PG4ClHNykCSxtAhxSSEM+2mb+7evD2CKF5V7c0dNum7AdpDh0ZdICwZY9sRSn8f+KH96sg==
-  dependencies:
-    caller-path "^2.0.0"
-    resolve-from "^3.0.0"
+  version "4.3.4"
+  resolved "https://registry.yarnpkg.com/immutable/-/immutable-4.3.4.tgz#2e07b33837b4bb7662f288c244d1ced1ef65a78f"
+  integrity sha512-fsXeu4J4i6WNWSikpI88v/PcVflZz+6kMhUfIwc5SY+poQRPnaf5V7qds6SUyUN3cVxEzuCab7QIoLOQ+DQ1wA==
 
-import-fresh@^3.0.0, import-fresh@^3.2.1:
+import-fresh@^3.0.0, import-fresh@^3.2.1, import-fresh@^3.3.0:
   version "3.3.0"
   resolved "https://registry.yarnpkg.com/import-fresh/-/import-fresh-3.3.0.tgz#37162c25fcb9ebaa2e6e53d5b4d88ce17d9e0c2b"
   integrity sha512-veYYhQa+D1QBKznvhUHxb8faxlrwUnxseDAbAp457E0wLNio2bOSKnjYDhMj+YiAq61xrMGhQk9iXVk5FzgQMw==
@@ -7383,7 +8028,12 @@ ini@^1.3.5, ini@~1.3.0:
   resolved "https://registry.yarnpkg.com/ini/-/ini-1.3.8.tgz#a29da425b48806f34767a4efce397269af28432c"
   integrity sha512-JV/yugV2uzW5iMRSiZAyDtQd+nxtUnjeLt0acNdw98kKLrvuRVyB80tsREOE7yvGVgalhZ6RNXCmEHkUKBKxew==
 
-inquirer@^6.0.0, inquirer@^6.2.2:
+ini@~3.0.0:
+  version "3.0.1"
+  resolved "https://registry.yarnpkg.com/ini/-/ini-3.0.1.tgz#c76ec81007875bc44d544ff7a11a55d12294102d"
+  integrity sha512-it4HyVAUTKBc6m8e1iXWvXSTdndF7HbdN713+kvLrymxTaU4AUBWrJ4vEooP+V7fexnVD3LKcBshjGGPefSMUQ==
+
+inquirer@^6.0.0:
   version "6.5.2"
   resolved "https://registry.yarnpkg.com/inquirer/-/inquirer-6.5.2.tgz#ad50942375d036d327ff528c08bd5fab089928ca"
   integrity sha512-cntlB5ghuB0iuO65Ovoi8ogLHiWGs/5yNrtUcKjFhSSiVeAIVpD7koaSU9RM8mpXw5YDi9RdYXGQMaOURB7ycQ==
@@ -7402,22 +8052,13 @@ inquirer@^6.0.0, inquirer@^6.2.2:
     strip-ansi "^5.1.0"
     through "^2.3.6"
 
-internal-slot@^1.0.3:
-  version "1.0.3"
-  resolved "https://registry.yarnpkg.com/internal-slot/-/internal-slot-1.0.3.tgz#7347e307deeea2faac2ac6205d4bc7d34967f59c"
-  integrity sha512-O0DB1JC/sPyZl7cIo78n5dR7eUSwwpYPiXRhTzNxZVAMUuB8vlnRFyLxdrVToks6XPLVnFfbzaVd5WLjhgg+vA==
-  dependencies:
-    get-intrinsic "^1.1.0"
-    has "^1.0.3"
-    side-channel "^1.0.4"
-
-internal-slot@^1.0.4:
-  version "1.0.4"
-  resolved "https://registry.yarnpkg.com/internal-slot/-/internal-slot-1.0.4.tgz#8551e7baf74a7a6ba5f749cfb16aa60722f0d6f3"
-  integrity sha512-tA8URYccNzMo94s5MQZgH8NB/XTa6HsOo0MLfXTKKEnHVVdegzaQoFZ7Jp44bdvLvY2waT5dc+j5ICEswhi7UQ==
+internal-slot@^1.0.5:
+  version "1.0.6"
+  resolved "https://registry.yarnpkg.com/internal-slot/-/internal-slot-1.0.6.tgz#37e756098c4911c5e912b8edbf71ed3aa116f930"
+  integrity sha512-Xj6dv+PsbtwyPpEflsejS+oIZxmMlV44zAhG479uYu89MsjcYOhCFnNyKrkJrihbsiasQyY0afoCl/9BLR65bg==
   dependencies:
-    get-intrinsic "^1.1.3"
-    has "^1.0.3"
+    get-intrinsic "^1.2.2"
+    hasown "^2.0.0"
     side-channel "^1.0.4"
 
 interpret@^1.0.0:
@@ -7449,19 +8090,12 @@ ipaddr.js@1.9.1:
   resolved "https://registry.yarnpkg.com/ipaddr.js/-/ipaddr.js-1.9.1.tgz#bff38543eeb8984825079ff3a2a8e6cbd46781b3"
   integrity sha512-0KI/607xoxSToH7GjN1FfSbLoU0+btTicjsQSWQlh/hZykN8KpmMf7uYwPW3R+akZ6R/w18ZlXSHBYXiYUPO3g==
 
-is-accessor-descriptor@^0.1.6:
-  version "0.1.6"
-  resolved "https://registry.yarnpkg.com/is-accessor-descriptor/-/is-accessor-descriptor-0.1.6.tgz#a9e12cb3ae8d876727eeef3843f8a0897b5c98d6"
-  integrity sha512-e1BM1qnDbMRG3ll2U9dSK0UMHuWOs3pY3AtcFsmvwPtKL3MML/Q86i+GilLfvqEs4GW+ExB91tQ3Ig9noDIZ+A==
-  dependencies:
-    kind-of "^3.0.2"
-
-is-accessor-descriptor@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/is-accessor-descriptor/-/is-accessor-descriptor-1.0.0.tgz#169c2f6d3df1f992618072365c9b0ea1f6878656"
-  integrity sha512-m5hnHTkcVsPfqx3AKlyttIPb7J+XykHvJP2B9bZDjlhLIoEq4XoK64Vg7boZlVWYK6LUY94dYPEE7Lh0ZkZKcQ==
+is-accessor-descriptor@^1.0.1:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/is-accessor-descriptor/-/is-accessor-descriptor-1.0.1.tgz#3223b10628354644b86260db29b3e693f5ceedd4"
+  integrity sha512-YBUanLI8Yoihw923YeFUS5fs0fF2f5TSFTNiYAAzhhDscDa3lEqYuz1pDOEP5KvX94I9ey3vsqjJcLVFVU+3QA==
   dependencies:
-    kind-of "^6.0.0"
+    hasown "^2.0.0"
 
 is-arguments@^1.0.4:
   version "1.1.1"
@@ -7471,13 +8105,13 @@ is-arguments@^1.0.4:
     call-bind "^1.0.2"
     has-tostringtag "^1.0.0"
 
-is-array-buffer@^3.0.1:
-  version "3.0.1"
-  resolved "https://registry.yarnpkg.com/is-array-buffer/-/is-array-buffer-3.0.1.tgz#deb1db4fcae48308d54ef2442706c0393997052a"
-  integrity sha512-ASfLknmY8Xa2XtB4wmbz13Wu202baeA18cJBCeCy0wXUHZF0IPyVEXqKEcd+t2fNSLLL1vC6k7lxZEojNbISXQ==
+is-array-buffer@^3.0.1, is-array-buffer@^3.0.2:
+  version "3.0.2"
+  resolved "https://registry.yarnpkg.com/is-array-buffer/-/is-array-buffer-3.0.2.tgz#f2653ced8412081638ecb0ebbd0c41c6e0aecbbe"
+  integrity sha512-y+FyyR/w8vfIRq4eQcM1EYgSTnmHXPqaF+IgzgraytCFq5Xh8lllDVmAZolPJiZttZLeFSINPYMaEJ7/vWUa1w==
   dependencies:
     call-bind "^1.0.2"
-    get-intrinsic "^1.1.3"
+    get-intrinsic "^1.2.0"
     is-typed-array "^1.1.10"
 
 is-arrayish@^0.2.1:
@@ -7512,7 +8146,7 @@ is-buffer@^1.1.5:
   resolved "https://registry.yarnpkg.com/is-buffer/-/is-buffer-1.1.6.tgz#efaa2ea9daa0d7ab2ea13a97b2b8ad51fefbe8be"
   integrity sha512-NcdALwpXkTm5Zvvbk7owOUSvVvBKDgKP5/ewfXEznmQFfs4ZRmanOeKBTjRVjka3QFoN6XJ+9F3USqfHqTaU5w==
 
-is-buffer@^2.0.5, is-buffer@~2.0.3:
+is-buffer@^2.0.5:
   version "2.0.5"
   resolved "https://registry.yarnpkg.com/is-buffer/-/is-buffer-2.0.5.tgz#ebc252e400d22ff8d77fa09888821a24a658c191"
   integrity sha512-i2R6zNFDwgEHJyQUtJEk0XFi1i0dPFn/oqjK3/vPCcDeJvW5NQ83V8QbicfF1SupOaB0h8ntgBC2YiE7dfyctQ==
@@ -7529,33 +8163,19 @@ is-ci@^2.0.0:
   dependencies:
     ci-info "^2.0.0"
 
-is-core-module@^2.11.0:
-  version "2.12.0"
-  resolved "https://registry.yarnpkg.com/is-core-module/-/is-core-module-2.12.0.tgz#36ad62f6f73c8253fd6472517a12483cf03e7ec4"
-  integrity sha512-RECHCBCd/viahWmwj6enj19sKbHfJrddi/6cBDsNTKbNq0f7VeaUkBo60BqzvPqo/W54ChS62Z5qyun7cfOMqQ==
-  dependencies:
-    has "^1.0.3"
-
-is-core-module@^2.9.0:
-  version "2.11.0"
-  resolved "https://registry.yarnpkg.com/is-core-module/-/is-core-module-2.11.0.tgz#ad4cb3e3863e814523c96f3f58d26cc570ff0144"
-  integrity sha512-RRjxlvLDkD1YJwDbroBHMb+cukurkDWNyHx7D3oNB5x9rb5ogcksMC5wHCadcXoo67gVr/+3GFySh3134zi6rw==
+is-core-module@^2.11.0, is-core-module@^2.13.0, is-core-module@^2.13.1:
+  version "2.13.1"
+  resolved "https://registry.yarnpkg.com/is-core-module/-/is-core-module-2.13.1.tgz#ad0d7532c6fea9da1ebdc82742d74525c6273384"
+  integrity sha512-hHrIjvZsftOsvKSn2TRYl63zvxsgE0K+0mYMoH6gD4omR5IWB2KynivBQczo3+wF1cCkjzvptnI9Q0sPU66ilw==
   dependencies:
-    has "^1.0.3"
-
-is-data-descriptor@^0.1.4:
-  version "0.1.4"
-  resolved "https://registry.yarnpkg.com/is-data-descriptor/-/is-data-descriptor-0.1.4.tgz#0b5ee648388e2c860282e793f1856fec3f301b56"
-  integrity sha512-+w9D5ulSoBNlmw9OHn3U2v51SyoCd0he+bB3xMl62oijhrspxowjU+AIcDY0N3iEJbUEkB15IlMASQsxYigvXg==
-  dependencies:
-    kind-of "^3.0.2"
+    hasown "^2.0.0"
 
-is-data-descriptor@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/is-data-descriptor/-/is-data-descriptor-1.0.0.tgz#d84876321d0e7add03990406abbbbd36ba9268c7"
-  integrity sha512-jbRXy1FmtAoCjQkVmIVYwuuqDFUbaOeDjmed1tOGPrsMhtJA4rD9tkgA0F1qJ3gRFRXcHYVkdeaP50Q5rE/jLQ==
+is-data-descriptor@^1.0.1:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/is-data-descriptor/-/is-data-descriptor-1.0.1.tgz#2109164426166d32ea38c405c1e0945d9e6a4eeb"
+  integrity sha512-bc4NlCDiCr28U4aEsQ3Qs2491gVq4V8G7MQyws968ImqjKuYtTJXrl7Vq7jsN7Ly/C3xj5KWFrY7sHNeDkAzXw==
   dependencies:
-    kind-of "^6.0.0"
+    hasown "^2.0.0"
 
 is-date-object@^1.0.1:
   version "1.0.5"
@@ -7565,33 +8185,31 @@ is-date-object@^1.0.1:
     has-tostringtag "^1.0.0"
 
 is-descriptor@^0.1.0:
-  version "0.1.6"
-  resolved "https://registry.yarnpkg.com/is-descriptor/-/is-descriptor-0.1.6.tgz#366d8240dde487ca51823b1ab9f07a10a78251ca"
-  integrity sha512-avDYr0SB3DwO9zsMov0gKCESFYqCnE4hq/4z3TdUlukEy5t9C0YRq7HLrsN52NAcqXKaepeCD0n+B0arnVG3Hg==
+  version "0.1.7"
+  resolved "https://registry.yarnpkg.com/is-descriptor/-/is-descriptor-0.1.7.tgz#2727eb61fd789dcd5bdf0ed4569f551d2fe3be33"
+  integrity sha512-C3grZTvObeN1xud4cRWl366OMXZTj0+HGyk4hvfpx4ZHt1Pb60ANSXqCK7pdOTeUQpRzECBSTphqvD7U+l22Eg==
   dependencies:
-    is-accessor-descriptor "^0.1.6"
-    is-data-descriptor "^0.1.4"
-    kind-of "^5.0.0"
+    is-accessor-descriptor "^1.0.1"
+    is-data-descriptor "^1.0.1"
 
 is-descriptor@^1.0.0, is-descriptor@^1.0.2:
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/is-descriptor/-/is-descriptor-1.0.2.tgz#3b159746a66604b04f8c81524ba365c5f14d86ec"
-  integrity sha512-2eis5WqQGV7peooDyLmNEPUrps9+SXX5c9pL3xEB+4e9HnGuDa7mB7kHxHw4CbqS9k1T2hOH3miL8n8WtiYVtg==
+  version "1.0.3"
+  resolved "https://registry.yarnpkg.com/is-descriptor/-/is-descriptor-1.0.3.tgz#92d27cb3cd311c4977a4db47df457234a13cb306"
+  integrity sha512-JCNNGbwWZEVaSPtS45mdtrneRWJFp07LLmykxeFV5F6oBvNF8vHSfJuJgoT472pSfk+Mf8VnlrspaFBHWM8JAw==
   dependencies:
-    is-accessor-descriptor "^1.0.0"
-    is-data-descriptor "^1.0.0"
-    kind-of "^6.0.2"
-
-is-directory@^0.3.1:
-  version "0.3.1"
-  resolved "https://registry.yarnpkg.com/is-directory/-/is-directory-0.3.1.tgz#61339b6f2475fc772fd9c9d83f5c8575dc154ae1"
-  integrity sha512-yVChGzahRFvbkscn2MlwGismPO12i9+znNruC5gVEntG3qu0xQMzsGg/JFbrsqDOHtHFPci+V5aP5T9I+yeKqw==
+    is-accessor-descriptor "^1.0.1"
+    is-data-descriptor "^1.0.1"
 
 is-docker@^2.0.0:
   version "2.2.1"
   resolved "https://registry.yarnpkg.com/is-docker/-/is-docker-2.2.1.tgz#33eeabe23cfe86f14bde4408a02c0cfb853acdaa"
   integrity sha512-F+i2BKsFrH66iaUFc0woD8sLy8getkwTwtOBjvs56Cx4CgJDeKQeqfz8wAYiSb8JOprWhHH5p77PbmYCvvUuXQ==
 
+is-docker@^3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/is-docker/-/is-docker-3.0.0.tgz#90093aa3106277d8a77a5910dbae71747e15a200"
+  integrity sha512-eljcgEDlEns/7AXFosB5K/2nCM4P7FQPkGc/DWLy5rmFEWvZayGrik1d9/QIY5nJ4f9YsVvBkA6kJpHn9rISdQ==
+
 is-extendable@^0.1.0, is-extendable@^0.1.1:
   version "0.1.1"
   resolved "https://registry.yarnpkg.com/is-extendable/-/is-extendable-0.1.1.tgz#62b110e289a471418e3ec36a617d472e301dfc89"
@@ -7646,7 +8264,7 @@ is-generator-fn@^2.0.0:
   resolved "https://registry.yarnpkg.com/is-generator-fn/-/is-generator-fn-2.1.0.tgz#7d140adc389aaf3011a8f2a2a4cfa6faadffb118"
   integrity sha512-cTIB4yPYL/Grw0EaSzASzg6bBy9gqCofvWN8okThAYIxKJZC+udlRAmGbM0XLeniEJSs8uEgHPGuHSe1XsOLSQ==
 
-is-glob@^4.0.0, is-glob@^4.0.1, is-glob@~4.0.1:
+is-glob@^4.0.0, is-glob@^4.0.1, is-glob@^4.0.3, is-glob@~4.0.1:
   version "4.0.3"
   resolved "https://registry.yarnpkg.com/is-glob/-/is-glob-4.0.3.tgz#64f61e42cbbb2eec2071a9dac0b28ba1e65d5084"
   integrity sha512-xelSayHH36ZgE7ZWhli7pW34hNbNl8Ojv5KVmkJD4hBdD3th8Tfk9vYasLM+mXWOZhFkgZfxhLSnrwRr4elSSg==
@@ -7658,6 +8276,13 @@ is-hex-prefixed@1.0.0:
   resolved "https://registry.yarnpkg.com/is-hex-prefixed/-/is-hex-prefixed-1.0.0.tgz#7d8d37e6ad77e5d127148913c573e082d777f554"
   integrity sha512-WvtOiug1VFrE9v1Cydwm+FnXd3+w9GaeVUss5W4v/SLy3UW00vP+6iNF2SdnfiBoLy4bTqVdkftNGTUeOFVsbA==
 
+is-inside-container@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/is-inside-container/-/is-inside-container-1.0.0.tgz#e81fba699662eb31dbdaf26766a61d4814717ea4"
+  integrity sha512-KIYLCCJghfHZxqjYBE7rEy0OBuTd5xCHS7tHVgvCLkx7StIoaxwNW3hCALgEUjFfeRk+MG/Qxmp/vtETEF3tRA==
+  dependencies:
+    is-docker "^3.0.0"
+
 is-negative-zero@^2.0.2:
   version "2.0.2"
   resolved "https://registry.yarnpkg.com/is-negative-zero/-/is-negative-zero-2.0.2.tgz#7bf6f03a28003b8b3965de3ac26f664d765f3150"
@@ -7682,6 +8307,11 @@ is-number@^7.0.0:
   resolved "https://registry.yarnpkg.com/is-number/-/is-number-7.0.0.tgz#7535345b896734d5f80c4d06c50955527a14f12b"
   integrity sha512-41Cifkg6e8TylSpdtTpeLVMqvSBEVzTttHvERD741+pnZ8ANv0004MRL43QKPDlK9cGvNp6NZWZUBlbGXYxxng==
 
+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"
+  integrity sha512-Fd4gABb+ycGAmKou8eMftCupSir5lRxqf4aD/vd0cD2qc4HL07OjCeuHMr8Ro4CoMaeCKDB0/ECBOVWjTwUvPQ==
+
 is-plain-obj@^2.1.0:
   version "2.1.0"
   resolved "https://registry.yarnpkg.com/is-plain-obj/-/is-plain-obj-2.1.0.tgz#45e42e37fccf1f40da8e5f76ee21515840c09287"
@@ -7719,6 +8349,11 @@ is-stream@^2.0.0:
   resolved "https://registry.yarnpkg.com/is-stream/-/is-stream-2.0.1.tgz#fac1e3d53b97ad5a9d0ae9cef2389f5810a5c077"
   integrity sha512-hFoiJiTl63nn+kstHGBtewWSKnQLpyb155KHheA1l39uvtO9nWIop1p3udqPcUd/xbF1VLMO4n7OI6p7RbngDg==
 
+is-stream@^3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/is-stream/-/is-stream-3.0.0.tgz#e6bfd7aa6bef69f4f472ce9bb681e3e57b4319ac"
+  integrity sha512-LnQR4bZ9IADDRSkvpqMGvt/tEJWclzklNgSw48V5EAaAeDd6qGvN8ei6k5p0tvxSR171VmGyHuTiAOfxAbr8kA==
+
 is-string@^1.0.5, is-string@^1.0.7:
   version "1.0.7"
   resolved "https://registry.yarnpkg.com/is-string/-/is-string-1.0.7.tgz#0dd12bf2006f255bb58f695110eff7491eebc0fd"
@@ -7733,16 +8368,12 @@ is-symbol@^1.0.2, is-symbol@^1.0.3:
   dependencies:
     has-symbols "^1.0.2"
 
-is-typed-array@^1.1.10, is-typed-array@^1.1.9:
-  version "1.1.10"
-  resolved "https://registry.yarnpkg.com/is-typed-array/-/is-typed-array-1.1.10.tgz#36a5b5cb4189b575d1a3e4b08536bfb485801e3f"
-  integrity sha512-PJqgEHiWZvMpaFZ3uTc8kHPM4+4ADTlDniuQL7cU/UDA0Ql7F70yGfHph3cLNe+c9toaigv+DFzTJKhc2CtO6A==
+is-typed-array@^1.1.10, is-typed-array@^1.1.12, is-typed-array@^1.1.9:
+  version "1.1.12"
+  resolved "https://registry.yarnpkg.com/is-typed-array/-/is-typed-array-1.1.12.tgz#d0bab5686ef4a76f7a73097b95470ab199c57d4a"
+  integrity sha512-Z14TF2JNG8Lss5/HMqt0//T9JeHXttXy5pH/DBU4vi98ozO2btxzq9MwYDZYnKwU8nRsz/+GVFVRDq3DkVuSPg==
   dependencies:
-    available-typed-arrays "^1.0.5"
-    call-bind "^1.0.2"
-    for-each "^0.3.3"
-    gopd "^1.0.1"
-    has-tostringtag "^1.0.0"
+    which-typed-array "^1.1.11"
 
 is-typedarray@^1.0.0, is-typedarray@~1.0.0:
   version "1.0.0"
@@ -7776,7 +8407,7 @@ is-windows@^1.0.2:
   resolved "https://registry.yarnpkg.com/is-windows/-/is-windows-1.0.2.tgz#d1850eb9791ecd18e6182ce12a30f396634bb19d"
   integrity sha512-eXK1UInq2bPmjyX6e3VHIzMLobc4J94i4AWn+Hpq3OU5KkrRC96OAcR3PRJ/pGu6m8TRnBHP9dkXQVsT/COVIA==
 
-is-wsl@^2.1.1:
+is-wsl@^2.1.1, is-wsl@^2.2.0:
   version "2.2.0"
   resolved "https://registry.yarnpkg.com/is-wsl/-/is-wsl-2.2.0.tgz#74a4c76e77ca9fd3f932f290c17ea326cd157271"
   integrity sha512-fKzAra0rGJUUBwGBgNkHZuToZcn+TtXHpeCgmkMJMMYx1sQDYaCSyjJBSCa2nH1DGm7s3n1oBnohoVTBaN7Lww==
@@ -7793,6 +8424,11 @@ isarray@1.0.0, isarray@~1.0.0:
   resolved "https://registry.yarnpkg.com/isarray/-/isarray-1.0.0.tgz#bb935d48582cba168c06834957a54a3e07124f11"
   integrity sha512-VLghIWNM6ELQzo7zwmcg0NmTVyWKYjvIeM83yjp0wRDTmUnrM678fQbcKBo6n2CJEF0szoG//ytg+TKla89ALQ==
 
+isarray@^2.0.5:
+  version "2.0.5"
+  resolved "https://registry.yarnpkg.com/isarray/-/isarray-2.0.5.tgz#8af1e4c1221244cc62459faf38940d4e644a5723"
+  integrity sha512-xHjhDr3cNBK0BzdUJSPXZntQUx/mwMS5Rw4A7lPJ90XGAO6ISP/ePDNuo0vhqOZU+UD5JoodwCAAoZQd3FeAKw==
+
 isexe@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/isexe/-/isexe-2.0.0.tgz#e8fbf374dc556ff8947a10dcb0572d633f2cfa10"
@@ -7820,7 +8456,7 @@ istanbul-lib-coverage@^3.0.0, istanbul-lib-coverage@^3.2.0:
   resolved "https://registry.yarnpkg.com/istanbul-lib-coverage/-/istanbul-lib-coverage-3.2.0.tgz#189e7909d0a39fa5a3dfad5b03f71947770191d3"
   integrity sha512-eOeJ5BHCmHYvQK7xt9GkdHuzuCGS1Y6g9Gvnx3Ym33fz/HpLRYxiS0wHNr+m/MBC8B647Xt608vCDEvhl9c6Mw==
 
-istanbul-lib-instrument@^5.0.4, istanbul-lib-instrument@^5.1.0:
+istanbul-lib-instrument@^5.0.4:
   version "5.2.1"
   resolved "https://registry.yarnpkg.com/istanbul-lib-instrument/-/istanbul-lib-instrument-5.2.1.tgz#d10c8885c2125574e1c231cacadf955675e1ce3d"
   integrity sha512-pzqtp31nLv/XFOzXGuvhCb8qhjmTVo5vjVk19XE4CRlSWz0KoeJ3bw9XsA7nOp9YBf4qHjwBxkDzKcME/J29Yg==
@@ -7831,13 +8467,24 @@ istanbul-lib-instrument@^5.0.4, istanbul-lib-instrument@^5.1.0:
     istanbul-lib-coverage "^3.2.0"
     semver "^6.3.0"
 
+istanbul-lib-instrument@^6.0.0:
+  version "6.0.1"
+  resolved "https://registry.yarnpkg.com/istanbul-lib-instrument/-/istanbul-lib-instrument-6.0.1.tgz#71e87707e8041428732518c6fb5211761753fbdf"
+  integrity sha512-EAMEJBsYuyyztxMxW3g7ugGPkrZsV57v0Hmv3mm1uQsmB+QnZuepg731CRaIgeUVSdmsTngOkSnauNF8p7FIhA==
+  dependencies:
+    "@babel/core" "^7.12.3"
+    "@babel/parser" "^7.14.7"
+    "@istanbuljs/schema" "^0.1.2"
+    istanbul-lib-coverage "^3.2.0"
+    semver "^7.5.4"
+
 istanbul-lib-report@^3.0.0:
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/istanbul-lib-report/-/istanbul-lib-report-3.0.0.tgz#7518fe52ea44de372f460a76b5ecda9ffb73d8a6"
-  integrity sha512-wcdi+uAKzfiGT2abPpKZ0hSU1rGQjUQnLvtY5MpQ7QCTahD3VODhcu4wcfY1YtkGaDD5yuydOLINXsfbus9ROw==
+  version "3.0.1"
+  resolved "https://registry.yarnpkg.com/istanbul-lib-report/-/istanbul-lib-report-3.0.1.tgz#908305bac9a5bd175ac6a74489eafd0fc2445a7d"
+  integrity sha512-GCfE1mtsHGOELCU8e/Z7YWzpmybrx/+dSTfLrvY8qRmaY6zXTKWn6WQIjaAFw069icm6GVMNkgu0NzI4iPZUNw==
   dependencies:
     istanbul-lib-coverage "^3.0.0"
-    make-dir "^3.0.0"
+    make-dir "^4.0.0"
     supports-color "^7.1.0"
 
 istanbul-lib-source-maps@^4.0.0:
@@ -7850,389 +8497,391 @@ istanbul-lib-source-maps@^4.0.0:
     source-map "^0.6.1"
 
 istanbul-reports@^3.1.3:
-  version "3.1.5"
-  resolved "https://registry.yarnpkg.com/istanbul-reports/-/istanbul-reports-3.1.5.tgz#cc9a6ab25cb25659810e4785ed9d9fb742578bae"
-  integrity sha512-nUsEMa9pBt/NOHqbcbeJEgqIlY/K7rVWUX6Lql2orY5e9roQOthbR3vtY4zzf2orPELg80fnxxk9zUyPlgwD1w==
+  version "3.1.6"
+  resolved "https://registry.yarnpkg.com/istanbul-reports/-/istanbul-reports-3.1.6.tgz#2544bcab4768154281a2f0870471902704ccaa1a"
+  integrity sha512-TLgnMkKg3iTDsQ9PbPTdpfAK2DzjF9mqUG7RMgcQl8oFjad8ob4laGxv5XV5U9MAfx8D6tSJiUyuAwzLicaxlg==
   dependencies:
     html-escaper "^2.0.0"
     istanbul-lib-report "^3.0.0"
 
-jest-changed-files@^29.2.0:
-  version "29.2.0"
-  resolved "https://registry.yarnpkg.com/jest-changed-files/-/jest-changed-files-29.2.0.tgz#b6598daa9803ea6a4dce7968e20ab380ddbee289"
-  integrity sha512-qPVmLLyBmvF5HJrY7krDisx6Voi8DmlV3GZYX0aFNbaQsZeoz1hfxcCMbqDGuQCxU1dJy9eYc2xscE8QrCCYaA==
+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"
+  integrity sha512-fEArFiwf1BpQ+4bXSprcDc3/x4HSzL4al2tozwVpDFpsxALjLYdyiIK4e5Vz66GQJIbXJ82+35PtysofptNX2w==
   dependencies:
     execa "^5.0.0"
+    jest-util "^29.7.0"
     p-limit "^3.1.0"
 
-jest-circus@^29.2.2:
-  version "29.2.2"
-  resolved "https://registry.yarnpkg.com/jest-circus/-/jest-circus-29.2.2.tgz#1dc4d35fd49bf5e64d3cc505fb2db396237a6dfa"
-  integrity sha512-upSdWxx+Mh4DV7oueuZndJ1NVdgtTsqM4YgywHEx05UMH5nxxA2Qu9T9T9XVuR021XxqSoaKvSmmpAbjwwwxMw==
+jest-circus@^29.7.0:
+  version "29.7.0"
+  resolved "https://registry.yarnpkg.com/jest-circus/-/jest-circus-29.7.0.tgz#b6817a45fcc835d8b16d5962d0c026473ee3668a"
+  integrity sha512-3E1nCMgipcTkCocFwM90XXQab9bS+GMsjdpmPrlelaxwD93Ad8iVEjX/vvHPdLPnFf+L40u+5+iutRdA1N9myw==
   dependencies:
-    "@jest/environment" "^29.2.2"
-    "@jest/expect" "^29.2.2"
-    "@jest/test-result" "^29.2.1"
-    "@jest/types" "^29.2.1"
+    "@jest/environment" "^29.7.0"
+    "@jest/expect" "^29.7.0"
+    "@jest/test-result" "^29.7.0"
+    "@jest/types" "^29.6.3"
     "@types/node" "*"
     chalk "^4.0.0"
     co "^4.6.0"
-    dedent "^0.7.0"
+    dedent "^1.0.0"
     is-generator-fn "^2.0.0"
-    jest-each "^29.2.1"
-    jest-matcher-utils "^29.2.2"
-    jest-message-util "^29.2.1"
-    jest-runtime "^29.2.2"
-    jest-snapshot "^29.2.2"
-    jest-util "^29.2.1"
+    jest-each "^29.7.0"
+    jest-matcher-utils "^29.7.0"
+    jest-message-util "^29.7.0"
+    jest-runtime "^29.7.0"
+    jest-snapshot "^29.7.0"
+    jest-util "^29.7.0"
     p-limit "^3.1.0"
-    pretty-format "^29.2.1"
+    pretty-format "^29.7.0"
+    pure-rand "^6.0.0"
     slash "^3.0.0"
     stack-utils "^2.0.3"
 
-jest-cli@^29.2.2:
-  version "29.2.2"
-  resolved "https://registry.yarnpkg.com/jest-cli/-/jest-cli-29.2.2.tgz#feaf0aa57d327e80d4f2f18d5f8cd2e77cac5371"
-  integrity sha512-R45ygnnb2CQOfd8rTPFR+/fls0d+1zXS6JPYTBBrnLPrhr58SSuPTiA5Tplv8/PXpz4zXR/AYNxmwIj6J6nrvg==
+jest-cli@^29.7.0:
+  version "29.7.0"
+  resolved "https://registry.yarnpkg.com/jest-cli/-/jest-cli-29.7.0.tgz#5592c940798e0cae677eec169264f2d839a37995"
+  integrity sha512-OVVobw2IubN/GSYsxETi+gOe7Ka59EFMR/twOU3Jb2GnKKeMGJB5SGUUrEz3SFVmJASUdZUzy83sLNNQ2gZslg==
   dependencies:
-    "@jest/core" "^29.2.2"
-    "@jest/test-result" "^29.2.1"
-    "@jest/types" "^29.2.1"
+    "@jest/core" "^29.7.0"
+    "@jest/test-result" "^29.7.0"
+    "@jest/types" "^29.6.3"
     chalk "^4.0.0"
+    create-jest "^29.7.0"
     exit "^0.1.2"
-    graceful-fs "^4.2.9"
     import-local "^3.0.2"
-    jest-config "^29.2.2"
-    jest-util "^29.2.1"
-    jest-validate "^29.2.2"
-    prompts "^2.0.1"
+    jest-config "^29.7.0"
+    jest-util "^29.7.0"
+    jest-validate "^29.7.0"
     yargs "^17.3.1"
 
-jest-config@^29.2.2:
-  version "29.2.2"
-  resolved "https://registry.yarnpkg.com/jest-config/-/jest-config-29.2.2.tgz#bf98623a46454d644630c1f0de8bba3f495c2d59"
-  integrity sha512-Q0JX54a5g1lP63keRfKR8EuC7n7wwny2HoTRDb8cx78IwQOiaYUVZAdjViY3WcTxpR02rPUpvNVmZ1fkIlZPcw==
+jest-config@^29.7.0:
+  version "29.7.0"
+  resolved "https://registry.yarnpkg.com/jest-config/-/jest-config-29.7.0.tgz#bcbda8806dbcc01b1e316a46bb74085a84b0245f"
+  integrity sha512-uXbpfeQ7R6TZBqI3/TxCU4q4ttk3u0PJeC+E0zbfSoSjq6bJ7buBPxzQPL0ifrkY4DNu4JUdk0ImlBUYi840eQ==
   dependencies:
     "@babel/core" "^7.11.6"
-    "@jest/test-sequencer" "^29.2.2"
-    "@jest/types" "^29.2.1"
-    babel-jest "^29.2.2"
+    "@jest/test-sequencer" "^29.7.0"
+    "@jest/types" "^29.6.3"
+    babel-jest "^29.7.0"
     chalk "^4.0.0"
     ci-info "^3.2.0"
     deepmerge "^4.2.2"
     glob "^7.1.3"
     graceful-fs "^4.2.9"
-    jest-circus "^29.2.2"
-    jest-environment-node "^29.2.2"
-    jest-get-type "^29.2.0"
-    jest-regex-util "^29.2.0"
-    jest-resolve "^29.2.2"
-    jest-runner "^29.2.2"
-    jest-util "^29.2.1"
-    jest-validate "^29.2.2"
+    jest-circus "^29.7.0"
+    jest-environment-node "^29.7.0"
+    jest-get-type "^29.6.3"
+    jest-regex-util "^29.6.3"
+    jest-resolve "^29.7.0"
+    jest-runner "^29.7.0"
+    jest-util "^29.7.0"
+    jest-validate "^29.7.0"
     micromatch "^4.0.4"
     parse-json "^5.2.0"
-    pretty-format "^29.2.1"
+    pretty-format "^29.7.0"
     slash "^3.0.0"
     strip-json-comments "^3.1.1"
 
-jest-diff@^29.2.1:
-  version "29.2.1"
-  resolved "https://registry.yarnpkg.com/jest-diff/-/jest-diff-29.2.1.tgz#027e42f5a18b693fb2e88f81b0ccab533c08faee"
-  integrity sha512-gfh/SMNlQmP3MOUgdzxPOd4XETDJifADpT937fN1iUGz+9DgOu2eUPHH25JDkLVcLwwqxv3GzVyK4VBUr9fjfA==
+jest-diff@^29.7.0:
+  version "29.7.0"
+  resolved "https://registry.yarnpkg.com/jest-diff/-/jest-diff-29.7.0.tgz#017934a66ebb7ecf6f205e84699be10afd70458a"
+  integrity sha512-LMIgiIrhigmPrs03JHpxUh2yISK3vLFPkAodPeo0+BuF7wA2FoQbkEg1u8gBYBThncu7e1oEDUfIXVuTqLRUjw==
   dependencies:
     chalk "^4.0.0"
-    diff-sequences "^29.2.0"
-    jest-get-type "^29.2.0"
-    pretty-format "^29.2.1"
+    diff-sequences "^29.6.3"
+    jest-get-type "^29.6.3"
+    pretty-format "^29.7.0"
 
-jest-docblock@^29.2.0:
-  version "29.2.0"
-  resolved "https://registry.yarnpkg.com/jest-docblock/-/jest-docblock-29.2.0.tgz#307203e20b637d97cee04809efc1d43afc641e82"
-  integrity sha512-bkxUsxTgWQGbXV5IENmfiIuqZhJcyvF7tU4zJ/7ioTutdz4ToB5Yx6JOFBpgI+TphRY4lhOyCWGNH/QFQh5T6A==
+jest-docblock@^29.7.0:
+  version "29.7.0"
+  resolved "https://registry.yarnpkg.com/jest-docblock/-/jest-docblock-29.7.0.tgz#8fddb6adc3cdc955c93e2a87f61cfd350d5d119a"
+  integrity sha512-q617Auw3A612guyaFgsbFeYpNP5t2aoUNLwBUbc/0kD1R4t9ixDbyFTHd1nok4epoVFpr7PmeWHrhvuV3XaJ4g==
   dependencies:
     detect-newline "^3.0.0"
 
-jest-each@^29.2.1:
-  version "29.2.1"
-  resolved "https://registry.yarnpkg.com/jest-each/-/jest-each-29.2.1.tgz#6b0a88ee85c2ba27b571a6010c2e0c674f5c9b29"
-  integrity sha512-sGP86H/CpWHMyK3qGIGFCgP6mt+o5tu9qG4+tobl0LNdgny0aitLXs9/EBacLy3Bwqy+v4uXClqJgASJWcruYw==
+jest-each@^29.7.0:
+  version "29.7.0"
+  resolved "https://registry.yarnpkg.com/jest-each/-/jest-each-29.7.0.tgz#162a9b3f2328bdd991beaabffbb74745e56577d1"
+  integrity sha512-gns+Er14+ZrEoC5fhOfYCY1LOHHr0TI+rQUHZS8Ttw2l7gl+80eHc/gFf2Ktkw0+SIACDTeWvpFcv3B04VembQ==
   dependencies:
-    "@jest/types" "^29.2.1"
+    "@jest/types" "^29.6.3"
     chalk "^4.0.0"
-    jest-get-type "^29.2.0"
-    jest-util "^29.2.1"
-    pretty-format "^29.2.1"
-
-jest-environment-node@^29.2.2:
-  version "29.2.2"
-  resolved "https://registry.yarnpkg.com/jest-environment-node/-/jest-environment-node-29.2.2.tgz#a64b272773870c3a947cd338c25fd34938390bc2"
-  integrity sha512-B7qDxQjkIakQf+YyrqV5dICNs7tlCO55WJ4OMSXsqz1lpI/0PmeuXdx2F7eU8rnPbRkUR/fItSSUh0jvE2y/tw==
-  dependencies:
-    "@jest/environment" "^29.2.2"
-    "@jest/fake-timers" "^29.2.2"
-    "@jest/types" "^29.2.1"
+    jest-get-type "^29.6.3"
+    jest-util "^29.7.0"
+    pretty-format "^29.7.0"
+
+jest-environment-node@^29.7.0:
+  version "29.7.0"
+  resolved "https://registry.yarnpkg.com/jest-environment-node/-/jest-environment-node-29.7.0.tgz#0b93e111dda8ec120bc8300e6d1fb9576e164376"
+  integrity sha512-DOSwCRqXirTOyheM+4d5YZOrWcdu0LNZ87ewUoywbcb2XR4wKgqiG8vNeYwhjFMbEkfju7wx2GYH0P2gevGvFw==
+  dependencies:
+    "@jest/environment" "^29.7.0"
+    "@jest/fake-timers" "^29.7.0"
+    "@jest/types" "^29.6.3"
     "@types/node" "*"
-    jest-mock "^29.2.2"
-    jest-util "^29.2.1"
+    jest-mock "^29.7.0"
+    jest-util "^29.7.0"
 
-jest-get-type@^29.2.0:
-  version "29.2.0"
-  resolved "https://registry.yarnpkg.com/jest-get-type/-/jest-get-type-29.2.0.tgz#726646f927ef61d583a3b3adb1ab13f3a5036408"
-  integrity sha512-uXNJlg8hKFEnDgFsrCjznB+sTxdkuqiCL6zMgA75qEbAJjJYTs9XPrvDctrEig2GDow22T/LvHgO57iJhXB/UA==
+jest-get-type@^29.6.3:
+  version "29.6.3"
+  resolved "https://registry.yarnpkg.com/jest-get-type/-/jest-get-type-29.6.3.tgz#36f499fdcea197c1045a127319c0481723908fd1"
+  integrity sha512-zrteXnqYxfQh7l5FHyL38jL39di8H8rHoecLH3JNxH3BwOrBsNeabdap5e0I23lD4HHI8W5VFBZqG4Eaq5LNcw==
 
-jest-haste-map@^29.2.1:
-  version "29.2.1"
-  resolved "https://registry.yarnpkg.com/jest-haste-map/-/jest-haste-map-29.2.1.tgz#f803fec57f8075e6c55fb5cd551f99a72471c699"
-  integrity sha512-wF460rAFmYc6ARcCFNw4MbGYQjYkvjovb9GBT+W10Um8q5nHq98jD6fHZMDMO3tA56S8XnmNkM8GcA8diSZfnA==
+jest-haste-map@^29.7.0:
+  version "29.7.0"
+  resolved "https://registry.yarnpkg.com/jest-haste-map/-/jest-haste-map-29.7.0.tgz#3c2396524482f5a0506376e6c858c3bbcc17b104"
+  integrity sha512-fP8u2pyfqx0K1rGn1R9pyE0/KTn+G7PxktWidOBTqFPLYX0b9ksaMFkhK5vrS3DVun09pckLdlx90QthlW7AmA==
   dependencies:
-    "@jest/types" "^29.2.1"
+    "@jest/types" "^29.6.3"
     "@types/graceful-fs" "^4.1.3"
     "@types/node" "*"
     anymatch "^3.0.3"
     fb-watchman "^2.0.0"
     graceful-fs "^4.2.9"
-    jest-regex-util "^29.2.0"
-    jest-util "^29.2.1"
-    jest-worker "^29.2.1"
+    jest-regex-util "^29.6.3"
+    jest-util "^29.7.0"
+    jest-worker "^29.7.0"
     micromatch "^4.0.4"
     walker "^1.0.8"
   optionalDependencies:
     fsevents "^2.3.2"
 
-jest-leak-detector@^29.2.1:
-  version "29.2.1"
-  resolved "https://registry.yarnpkg.com/jest-leak-detector/-/jest-leak-detector-29.2.1.tgz#ec551686b7d512ec875616c2c3534298b1ffe2fc"
-  integrity sha512-1YvSqYoiurxKOJtySc+CGVmw/e1v4yNY27BjWTVzp0aTduQeA7pdieLiW05wTYG/twlKOp2xS/pWuikQEmklug==
+jest-leak-detector@^29.7.0:
+  version "29.7.0"
+  resolved "https://registry.yarnpkg.com/jest-leak-detector/-/jest-leak-detector-29.7.0.tgz#5b7ec0dadfdfec0ca383dc9aa016d36b5ea4c728"
+  integrity sha512-kYA8IJcSYtST2BY9I+SMC32nDpBT3J2NvWJx8+JCuCdl/CR1I4EKUJROiP8XtCcxqgTTBGJNdbB1A8XRKbTetw==
   dependencies:
-    jest-get-type "^29.2.0"
-    pretty-format "^29.2.1"
+    jest-get-type "^29.6.3"
+    pretty-format "^29.7.0"
 
-jest-matcher-utils@^29.0.3, jest-matcher-utils@^29.2.2:
-  version "29.2.2"
-  resolved "https://registry.yarnpkg.com/jest-matcher-utils/-/jest-matcher-utils-29.2.2.tgz#9202f8e8d3a54733266784ce7763e9a08688269c"
-  integrity sha512-4DkJ1sDPT+UX2MR7Y3od6KtvRi9Im1ZGLGgdLFLm4lPexbTaCgJW5NN3IOXlQHF7NSHY/VHhflQ+WoKtD/vyCw==
+jest-matcher-utils@^29.0.3, jest-matcher-utils@^29.7.0:
+  version "29.7.0"
+  resolved "https://registry.yarnpkg.com/jest-matcher-utils/-/jest-matcher-utils-29.7.0.tgz#ae8fec79ff249fd592ce80e3ee474e83a6c44f12"
+  integrity sha512-sBkD+Xi9DtcChsI3L3u0+N0opgPYnCRPtGcQYrgXmR+hmt/fYfWAL0xRXYU8eWOdfuLgBe0YCW3AFtnRLagq/g==
   dependencies:
     chalk "^4.0.0"
-    jest-diff "^29.2.1"
-    jest-get-type "^29.2.0"
-    pretty-format "^29.2.1"
+    jest-diff "^29.7.0"
+    jest-get-type "^29.6.3"
+    pretty-format "^29.7.0"
 
-jest-message-util@^29.2.1:
-  version "29.2.1"
-  resolved "https://registry.yarnpkg.com/jest-message-util/-/jest-message-util-29.2.1.tgz#3a51357fbbe0cc34236f17a90d772746cf8d9193"
-  integrity sha512-Dx5nEjw9V8C1/Yj10S/8ivA8F439VS8vTq1L7hEgwHFn9ovSKNpYW/kwNh7UglaEgXO42XxzKJB+2x0nSglFVw==
+jest-message-util@^29.7.0:
+  version "29.7.0"
+  resolved "https://registry.yarnpkg.com/jest-message-util/-/jest-message-util-29.7.0.tgz#8bc392e204e95dfe7564abbe72a404e28e51f7f3"
+  integrity sha512-GBEV4GRADeP+qtB2+6u61stea8mGcOT4mCtrYISZwfu9/ISHFJ/5zOMXYbpBE9RsS5+Gb63DW4FgmnKJ79Kf6w==
   dependencies:
     "@babel/code-frame" "^7.12.13"
-    "@jest/types" "^29.2.1"
+    "@jest/types" "^29.6.3"
     "@types/stack-utils" "^2.0.0"
     chalk "^4.0.0"
     graceful-fs "^4.2.9"
     micromatch "^4.0.4"
-    pretty-format "^29.2.1"
+    pretty-format "^29.7.0"
     slash "^3.0.0"
     stack-utils "^2.0.3"
 
-jest-mock@^29.2.2:
-  version "29.2.2"
-  resolved "https://registry.yarnpkg.com/jest-mock/-/jest-mock-29.2.2.tgz#9045618b3f9d27074bbcf2d55bdca6a5e2e8bca7"
-  integrity sha512-1leySQxNAnivvbcx0sCB37itu8f4OX2S/+gxLAV4Z62shT4r4dTG9tACDywUAEZoLSr36aYUTsVp3WKwWt4PMQ==
+jest-mock@^29.7.0:
+  version "29.7.0"
+  resolved "https://registry.yarnpkg.com/jest-mock/-/jest-mock-29.7.0.tgz#4e836cf60e99c6fcfabe9f99d017f3fdd50a6347"
+  integrity sha512-ITOMZn+UkYS4ZFh83xYAOzWStloNzJFO2s8DWrE4lhtGD+AorgnbkiKERe4wQVBydIGPx059g6riW5Btp6Llnw==
   dependencies:
-    "@jest/types" "^29.2.1"
+    "@jest/types" "^29.6.3"
     "@types/node" "*"
-    jest-util "^29.2.1"
+    jest-util "^29.7.0"
 
 jest-pnp-resolver@^1.2.2:
-  version "1.2.2"
-  resolved "https://registry.yarnpkg.com/jest-pnp-resolver/-/jest-pnp-resolver-1.2.2.tgz#b704ac0ae028a89108a4d040b3f919dfddc8e33c"
-  integrity sha512-olV41bKSMm8BdnuMsewT4jqlZ8+3TCARAXjZGT9jcoSnrfUnRCqnMoF9XEeoWjbzObpqF9dRhHQj0Xb9QdF6/w==
+  version "1.2.3"
+  resolved "https://registry.yarnpkg.com/jest-pnp-resolver/-/jest-pnp-resolver-1.2.3.tgz#930b1546164d4ad5937d5540e711d4d38d4cad2e"
+  integrity sha512-+3NpwQEnRoIBtx4fyhblQDPgJI0H1IEIkX7ShLUjPGA7TtUTvI1oiKi3SR4oBR0hQhQR80l4WAe5RrXBwWMA8w==
 
-jest-regex-util@^29.2.0:
-  version "29.2.0"
-  resolved "https://registry.yarnpkg.com/jest-regex-util/-/jest-regex-util-29.2.0.tgz#82ef3b587e8c303357728d0322d48bbfd2971f7b"
-  integrity sha512-6yXn0kg2JXzH30cr2NlThF+70iuO/3irbaB4mh5WyqNIvLLP+B6sFdluO1/1RJmslyh/f9osnefECflHvTbwVA==
+jest-regex-util@^29.6.3:
+  version "29.6.3"
+  resolved "https://registry.yarnpkg.com/jest-regex-util/-/jest-regex-util-29.6.3.tgz#4a556d9c776af68e1c5f48194f4d0327d24e8a52"
+  integrity sha512-KJJBsRCyyLNWCNBOvZyRDnAIfUiRJ8v+hOBQYGn8gDyF3UegwiP4gwRR3/SDa42g1YbVycTidUF3rKjyLFDWbg==
 
-jest-resolve-dependencies@^29.2.2:
-  version "29.2.2"
-  resolved "https://registry.yarnpkg.com/jest-resolve-dependencies/-/jest-resolve-dependencies-29.2.2.tgz#1f444766f37a25f1490b5137408b6ff746a05d64"
-  integrity sha512-wWOmgbkbIC2NmFsq8Lb+3EkHuW5oZfctffTGvwsA4JcJ1IRk8b2tg+hz44f0lngvRTeHvp3Kyix9ACgudHH9aQ==
+jest-resolve-dependencies@^29.7.0:
+  version "29.7.0"
+  resolved "https://registry.yarnpkg.com/jest-resolve-dependencies/-/jest-resolve-dependencies-29.7.0.tgz#1b04f2c095f37fc776ff40803dc92921b1e88428"
+  integrity sha512-un0zD/6qxJ+S0et7WxeI3H5XSe9lTBBR7bOHCHXkKR6luG5mwDDlIzVQ0V5cZCuoTgEdcdwzTghYkTWfubi+nA==
   dependencies:
-    jest-regex-util "^29.2.0"
-    jest-snapshot "^29.2.2"
+    jest-regex-util "^29.6.3"
+    jest-snapshot "^29.7.0"
 
-jest-resolve@^29.2.2:
-  version "29.2.2"
-  resolved "https://registry.yarnpkg.com/jest-resolve/-/jest-resolve-29.2.2.tgz#ad6436053b0638b41e12bbddde2b66e1397b35b5"
-  integrity sha512-3gaLpiC3kr14rJR3w7vWh0CBX2QAhfpfiQTwrFPvVrcHe5VUBtIXaR004aWE/X9B2CFrITOQAp5gxLONGrk6GA==
+jest-resolve@^29.7.0:
+  version "29.7.0"
+  resolved "https://registry.yarnpkg.com/jest-resolve/-/jest-resolve-29.7.0.tgz#64d6a8992dd26f635ab0c01e5eef4399c6bcbc30"
+  integrity sha512-IOVhZSrg+UvVAshDSDtHyFCCBUl/Q3AAJv8iZ6ZjnZ74xzvwuzLXid9IIIPgTnY62SJjfuupMKZsZQRsCvxEgA==
   dependencies:
     chalk "^4.0.0"
     graceful-fs "^4.2.9"
-    jest-haste-map "^29.2.1"
+    jest-haste-map "^29.7.0"
     jest-pnp-resolver "^1.2.2"
-    jest-util "^29.2.1"
-    jest-validate "^29.2.2"
+    jest-util "^29.7.0"
+    jest-validate "^29.7.0"
     resolve "^1.20.0"
-    resolve.exports "^1.1.0"
+    resolve.exports "^2.0.0"
     slash "^3.0.0"
 
-jest-runner@^29.2.2:
-  version "29.2.2"
-  resolved "https://registry.yarnpkg.com/jest-runner/-/jest-runner-29.2.2.tgz#6b5302ed15eba8bf05e6b14d40f1e8d469564da3"
-  integrity sha512-1CpUxXDrbsfy9Hr9/1zCUUhT813kGGK//58HeIw/t8fa/DmkecEwZSWlb1N/xDKXg3uCFHQp1GCvlSClfImMxg==
+jest-runner@^29.7.0:
+  version "29.7.0"
+  resolved "https://registry.yarnpkg.com/jest-runner/-/jest-runner-29.7.0.tgz#809af072d408a53dcfd2e849a4c976d3132f718e"
+  integrity sha512-fsc4N6cPCAahybGBfTRcq5wFR6fpLznMg47sY5aDpsoejOcVYFb07AHuSnR0liMcPTgBsA3ZJL6kFOjPdoNipQ==
   dependencies:
-    "@jest/console" "^29.2.1"
-    "@jest/environment" "^29.2.2"
-    "@jest/test-result" "^29.2.1"
-    "@jest/transform" "^29.2.2"
-    "@jest/types" "^29.2.1"
+    "@jest/console" "^29.7.0"
+    "@jest/environment" "^29.7.0"
+    "@jest/test-result" "^29.7.0"
+    "@jest/transform" "^29.7.0"
+    "@jest/types" "^29.6.3"
     "@types/node" "*"
     chalk "^4.0.0"
     emittery "^0.13.1"
     graceful-fs "^4.2.9"
-    jest-docblock "^29.2.0"
-    jest-environment-node "^29.2.2"
-    jest-haste-map "^29.2.1"
-    jest-leak-detector "^29.2.1"
-    jest-message-util "^29.2.1"
-    jest-resolve "^29.2.2"
-    jest-runtime "^29.2.2"
-    jest-util "^29.2.1"
-    jest-watcher "^29.2.2"
-    jest-worker "^29.2.1"
+    jest-docblock "^29.7.0"
+    jest-environment-node "^29.7.0"
+    jest-haste-map "^29.7.0"
+    jest-leak-detector "^29.7.0"
+    jest-message-util "^29.7.0"
+    jest-resolve "^29.7.0"
+    jest-runtime "^29.7.0"
+    jest-util "^29.7.0"
+    jest-watcher "^29.7.0"
+    jest-worker "^29.7.0"
     p-limit "^3.1.0"
     source-map-support "0.5.13"
 
-jest-runtime@^29.2.2:
-  version "29.2.2"
-  resolved "https://registry.yarnpkg.com/jest-runtime/-/jest-runtime-29.2.2.tgz#4068ee82423769a481460efd21d45a8efaa5c179"
-  integrity sha512-TpR1V6zRdLynckKDIQaY41od4o0xWL+KOPUCZvJK2bu5P1UXhjobt5nJ2ICNeIxgyj9NGkO0aWgDqYPVhDNKjA==
-  dependencies:
-    "@jest/environment" "^29.2.2"
-    "@jest/fake-timers" "^29.2.2"
-    "@jest/globals" "^29.2.2"
-    "@jest/source-map" "^29.2.0"
-    "@jest/test-result" "^29.2.1"
-    "@jest/transform" "^29.2.2"
-    "@jest/types" "^29.2.1"
+jest-runtime@^29.7.0:
+  version "29.7.0"
+  resolved "https://registry.yarnpkg.com/jest-runtime/-/jest-runtime-29.7.0.tgz#efecb3141cf7d3767a3a0cc8f7c9990587d3d817"
+  integrity sha512-gUnLjgwdGqW7B4LvOIkbKs9WGbn+QLqRQQ9juC6HndeDiezIwhDP+mhMwHWCEcfQ5RUXa6OPnFF8BJh5xegwwQ==
+  dependencies:
+    "@jest/environment" "^29.7.0"
+    "@jest/fake-timers" "^29.7.0"
+    "@jest/globals" "^29.7.0"
+    "@jest/source-map" "^29.6.3"
+    "@jest/test-result" "^29.7.0"
+    "@jest/transform" "^29.7.0"
+    "@jest/types" "^29.6.3"
     "@types/node" "*"
     chalk "^4.0.0"
     cjs-module-lexer "^1.0.0"
     collect-v8-coverage "^1.0.0"
     glob "^7.1.3"
     graceful-fs "^4.2.9"
-    jest-haste-map "^29.2.1"
-    jest-message-util "^29.2.1"
-    jest-mock "^29.2.2"
-    jest-regex-util "^29.2.0"
-    jest-resolve "^29.2.2"
-    jest-snapshot "^29.2.2"
-    jest-util "^29.2.1"
+    jest-haste-map "^29.7.0"
+    jest-message-util "^29.7.0"
+    jest-mock "^29.7.0"
+    jest-regex-util "^29.6.3"
+    jest-resolve "^29.7.0"
+    jest-snapshot "^29.7.0"
+    jest-util "^29.7.0"
     slash "^3.0.0"
     strip-bom "^4.0.0"
 
-jest-snapshot@^29.2.2:
-  version "29.2.2"
-  resolved "https://registry.yarnpkg.com/jest-snapshot/-/jest-snapshot-29.2.2.tgz#1016ce60297b77382386bad561107174604690c2"
-  integrity sha512-GfKJrpZ5SMqhli3NJ+mOspDqtZfJBryGA8RIBxF+G+WbDoC7HCqKaeAss4Z/Sab6bAW11ffasx8/vGsj83jyjA==
+jest-snapshot@^29.7.0:
+  version "29.7.0"
+  resolved "https://registry.yarnpkg.com/jest-snapshot/-/jest-snapshot-29.7.0.tgz#c2c574c3f51865da1bb329036778a69bf88a6be5"
+  integrity sha512-Rm0BMWtxBcioHr1/OX5YCP8Uov4riHvKPknOGs804Zg9JGZgmIBkbtlxJC/7Z4msKYVbIJtfU+tKb8xlYNfdkw==
   dependencies:
     "@babel/core" "^7.11.6"
     "@babel/generator" "^7.7.2"
     "@babel/plugin-syntax-jsx" "^7.7.2"
     "@babel/plugin-syntax-typescript" "^7.7.2"
-    "@babel/traverse" "^7.7.2"
     "@babel/types" "^7.3.3"
-    "@jest/expect-utils" "^29.2.2"
-    "@jest/transform" "^29.2.2"
-    "@jest/types" "^29.2.1"
-    "@types/babel__traverse" "^7.0.6"
-    "@types/prettier" "^2.1.5"
+    "@jest/expect-utils" "^29.7.0"
+    "@jest/transform" "^29.7.0"
+    "@jest/types" "^29.6.3"
     babel-preset-current-node-syntax "^1.0.0"
     chalk "^4.0.0"
-    expect "^29.2.2"
+    expect "^29.7.0"
     graceful-fs "^4.2.9"
-    jest-diff "^29.2.1"
-    jest-get-type "^29.2.0"
-    jest-haste-map "^29.2.1"
-    jest-matcher-utils "^29.2.2"
-    jest-message-util "^29.2.1"
-    jest-util "^29.2.1"
+    jest-diff "^29.7.0"
+    jest-get-type "^29.6.3"
+    jest-matcher-utils "^29.7.0"
+    jest-message-util "^29.7.0"
+    jest-util "^29.7.0"
     natural-compare "^1.4.0"
-    pretty-format "^29.2.1"
-    semver "^7.3.5"
+    pretty-format "^29.7.0"
+    semver "^7.5.3"
 
-jest-util@^29.0.0, jest-util@^29.2.1:
-  version "29.2.1"
-  resolved "https://registry.yarnpkg.com/jest-util/-/jest-util-29.2.1.tgz#f26872ba0dc8cbefaba32c34f98935f6cf5fc747"
-  integrity sha512-P5VWDj25r7kj7kl4pN2rG/RN2c1TLfYYYZYULnS/35nFDjBai+hBeo3MDrYZS7p6IoY3YHZnt2vq4L6mKnLk0g==
+jest-util@^29.0.0, jest-util@^29.7.0:
+  version "29.7.0"
+  resolved "https://registry.yarnpkg.com/jest-util/-/jest-util-29.7.0.tgz#23c2b62bfb22be82b44de98055802ff3710fc0bc"
+  integrity sha512-z6EbKajIpqGKU56y5KBUgy1dt1ihhQJgWzUlZHArA/+X2ad7Cb5iF+AK1EWVL/Bo7Rz9uurpqw6SiBCefUbCGA==
   dependencies:
-    "@jest/types" "^29.2.1"
+    "@jest/types" "^29.6.3"
     "@types/node" "*"
     chalk "^4.0.0"
     ci-info "^3.2.0"
     graceful-fs "^4.2.9"
     picomatch "^2.2.3"
 
-jest-validate@^29.2.2:
-  version "29.2.2"
-  resolved "https://registry.yarnpkg.com/jest-validate/-/jest-validate-29.2.2.tgz#e43ce1931292dfc052562a11bc681af3805eadce"
-  integrity sha512-eJXATaKaSnOuxNfs8CLHgdABFgUrd0TtWS8QckiJ4L/QVDF4KVbZFBBOwCBZHOS0Rc5fOxqngXeGXE3nGQkpQA==
+jest-validate@^29.7.0:
+  version "29.7.0"
+  resolved "https://registry.yarnpkg.com/jest-validate/-/jest-validate-29.7.0.tgz#7bf705511c64da591d46b15fce41400d52147d9c"
+  integrity sha512-ZB7wHqaRGVw/9hST/OuFUReG7M8vKeq0/J2egIGLdvjHCmYqGARhzXmtgi+gVeZ5uXFF219aOc3Ls2yLg27tkw==
   dependencies:
-    "@jest/types" "^29.2.1"
+    "@jest/types" "^29.6.3"
     camelcase "^6.2.0"
     chalk "^4.0.0"
-    jest-get-type "^29.2.0"
+    jest-get-type "^29.6.3"
     leven "^3.1.0"
-    pretty-format "^29.2.1"
+    pretty-format "^29.7.0"
 
-jest-watcher@^29.2.2:
-  version "29.2.2"
-  resolved "https://registry.yarnpkg.com/jest-watcher/-/jest-watcher-29.2.2.tgz#7093d4ea8177e0a0da87681a9e7b09a258b9daf7"
-  integrity sha512-j2otfqh7mOvMgN2WlJ0n7gIx9XCMWntheYGlBK7+5g3b1Su13/UAK7pdKGyd4kDlrLwtH2QPvRv5oNIxWvsJ1w==
+jest-watcher@^29.7.0:
+  version "29.7.0"
+  resolved "https://registry.yarnpkg.com/jest-watcher/-/jest-watcher-29.7.0.tgz#7810d30d619c3a62093223ce6bb359ca1b28a2f2"
+  integrity sha512-49Fg7WXkU3Vl2h6LbLtMQ/HyB6rXSIX7SqvBLQmssRBGN9I0PNvPmAmCWSOY6SOvrjhI/F7/bGAv9RtnsPA03g==
   dependencies:
-    "@jest/test-result" "^29.2.1"
-    "@jest/types" "^29.2.1"
+    "@jest/test-result" "^29.7.0"
+    "@jest/types" "^29.6.3"
     "@types/node" "*"
     ansi-escapes "^4.2.1"
     chalk "^4.0.0"
     emittery "^0.13.1"
-    jest-util "^29.2.1"
+    jest-util "^29.7.0"
     string-length "^4.0.1"
 
-jest-worker@^29.2.1:
-  version "29.2.1"
-  resolved "https://registry.yarnpkg.com/jest-worker/-/jest-worker-29.2.1.tgz#8ba68255438252e1674f990f0180c54dfa26a3b1"
-  integrity sha512-ROHTZ+oj7sBrgtv46zZ84uWky71AoYi0vEV9CdEtc1FQunsoAGe5HbQmW76nI5QWdvECVPrSi1MCVUmizSavMg==
+jest-worker@^29.7.0:
+  version "29.7.0"
+  resolved "https://registry.yarnpkg.com/jest-worker/-/jest-worker-29.7.0.tgz#acad073acbbaeb7262bd5389e1bcf43e10058d4a"
+  integrity sha512-eIz2msL/EzL9UFTFFx7jBTkeZfku0yUAyZZZmJ93H2TYEiroIx2PQjEXcwYtYl8zXCxb+PAmA2hLIt/6ZEkPHw==
   dependencies:
     "@types/node" "*"
-    jest-util "^29.2.1"
+    jest-util "^29.7.0"
     merge-stream "^2.0.0"
     supports-color "^8.0.0"
 
 jest@^29.0.3:
-  version "29.2.2"
-  resolved "https://registry.yarnpkg.com/jest/-/jest-29.2.2.tgz#24da83cbbce514718acd698926b7679109630476"
-  integrity sha512-r+0zCN9kUqoON6IjDdjbrsWobXM/09Nd45kIPRD8kloaRh1z5ZCMdVsgLXGxmlL7UpAJsvCYOQNO+NjvG/gqiQ==
+  version "29.7.0"
+  resolved "https://registry.yarnpkg.com/jest/-/jest-29.7.0.tgz#994676fc24177f088f1c5e3737f5697204ff2613"
+  integrity sha512-NIy3oAFp9shda19hy4HK0HRTWKtPJmGdnvywu01nOqNC2vZg+Z+fvJDxpMQA88eb2I9EcafcdjYgsDthnYTvGw==
   dependencies:
-    "@jest/core" "^29.2.2"
-    "@jest/types" "^29.2.1"
+    "@jest/core" "^29.7.0"
+    "@jest/types" "^29.6.3"
     import-local "^3.0.2"
-    jest-cli "^29.2.2"
+    jest-cli "^29.7.0"
+
+js-sdsl@^4.1.4:
+  version "4.4.2"
+  resolved "https://registry.yarnpkg.com/js-sdsl/-/js-sdsl-4.4.2.tgz#2e3c031b1f47d3aca8b775532e3ebb0818e7f847"
+  integrity sha512-dwXFwByc/ajSV6m5bcKAPwe4yDDF6D614pxmIi5odytzxRlwqF6nwoiCek80Ixc7Cvma5awClxrzFtxCQvcM8w==
 
 js-sha3@0.5.5:
   version "0.5.5"
   resolved "https://registry.yarnpkg.com/js-sha3/-/js-sha3-0.5.5.tgz#baf0c0e8c54ad5903447df96ade7a4a1bca79a4a"
   integrity sha512-yLLwn44IVeunwjpDVTDZmQeVbB0h+dZpY2eO68B/Zik8hu6dH+rKeLxwua79GGIvW6xr8NBAcrtiUbYrTjEFTA==
 
-js-sha3@0.5.7, js-sha3@^0.5.7:
-  version "0.5.7"
-  resolved "https://registry.yarnpkg.com/js-sha3/-/js-sha3-0.5.7.tgz#0d4ffd8002d5333aabaf4a23eed2f6374c9f28e7"
-  integrity sha512-GII20kjaPX0zJ8wzkTbNDYMY7msuZcTWk8S5UOh6806Jq/wz1J8/bnr8uGU0DAUmYDjj2Mr4X1cW8v/GLYnR+g==
-
 js-sha3@0.8.0, js-sha3@^0.8.0:
   version "0.8.0"
   resolved "https://registry.yarnpkg.com/js-sha3/-/js-sha3-0.8.0.tgz#b9b7a5da73afad7dedd0f8c463954cbde6818840"
   integrity sha512-gF1cRrHhIzNfToc802P800N8PpXS+evLLXfsVpowqmAFR9uwbi89WvXg2QspOmXL8QL86J4T1EpFu+yUkwJY3Q==
 
+js-sha3@^0.5.7:
+  version "0.5.7"
+  resolved "https://registry.yarnpkg.com/js-sha3/-/js-sha3-0.5.7.tgz#0d4ffd8002d5333aabaf4a23eed2f6374c9f28e7"
+  integrity sha512-GII20kjaPX0zJ8wzkTbNDYMY7msuZcTWk8S5UOh6806Jq/wz1J8/bnr8uGU0DAUmYDjj2Mr4X1cW8v/GLYnR+g==
+
 "js-tokens@^3.0.0 || ^4.0.0", js-tokens@^4.0.0:
   version "4.0.0"
   resolved "https://registry.yarnpkg.com/js-tokens/-/js-tokens-4.0.0.tgz#19203fb59991df98e3a287050d4647cdeaf32499"
@@ -8243,15 +8892,7 @@ js-tokens@^3.0.2:
   resolved "https://registry.yarnpkg.com/js-tokens/-/js-tokens-3.0.2.tgz#9866df395102130e38f7f996bceb65443209c25b"
   integrity sha512-RjTcuD4xjtthQkaWH7dFlH85L+QaVtSoOyGdZ3g6HFhS9dFNDfLyqgm2NFe2X6cQpeFmt0452FJjFG5UameExg==
 
-js-yaml@3.13.1, js-yaml@~3.13.1:
-  version "3.13.1"
-  resolved "https://registry.yarnpkg.com/js-yaml/-/js-yaml-3.13.1.tgz#aff151b30bfdfa8e49e05da22e7415e9dfa37847"
-  integrity sha512-YfbcO7jXDdyj0DGxYVSlSeQNHbD7XPWvrVWeVUujrQEoZzWJIRrCPoyk6kL6IAjAG2IolMK4T0hNUe0HOUs5Jw==
-  dependencies:
-    argparse "^1.0.7"
-    esprima "^4.0.0"
-
-js-yaml@3.x, js-yaml@^3.12.0, js-yaml@^3.13.0, js-yaml@^3.13.1:
+js-yaml@3.x, js-yaml@^3.13.1:
   version "3.14.1"
   resolved "https://registry.yarnpkg.com/js-yaml/-/js-yaml-3.14.1.tgz#dae812fdb3825fa306609a8717383c50c36a0537"
   integrity sha512-okMH7OXXJ7YrN9Ok3/SXrnu4iX9yOk+25nqX4imS2npuvTYDmo/QEZoqwZkYaIDk3jVvBOTOIEgEhaLOynBS9g==
@@ -8259,12 +8900,20 @@ js-yaml@3.x, js-yaml@^3.12.0, js-yaml@^3.13.0, js-yaml@^3.13.1:
     argparse "^1.0.7"
     esprima "^4.0.0"
 
-js-yaml@4.1.0:
+js-yaml@4.1.0, js-yaml@^4.1.0:
   version "4.1.0"
   resolved "https://registry.yarnpkg.com/js-yaml/-/js-yaml-4.1.0.tgz#c1fb65f8f5017901cdd2c951864ba18458a10602"
   integrity sha512-wpxZs9NoxZaJESJGIZTyDEaYpl0FKSA+FB9aJiyemKhMwkxQg63h4T1KJgUGHpTqPDNRcmmYLugrRjJlBtWvRA==
   dependencies:
-    argparse "^2.0.1"
+    argparse "^2.0.1"
+
+js-yaml@~3.13.1:
+  version "3.13.1"
+  resolved "https://registry.yarnpkg.com/js-yaml/-/js-yaml-3.13.1.tgz#aff151b30bfdfa8e49e05da22e7415e9dfa37847"
+  integrity sha512-YfbcO7jXDdyj0DGxYVSlSeQNHbD7XPWvrVWeVUujrQEoZzWJIRrCPoyk6kL6IAjAG2IolMK4T0hNUe0HOUs5Jw==
+  dependencies:
+    argparse "^1.0.7"
+    esprima "^4.0.0"
 
 jsbn@~0.1.0:
   version "0.1.1"
@@ -8367,16 +9016,28 @@ json5@^0.5.1:
   resolved "https://registry.yarnpkg.com/json5/-/json5-0.5.1.tgz#1eade7acc012034ad84e2396767ead9fa5495821"
   integrity sha512-4xrs1aW+6N5DalkqSVA8fxh458CXvR99WU8WLKmq4v8eWAL86Xo3BVqyd3SkA9wEVjCMqyvvRRkshAdOnBp5rw==
 
-json5@^2.2.1:
-  version "2.2.1"
-  resolved "https://registry.yarnpkg.com/json5/-/json5-2.2.1.tgz#655d50ed1e6f95ad1a3caababd2b0efda10b395c"
-  integrity sha512-1hqLFMSrGHRHxav9q9gNjJ5EXznIxGVO09xQRrwplcS8qs28pZ8s8hupZAmqDwZUmVZ2Qb2jnyPOWcDH8m8dlA==
+json5@^1.0.2:
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/json5/-/json5-1.0.2.tgz#63d98d60f21b313b77c4d6da18bfa69d80e1d593"
+  integrity sha512-g1MWMLBiz8FKi1e4w0UyVL3w+iJceWAFBAaBnnGKOpNa5f8TLktkbre1+s6oICydWAm+HRUGTmI+//xv2hvXYA==
+  dependencies:
+    minimist "^1.2.0"
+
+json5@^2.2.3:
+  version "2.2.3"
+  resolved "https://registry.yarnpkg.com/json5/-/json5-2.2.3.tgz#78cd6f1a19bdc12b73db5ad0c61efd66c1e29283"
+  integrity sha512-XmOWe7eyHYH14cLdVPoyg+GOH3rYX++KpzrylJwSW98t3Nk+U8XOl8FWKOgwtzdb8lXGf6zYwDUzeHMWfxasyg==
 
 jsonc-parser@~2.2.0:
   version "2.2.1"
   resolved "https://registry.yarnpkg.com/jsonc-parser/-/jsonc-parser-2.2.1.tgz#db73cd59d78cce28723199466b2a03d1be1df2bc"
   integrity sha512-o6/yDBYccGvTz1+QFevz6l6OBZ2+fMVu2JZ9CIhzsYRX4mjaK5IyX9eldUdCmga16zlgQxyrj5pt9kzuj2C02w==
 
+jsonc-parser@~3.2.0:
+  version "3.2.0"
+  resolved "https://registry.yarnpkg.com/jsonc-parser/-/jsonc-parser-3.2.0.tgz#31ff3f4c2b9793f89c67212627c51c6394f88e76"
+  integrity sha512-gfFQZrcTc8CnKXp6Y4/CBT3fTc0OVuDofpre4aEeEpSBPV5X5v4+Vmx+8snU7RLPrNHPKSgLxGo9YuQzz20o+w==
+
 jsonfile@^2.1.0:
   version "2.4.0"
   resolved "https://registry.yarnpkg.com/jsonfile/-/jsonfile-2.4.0.tgz#3736a2b428b87bbda0cc83b53fa3d633a35c2ae8"
@@ -8467,9 +9128,9 @@ keccak@3.0.1:
     node-gyp-build "^4.2.0"
 
 keccak@^3.0.0, keccak@^3.0.2:
-  version "3.0.2"
-  resolved "https://registry.yarnpkg.com/keccak/-/keccak-3.0.2.tgz#4c2c6e8c54e04f2670ee49fa734eb9da152206e0"
-  integrity sha512-PyKKjkH53wDMLGrvmRGSNWgmSxZOUqbnXwKL9tmgbFYA1iAYqW21kfR7mZXV0MlESiefxQQE9X9fTa3X+2MPDQ==
+  version "3.0.4"
+  resolved "https://registry.yarnpkg.com/keccak/-/keccak-3.0.4.tgz#edc09b89e633c0549da444432ecf062ffadee86d"
+  integrity sha512-3vKuW0jV8J3XNTzvfyicFR5qvxrSAGl7KIhvgOu5cmWwM7tZRj3fMbj/pfIf4be7aznbc+prBWGjywox/g2Y6Q==
   dependencies:
     node-addon-api "^2.0.0"
     node-gyp-build "^4.2.0"
@@ -8482,10 +9143,10 @@ keyv@^3.0.0:
   dependencies:
     json-buffer "3.0.0"
 
-keyv@^4.0.0:
-  version "4.5.2"
-  resolved "https://registry.yarnpkg.com/keyv/-/keyv-4.5.2.tgz#0e310ce73bf7851ec702f2eaf46ec4e3805cce56"
-  integrity sha512-5MHbFaKn8cNSmVW7BYnijeAVlE4cYA/SVkifVgrh7yotnfhKmjuXpDKjrABLnT0SfHWV21P8ow07OGfRrNDg8g==
+keyv@^4.0.0, 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==
   dependencies:
     json-buffer "3.0.1"
 
@@ -8503,12 +9164,7 @@ kind-of@^4.0.0:
   dependencies:
     is-buffer "^1.1.5"
 
-kind-of@^5.0.0:
-  version "5.1.0"
-  resolved "https://registry.yarnpkg.com/kind-of/-/kind-of-5.1.0.tgz#729c91e2d857b7a419a1f9aa65685c4c33f5845d"
-  integrity sha512-NGEErnH6F2vUuXDh+OlbcKW7/wOcfdRHaZ7VWtqCztfHri/++YKmP51OdWeGPuqCOba6kk2OTe5d02VmTB80Pw==
-
-kind-of@^6.0.0, kind-of@^6.0.2:
+kind-of@^6.0.2:
   version "6.0.3"
   resolved "https://registry.yarnpkg.com/kind-of/-/kind-of-6.0.3.tgz#07c05034a6c349fa06e24fa35aa76db4580ce4dd"
   integrity sha512-dcS1ul+9tmeD95T+x28/ehLgd9mENa3LsvDTtzm3vyBEO7RPptvAD+t44WVXaUjTBRcrpFeFlC8WCruUR456hw==
@@ -8533,12 +9189,16 @@ kleur@^3.0.3:
   integrity sha512-eTIzlVOSUR+JxdDFepEYcBMtZ9Qqdef+rnzWdRZuMbOywu5tO2w2N7rqjoANZ5k9vywhL6Br1VRjUIgTQx4E8w==
 
 "l1-zksync-contracts@link:contracts/ethereum":
-  version "0.0.0"
-  uid ""
+  version "0.1.0"
+  dependencies:
+    dotenv "^16.0.3"
+  optionalDependencies:
+    zksync-web3 "^0.14.3"
 
 "l2-zksync-contracts@link:contracts/zksync":
-  version "0.0.0"
-  uid ""
+  version "0.1.0"
+  dependencies:
+    dotenv "^16.0.3"
 
 lcid@^1.0.0:
   version "1.0.0"
@@ -8713,14 +9373,6 @@ leven@^3.1.0:
   resolved "https://registry.yarnpkg.com/leven/-/leven-3.1.0.tgz#77891de834064cccba82ae7842bb6b14a13ed7f2"
   integrity sha512-qsda+H8jTaUaN/x5vzW2rzc+8Rw4TAQ/4KjB46IwK5VH+IlVeeeje/EoZRpiXvIqjFgK84QffqPztGI3VBLG1A==
 
-levn@^0.3.0, levn@~0.3.0:
-  version "0.3.0"
-  resolved "https://registry.yarnpkg.com/levn/-/levn-0.3.0.tgz#3b09924edf9f083c0490fdd4c0bc4421e04764ee"
-  integrity sha512-0OO4y2iOHix2W6ujICbKIaEQXvFQHue65vUG3pb5EUomzPI90z9hsA1VsO/dbIIpC53J8gxM9Q4Oho0jrCM/yA==
-  dependencies:
-    prelude-ls "~1.1.2"
-    type-check "~0.3.2"
-
 levn@^0.4.1:
   version "0.4.1"
   resolved "https://registry.yarnpkg.com/levn/-/levn-0.4.1.tgz#ae4562c007473b932a6200d403268dd2fffc6ade"
@@ -8729,6 +9381,14 @@ levn@^0.4.1:
     prelude-ls "^1.2.1"
     type-check "~0.4.0"
 
+levn@~0.3.0:
+  version "0.3.0"
+  resolved "https://registry.yarnpkg.com/levn/-/levn-0.3.0.tgz#3b09924edf9f083c0490fdd4c0bc4421e04764ee"
+  integrity sha512-0OO4y2iOHix2W6ujICbKIaEQXvFQHue65vUG3pb5EUomzPI90z9hsA1VsO/dbIIpC53J8gxM9Q4Oho0jrCM/yA==
+  dependencies:
+    prelude-ls "~1.1.2"
+    type-check "~0.3.2"
+
 lines-and-columns@^1.1.6:
   version "1.2.4"
   resolved "https://registry.yarnpkg.com/lines-and-columns/-/lines-and-columns-1.2.4.tgz#eca284f75d2965079309dc0ad9255abb2ebc1632"
@@ -8741,6 +9401,13 @@ linkify-it@^3.0.1:
   dependencies:
     uc.micro "^1.0.1"
 
+linkify-it@^4.0.1:
+  version "4.0.1"
+  resolved "https://registry.yarnpkg.com/linkify-it/-/linkify-it-4.0.1.tgz#01f1d5e508190d06669982ba31a7d9f56a5751ec"
+  integrity sha512-C7bfi1UZmoj8+PQx22XyeXCuBlokoyWQL5pWSP+EI6nzRylyThouddufc2c1NDIcP9k5agmN9fLpA7VNJfIiqw==
+  dependencies:
+    uc.micro "^1.0.1"
+
 load-json-file@^1.0.0:
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/load-json-file/-/load-json-file-1.1.0.tgz#956905708d58b4bab4c2261b04f59f31c99374c0"
@@ -8770,14 +9437,6 @@ locate-path@^2.0.0:
     p-locate "^2.0.0"
     path-exists "^3.0.0"
 
-locate-path@^3.0.0:
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/locate-path/-/locate-path-3.0.0.tgz#dbec3b3ab759758071b58fe59fc41871af21400e"
-  integrity sha512-7AO748wWnIhNqAuaty2ZWHkQHRSNfPVIsPIfwEOWO22AmaoVrWavlOcMR5nzTLNYvp36X220/maaRsrec1G65A==
-  dependencies:
-    p-locate "^3.0.0"
-    path-exists "^3.0.0"
-
 locate-path@^5.0.0:
   version "5.0.0"
   resolved "https://registry.yarnpkg.com/locate-path/-/locate-path-5.0.0.tgz#1afba396afd676a6d42504d0a67a3a7eb9f62aa0"
@@ -8797,6 +9456,11 @@ lodash.assign@^4.0.3, lodash.assign@^4.0.6:
   resolved "https://registry.yarnpkg.com/lodash.assign/-/lodash.assign-4.2.0.tgz#0d99f3ccd7a6d261d19bdaeb9245005d285808e7"
   integrity sha512-hFuH8TY+Yji7Eja3mGiuAxBqLagejScbG8GbG0j6o9vzn0YL14My+ktnqtZgFTosKymC9/44wP6s7xyuLfnClw==
 
+lodash.camelcase@^4.3.0:
+  version "4.3.0"
+  resolved "https://registry.yarnpkg.com/lodash.camelcase/-/lodash.camelcase-4.3.0.tgz#b28aa6288a2b9fc651035c7711f65ab6190331a6"
+  integrity sha512-TwuEnCnxbc3rAvhf/LbG7tJUDzhqXyFnv3dtzLOPgCG/hODL7WFnsbwktkD7yUV0RrreP/l1PALq/YSg6VvjlA==
+
 lodash.clonedeep@^4.5.0:
   version "4.5.0"
   resolved "https://registry.yarnpkg.com/lodash.clonedeep/-/lodash.clonedeep-4.5.0.tgz#e23f3f9c4f8fbdde872529c1071857a086e5ccef"
@@ -8822,6 +9486,11 @@ lodash.isboolean@^3.0.3:
   resolved "https://registry.yarnpkg.com/lodash.isboolean/-/lodash.isboolean-3.0.3.tgz#6c2e171db2a257cd96802fd43b01b20d5f5870f6"
   integrity sha512-Bz5mupy2SVbPHURB98VAcw+aHh4vRV5IPNhILUCsOzRmsTmSQ17jIuqopAentWoehktxGd9e/hbIXq980/1QJg==
 
+lodash.isequal@^4.5.0:
+  version "4.5.0"
+  resolved "https://registry.yarnpkg.com/lodash.isequal/-/lodash.isequal-4.5.0.tgz#415c4478f2bcc30120c22ce10ed3226f7d3e18e0"
+  integrity sha512-pDo3lu8Jhfjqls6GkMgpahsF9kCyayhgykjyLMNFTKWrpVdAQtYyB4muAMWozBB4ig/dtWAmsMxLEI8wuz+DYQ==
+
 lodash.isinteger@^4.0.4:
   version "4.0.4"
   resolved "https://registry.yarnpkg.com/lodash.isinteger/-/lodash.isinteger-4.0.4.tgz#619c0af3d03f8b04c31f5882840b77b11cd68343"
@@ -8867,18 +9536,11 @@ lodash@4.17.20:
   resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.20.tgz#b44a9b6297bcb698f1c51a3545a2b3b368d59c52"
   integrity sha512-PlhdFcillOINfeV7Ni6oF1TAEayyZBoZ8bcshTHqOYJYlrqzRK5hagpagky5o4HfCzzd1TRkXPMFq6cKk9rGmA==
 
-lodash@^4.17.11, lodash@^4.17.12, lodash@^4.17.14, lodash@^4.17.15, lodash@^4.17.19, lodash@^4.17.21, lodash@^4.17.4:
+lodash@^4.17.11, lodash@^4.17.12, lodash@^4.17.14, lodash@^4.17.15, lodash@^4.17.21, lodash@^4.17.4:
   version "4.17.21"
   resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.21.tgz#679591c564c3bffaae8454cf0b3df370c3d6911c"
   integrity sha512-v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg==
 
-log-symbols@3.0.0:
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/log-symbols/-/log-symbols-3.0.0.tgz#f3a08516a5dea893336a7dee14d18a1cfdab77c4"
-  integrity sha512-dSkNGuI7iG3mfvDzUuYZyvk5dD9ocYCYzNU6CYDE6+Xqd+gwme6Z00NS3dUh8mq/73HaEtT7m6W+yUPtU6BZnQ==
-  dependencies:
-    chalk "^2.4.2"
-
 log-symbols@4.1.0:
   version "4.1.0"
   resolved "https://registry.yarnpkg.com/log-symbols/-/log-symbols-4.1.0.tgz#3fbdbb95b4683ac9fc785111e792e558d4abd503"
@@ -8904,12 +9566,12 @@ loose-envify@^1.0.0:
   dependencies:
     js-tokens "^3.0.0 || ^4.0.0"
 
-loupe@^2.3.1:
-  version "2.3.4"
-  resolved "https://registry.yarnpkg.com/loupe/-/loupe-2.3.4.tgz#7e0b9bffc76f148f9be769cb1321d3dcf3cb25f3"
-  integrity sha512-OvKfgCC2Ndby6aSTREl5aCCPTNIzlDfQZvZxNUrBrihDhL3xcrYegTblhmEiCrg2kKQz4XsFIaemE5BF4ybSaQ==
+loupe@^2.3.6:
+  version "2.3.7"
+  resolved "https://registry.yarnpkg.com/loupe/-/loupe-2.3.7.tgz#6e69b7d4db7d3ab436328013d37d1c8c3540c697"
+  integrity sha512-zSMINGVYkdpYSOBmLi0D1Uo7JU9nVdQKrHxC8eYlV+9YKK9WePqAlL7lSlorG/U2Fw1w0hTBmaa/jrQ3UbPHtA==
   dependencies:
-    get-func-name "^2.0.0"
+    get-func-name "^2.0.1"
 
 lowercase-keys@^1.0.0, lowercase-keys@^1.0.1:
   version "1.0.1"
@@ -8957,12 +9619,12 @@ ltgt@~2.1.1:
   resolved "https://registry.yarnpkg.com/ltgt/-/ltgt-2.1.3.tgz#10851a06d9964b971178441c23c9e52698eece34"
   integrity sha512-5VjHC5GsENtIi5rbJd+feEpDKhfr7j0odoUR2Uh978g+2p93nd5o34cTjQWohXsPsCZeqoDnIqEf88mPCe0Pfw==
 
-make-dir@^3.0.0:
-  version "3.1.0"
-  resolved "https://registry.yarnpkg.com/make-dir/-/make-dir-3.1.0.tgz#415e967046b3a7f1d185277d84aa58203726a13f"
-  integrity sha512-g3FeP20LNwhALb/6Cz6Dd4F2ngze0jz7tbzrD2wAV+o9FeNHe4rL+yK2md0J/fiSf1sa1ADhXqi5+oVwOM/eGw==
+make-dir@^4.0.0:
+  version "4.0.0"
+  resolved "https://registry.yarnpkg.com/make-dir/-/make-dir-4.0.0.tgz#c3c2307a771277cd9638305f915c29ae741b614e"
+  integrity sha512-hXdUTZYIVOt1Ex//jAQi+wTZZpUpwBj/0QsOzqegb3rGMMeJiSEu5xLHnYfBrRV4RH2+OCSOO95Is/7x1WJ4bw==
   dependencies:
-    semver "^6.0.0"
+    semver "^7.5.3"
 
 make-error@1.x, make-error@^1.1.1:
   version "1.3.6"
@@ -8999,6 +9661,17 @@ markdown-it@11.0.0:
     mdurl "^1.0.1"
     uc.micro "^1.0.5"
 
+markdown-it@13.0.1:
+  version "13.0.1"
+  resolved "https://registry.yarnpkg.com/markdown-it/-/markdown-it-13.0.1.tgz#c6ecc431cacf1a5da531423fc6a42807814af430"
+  integrity sha512-lTlxriVoy2criHP0JKRhO2VDG9c2ypWCsT237eDiLqi09rmbKoUetyGHq2uOIRoRS//kfoJckS0eUzzkDR+k2Q==
+  dependencies:
+    argparse "^2.0.1"
+    entities "~3.0.1"
+    linkify-it "^4.0.1"
+    mdurl "^1.0.1"
+    uc.micro "^1.0.5"
+
 markdown-table@^1.1.3:
   version "1.1.3"
   resolved "https://registry.yarnpkg.com/markdown-table/-/markdown-table-1.1.3.tgz#9fcb69bcfdb8717bfd0398c6ec2d93036ef8de60"
@@ -9024,6 +9697,21 @@ markdownlint-cli@^0.24.0:
     minimist "~1.2.5"
     rc "~1.2.7"
 
+markdownlint-cli@^0.33.0:
+  version "0.33.0"
+  resolved "https://registry.yarnpkg.com/markdownlint-cli/-/markdownlint-cli-0.33.0.tgz#703af1234c32c309ab52fcd0e8bc797a34e2b096"
+  integrity sha512-zMK1oHpjYkhjO+94+ngARiBBrRDEUMzooDHBAHtmEIJ9oYddd9l3chCReY2mPlecwH7gflQp1ApilTo+o0zopQ==
+  dependencies:
+    commander "~9.4.1"
+    get-stdin "~9.0.0"
+    glob "~8.0.3"
+    ignore "~5.2.4"
+    js-yaml "^4.1.0"
+    jsonc-parser "~3.2.0"
+    markdownlint "~0.27.0"
+    minimatch "~5.1.2"
+    run-con "~1.2.11"
+
 markdownlint-rule-helpers@~0.12.0:
   version "0.12.0"
   resolved "https://registry.yarnpkg.com/markdownlint-rule-helpers/-/markdownlint-rule-helpers-0.12.0.tgz#c41d9b990c50911572e8eb2fba3e6975a5514b7e"
@@ -9036,6 +9724,13 @@ markdownlint@~0.21.0:
   dependencies:
     markdown-it "11.0.0"
 
+markdownlint@~0.27.0:
+  version "0.27.0"
+  resolved "https://registry.yarnpkg.com/markdownlint/-/markdownlint-0.27.0.tgz#9dabf7710a4999e2835e3c68317f1acd0bc89049"
+  integrity sha512-HtfVr/hzJJmE0C198F99JLaeada+646B5SaG2pVoEakLFI6iRGsvMqrnnrflq8hm1zQgwskEgqSnhDW11JBp0w==
+  dependencies:
+    markdown-it "13.0.1"
+
 mcl-wasm@^0.7.1:
   version "0.7.9"
   resolved "https://registry.yarnpkg.com/mcl-wasm/-/mcl-wasm-0.7.9.tgz#c1588ce90042a8700c3b60e40efb339fc07ab87f"
@@ -9156,6 +9851,11 @@ methods@~1.1.2:
   resolved "https://registry.yarnpkg.com/methods/-/methods-1.1.2.tgz#5529a4d67654134edcc5266656835b0f851afcee"
   integrity sha512-iclAHeNqNm68zFtnZ0e+1L2yUIdvzNoauKU4WBA3VvH/vPFieF7qfRlwUZU+DA9P9bPXIS90ulxoUoCH23sV2w==
 
+micro-ftch@^0.3.1:
+  version "0.3.1"
+  resolved "https://registry.yarnpkg.com/micro-ftch/-/micro-ftch-0.3.1.tgz#6cb83388de4c1f279a034fb0cf96dfc050853c5f"
+  integrity sha512-/0LLxhzP0tfiR5hcQebtudP56gUurs2CLkGarnCiB/OqEyUFQ6U3paQi/tgLv0hBJYt2rnr9MNpxz4fiiugstg==
+
 micromatch@^3.1.4:
   version "3.1.10"
   resolved "https://registry.yarnpkg.com/micromatch/-/micromatch-3.1.10.tgz#70859bc95c9840952f359a068a3fc49f9ecfac23"
@@ -9218,6 +9918,11 @@ mimic-fn@^2.1.0:
   resolved "https://registry.yarnpkg.com/mimic-fn/-/mimic-fn-2.1.0.tgz#7ed2c2ccccaf84d3ffcb7a69b57711fc2083401b"
   integrity sha512-OqbOk5oEQeAZ8WXWydlu9HJjz9WVdEIvamMCcXmuqUYjTknH/sqsWvhQ3vgwKFRR1HpjvNBKQ37nbJgYzGqGcg==
 
+mimic-fn@^4.0.0:
+  version "4.0.0"
+  resolved "https://registry.yarnpkg.com/mimic-fn/-/mimic-fn-4.0.0.tgz#60a90550d5cb0b239cca65d893b1a53b29871ecc"
+  integrity sha512-vqiC06CuhBTUdZH+RYl8sFrL096vA45Ok5ISO6sE/Mr1jRbGH4Csnhi8f3wKVl7x8mO4Au7Ir9D3Oyv1VYMFJw==
+
 mimic-response@^1.0.0, mimic-response@^1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/mimic-response/-/mimic-response-1.0.1.tgz#4923538878eef42063cb8a3e3b0798781487ab1b"
@@ -9245,20 +9950,13 @@ minimalistic-crypto-utils@^1.0.1:
   resolved "https://registry.yarnpkg.com/minimalistic-crypto-utils/-/minimalistic-crypto-utils-1.0.1.tgz#f6c00c1c0b082246e5c4d99dfb8c7c083b2b582a"
   integrity sha512-JIYlbt6g8i5jKfJ3xz7rF0LXmv2TkDxBLUkiBeZ7bAx4GnnNMr8xFpGnOxn6GhTEHx3SjRrZEoU+j04prX1ktg==
 
-"minimatch@2 || 3", minimatch@^3.0.4, minimatch@^3.0.5, minimatch@^3.1.1:
+"minimatch@2 || 3", minimatch@^3.0.4, minimatch@^3.0.5, minimatch@^3.1.1, minimatch@^3.1.2:
   version "3.1.2"
   resolved "https://registry.yarnpkg.com/minimatch/-/minimatch-3.1.2.tgz#19cd194bfd3e428f049a70817c038d89ab4be35b"
   integrity sha512-J7p63hRiAjw1NDEww1W7i37+ByIrOWO5XQQAzZ3VOcL0PNybwpfmV/N05zFAzwQ9USyEcX6t3UO+K5aqBQOIHw==
   dependencies:
     brace-expansion "^1.1.7"
 
-minimatch@3.0.4:
-  version "3.0.4"
-  resolved "https://registry.yarnpkg.com/minimatch/-/minimatch-3.0.4.tgz#5166e286457f03306064be5497e8dbb0c3d32083"
-  integrity sha512-yJHVQEhyqPLUTgt9B83PXu6W3rx4MvvHvSUvToogpwoGDOUQ+yDrR0HRot+yOCdCO7u4hX3pWft6kWBBcqh0UA==
-  dependencies:
-    brace-expansion "^1.1.7"
-
 minimatch@4.2.1:
   version "4.2.1"
   resolved "https://registry.yarnpkg.com/minimatch/-/minimatch-4.2.1.tgz#40d9d511a46bdc4e563c22c3080cde9c0d8299b4"
@@ -9273,6 +9971,20 @@ minimatch@5.0.1:
   dependencies:
     brace-expansion "^2.0.1"
 
+minimatch@^5.0.1, minimatch@~5.1.2:
+  version "5.1.6"
+  resolved "https://registry.yarnpkg.com/minimatch/-/minimatch-5.1.6.tgz#1cfcb8cf5522ea69952cd2af95ae09477f122a96"
+  integrity sha512-lKwV/1brpG6mBUFHtb7NUmtABCb2WZZmm2wNiOA5hAb8VdCS4B3dtMWyvcoViccwAW/COERjXLt0zP1zXUN26g==
+  dependencies:
+    brace-expansion "^2.0.1"
+
+minimatch@^7.4.3:
+  version "7.4.6"
+  resolved "https://registry.yarnpkg.com/minimatch/-/minimatch-7.4.6.tgz#845d6f254d8f4a5e4fd6baf44d5f10c8448365fb"
+  integrity sha512-sBz8G/YjVniEz6lKPNpKxXwazJe4c19fEfV2GDMX6AjFz+MX9uDWIZW8XreVhkFW3fkIdTv/gxWr/Kks5FFAVw==
+  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"
@@ -9280,10 +9992,10 @@ minimatch@~3.0.4:
   dependencies:
     brace-expansion "^1.1.7"
 
-minimist@^1.2.0, minimist@^1.2.5, minimist@^1.2.6, minimist@~1.2.5, minimist@~1.2.7:
-  version "1.2.7"
-  resolved "https://registry.yarnpkg.com/minimist/-/minimist-1.2.7.tgz#daa1c4d91f507390437c6a8bc01078e7000c4d18"
-  integrity sha512-bzfL1YUZsP41gmu/qjrEk0Q6i2ix/cVeAhbCbqH9u3zYutS1cLg00qhrD0M2MVdCcx4Sc0UpP2eBWo9rotpq6g==
+minimist@^1.2.0, minimist@^1.2.5, minimist@^1.2.6, minimist@^1.2.8, minimist@~1.2.5, minimist@~1.2.8:
+  version "1.2.8"
+  resolved "https://registry.yarnpkg.com/minimist/-/minimist-1.2.8.tgz#c1a464e7693302e082a075cee0c057741ac4772c"
+  integrity sha512-2yyAR8qBkN3YuheJanUpWC5U3bb5osDywNB8RzDVlDwDHbocAJveqqj1u8+SVD7jkWT4yvsHCpWqqWqAxb0zCA==
 
 minipass@^2.6.0, minipass@^2.9.0:
   version "2.9.0"
@@ -9321,16 +10033,9 @@ mkdirp-promise@^5.0.1:
     mkdirp "*"
 
 mkdirp@*:
-  version "2.1.3"
-  resolved "https://registry.yarnpkg.com/mkdirp/-/mkdirp-2.1.3.tgz#b083ff37be046fd3d6552468c1f0ff44c1545d1f"
-  integrity sha512-sjAkg21peAG9HS+Dkx7hlG9Ztx7HLeKnvB3NQRcu/mltCVmvkF0pisbiTSfDVYTT86XEfZrTUosLdZLStquZUw==
-
-mkdirp@0.5.5:
-  version "0.5.5"
-  resolved "https://registry.yarnpkg.com/mkdirp/-/mkdirp-0.5.5.tgz#d91cefd62d1436ca0f41620e251288d420099def"
-  integrity sha512-NKmAlESf6jMGym1++R0Ra7wvhV+wFW63FaSOFPwRahvea0gMUcGUhVeAg/0BC0wiv9ih5NYPB1Wn1UEI1/L+xQ==
-  dependencies:
-    minimist "^1.2.5"
+  version "3.0.1"
+  resolved "https://registry.yarnpkg.com/mkdirp/-/mkdirp-3.0.1.tgz#e44e4c5607fb279c168241713cc6e0fea9adcb50"
+  integrity sha512-+NsyUUAZDmo6YVHzL/stxSu3t9YS1iljliy3BSDrXJ/dkn1KYdmtZODGGjLcc9XLgVVpH4KshHB8XmZgMhaBXg==
 
 mkdirp@0.5.x, mkdirp@^0.5.1, mkdirp@^0.5.5:
   version "0.5.6"
@@ -9339,6 +10044,16 @@ mkdirp@0.5.x, mkdirp@^0.5.1, mkdirp@^0.5.5:
   dependencies:
     minimist "^1.2.6"
 
+mkdirp@^1.0.4:
+  version "1.0.4"
+  resolved "https://registry.yarnpkg.com/mkdirp/-/mkdirp-1.0.4.tgz#3eb5ed62622756d79a5f0e2a221dfebad75c2f7e"
+  integrity sha512-vVqVZQyf3WLx2Shd0qJ9xuvqgAyKPLAiqITEtqW0oIUjzo3PePDd6fW9iFz30ef7Ysp/oiWqbhszeGWW2T6Gzw==
+
+mkdirp@^2.1.6:
+  version "2.1.6"
+  resolved "https://registry.yarnpkg.com/mkdirp/-/mkdirp-2.1.6.tgz#964fbcb12b2d8c5d6fbc62a963ac95a273e2cc19"
+  integrity sha512-+hEnITedc8LAtIP9u3HJDFIdcLV2vXP33sqLLIzkv1Db1zO/1OxbvYf0Y1OC/S/Qo5dxHXepofhmxL02PsKe+A==
+
 mnemonist@^0.38.0:
   version "0.38.5"
   resolved "https://registry.yarnpkg.com/mnemonist/-/mnemonist-0.38.5.tgz#4adc7f4200491237fe0fa689ac0b86539685cade"
@@ -9351,40 +10066,10 @@ mocha-steps@^1.3.0:
   resolved "https://registry.yarnpkg.com/mocha-steps/-/mocha-steps-1.3.0.tgz#2449231ec45ec56810f65502cb22e2571862957f"
   integrity sha512-KZvpMJTqzLZw3mOb+EEuYi4YZS41C9iTnb7skVFRxHjUd1OYbl64tCMSmpdIRM9LnwIrSOaRfPtNpF5msgv6Eg==
 
-mocha@7.1.2:
-  version "7.1.2"
-  resolved "https://registry.yarnpkg.com/mocha/-/mocha-7.1.2.tgz#8e40d198acf91a52ace122cd7599c9ab857b29e6"
-  integrity sha512-o96kdRKMKI3E8U0bjnfqW4QMk12MwZ4mhdBTf+B5a1q9+aq2HRnj+3ZdJu0B/ZhJeK78MgYuv6L8d/rA5AeBJA==
-  dependencies:
-    ansi-colors "3.2.3"
-    browser-stdout "1.3.1"
-    chokidar "3.3.0"
-    debug "3.2.6"
-    diff "3.5.0"
-    escape-string-regexp "1.0.5"
-    find-up "3.0.0"
-    glob "7.1.3"
-    growl "1.10.5"
-    he "1.2.0"
-    js-yaml "3.13.1"
-    log-symbols "3.0.0"
-    minimatch "3.0.4"
-    mkdirp "0.5.5"
-    ms "2.1.1"
-    node-environment-flags "1.0.6"
-    object.assign "4.1.0"
-    strip-json-comments "2.0.1"
-    supports-color "6.0.0"
-    which "1.3.1"
-    wide-align "1.1.3"
-    yargs "13.3.2"
-    yargs-parser "13.1.2"
-    yargs-unparser "1.6.0"
-
-mocha@^10.0.0:
-  version "10.1.0"
-  resolved "https://registry.yarnpkg.com/mocha/-/mocha-10.1.0.tgz#dbf1114b7c3f9d0ca5de3133906aea3dfc89ef7a"
-  integrity sha512-vUF7IYxEoN7XhQpFLxQAEMtE4W91acW4B6En9l97MwE9stL1A9gusXfoHZCLVHDUJ/7V5+lbCM6yMqzo5vNymg==
+mocha@10.2.0, mocha@^10.0.0, mocha@^10.2.0:
+  version "10.2.0"
+  resolved "https://registry.yarnpkg.com/mocha/-/mocha-10.2.0.tgz#1fd4a7c32ba5ac372e03a17eef435bd00e5c68b8"
+  integrity sha512-IDY7fl/BecMwFHzoqF2sg/SHHANeBoMMXFlS9r0OXKDssYE1M5O43wUY/9BVPeIvfH2zmEbBfseqN9gBQZzXkg==
   dependencies:
     ansi-colors "4.1.1"
     browser-stdout "1.3.1"
@@ -9408,36 +10093,6 @@ mocha@^10.0.0:
     yargs-parser "20.2.4"
     yargs-unparser "2.0.0"
 
-mocha@^7.1.1:
-  version "7.2.0"
-  resolved "https://registry.yarnpkg.com/mocha/-/mocha-7.2.0.tgz#01cc227b00d875ab1eed03a75106689cfed5a604"
-  integrity sha512-O9CIypScywTVpNaRrCAgoUnJgozpIofjKUYmJhiCIJMiuYnLI6otcb1/kpW9/n/tJODHGZ7i8aLQoDVsMtOKQQ==
-  dependencies:
-    ansi-colors "3.2.3"
-    browser-stdout "1.3.1"
-    chokidar "3.3.0"
-    debug "3.2.6"
-    diff "3.5.0"
-    escape-string-regexp "1.0.5"
-    find-up "3.0.0"
-    glob "7.1.3"
-    growl "1.10.5"
-    he "1.2.0"
-    js-yaml "3.13.1"
-    log-symbols "3.0.0"
-    minimatch "3.0.4"
-    mkdirp "0.5.5"
-    ms "2.1.1"
-    node-environment-flags "1.0.6"
-    object.assign "4.1.0"
-    strip-json-comments "2.0.1"
-    supports-color "6.0.0"
-    which "1.3.1"
-    wide-align "1.1.3"
-    yargs "13.3.2"
-    yargs-parser "13.1.2"
-    yargs-unparser "1.6.0"
-
 mocha@^9.0.2:
   version "9.2.2"
   resolved "https://registry.yarnpkg.com/mocha/-/mocha-9.2.2.tgz#d70db46bdb93ca57402c809333e5a84977a88fb9"
@@ -9473,6 +10128,18 @@ mock-fs@^4.1.0:
   resolved "https://registry.yarnpkg.com/mock-fs/-/mock-fs-4.14.0.tgz#ce5124d2c601421255985e6e94da80a7357b1b18"
   integrity sha512-qYvlv/exQ4+svI3UOvPUpLDF0OMX5euvUH0Ny4N5QyRyhNdgAgUrVH3iUINSzEPLvx0kbo/Bp28GJKIqvE7URw==
 
+mock-property@~1.0.0:
+  version "1.0.3"
+  resolved "https://registry.yarnpkg.com/mock-property/-/mock-property-1.0.3.tgz#3e37c50a56609d548cabd56559fde3dd8767b10c"
+  integrity sha512-2emPTb1reeLLYwHxyVx993iYyCHEiRRO+y8NFXFPL5kl5q14sgTK76cXyEKkeKCHeRw35SfdkUJ10Q1KfHuiIQ==
+  dependencies:
+    define-data-property "^1.1.1"
+    functions-have-names "^1.2.3"
+    gopd "^1.0.1"
+    has-property-descriptors "^1.0.0"
+    hasown "^2.0.0"
+    isarray "^2.0.5"
+
 module-error@^1.0.1, module-error@^1.0.2:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/module-error/-/module-error-1.0.2.tgz#8d1a48897ca883f47a45816d4fb3e3c6ba404d86"
@@ -9483,11 +10150,6 @@ ms@2.0.0:
   resolved "https://registry.yarnpkg.com/ms/-/ms-2.0.0.tgz#5608aeadfc00be6c2901df5f9861788de0d597c8"
   integrity sha512-Tpp60P6IUJDTuOq/5Z8cdskzJujfwqfOTkrwIwj7IRISpnkJnT6SyJ4PCPnGMoFjC9ddhal5KVIYtAt97ix05A==
 
-ms@2.1.1:
-  version "2.1.1"
-  resolved "https://registry.yarnpkg.com/ms/-/ms-2.1.1.tgz#30a5864eb3ebb0a66f2ebe6d727af06a09d86e0a"
-  integrity sha512-tgp+dl5cGk28utYktBsrFqA7HKgrhgPsg6Z/EfhWI4gl1Hwq8B/GmY/0oXZ6nF8hDVesS/FpnYaD/kOWhYQvyg==
-
 ms@2.1.2:
   version "2.1.2"
   resolved "https://registry.yarnpkg.com/ms/-/ms-2.1.2.tgz#d09d1f357b443f493382a8eb3ccd183872ae6009"
@@ -9552,10 +10214,10 @@ mz@^2.7.0:
     object-assign "^4.0.1"
     thenify-all "^1.0.0"
 
-nan@^2.15.0, nan@^2.16.0:
-  version "2.17.0"
-  resolved "https://registry.yarnpkg.com/nan/-/nan-2.17.0.tgz#c0150a2368a182f033e9aa5195ec76ea41a199cb"
-  integrity sha512-2ZTgtl0nJsO0KQCjEpxcIr5D+Yv90plTitZt9JBfQvVJDS5seMl3FOvsh3+9CoYWXf/1l5OaZzzF6nDm4cagaQ==
+nan@^2.17.0:
+  version "2.18.0"
+  resolved "https://registry.yarnpkg.com/nan/-/nan-2.18.0.tgz#26a6faae7ffbeb293a39660e88a76b82e30b7554"
+  integrity sha512-W7tfG7vMOGtD30sHoZSSc/JVYiyDPEyQVso/Zz+/uQd0B0L46gtC+pHha5FFMRpil6fm/AoEcRWyOVi4+E/f8w==
 
 nano-json-stream-parser@^0.1.2:
   version "0.1.2"
@@ -9589,10 +10251,10 @@ nanomatch@^1.2.9:
     snapdragon "^0.8.1"
     to-regex "^3.0.1"
 
-napi-macros@~2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/napi-macros/-/napi-macros-2.0.0.tgz#2b6bae421e7b96eb687aa6c77a7858640670001b"
-  integrity sha512-A0xLykHtARfueITVDernsAWdtIMbOJgKgcluwENp3AlsKN/PloyO10HtmoqnFAQAcxPkgZN7wdfPfEd0zNGxbg==
+napi-macros@^2.2.2:
+  version "2.2.2"
+  resolved "https://registry.yarnpkg.com/napi-macros/-/napi-macros-2.2.2.tgz#817fef20c3e0e40a963fbf7b37d1600bd0201044"
+  integrity sha512-hmEVtAGYzVQpCKdbQea4skABsdXW4RUh5t5mJ2zzqowJS2OyXZTU1KhDVFhx+NlWZ4ap9mqR9TcDO3LTTttd+g==
 
 natural-compare@^1.4.0:
   version "1.4.0"
@@ -9604,7 +10266,7 @@ negotiator@0.6.3:
   resolved "https://registry.yarnpkg.com/negotiator/-/negotiator-0.6.3.tgz#58e323a72fedc0d6f9cd4d31fe49f51479590ccd"
   integrity sha512-+EUsqGPLsM+j/zdChZjsnX51g4XrHFOIXwfnCVPGlQk/k5giakcKsuxCObBRu6DSm9opw/O6slWbJdghQM4bBg==
 
-neo-async@^2.6.0, neo-async@^2.6.2:
+neo-async@^2.6.2:
   version "2.6.2"
   resolved "https://registry.yarnpkg.com/neo-async/-/neo-async-2.6.2.tgz#b4aafb93e3aeb2d8174ca53cf163ab7d7308305f"
   integrity sha512-Yd3UES5mWCSqR+qNT93S3UoYUkqAZ9lLg8a7g9rimsWmYGK8cVToA4/sF3RrshdyV3sAGMXVUmpMYOw+dLpOuw==
@@ -9631,25 +10293,10 @@ node-emoji@^1.10.0:
   dependencies:
     lodash "^4.17.21"
 
-node-environment-flags@1.0.6:
-  version "1.0.6"
-  resolved "https://registry.yarnpkg.com/node-environment-flags/-/node-environment-flags-1.0.6.tgz#a30ac13621f6f7d674260a54dede048c3982c088"
-  integrity sha512-5Evy2epuL+6TM0lCQGpFIj6KwiEsGh1SrHUhTbNX+sLbBtjidPZFAnVK9y5yU1+h//RitLbRHTIMyxQPtxMdHw==
-  dependencies:
-    object.getownpropertydescriptors "^2.0.3"
-    semver "^5.7.0"
-
-node-fetch@^2.6.0, node-fetch@^2.6.1:
-  version "2.6.7"
-  resolved "https://registry.yarnpkg.com/node-fetch/-/node-fetch-2.6.7.tgz#24de9fba827e3b4ae44dc8b20256a379160052ad"
-  integrity sha512-ZjMPFEfVx5j+y2yF35Kzx5sF7kDzxuDj6ziH4FFbOp87zKDZNx8yExJIb05OGF4Nlt9IHFIMBkRl41VdvcNdbQ==
-  dependencies:
-    whatwg-url "^5.0.0"
-
-node-fetch@^2.6.7:
-  version "2.6.8"
-  resolved "https://registry.yarnpkg.com/node-fetch/-/node-fetch-2.6.8.tgz#a68d30b162bc1d8fd71a367e81b997e1f4d4937e"
-  integrity sha512-RZ6dBYuj8dRSfxpUSu+NsdF1dpPpluJxwOp+6IoDp/sH2QNDSvurYsAa+F1WxY2RjA1iP93xhcsUoYbF2XBqVg==
+node-fetch@^2.6.0, node-fetch@^2.6.1, node-fetch@^2.6.7:
+  version "2.7.0"
+  resolved "https://registry.yarnpkg.com/node-fetch/-/node-fetch-2.7.0.tgz#d0f0fa6e3e2dc1d27efcd8ad99d550bda94d187d"
+  integrity sha512-c4FRfUm/dbcWZ7U+1Wq0AwCyFL+3nt2bEw05wfxSz+DWpWsitgmSgYmy2dQdWyKC1694ELPqMs/YzUSNozLt8A==
   dependencies:
     whatwg-url "^5.0.0"
 
@@ -9662,19 +10309,19 @@ node-fetch@~1.7.1:
     is-stream "^1.0.1"
 
 node-gyp-build@^4.2.0, node-gyp-build@^4.3.0:
-  version "4.5.0"
-  resolved "https://registry.yarnpkg.com/node-gyp-build/-/node-gyp-build-4.5.0.tgz#7a64eefa0b21112f89f58379da128ac177f20e40"
-  integrity sha512-2iGbaQBV+ITgCz76ZEjmhUKAKVf7xfY1sRl4UiKQspfZMH2h06SyhNsnSVy50cwkFQDGLyif6m/6uFXHkOZ6rg==
+  version "4.6.1"
+  resolved "https://registry.yarnpkg.com/node-gyp-build/-/node-gyp-build-4.6.1.tgz#24b6d075e5e391b8d5539d98c7fc5c210cac8a3e"
+  integrity sha512-24vnklJmyRS8ViBNI8KbtK/r/DmXQMRiOMXTNz2nrTnAYUwjmEEbnnpB/+kt+yWRv73bPsSPRFddrcIbAxSiMQ==
 
 node-int64@^0.4.0:
   version "0.4.0"
   resolved "https://registry.yarnpkg.com/node-int64/-/node-int64-0.4.0.tgz#87a9065cdb355d3182d8f94ce11188b825c68a3b"
   integrity sha512-O5lz91xSOeoXP6DulyHfllpq+Eg00MWitZIbtPfoSEvqIHdl5gfcY6hYzDWnj0qD5tz52PI08u9qUvSVeUBeHw==
 
-node-releases@^2.0.6:
-  version "2.0.6"
-  resolved "https://registry.yarnpkg.com/node-releases/-/node-releases-2.0.6.tgz#8a7088c63a55e493845683ebf3c828d8c51c5503"
-  integrity sha512-PiVXnNuFm5+iYkLBNeq5211hvO38y63T0i2KKh2KnUs3RpzJ+JtODFjkD8yjLwnDkTYF1eKXheUwdssR+NRZdg==
+node-releases@^2.0.13:
+  version "2.0.13"
+  resolved "https://registry.yarnpkg.com/node-releases/-/node-releases-2.0.13.tgz#d5ed1627c23e3461e819b02e57b75e4899b1c81d"
+  integrity sha512-uYr7J37ae/ORWdZeQ1xxMJe3NtdmqMC/JZK+geofDrkLUApKRHPd18/TxtBOJ4A0/+uUIliorNrfYV6s1b02eQ==
 
 nofilter@^3.1.0:
   version "3.1.0"
@@ -9735,6 +10382,13 @@ npm-run-path@^4.0.1:
   dependencies:
     path-key "^3.0.0"
 
+npm-run-path@^5.1.0:
+  version "5.1.0"
+  resolved "https://registry.yarnpkg.com/npm-run-path/-/npm-run-path-5.1.0.tgz#bc62f7f3f6952d9894bd08944ba011a6ee7b7e00"
+  integrity sha512-sJOdmRGrY2sjNTRMbSvluQqg+8X7ZK61yvzBEIDhz4f8z1TZFYABsqjjCBd/0PUNE9M6QDgHJXQkGUEm7Q+l9Q==
+  dependencies:
+    path-key "^4.0.0"
+
 number-is-nan@^1.0.0:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/number-is-nan/-/number-is-nan-1.0.1.tgz#097b602b53422a522c1afb8790318336941a011d"
@@ -9767,10 +10421,10 @@ object-copy@^0.1.0:
     define-property "^0.2.5"
     kind-of "^3.0.3"
 
-object-inspect@^1.12.2, object-inspect@^1.9.0:
-  version "1.12.2"
-  resolved "https://registry.yarnpkg.com/object-inspect/-/object-inspect-1.12.2.tgz#c0641f26394532f28ab8d796ab954e43c009a8ea"
-  integrity sha512-z+cPxW0QGUp0mcqcsgQyLVRDoXFQbXOwBaqyF7VIgI4TWNQsDHrBpUQslRmIfAoYWdYzs6UlKJtB2XJpTaNSpQ==
+object-inspect@^1.13.1, object-inspect@^1.9.0:
+  version "1.13.1"
+  resolved "https://registry.yarnpkg.com/object-inspect/-/object-inspect-1.13.1.tgz#b96c6109324ccfef6b12216a956ca4dc2ff94bc2"
+  integrity sha512-5qoj1RUiKOMsCCNLV1CBiPYE10sziTsnmNxkAI/rZhiD63CF7IqdFGC/XzjWjpSgLf0LxXX3bDFIh0E18f6UhQ==
 
 object-inspect@~1.12.3:
   version "1.12.3"
@@ -9785,7 +10439,7 @@ object-is@^1.0.1:
     call-bind "^1.0.2"
     define-properties "^1.1.3"
 
-object-keys@^1.0.11, object-keys@^1.1.1:
+object-keys@^1.1.1:
   version "1.1.1"
   resolved "https://registry.yarnpkg.com/object-keys/-/object-keys-1.1.1.tgz#1c47f272df277f3b1daf061677d9c82e2322c60e"
   integrity sha512-NuAESUOUMrlIXOfHKzD6bpPu3tYt3xvjNdRIQ+FeT0lNb4K8WR70CaDxhuNguS2XG+GjkyMwOzsN5ZktImfhLA==
@@ -9802,16 +10456,6 @@ object-visit@^1.0.0:
   dependencies:
     isobject "^3.0.0"
 
-object.assign@4.1.0:
-  version "4.1.0"
-  resolved "https://registry.yarnpkg.com/object.assign/-/object.assign-4.1.0.tgz#968bf1100d7956bb3ca086f006f846b3bc4008da"
-  integrity sha512-exHJeq6kBKj58mqGyTQ9DFvrZC/eR6OwxzoM9YRoGBqrXYonaFyGiFMuc9VZrXf7DarreEwMpurG3dd+CNyW5w==
-  dependencies:
-    define-properties "^1.1.2"
-    function-bind "^1.1.1"
-    has-symbols "^1.0.0"
-    object-keys "^1.0.11"
-
 object.assign@^4.1.4:
   version "4.1.4"
   resolved "https://registry.yarnpkg.com/object.assign/-/object.assign-4.1.4.tgz#9673c7c7c351ab8c4d0b516f4343ebf4dfb7799f"
@@ -9822,15 +10466,35 @@ object.assign@^4.1.4:
     has-symbols "^1.0.3"
     object-keys "^1.1.1"
 
-object.getownpropertydescriptors@^2.0.3, object.getownpropertydescriptors@^2.1.1:
-  version "2.1.5"
-  resolved "https://registry.yarnpkg.com/object.getownpropertydescriptors/-/object.getownpropertydescriptors-2.1.5.tgz#db5a9002489b64eef903df81d6623c07e5b4b4d3"
-  integrity sha512-yDNzckpM6ntyQiGTik1fKV1DcVDRS+w8bvpWNCBanvH5LfRX9O8WTHqQzG4RZwRAM4I0oU7TV11Lj5v0g20ibw==
+object.fromentries@^2.0.7:
+  version "2.0.7"
+  resolved "https://registry.yarnpkg.com/object.fromentries/-/object.fromentries-2.0.7.tgz#71e95f441e9a0ea6baf682ecaaf37fa2a8d7e616"
+  integrity sha512-UPbPHML6sL8PI/mOqPwsH4G6iyXcCGzLin8KvEPenOZN5lpCNBZZQ+V62vdjB1mQHrmqGQt5/OJzemUA+KJmEA==
   dependencies:
-    array.prototype.reduce "^1.0.5"
     call-bind "^1.0.2"
-    define-properties "^1.1.4"
-    es-abstract "^1.20.4"
+    define-properties "^1.2.0"
+    es-abstract "^1.22.1"
+
+object.getownpropertydescriptors@^2.1.6:
+  version "2.1.7"
+  resolved "https://registry.yarnpkg.com/object.getownpropertydescriptors/-/object.getownpropertydescriptors-2.1.7.tgz#7a466a356cd7da4ba8b9e94ff6d35c3eeab5d56a"
+  integrity sha512-PrJz0C2xJ58FNn11XV2lr4Jt5Gzl94qpy9Lu0JlfEj14z88sqbSBJCBEzdlNUCzY2gburhbrwOZ5BHCmuNUy0g==
+  dependencies:
+    array.prototype.reduce "^1.0.6"
+    call-bind "^1.0.2"
+    define-properties "^1.2.0"
+    es-abstract "^1.22.1"
+    safe-array-concat "^1.0.0"
+
+object.groupby@^1.0.1:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/object.groupby/-/object.groupby-1.0.1.tgz#d41d9f3c8d6c778d9cbac86b4ee9f5af103152ee"
+  integrity sha512-HqaQtqLnp/8Bn4GL16cj+CUYbnpe1bh0TtEaWvybszDG4tgxCJuRpV8VGuvNaI1fAnI4lUJzDG55MXcOH4JZcQ==
+  dependencies:
+    call-bind "^1.0.2"
+    define-properties "^1.2.0"
+    es-abstract "^1.22.1"
+    get-intrinsic "^1.2.1"
 
 object.pick@^1.3.0:
   version "1.3.0"
@@ -9839,6 +10503,15 @@ object.pick@^1.3.0:
   dependencies:
     isobject "^3.0.1"
 
+object.values@^1.1.7:
+  version "1.1.7"
+  resolved "https://registry.yarnpkg.com/object.values/-/object.values-1.1.7.tgz#617ed13272e7e1071b43973aa1655d9291b8442a"
+  integrity sha512-aU6xnDFYT3x17e/f0IiiwlGPTy2jzMySGfUB4fq6z7CV8l85CWHDk5ErhyhpfDHhrOMwGFhSQkhMGHaIotA6Ng==
+  dependencies:
+    call-bind "^1.0.2"
+    define-properties "^1.2.0"
+    es-abstract "^1.22.1"
+
 obliterator@^2.0.0:
   version "2.0.4"
   resolved "https://registry.yarnpkg.com/obliterator/-/obliterator-2.0.4.tgz#fa650e019b2d075d745e44f1effeb13a2adbe816"
@@ -9851,6 +10524,11 @@ oboe@2.1.4:
   dependencies:
     http-https "^1.0.0"
 
+obuf@~1.1.2:
+  version "1.1.2"
+  resolved "https://registry.yarnpkg.com/obuf/-/obuf-1.1.2.tgz#09bea3343d41859ebd446292d11c9d4db619084e"
+  integrity sha512-PX1wu0AmAdPqOL1mWhqmlOd8kOIZQwGZw6rh7uby9fTc5lhaOWFLX3I6R1hrF9k3zUY40e6igsLGkDXK92LJNg==
+
 on-finished@2.4.1:
   version "2.4.1"
   resolved "https://registry.yarnpkg.com/on-finished/-/on-finished-2.4.1.tgz#58c8c44116e54845ad57f14ab10b03533184ac3f"
@@ -9879,6 +10557,13 @@ onetime@^5.1.2:
   dependencies:
     mimic-fn "^2.1.0"
 
+onetime@^6.0.0:
+  version "6.0.0"
+  resolved "https://registry.yarnpkg.com/onetime/-/onetime-6.0.0.tgz#7c24c18ed1fd2e9bca4bd26806a33613c77d34b4"
+  integrity sha512-1FlR+gjXK7X+AsAHso35MnyN5KqGwJRi/31ft6x0M194ht7S+rWAvd7PHss9xSKMzE0asv1pyIHaJYq+BbacAQ==
+  dependencies:
+    mimic-fn "^4.0.0"
+
 open@^7.4.2:
   version "7.4.2"
   resolved "https://registry.yarnpkg.com/open/-/open-7.4.2.tgz#b8147e26dcf3e426316c730089fd71edd29c2321"
@@ -9887,7 +10572,17 @@ open@^7.4.2:
     is-docker "^2.0.0"
     is-wsl "^2.1.1"
 
-optionator@^0.8.1, optionator@^0.8.2:
+open@^9.1.0:
+  version "9.1.0"
+  resolved "https://registry.yarnpkg.com/open/-/open-9.1.0.tgz#684934359c90ad25742f5a26151970ff8c6c80b6"
+  integrity sha512-OS+QTnw1/4vrf+9hh1jc1jnYjzSG4ttTBB8UxOwAnInG3Uo4ssetzC1ihqaIHjLJnA5GGlRl6QlZXOTQhRBUvg==
+  dependencies:
+    default-browser "^4.0.0"
+    define-lazy-prop "^3.0.0"
+    is-inside-container "^1.0.0"
+    is-wsl "^2.2.0"
+
+optionator@^0.8.1:
   version "0.8.3"
   resolved "https://registry.yarnpkg.com/optionator/-/optionator-0.8.3.tgz#84fa1d036fe9d3c7e21d99884b601167ec8fb495"
   integrity sha512-+IW9pACdk3XWmmTXG8m3upGUJst5XRGzxMRjXzAuJ1XnIFNvfhjjIuYkDvysnPQ7qzqVzLt78BCruntqRhWQbA==
@@ -9899,17 +10594,22 @@ optionator@^0.8.1, optionator@^0.8.2:
     type-check "~0.3.2"
     word-wrap "~1.2.3"
 
-optionator@^0.9.1:
-  version "0.9.1"
-  resolved "https://registry.yarnpkg.com/optionator/-/optionator-0.9.1.tgz#4f236a6373dae0566a6d43e1326674f50c291499"
-  integrity sha512-74RlY5FCnhq4jRxVUPKDaRwrVNXMqsGsiW6AJw4XK8hmtm10wC0ypZBLw5IIp85NZMr91+qd1RvvENwg7jjRFw==
+optionator@^0.9.1, optionator@^0.9.3:
+  version "0.9.3"
+  resolved "https://registry.yarnpkg.com/optionator/-/optionator-0.9.3.tgz#007397d44ed1872fdc6ed31360190f81814e2c64"
+  integrity sha512-JjCoypp+jKn1ttEFExxhetCKeJt9zhAgAve5FXHixTvFDW/5aEktX9bufBKLRRMdU7bNtpLfcGu94B3cdEJgjg==
   dependencies:
+    "@aashutoshrathi/word-wrap" "^1.2.3"
     deep-is "^0.1.3"
     fast-levenshtein "^2.0.6"
     levn "^0.4.1"
     prelude-ls "^1.2.1"
     type-check "^0.4.0"
-    word-wrap "^1.2.3"
+
+ordinal@^1.0.3:
+  version "1.0.3"
+  resolved "https://registry.yarnpkg.com/ordinal/-/ordinal-1.0.3.tgz#1a3c7726a61728112f50944ad7c35c06ae3a0d4d"
+  integrity sha512-cMddMgb2QElm8G7vdaa02jhUNbTSrhsgAGUz1OokD83uJTwSUn+nKoNoKVVaRa08yF6sgfO7Maou1+bgLd9rdQ==
 
 os-homedir@^1.0.0:
   version "1.0.2"
@@ -9945,7 +10645,7 @@ p-limit@^1.1.0:
   dependencies:
     p-try "^1.0.0"
 
-p-limit@^2.0.0, p-limit@^2.2.0:
+p-limit@^2.2.0:
   version "2.3.0"
   resolved "https://registry.yarnpkg.com/p-limit/-/p-limit-2.3.0.tgz#3dd33c647a214fdfffd835933eb086da0dc21db1"
   integrity sha512-//88mFWSJx8lxCzwdAABTJL2MyWB12+eIY7MDL2SqLmAkeKU9qxRvWuSyTjm3FUmpBEMuFfckAIqEaVGUDxb6w==
@@ -9959,6 +10659,13 @@ p-limit@^3.0.2, p-limit@^3.1.0:
   dependencies:
     yocto-queue "^0.1.0"
 
+p-limit@^4.0.0:
+  version "4.0.0"
+  resolved "https://registry.yarnpkg.com/p-limit/-/p-limit-4.0.0.tgz#914af6544ed32bfa54670b061cafcbd04984b644"
+  integrity sha512-5b0R4txpzjPWVw/cXXUResoD4hb6U/x9BH08L7nw+GN1sezDzPdxeRvpc9c433fZhBan/wusjbCsqwqm4EIBIQ==
+  dependencies:
+    yocto-queue "^1.0.0"
+
 p-locate@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/p-locate/-/p-locate-2.0.0.tgz#20a0103b222a70c8fd39cc2e580680f3dde5ec43"
@@ -9966,13 +10673,6 @@ p-locate@^2.0.0:
   dependencies:
     p-limit "^1.1.0"
 
-p-locate@^3.0.0:
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/p-locate/-/p-locate-3.0.0.tgz#322d69a05c0264b25997d9f40cd8a891ab0064a4"
-  integrity sha512-x+12w/To+4GFfgJhBEpiDcLozRJGegY+Ei7/z0tSLkMmxGZNybVMSfWj9aJn8Z5Fc7dBUNJOOVgPv2H7IwulSQ==
-  dependencies:
-    p-limit "^2.0.0"
-
 p-locate@^4.1.0:
   version "4.1.0"
   resolved "https://registry.yarnpkg.com/p-locate/-/p-locate-4.1.0.tgz#a3428bb7088b3a60292f66919278b7c297ad4f07"
@@ -10004,6 +10704,11 @@ p-try@^2.0.0:
   resolved "https://registry.yarnpkg.com/p-try/-/p-try-2.2.0.tgz#cb2868540e313d61de58fafbe35ce9004d5540e6"
   integrity sha512-R4nPAVTAU0B9D35/Gk3uJf/7XYbQcyohSKdvAxIRSNghFl4e71hVoGnBNQz9cWaXxO2I10KTC+3jMdvvoKw6dQ==
 
+packet-reader@1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/packet-reader/-/packet-reader-1.0.0.tgz#9238e5480dedabacfe1fe3f2771063f164157d74"
+  integrity sha512-HAKu/fG3HpHFO0AA8WE8q2g+gBJaZ9MG7fcKk+IJPLTGAD6Psw4443l+9DGRbOIh3/aXr7Phy0TjilYivJo5XQ==
+
 parent-module@^1.0.0:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/parent-module/-/parent-module-1.0.1.tgz#691d2709e78c79fae3a156622452d00762caaaa2"
@@ -10011,7 +10716,7 @@ parent-module@^1.0.0:
   dependencies:
     callsites "^3.0.0"
 
-parse-asn1@^5.0.0, parse-asn1@^5.1.5:
+parse-asn1@^5.0.0, parse-asn1@^5.1.6:
   version "5.1.6"
   resolved "https://registry.yarnpkg.com/parse-asn1/-/parse-asn1-5.1.6.tgz#385080a3ec13cb62a62d39409cb3e88844cdaed4"
   integrity sha512-RnZRo1EPU6JBnra2vGHj0yhp6ebyjBZpmUCLHWiFhxlzvBCCpAuZ7elsBp1PVAbQN0/04VD/19rfzlBSwLstMw==
@@ -10105,7 +10810,7 @@ patch-package@^6.2.2:
     tmp "^0.0.33"
     yaml "^1.10.2"
 
-path-browserify@^1.0.0:
+path-browserify@^1.0.0, path-browserify@^1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/path-browserify/-/path-browserify-1.0.1.tgz#d98454a9c3753d5790860f16f68867b9e46be1fd"
   integrity sha512-b7uo2UCUOYZcnF/3ID0lulOJi/bafxa1xPe7ZPsammBSpjSWQkjNxlt635YGS2MiR9GjvuXCtz2emr3jbsz98g==
@@ -10132,11 +10837,6 @@ path-is-absolute@^1.0.0, path-is-absolute@^1.0.1:
   resolved "https://registry.yarnpkg.com/path-is-absolute/-/path-is-absolute-1.0.1.tgz#174b9268735534ffbc7ace6bf53a5a9e1b5c5f5f"
   integrity sha512-AVbw3UJ2e9bq64vSaS9Am0fje1Pa8pbGqTTsmXfaIiMpnr5DlDhfJOuLj9Sf95ZPVDAUerDfEk88MPmPe7UCQg==
 
-path-is-inside@^1.0.2:
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/path-is-inside/-/path-is-inside-1.0.2.tgz#365417dede44430d1c11af61027facf074bdfc53"
-  integrity sha512-DUWJr3+ULp4zXmol/SZkFf3JGsS9/SIv+Y3Rt93/UjPpDpklB5f1er4O3POIbUuUJ3FXgqte2Q7SrU6zAqwk8w==
-
 path-key@^2.0.1:
   version "2.0.1"
   resolved "https://registry.yarnpkg.com/path-key/-/path-key-2.0.1.tgz#411cadb574c5a140d3a4b1910d40d80cc9f40b40"
@@ -10147,6 +10847,11 @@ path-key@^3.0.0, path-key@^3.1.0:
   resolved "https://registry.yarnpkg.com/path-key/-/path-key-3.1.1.tgz#581f6ade658cbba65a0d3380de7753295054f375"
   integrity sha512-ojmeN0qd+y0jszEtoY48r0Peq5dwMEkIlCOu6Q5f41lfkswXuKtYrhgoTpLnyIcHm24Uhqx+5Tqm2InSwLhE6Q==
 
+path-key@^4.0.0:
+  version "4.0.0"
+  resolved "https://registry.yarnpkg.com/path-key/-/path-key-4.0.0.tgz#295588dc3aee64154f877adb9d780b81c554bf18"
+  integrity sha512-haREypq7xkM7ErfgIyA0z+Bj4AGKlMSdlQE2jvJo6huWD1EdkKYV+G/T4nq0YEF2vgTT8kqMFKo1uHn950r4SQ==
+
 path-parse@^1.0.6, path-parse@^1.0.7:
   version "1.0.7"
   resolved "https://registry.yarnpkg.com/path-parse/-/path-parse-1.0.7.tgz#fbc114b60ca42b30d9daf5858e4bd68bbedb6735"
@@ -10186,6 +10891,11 @@ path@^0.12.7:
     process "^0.11.1"
     util "^0.10.3"
 
+pathington@^1.1.7:
+  version "1.1.7"
+  resolved "https://registry.yarnpkg.com/pathington/-/pathington-1.1.7.tgz#caf2d2db899a31fea4e81e3657af6acde5171903"
+  integrity sha512-JxzhUzagDfNIOm4qqwQqP3rWeo7rNNOfIahy4n+3GTEdwXLqw5cJHUR0soSopQtNEv763lzxb6eA2xBllpR8zw==
+
 pathval@^1.1.1:
   version "1.1.1"
   resolved "https://registry.yarnpkg.com/pathval/-/pathval-1.1.1.tgz#8534e77a77ce7ac5a2512ea21e0fdb8fcf6c3d8d"
@@ -10207,6 +10917,82 @@ performance-now@^2.1.0:
   resolved "https://registry.yarnpkg.com/performance-now/-/performance-now-2.1.0.tgz#6309f4e0e5fa913ec1c69307ae364b4b377c9e7b"
   integrity sha512-7EAHlyLHI56VEIdK57uwHdHKIaAGbnXPiw0yWbarQZOKaKpvUIgW0jWRVLiatnM+XXlSwsanIBH/hzGMJulMow==
 
+pg-cloudflare@^1.1.1:
+  version "1.1.1"
+  resolved "https://registry.yarnpkg.com/pg-cloudflare/-/pg-cloudflare-1.1.1.tgz#e6d5833015b170e23ae819e8c5d7eaedb472ca98"
+  integrity sha512-xWPagP/4B6BgFO+EKz3JONXv3YDgvkbVrGw2mTo3D6tVDQRh1e7cqVGvyR3BE+eQgAvx1XhW/iEASj4/jCWl3Q==
+
+pg-connection-string@^2.6.2:
+  version "2.6.2"
+  resolved "https://registry.yarnpkg.com/pg-connection-string/-/pg-connection-string-2.6.2.tgz#713d82053de4e2bd166fab70cd4f26ad36aab475"
+  integrity sha512-ch6OwaeaPYcova4kKZ15sbJ2hKb/VP48ZD2gE7i1J+L4MspCtBMAx8nMgz7bksc7IojCIIWuEhHibSMFH8m8oA==
+
+pg-int8@1.0.1:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/pg-int8/-/pg-int8-1.0.1.tgz#943bd463bf5b71b4170115f80f8efc9a0c0eb78c"
+  integrity sha512-WCtabS6t3c8SkpDBUlb1kjOs7l66xsGdKpIPZsg4wR+B3+u9UAum2odSsF9tnvxg80h4ZxLWMy4pRjOsFIqQpw==
+
+pg-numeric@1.0.2:
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/pg-numeric/-/pg-numeric-1.0.2.tgz#816d9a44026086ae8ae74839acd6a09b0636aa3a"
+  integrity sha512-BM/Thnrw5jm2kKLE5uJkXqqExRUY/toLHda65XgFTBTFYZyopbKjBe29Ii3RbkvlsMoFwD+tHeGaCjjv0gHlyw==
+
+pg-pool@^3.6.1:
+  version "3.6.1"
+  resolved "https://registry.yarnpkg.com/pg-pool/-/pg-pool-3.6.1.tgz#5a902eda79a8d7e3c928b77abf776b3cb7d351f7"
+  integrity sha512-jizsIzhkIitxCGfPRzJn1ZdcosIt3pz9Sh3V01fm1vZnbnCMgmGl5wvGGdNN2EL9Rmb0EcFoCkixH4Pu+sP9Og==
+
+pg-protocol@*, pg-protocol@^1.6.0:
+  version "1.6.0"
+  resolved "https://registry.yarnpkg.com/pg-protocol/-/pg-protocol-1.6.0.tgz#4c91613c0315349363af2084608db843502f8833"
+  integrity sha512-M+PDm637OY5WM307051+bsDia5Xej6d9IR4GwJse1qA1DIhiKlksvrneZOYQq42OM+spubpcNYEo2FcKQrDk+Q==
+
+pg-types@^2.1.0:
+  version "2.2.0"
+  resolved "https://registry.yarnpkg.com/pg-types/-/pg-types-2.2.0.tgz#2d0250d636454f7cfa3b6ae0382fdfa8063254a3"
+  integrity sha512-qTAAlrEsl8s4OiEQY69wDvcMIdQN6wdz5ojQiOy6YRMuynxenON0O5oCpJI6lshc6scgAY8qvJ2On/p+CXY0GA==
+  dependencies:
+    pg-int8 "1.0.1"
+    postgres-array "~2.0.0"
+    postgres-bytea "~1.0.0"
+    postgres-date "~1.0.4"
+    postgres-interval "^1.1.0"
+
+pg-types@^4.0.1:
+  version "4.0.1"
+  resolved "https://registry.yarnpkg.com/pg-types/-/pg-types-4.0.1.tgz#31857e89d00a6c66b06a14e907c3deec03889542"
+  integrity sha512-hRCSDuLII9/LE3smys1hRHcu5QGcLs9ggT7I/TCs0IE+2Eesxi9+9RWAAwZ0yaGjxoWICF/YHLOEjydGujoJ+g==
+  dependencies:
+    pg-int8 "1.0.1"
+    pg-numeric "1.0.2"
+    postgres-array "~3.0.1"
+    postgres-bytea "~3.0.0"
+    postgres-date "~2.0.1"
+    postgres-interval "^3.0.0"
+    postgres-range "^1.1.1"
+
+pg@^8.11.3:
+  version "8.11.3"
+  resolved "https://registry.yarnpkg.com/pg/-/pg-8.11.3.tgz#d7db6e3fe268fcedd65b8e4599cda0b8b4bf76cb"
+  integrity sha512-+9iuvG8QfaaUrrph+kpF24cXkH1YOOUeArRNYIxq1viYHZagBxrTno7cecY1Fa44tJeZvaoG+Djpkc3JwehN5g==
+  dependencies:
+    buffer-writer "2.0.0"
+    packet-reader "1.0.0"
+    pg-connection-string "^2.6.2"
+    pg-pool "^3.6.1"
+    pg-protocol "^1.6.0"
+    pg-types "^2.1.0"
+    pgpass "1.x"
+  optionalDependencies:
+    pg-cloudflare "^1.1.1"
+
+pgpass@1.x:
+  version "1.0.5"
+  resolved "https://registry.yarnpkg.com/pgpass/-/pgpass-1.0.5.tgz#9b873e4a564bb10fa7a7dbd55312728d422a223d"
+  integrity sha512-FdW9r/jQZhSeohs1Z3sI1yxFQNFvMcnmfuj4WBMUTxOrAyLMaTcE1aAMBiTlbMNaXvBCQuVi0R7hd8udDSP7ug==
+  dependencies:
+    split2 "^4.1.0"
+
 picocolors@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/picocolors/-/picocolors-1.0.0.tgz#cb5bdc74ff3f51892236eaf79d68bc44564ab81c"
@@ -10250,9 +11036,9 @@ pinkie@^2.0.0:
   integrity sha512-MnUuEycAemtSaeFSjXKW/aroV7akBbY+Sv+RkyqFjgAe73F+MR0TBWKBRDkmfWq/HiFmdavfZ1G7h4SPZXaCSg==
 
 pirates@^4.0.4:
-  version "4.0.5"
-  resolved "https://registry.yarnpkg.com/pirates/-/pirates-4.0.5.tgz#feec352ea5c3268fb23a37c702ab1699f35a5f3b"
-  integrity sha512-8V9+HQPupnaXMA23c5hvl69zXvTwTzyAYasnkb0Tts4XvO4CliqONMOnvlq26rkhLC3nWDFBJf73LU1e1VZLaQ==
+  version "4.0.6"
+  resolved "https://registry.yarnpkg.com/pirates/-/pirates-4.0.6.tgz#3018ae32ecfcff6c29ba2267cbf21166ac1f36b9"
+  integrity sha512-saLsH7WeYYPiD25LDuLRRY/i+6HaPYr6G1OUlN39otzkSTxKnubR9RTxS3/Kk50s1g2JTgFwWQDQyplC5/SHZg==
 
 pkg-dir@^4.2.0:
   version "4.2.0"
@@ -10261,11 +11047,65 @@ pkg-dir@^4.2.0:
   dependencies:
     find-up "^4.0.0"
 
+pluralize@^8.0.0:
+  version "8.0.0"
+  resolved "https://registry.yarnpkg.com/pluralize/-/pluralize-8.0.0.tgz#1a6fa16a38d12a1901e0320fa017051c539ce3b1"
+  integrity sha512-Nc3IT5yHzflTfbjgqWcCPpo7DaKy4FnpB0l/zCAW0Tc7jxAiuqSxHasntB3D7887LSrA93kDJ9IXovxJYxyLCA==
+
 posix-character-classes@^0.1.0:
   version "0.1.1"
   resolved "https://registry.yarnpkg.com/posix-character-classes/-/posix-character-classes-0.1.1.tgz#01eac0fe3b5af71a2a6c02feabb8c1fef7e00eab"
   integrity sha512-xTgYBc3fuo7Yt7JbiuFxSYGToMoz8fLoE6TC9Wx1P/u+LfeThMOAqmuyECnlBaaJb+u1m9hHiXUEtwW4OzfUJg==
 
+postgres-array@~2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/postgres-array/-/postgres-array-2.0.0.tgz#48f8fce054fbc69671999329b8834b772652d82e"
+  integrity sha512-VpZrUqU5A69eQyW2c5CA1jtLecCsN2U/bD6VilrFDWq5+5UIEVO7nazS3TEcHf1zuPYO/sqGvUvW62g86RXZuA==
+
+postgres-array@~3.0.1:
+  version "3.0.2"
+  resolved "https://registry.yarnpkg.com/postgres-array/-/postgres-array-3.0.2.tgz#68d6182cb0f7f152a7e60dc6a6889ed74b0a5f98"
+  integrity sha512-6faShkdFugNQCLwucjPcY5ARoW1SlbnrZjmGl0IrrqewpvxvhSLHimCVzqeuULCbG0fQv7Dtk1yDbG3xv7Veog==
+
+postgres-bytea@~1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/postgres-bytea/-/postgres-bytea-1.0.0.tgz#027b533c0aa890e26d172d47cf9ccecc521acd35"
+  integrity sha512-xy3pmLuQqRBZBXDULy7KbaitYqLcmxigw14Q5sj8QBVLqEwXfeybIKVWiqAXTlcvdvb0+xkOtDbfQMOf4lST1w==
+
+postgres-bytea@~3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/postgres-bytea/-/postgres-bytea-3.0.0.tgz#9048dc461ac7ba70a6a42d109221619ecd1cb089"
+  integrity sha512-CNd4jim9RFPkObHSjVHlVrxoVQXz7quwNFpz7RY1okNNme49+sVyiTvTRobiLV548Hx/hb1BG+iE7h9493WzFw==
+  dependencies:
+    obuf "~1.1.2"
+
+postgres-date@~1.0.4:
+  version "1.0.7"
+  resolved "https://registry.yarnpkg.com/postgres-date/-/postgres-date-1.0.7.tgz#51bc086006005e5061c591cee727f2531bf641a8"
+  integrity sha512-suDmjLVQg78nMK2UZ454hAG+OAW+HQPZ6n++TNDUX+L0+uUlLywnoxJKDou51Zm+zTCjrCl0Nq6J9C5hP9vK/Q==
+
+postgres-date@~2.0.1:
+  version "2.0.1"
+  resolved "https://registry.yarnpkg.com/postgres-date/-/postgres-date-2.0.1.tgz#638b62e5c33764c292d37b08f5257ecb09231457"
+  integrity sha512-YtMKdsDt5Ojv1wQRvUhnyDJNSr2dGIC96mQVKz7xufp07nfuFONzdaowrMHjlAzY6GDLd4f+LUHHAAM1h4MdUw==
+
+postgres-interval@^1.1.0:
+  version "1.2.0"
+  resolved "https://registry.yarnpkg.com/postgres-interval/-/postgres-interval-1.2.0.tgz#b460c82cb1587507788819a06aa0fffdb3544695"
+  integrity sha512-9ZhXKM/rw350N1ovuWHbGxnGh/SNJ4cnxHiM0rxE4VN41wsg8P8zWn9hv/buK00RP4WvlOyr/RBDiptyxVbkZQ==
+  dependencies:
+    xtend "^4.0.0"
+
+postgres-interval@^3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/postgres-interval/-/postgres-interval-3.0.0.tgz#baf7a8b3ebab19b7f38f07566c7aab0962f0c86a"
+  integrity sha512-BSNDnbyZCXSxgA+1f5UU2GmwhoI0aU5yMxRGO8CdFEcY2BQF9xm/7MqKnYoM1nJDk8nONNWDk9WeSmePFhQdlw==
+
+postgres-range@^1.1.1:
+  version "1.1.3"
+  resolved "https://registry.yarnpkg.com/postgres-range/-/postgres-range-1.1.3.tgz#9ccd7b01ca2789eb3c2e0888b3184225fa859f76"
+  integrity sha512-VdlZoocy5lCP0c/t66xAfclglEapXPCIVhqqJRncYpvbCgImF0w67aPKfbqUMr72tO2k5q0TdTZwCLjPTI6C9g==
+
 postinstall-postinstall@^2.1.0:
   version "2.1.0"
   resolved "https://registry.yarnpkg.com/postinstall-postinstall/-/postinstall-postinstall-2.1.0.tgz#4f7f77441ef539d1512c40bd04c71b06a4704ca3"
@@ -10291,6 +11131,20 @@ prepend-http@^2.0.0:
   resolved "https://registry.yarnpkg.com/prepend-http/-/prepend-http-2.0.0.tgz#e92434bfa5ea8c19f41cdfd401d741a3c819d897"
   integrity sha512-ravE6m9Atw9Z/jjttRUZ+clIXogdghyZAuWJ3qEzjT+jI/dL1ifAqhZeC5VHzQp1MSt1+jxKkFNemj/iO7tVUA==
 
+preprocess@^3.2.0:
+  version "3.2.0"
+  resolved "https://registry.yarnpkg.com/preprocess/-/preprocess-3.2.0.tgz#36b3e2c52331fbc6fabb26d4fd5709304b7e3675"
+  integrity sha512-cO+Rf+Ose/eD+ze8Hxd9p9nS1xT8thYqv8owG/V8+IS/Remd7Z17SvaRK/oJxp08yaM8zb+QTckDKJUul2pk7g==
+  dependencies:
+    xregexp "3.1.0"
+
+prettier-linter-helpers@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/prettier-linter-helpers/-/prettier-linter-helpers-1.0.0.tgz#d23d41fe1375646de2d0104d3454a3008802cf7b"
+  integrity sha512-GbK2cP9nraSSUF9N2XwUwqfzlAFlMNYYl+ShE/V+H8a9uNl/oUqB1w2EL54Jh0OlyRSd8RfWYJ3coVS4TROP2w==
+  dependencies:
+    fast-diff "^1.1.2"
+
 prettier-plugin-solidity@=1.0.0-dev.22:
   version "1.0.0-dev.22"
   resolved "https://registry.yarnpkg.com/prettier-plugin-solidity/-/prettier-plugin-solidity-1.0.0-dev.22.tgz#08c07816884d17bd9171c073c2421559057230c3"
@@ -10303,27 +11157,31 @@ prettier-plugin-solidity@=1.0.0-dev.22:
     solidity-comments-extractor "^0.0.7"
     string-width "^4.2.3"
 
-prettier@^1.14.3, prettier@^1.18.2:
-  version "1.19.1"
-  resolved "https://registry.yarnpkg.com/prettier/-/prettier-1.19.1.tgz#f7d7f5ff8a9cd872a7be4ca142095956a60797cb"
-  integrity sha512-s7PoyDv/II1ObgQunCbB9PdLmUcBZcnWOcxDh7O0N/UwDEsHyqkW+Qh28jW+mVuCdx7gLB0BotYI1Y6uI9iyew==
+prettier-plugin-solidity@^1.1.3:
+  version "1.1.3"
+  resolved "https://registry.yarnpkg.com/prettier-plugin-solidity/-/prettier-plugin-solidity-1.1.3.tgz#9a35124f578404caf617634a8cab80862d726cba"
+  integrity sha512-fQ9yucPi2sBbA2U2Xjh6m4isUTJ7S7QLc/XDDsktqqxYfTwdYKJ0EnnywXHwCGAaYbQNK+HIYPL1OemxuMsgeg==
+  dependencies:
+    "@solidity-parser/parser" "^0.16.0"
+    semver "^7.3.8"
+    solidity-comments-extractor "^0.0.7"
 
-prettier@^2.1.2:
-  version "2.8.3"
-  resolved "https://registry.yarnpkg.com/prettier/-/prettier-2.8.3.tgz#ab697b1d3dd46fb4626fbe2f543afe0cc98d8632"
-  integrity sha512-tJ/oJ4amDihPoufT5sM0Z1SKEuKay8LfVAMlbbhnnkvt6BUserZylqo2PN+p9KeljLr0OHa2rXHU1T8reeoTrw==
+prettier@^2.1.2, prettier@^2.3.1, prettier@^2.3.2, prettier@^2.8.3:
+  version "2.8.8"
+  resolved "https://registry.yarnpkg.com/prettier/-/prettier-2.8.8.tgz#e8c5d7e98a4305ffe3de2e1fc4aca1a71c28b1da"
+  integrity sha512-tdN8qQGvNjw4CHbY+XXk0JgCXn9QiF21a55rBe5LJAU+kDyC4WQn4+awm2Xfk2lQMk5fKup9XgzTZtGkjBdP9Q==
 
-prettier@^2.3.2:
-  version "2.7.1"
-  resolved "https://registry.yarnpkg.com/prettier/-/prettier-2.7.1.tgz#e235806850d057f97bb08368a4f7d899f7760c64"
-  integrity sha512-ujppO+MkdPqoVINuDFDRLClm7D78qbDt0/NR+wp5FqEZOoTNAjPHWj17QRhu7geIHJfcNhRk1XVQmF8Bp3ye+g==
+prettier@^3.0.3:
+  version "3.0.3"
+  resolved "https://registry.yarnpkg.com/prettier/-/prettier-3.0.3.tgz#432a51f7ba422d1469096c0fdc28e235db8f9643"
+  integrity sha512-L/4pUDMxcNa8R/EthV08Zt42WBO4h1rarVtK0K+QJG0X187OLo7l699jWw0GKuwzkPQ//jMFA/8Xm6Fh3J/DAg==
 
-pretty-format@^29.0.0, pretty-format@^29.2.1:
-  version "29.2.1"
-  resolved "https://registry.yarnpkg.com/pretty-format/-/pretty-format-29.2.1.tgz#86e7748fe8bbc96a6a4e04fa99172630907a9611"
-  integrity sha512-Y41Sa4aLCtKAXvwuIpTvcFBkyeYp2gdFWzXGA+ZNES3VwURIB165XO/z7CjETwzCCS53MjW/rLMyyqEnTtaOfA==
+pretty-format@^29.0.0, pretty-format@^29.7.0:
+  version "29.7.0"
+  resolved "https://registry.yarnpkg.com/pretty-format/-/pretty-format-29.7.0.tgz#ca42c758310f365bfa71a0bda0a807160b776812"
+  integrity sha512-Pdlw/oPxN+aXdmM9R00JVC9WVFoCLTKJvDVLgmJ+qAffBMxsV85l/Lu7sNx4zSzPyoL2euImuEwHhOXdEgNFZQ==
   dependencies:
-    "@jest/schemas" "^29.0.0"
+    "@jest/schemas" "^29.6.3"
     ansi-styles "^5.0.0"
     react-is "^18.0.0"
 
@@ -10370,6 +11228,15 @@ prompts@^2.0.1:
     kleur "^3.0.3"
     sisteransi "^1.0.5"
 
+proper-lockfile@^4.1.2:
+  version "4.1.2"
+  resolved "https://registry.yarnpkg.com/proper-lockfile/-/proper-lockfile-4.1.2.tgz#c8b9de2af6b2f1601067f98e01ac66baa223141f"
+  integrity sha512-TjNPblN4BwAWMXU8s9AEz4JmQxnD1NNL7bNOY/AKUzyamc379FWASUhc/K1pL2noVb+XmZKLL68cjzLsiOAMaA==
+  dependencies:
+    graceful-fs "^4.2.4"
+    retry "^0.12.0"
+    signal-exit "^3.0.2"
+
 proxy-addr@~2.0.7:
   version "2.0.7"
   resolved "https://registry.yarnpkg.com/proxy-addr/-/proxy-addr-2.0.7.tgz#f19fe69ceab311eeb94b42e70e8c2070f9ba1025"
@@ -10474,37 +11341,37 @@ pump@^3.0.0:
     end-of-stream "^1.1.0"
     once "^1.3.1"
 
-punycode@1.3.2:
-  version "1.3.2"
-  resolved "https://registry.yarnpkg.com/punycode/-/punycode-1.3.2.tgz#9653a036fb7c1ee42342f2325cceefea3926c48d"
-  integrity sha512-RofWgt/7fL5wP1Y7fxE7/EmTLzQVnB0ycyibJ0OOHIlJqTNzglYFxVwETOcIoJqJmpDXJ9xImDv+Fq34F/d4Dw==
-
 punycode@2.1.0:
   version "2.1.0"
   resolved "https://registry.yarnpkg.com/punycode/-/punycode-2.1.0.tgz#5f863edc89b96db09074bad7947bf09056ca4e7d"
   integrity sha512-Yxz2kRwT90aPiWEMHVYnEf4+rhwF1tBmmZ4KepCP+Wkium9JxtWnUm1nqGwpiAHr/tnTSeHqr3wb++jgSkXjhA==
 
-punycode@^2.1.0:
-  version "2.1.1"
-  resolved "https://registry.yarnpkg.com/punycode/-/punycode-2.1.1.tgz#b58b010ac40c22c5657616c8d2c2c02c7bf479ec"
-  integrity sha512-XRsRjdf+j5ml+y/6GKHPZbrF/8p2Yga0JPtdqTIY2Xe5ohJPD9saDJJLPvp9+NSBprVvevdXZybnj2cv8OEd0A==
+punycode@^1.4.1:
+  version "1.4.1"
+  resolved "https://registry.yarnpkg.com/punycode/-/punycode-1.4.1.tgz#c0d5a63b2718800ad8e1eb0fa5269c84dd41845e"
+  integrity sha512-jmYNElW7yvO7TV33CjSmvSiE2yco3bV2czu/OzDKdMNVZQWfxCblURLhf+47syQRBntjfLdd/H0egrzIG+oaFQ==
 
-punycode@^2.1.1:
+punycode@^2.1.0, punycode@^2.1.1:
   version "2.3.0"
   resolved "https://registry.yarnpkg.com/punycode/-/punycode-2.3.0.tgz#f67fa67c94da8f4d0cfff981aee4118064199b8f"
   integrity sha512-rRV+zQD8tVFys26lAGR9WUuS4iUAngJScM+ZRSKtvl5tKeZ2t5bvdNFdNHBW9FWR4guGHlgmsZ1G7BSm2wTbuA==
 
-qs@6.11.0, qs@^6.7.0:
+pure-rand@^6.0.0:
+  version "6.0.4"
+  resolved "https://registry.yarnpkg.com/pure-rand/-/pure-rand-6.0.4.tgz#50b737f6a925468679bff00ad20eade53f37d5c7"
+  integrity sha512-LA0Y9kxMYv47GIPJy6MI84fqTd2HmYZI83W/kM/SkKfDlajnZYfmXFTxkbY+xSBPkLJxltMa9hIkmdc29eguMA==
+
+qs@6.11.0:
   version "6.11.0"
   resolved "https://registry.yarnpkg.com/qs/-/qs-6.11.0.tgz#fd0d963446f7a65e1367e01abd85429453f0c37a"
   integrity sha512-MvjoMCJwEarSbUYk5O+nmoSzSutSsTwF85zcHPQ9OrlFoZOYIjaqBAJIqIXjptyD5vThxGq52Xu/MaJzRkIk4Q==
   dependencies:
     side-channel "^1.0.4"
 
-qs@^6.4.0:
-  version "6.11.1"
-  resolved "https://registry.yarnpkg.com/qs/-/qs-6.11.1.tgz#6c29dff97f0c0060765911ba65cbc9764186109f"
-  integrity sha512-0wsrzgTz/kAVIeuxSjnpGC56rzYtr6JT/2BwEvMaPhFIoYa1aGO8LbzuU1R0uUYQkLpWBTOj0l/CLAJB64J6nQ==
+qs@^6.11.2, qs@^6.4.0:
+  version "6.11.2"
+  resolved "https://registry.yarnpkg.com/qs/-/qs-6.11.2.tgz#64bea51f12c1f5da1bc01496f48ffcff7c69d7d9"
+  integrity sha512-tDNIz22aBzCDxLtVH++VnTfzxlfeK5CbqohpSqpJgj1Wg/cQbStNAz3NuqCs5vV+pjBsK4x4pN9HlVh7rcYRiA==
   dependencies:
     side-channel "^1.0.4"
 
@@ -10522,11 +11389,6 @@ query-string@^5.0.1:
     object-assign "^4.1.0"
     strict-uri-encode "^1.0.0"
 
-querystring@0.2.0:
-  version "0.2.0"
-  resolved "https://registry.yarnpkg.com/querystring/-/querystring-0.2.0.tgz#b209849203bb25df820da756e747005878521620"
-  integrity sha512-X/xY82scca2tau62i9mDyU9K+I+djTMUsvwf7xnUX5GLvVzgJybOJf4Y6o9Zx3oJK/LSXg5tTZBjwzqVPaPO2g==
-
 querystring@^0.2.0:
   version "0.2.1"
   resolved "https://registry.yarnpkg.com/querystring/-/querystring-0.2.1.tgz#40d77615bb09d16902a85c3e38aa8b5ed761c2dd"
@@ -10562,7 +11424,7 @@ range-parser@~1.2.1:
   resolved "https://registry.yarnpkg.com/range-parser/-/range-parser-1.2.1.tgz#3cf37023d199e1c24d1a55b84800c2f3e6468031"
   integrity sha512-Hrgsx+orqoygnmhFbKaHE6c296J+HTAQXoxEF6gNupROmmGJRoyzfG3ccAveqCBrwr/2yxQ5BVd/GTl5agOwSg==
 
-raw-body@2.5.1, raw-body@^2.4.1:
+raw-body@2.5.1:
   version "2.5.1"
   resolved "https://registry.yarnpkg.com/raw-body/-/raw-body-2.5.1.tgz#fe1b1628b181b700215e5fd42389f98b71392857"
   integrity sha512-qqJBtEyVgS0ZmPGdCFPWJ3FreoqvG4MVQln/kCgF7Olq95IbOp0/BWyMwbdtn4VTvkM8Y7khCQ2Xgk/tcrCXig==
@@ -10572,6 +11434,16 @@ raw-body@2.5.1, raw-body@^2.4.1:
     iconv-lite "0.4.24"
     unpipe "1.0.0"
 
+raw-body@2.5.2, raw-body@^2.4.1:
+  version "2.5.2"
+  resolved "https://registry.yarnpkg.com/raw-body/-/raw-body-2.5.2.tgz#99febd83b90e08975087e8f1f9419a149366b68a"
+  integrity sha512-8zGqypfENjCIqGhgXToC8aB2r7YrBX+AQAfIPs/Mlk+BtPTztOvTS01NRW/3Eh60J+a48lt8qsCzirQ6loCVfA==
+  dependencies:
+    bytes "3.1.2"
+    http-errors "2.0.0"
+    iconv-lite "0.4.24"
+    unpipe "1.0.0"
+
 rc@~1.2.7:
   version "1.2.8"
   resolved "https://registry.yarnpkg.com/rc/-/rc-1.2.8.tgz#cd924bf5200a075b83c188cd6b9e211b7fc0d3ed"
@@ -10624,9 +11496,9 @@ readable-stream@^1.0.33:
     string_decoder "~0.10.x"
 
 readable-stream@^2.0.0, readable-stream@^2.0.5, readable-stream@^2.2.2, readable-stream@^2.2.8, readable-stream@^2.2.9, readable-stream@^2.3.0, readable-stream@^2.3.5, readable-stream@^2.3.6, readable-stream@~2.3.6:
-  version "2.3.7"
-  resolved "https://registry.yarnpkg.com/readable-stream/-/readable-stream-2.3.7.tgz#1eca1cf711aef814c04f62252a36a62f6cb23b57"
-  integrity sha512-Ebho8K4jIbHAxnuxi7o42OrZgF/ZTNcsZj6nRKyUmkhLFq8CHItp/fy6hQZuZmP/n3yZ9VBUbp4zz/mX8hmYPw==
+  version "2.3.8"
+  resolved "https://registry.yarnpkg.com/readable-stream/-/readable-stream-2.3.8.tgz#91125e8042bba1b9887f49345f6277027ce8be9b"
+  integrity sha512-8p0AUk4XODgIewSi0l8Epjs+EVnWiK7NoDIEGU0HhE7+ZyY8D1IMY7odu5lRrFXGg71L15KG8QrPmum45RTtdA==
   dependencies:
     core-util-is "~1.0.0"
     inherits "~2.0.3"
@@ -10636,10 +11508,10 @@ readable-stream@^2.0.0, readable-stream@^2.0.5, readable-stream@^2.2.2, readable
     string_decoder "~1.1.1"
     util-deprecate "~1.0.1"
 
-readable-stream@^3.0.6, readable-stream@^3.1.1, readable-stream@^3.4.0, readable-stream@^3.5.0, readable-stream@^3.6.0:
-  version "3.6.0"
-  resolved "https://registry.yarnpkg.com/readable-stream/-/readable-stream-3.6.0.tgz#337bbda3adc0706bd3e024426a286d4b4b2c9198"
-  integrity sha512-BViHy7LKeTz4oNnkcLJ+lVSL6vpiFeX6/d3oSH8zCW7UxP2onchk+vTGB143xuFjHS3deTgkKoXXymXqymiIdA==
+readable-stream@^3.0.6, readable-stream@^3.1.1, readable-stream@^3.4.0, readable-stream@^3.5.0, readable-stream@^3.6.0, readable-stream@^3.6.2:
+  version "3.6.2"
+  resolved "https://registry.yarnpkg.com/readable-stream/-/readable-stream-3.6.2.tgz#56a9b36ea965c00c5a93ef31eb111a0f11056967"
+  integrity sha512-9u/sniCrY3D5WdsERHzHE4G2YCXqoG5FTHUiCC4SIbr6XcLZBY05ya9EKjYek9O5xOAwjGq+1JdGBAS7Q9ScoA==
   dependencies:
     inherits "^2.0.3"
     string_decoder "^1.1.1"
@@ -10655,13 +11527,6 @@ readable-stream@~1.0.15, readable-stream@~1.0.26-4:
     isarray "0.0.1"
     string_decoder "~0.10.x"
 
-readdirp@~3.2.0:
-  version "3.2.0"
-  resolved "https://registry.yarnpkg.com/readdirp/-/readdirp-3.2.0.tgz#c30c33352b12c96dfb4b895421a49fd5a9593839"
-  integrity sha512-crk4Qu3pmXwgxdSgGhgA/eXiJAPQiX4GMOZZMXnqKxHX7TaoL+3gQVo/WeuAiogr07DpnfjIMpXXa+PAIvwPGQ==
-  dependencies:
-    picomatch "^2.0.4"
-
 readdirp@~3.6.0:
   version "3.6.0"
   resolved "https://registry.yarnpkg.com/readdirp/-/readdirp-3.6.0.tgz#74a370bd857116e245b29cc97340cd431a02a6c7"
@@ -10683,6 +11548,11 @@ recursive-readdir@^2.2.2:
   dependencies:
     minimatch "^3.0.5"
 
+reduce-flatten@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/reduce-flatten/-/reduce-flatten-2.0.0.tgz#734fd84e65f375d7ca4465c69798c25c9d10ae27"
+  integrity sha512-EJ4UNY/U1t2P/2k6oqotuX2Cc3T6nxJwsM0N0asT7dhrtH1ltUxDn4NalSYmPE2rCkVpcf/X6R0wDwcFpzhd4w==
+
 regenerate@^1.2.1:
   version "1.4.2"
   resolved "https://registry.yarnpkg.com/regenerate/-/regenerate-1.4.2.tgz#b9346d8827e8f5a32f7ba29637d398b69014848a"
@@ -10710,19 +11580,14 @@ regex-not@^1.0.0, regex-not@^1.0.2:
     extend-shallow "^3.0.2"
     safe-regex "^1.1.0"
 
-regexp.prototype.flags@^1.2.0, regexp.prototype.flags@^1.4.3:
-  version "1.4.3"
-  resolved "https://registry.yarnpkg.com/regexp.prototype.flags/-/regexp.prototype.flags-1.4.3.tgz#87cab30f80f66660181a3bb7bf5981a872b367ac"
-  integrity sha512-fjggEOO3slI6Wvgjwflkc4NFRCTZAu5CnNfBd5qOMYhWdn67nJBBu34/TkD++eeFmd8C9r9jfXJ27+nSiRkSUA==
+regexp.prototype.flags@^1.2.0, regexp.prototype.flags@^1.5.1:
+  version "1.5.1"
+  resolved "https://registry.yarnpkg.com/regexp.prototype.flags/-/regexp.prototype.flags-1.5.1.tgz#90ce989138db209f81492edd734183ce99f9677e"
+  integrity sha512-sy6TXMN+hnP/wMy+ISxg3krXx7BAtWVO4UouuCN/ziM9UEne0euamVNafDfvC83bRNr95y0V5iijeDQFUNpvrg==
   dependencies:
     call-bind "^1.0.2"
-    define-properties "^1.1.3"
-    functions-have-names "^1.2.2"
-
-regexpp@^2.0.1:
-  version "2.0.1"
-  resolved "https://registry.yarnpkg.com/regexpp/-/regexpp-2.0.1.tgz#8d19d31cf632482b589049f8281f93dbcba4d07f"
-  integrity sha512-lv0M6+TkDVniA3aD1Eg0DVpfU/booSu7Eev3TDO/mZKHBfVjgCGTV4t4buppESEYDtkArYFOxTJWv6S5C+iaNw==
+    define-properties "^1.2.0"
+    set-function-name "^2.0.0"
 
 regexpp@^3.1.0:
   version "3.2.0"
@@ -10781,23 +11646,7 @@ req-from@^2.0.0:
   dependencies:
     resolve-from "^3.0.0"
 
-request-promise-core@1.1.4:
-  version "1.1.4"
-  resolved "https://registry.yarnpkg.com/request-promise-core/-/request-promise-core-1.1.4.tgz#3eedd4223208d419867b78ce815167d10593a22f"
-  integrity sha512-TTbAfBBRdWD7aNNOoVOBH4pN/KigV6LyapYNNlAPA8JwbovRti1E88m3sYAwsLi5ryhPKsE9APwnjFTgdUjTpw==
-  dependencies:
-    lodash "^4.17.19"
-
-request-promise-native@^1.0.5:
-  version "1.0.9"
-  resolved "https://registry.yarnpkg.com/request-promise-native/-/request-promise-native-1.0.9.tgz#e407120526a5efdc9a39b28a5679bf47b9d9dc28"
-  integrity sha512-wcW+sIUiWnKgNY0dqCpOZkUbF/I+YPi+f09JZIDa39Ec+q82CpSYniDp+ISgTTbKmnpJWASeJBPZmoxH84wt3g==
-  dependencies:
-    request-promise-core "1.1.4"
-    stealthy-require "^1.1.1"
-    tough-cookie "^2.3.3"
-
-request@^2.79.0, request@^2.85.0, request@^2.88.0:
+request@^2.79.0, request@^2.85.0:
   version "2.88.2"
   resolved "https://registry.yarnpkg.com/request/-/request-2.88.2.tgz#d73c918731cb5a87da047e207234146f664d12b3"
   integrity sha512-MsvtOrfG9ZcrOwAW+Qi+F6HbD0CWXEh9ou77uOb7FM2WPhwT7smM833PzanhJLsgXjN89Ir6V2PczXNnMpwKhw==
@@ -10843,11 +11692,6 @@ require-main-filename@^1.0.1:
   resolved "https://registry.yarnpkg.com/require-main-filename/-/require-main-filename-1.0.1.tgz#97f717b69d48784f5f526a6c5aa8ffdda055a4d1"
   integrity sha512-IqSUtOVP4ksd1C/ej5zeEh/BIP2ajqpn8c5x+q99gvcIG/Qf0cud5raVnE/Dwd0ua9TXYDoDc0RE5hBSdz22Ug==
 
-require-main-filename@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/require-main-filename/-/require-main-filename-2.0.0.tgz#d0b329ecc7cc0f61649f62215be69af54aa8989b"
-  integrity sha512-NKN5kMDylKuldxYLSUfrbo5Tuzh4hd+2E8NPPX02mZtn1VuREQToYe/ZdlJy+J3uCpfaiGF05e7B8W0iXbQHmg==
-
 resolve-alpn@^1.0.0:
   version "1.2.1"
   resolved "https://registry.yarnpkg.com/resolve-alpn/-/resolve-alpn-1.2.1.tgz#b7adbdac3546aaaec20b45e7d8265927072726f9"
@@ -10875,15 +11719,20 @@ resolve-from@^5.0.0:
   resolved "https://registry.yarnpkg.com/resolve-from/-/resolve-from-5.0.0.tgz#c35225843df8f776df21c57557bc087e9dfdfc69"
   integrity sha512-qYg9KP24dD5qka9J47d0aVky0N+b4fTU89LN9iDnjB5waksiC49rvMB0PrUJQGoTmH50XPiqOvAjDfaijGxYZw==
 
+resolve-pkg-maps@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/resolve-pkg-maps/-/resolve-pkg-maps-1.0.0.tgz#616b3dc2c57056b5588c31cdf4b3d64db133720f"
+  integrity sha512-seS2Tj26TBVOC2NIc2rOe2y2ZO7efxITtLZcGSOnHHNOQ7CkiUBfw0Iw2ck6xkIhPwLhKNLS8BO+hEpngQlqzw==
+
 resolve-url@^0.2.1:
   version "0.2.1"
   resolved "https://registry.yarnpkg.com/resolve-url/-/resolve-url-0.2.1.tgz#2c637fe77c893afd2a663fe21aa9080068e2052a"
   integrity sha512-ZuF55hVUQaaczgOIwqWzkEcEidmlD/xl44x1UZnhOXcYuFN2S6+rcxpG+C1N3So0wvNI3DmJICUFfu2SxhBmvg==
 
-resolve.exports@^1.1.0:
-  version "1.1.0"
-  resolved "https://registry.yarnpkg.com/resolve.exports/-/resolve.exports-1.1.0.tgz#5ce842b94b05146c0e03076985d1d0e7e48c90c9"
-  integrity sha512-J1l+Zxxp4XK3LUDZ9m60LRJF/mAe4z6a4xyabPHk7pvK5t35dACV32iIjJDFeWZFfZlO29w6SZ67knR0tHzJtQ==
+resolve.exports@^2.0.0:
+  version "2.0.2"
+  resolved "https://registry.yarnpkg.com/resolve.exports/-/resolve.exports-2.0.2.tgz#f8c934b8e6a13f539e38b7098e2e36134f01e800"
+  integrity sha512-X2UW6Nw3n/aMgDVy+0rSqgHlv39WZAlZrXCdnbyEiKm17DSqHX4MmQMaST3FbeWR5FTuRcUwYAziZajji0Y7mg==
 
 resolve@1.1.x:
   version "1.1.7"
@@ -10897,21 +11746,12 @@ resolve@1.17.0:
   dependencies:
     path-parse "^1.0.6"
 
-resolve@^1.1.6:
-  version "1.22.2"
-  resolved "https://registry.yarnpkg.com/resolve/-/resolve-1.22.2.tgz#0ed0943d4e301867955766c9f3e1ae6d01c6845f"
-  integrity sha512-Sb+mjNHOULsBv818T40qSPeRiuWLyaGMa5ewydRLFimneixmVy2zdivRl+AF6jaYPC8ERxGDmFSiqui6SfPd+g==
-  dependencies:
-    is-core-module "^2.11.0"
-    path-parse "^1.0.7"
-    supports-preserve-symlinks-flag "^1.0.0"
-
-resolve@^1.10.0, resolve@^1.12.0, resolve@^1.20.0, resolve@^1.8.1, resolve@~1.22.1:
-  version "1.22.1"
-  resolved "https://registry.yarnpkg.com/resolve/-/resolve-1.22.1.tgz#27cb2ebb53f91abb49470a928bba7558066ac177"
-  integrity sha512-nBpuuYuY5jFsli/JIs1oldw6fOQCBioohqWZg/2hiaOybXOft4lonv85uDOKXdf8rhyK159cxU5cDcK/NKk8zw==
+resolve@^1.1.6, resolve@^1.10.0, resolve@^1.12.0, resolve@^1.20.0, resolve@^1.22.4, resolve@^1.8.1, resolve@~1.22.6:
+  version "1.22.8"
+  resolved "https://registry.yarnpkg.com/resolve/-/resolve-1.22.8.tgz#b6c87a9f2aa06dfab52e3d70ac8cde321fa5a48d"
+  integrity sha512-oKWePCxqpd6FlLvGV1VU0x7bkPmmCNolxzjMf4NczoDnQcIWrAF+cPtZn5i6n+RfD2d9i0tzpKnG6Yk168yIyw==
   dependencies:
-    is-core-module "^2.9.0"
+    is-core-module "^2.13.0"
     path-parse "^1.0.7"
     supports-preserve-symlinks-flag "^1.0.0"
 
@@ -10937,30 +11777,21 @@ restore-cursor@^2.0.0:
     onetime "^2.0.0"
     signal-exit "^3.0.2"
 
-resumer@~0.0.0:
-  version "0.0.0"
-  resolved "https://registry.yarnpkg.com/resumer/-/resumer-0.0.0.tgz#f1e8f461e4064ba39e82af3cdc2a8c893d076759"
-  integrity sha512-Fn9X8rX8yYF4m81rZCK/5VmrmsSbqS/i3rDLl6ZZHAXgC2nTAx3dhwG8q8odP/RmdLa2YrybDJaAMg+X1ajY3w==
-  dependencies:
-    through "~2.3.4"
-
 ret@~0.1.10:
   version "0.1.15"
   resolved "https://registry.yarnpkg.com/ret/-/ret-0.1.15.tgz#b8a4825d5bdb1fc3f6f53c2bc33f81388681c7bc"
   integrity sha512-TTlYpa+OL+vMMNG24xSlQGEJ3B/RzEfUlLct7b5G/ytav+wPrplCpVMFuwzXbkecJrb6IYo1iFb0S9v37754mg==
 
+retry@^0.12.0:
+  version "0.12.0"
+  resolved "https://registry.yarnpkg.com/retry/-/retry-0.12.0.tgz#1b42a6266a21f07421d1b0b54b7dc167b01c013b"
+  integrity sha512-9LkiTwjUh6rT555DtE9rTX+BKByPfrMzEAtnlEtdEwr3Nkffwiihqe2bWADg+OQRjt9gl6ICdmB/ZFDCGAtSow==
+
 reusify@^1.0.4:
   version "1.0.4"
   resolved "https://registry.yarnpkg.com/reusify/-/reusify-1.0.4.tgz#90da382b1e126efc02146e90845a88db12925d76"
   integrity sha512-U9nH88a3fc/ekCF1l0/UP1IosiuIjyTh7hBvXVMHYgVcfGvt897Xguj2UOLDeI5BG2m7/uwyaLVT6fbtCwTyzw==
 
-rimraf@2.6.3:
-  version "2.6.3"
-  resolved "https://registry.yarnpkg.com/rimraf/-/rimraf-2.6.3.tgz#b2d104fe0d8fb27cf9e0a1cda8262dd3833c6cab"
-  integrity sha512-mwqeW5XsA2qAejG46gYdENaxXjx9onRNCfn7L0duuP4hCuTIi/QO7PDK07KJfp1d+izWPrzEJDcSqBa0OZQriA==
-  dependencies:
-    glob "^7.1.3"
-
 rimraf@^2.2.8, rimraf@^2.6.3:
   version "2.7.1"
   resolved "https://registry.yarnpkg.com/rimraf/-/rimraf-2.7.1.tgz#35797f13a7fdadc566142c29d4f07ccad483e3ec"
@@ -10990,11 +11821,28 @@ rlp@^2.0.0, rlp@^2.2.1, rlp@^2.2.2, rlp@^2.2.3, rlp@^2.2.4:
   dependencies:
     bn.js "^5.2.0"
 
+run-applescript@^5.0.0:
+  version "5.0.0"
+  resolved "https://registry.yarnpkg.com/run-applescript/-/run-applescript-5.0.0.tgz#e11e1c932e055d5c6b40d98374e0268d9b11899c"
+  integrity sha512-XcT5rBksx1QdIhlFOCtgZkB99ZEouFZ1E2Kc2LHqNW13U3/74YGdkQRmThTwxy4QIyookibDKYZOPqX//6BlAg==
+  dependencies:
+    execa "^5.0.0"
+
 run-async@^2.2.0:
   version "2.4.1"
   resolved "https://registry.yarnpkg.com/run-async/-/run-async-2.4.1.tgz#8440eccf99ea3e70bd409d49aab88e10c189a455"
   integrity sha512-tvVnVv01b8c1RrA6Ep7JkStj85Guv/YrMcwqYQnwjsAS2cTmmPGBBjAjpCW7RrSodNSoE2/qg9O4bceNvUuDgQ==
 
+run-con@~1.2.11:
+  version "1.2.12"
+  resolved "https://registry.yarnpkg.com/run-con/-/run-con-1.2.12.tgz#51c319910e45a3bd71ee773564a89d96635c8c64"
+  integrity sha512-5257ILMYIF4RztL9uoZ7V9Q97zHtNHn5bN3NobeAnzB1P3ASLgg8qocM2u+R18ttp+VEM78N2LK8XcNVtnSRrg==
+  dependencies:
+    deep-extend "^0.6.0"
+    ini "~3.0.0"
+    minimist "^1.2.8"
+    strip-json-comments "~3.1.1"
+
 run-parallel-limit@^1.1.0:
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/run-parallel-limit/-/run-parallel-limit-1.1.0.tgz#be80e936f5768623a38a963262d6bef8ff11e7ba"
@@ -11021,6 +11869,16 @@ rxjs@^6.4.0:
   dependencies:
     tslib "^1.9.0"
 
+safe-array-concat@^1.0.0, safe-array-concat@^1.0.1:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/safe-array-concat/-/safe-array-concat-1.0.1.tgz#91686a63ce3adbea14d61b14c99572a8ff84754c"
+  integrity sha512-6XbUAseYE2KtOuGueyeobCySj9L4+66Tn6KQMOPQJrAJEowYKW/YR/MGJZl7FdydUdaFu4LYyDZjxf4/Nmo23Q==
+  dependencies:
+    call-bind "^1.0.2"
+    get-intrinsic "^1.2.1"
+    has-symbols "^1.0.3"
+    isarray "^2.0.5"
+
 safe-buffer@5.2.1, safe-buffer@^5.0.1, safe-buffer@^5.1.0, safe-buffer@^5.1.1, safe-buffer@^5.1.2, safe-buffer@^5.2.0, safe-buffer@^5.2.1, safe-buffer@~5.2.0:
   version "5.2.1"
   resolved "https://registry.yarnpkg.com/safe-buffer/-/safe-buffer-5.2.1.tgz#1eaf9fa9bdb1fdd4ec75f58f9cdb4e6b7827eec6"
@@ -11079,11 +11937,6 @@ sc-istanbul@^0.4.5:
     which "^1.1.1"
     wordwrap "^1.0.0"
 
-scrypt-js@2.0.4:
-  version "2.0.4"
-  resolved "https://registry.yarnpkg.com/scrypt-js/-/scrypt-js-2.0.4.tgz#32f8c5149f0797672e551c07e230f834b6af5f16"
-  integrity sha512-4KsaGcPnuhtCZQCxFxN3GVYIhKFPTdLd8PLC552XwbMndtD0cjRFAhDuuydXQ0h08ZfPgzqe6EKHozpuH74iDw==
-
 scrypt-js@3.0.1, scrypt-js@^3.0.0, scrypt-js@^3.0.1:
   version "3.0.1"
   resolved "https://registry.yarnpkg.com/scrypt-js/-/scrypt-js-3.0.1.tgz#d314a57c2aef69d1ad98a138a21fe9eafa9ee312"
@@ -11115,27 +11968,20 @@ semaphore@>=1.0.1, semaphore@^1.0.3, semaphore@^1.1.0:
   resolved "https://registry.yarnpkg.com/semaphore/-/semaphore-1.1.0.tgz#aaad8b86b20fe8e9b32b16dc2ee682a8cd26a8aa"
   integrity sha512-O4OZEaNtkMd/K0i6js9SL+gqy0ZCBMgUvlSqHKi4IBdjhe7wB8pwztUk1BbZ1fmrvpwFrPbHzqd2w5pTcJH6LA==
 
-"semver@2 || 3 || 4 || 5", semver@^5.3.0, semver@^5.5.0, semver@^5.5.1, semver@^5.6.0, semver@^5.7.0:
-  version "5.7.1"
-  resolved "https://registry.yarnpkg.com/semver/-/semver-5.7.1.tgz#a954f931aeba508d307bbf069eff0c01c96116f7"
-  integrity sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ==
-
-semver@7.x, semver@^7.2.1, semver@^7.3.5, semver@^7.3.7:
-  version "7.3.8"
-  resolved "https://registry.yarnpkg.com/semver/-/semver-7.3.8.tgz#07a78feafb3f7b32347d725e33de7e2a2df67798"
-  integrity sha512-NB1ctGL5rlHrPJtFDVIVzTyQylMLu9N9VICA6HSFJo8MCGVTMW6gfpicwKmmK/dAjTOrqu5l63JJOpDSrAis3A==
-  dependencies:
-    lru-cache "^6.0.0"
+"semver@2 || 3 || 4 || 5", semver@^5.3.0, semver@^5.5.0, semver@^5.6.0:
+  version "5.7.2"
+  resolved "https://registry.yarnpkg.com/semver/-/semver-5.7.2.tgz#48d55db737c3287cd4835e17fa13feace1c41ef8"
+  integrity sha512-cBznnQ9KjJqU67B52RMC65CMarK2600WFnbkcaiwWq3xy/5haFJlshgnpjovMVJ+Hff49d8GEn0b87C5pDQ10g==
 
-semver@^6.0.0, semver@^6.3.0:
-  version "6.3.0"
-  resolved "https://registry.yarnpkg.com/semver/-/semver-6.3.0.tgz#ee0a64c8af5e8ceea67687b133761e1becbd1d3d"
-  integrity sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==
+semver@^6.3.0, semver@^6.3.1:
+  version "6.3.1"
+  resolved "https://registry.yarnpkg.com/semver/-/semver-6.3.1.tgz#556d2ef8689146e46dcea4bfdd095f3434dffcb4"
+  integrity sha512-BR7VvDCVHO+q2xBEWskxS6DJE1qRnb7DxzUrogb71CWoSficBxYsiAGd+Kl0mmq/MprG9yArRkyrQxTO6XjMzA==
 
-semver@^7.3.4:
-  version "7.4.0"
-  resolved "https://registry.yarnpkg.com/semver/-/semver-7.4.0.tgz#8481c92feffc531ab1e012a8ffc15bdd3a0f4318"
-  integrity sha512-RgOxM8Mw+7Zus0+zcLEUn8+JfoLpj/huFTItQy2hsM4khuC1HYRDp0cU482Ewn/Fcy6bCjufD8vAj7voC66KQw==
+semver@^7.2.1, semver@^7.3.4, semver@^7.3.5, semver@^7.3.7, semver@^7.3.8, semver@^7.5.1, semver@^7.5.2, semver@^7.5.3, semver@^7.5.4:
+  version "7.5.4"
+  resolved "https://registry.yarnpkg.com/semver/-/semver-7.5.4.tgz#483986ec4ed38e1c6c48c34894a9182dbff68a6e"
+  integrity sha512-1bCSESV6Pv+i21Hvpxp3Dx+pSD8lIPt8uVjRrxAUt/nbswYc+tK6Y2btiULjd4+fnq15PX+nqQDC7Oft7WkwcA==
   dependencies:
     lru-cache "^6.0.0"
 
@@ -11196,6 +12042,25 @@ set-blocking@^2.0.0:
   resolved "https://registry.yarnpkg.com/set-blocking/-/set-blocking-2.0.0.tgz#045f9782d011ae9a6803ddd382b24392b3d890f7"
   integrity sha512-KiKBS8AnWGEyLzofFfmvKwpdPzqiy16LvQfK3yv/fVH7Bj13/wl3JSR1J+rfgRE9q7xUJK4qvgS8raSOeLUehw==
 
+set-function-length@^1.1.1:
+  version "1.1.1"
+  resolved "https://registry.yarnpkg.com/set-function-length/-/set-function-length-1.1.1.tgz#4bc39fafb0307224a33e106a7d35ca1218d659ed"
+  integrity sha512-VoaqjbBJKiWtg4yRcKBQ7g7wnGnLV3M8oLvVWwOk2PdYY6PEFegR1vezXR0tw6fZGF9csVakIRjrJiy2veSBFQ==
+  dependencies:
+    define-data-property "^1.1.1"
+    get-intrinsic "^1.2.1"
+    gopd "^1.0.1"
+    has-property-descriptors "^1.0.0"
+
+set-function-name@^2.0.0:
+  version "2.0.1"
+  resolved "https://registry.yarnpkg.com/set-function-name/-/set-function-name-2.0.1.tgz#12ce38b7954310b9f61faa12701620a0c882793a"
+  integrity sha512-tMNCiqYVkXIZgc2Hnoy2IvC/f8ezc5koaRFkCjrpWzGpCd3qbZXPzVy9MAZzK1ch/X0jvSkojys3oqJN0qCmdA==
+  dependencies:
+    define-data-property "^1.0.1"
+    functions-have-names "^1.2.3"
+    has-property-descriptors "^1.0.0"
+
 set-immediate-shim@^1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/set-immediate-shim/-/set-immediate-shim-1.0.1.tgz#4b2b1b27eb808a9f8dcc481a58e5e56f599f3f61"
@@ -11211,11 +12076,6 @@ set-value@^2.0.0, set-value@^2.0.1:
     is-plain-object "^2.0.3"
     split-string "^3.0.1"
 
-setimmediate@1.0.4:
-  version "1.0.4"
-  resolved "https://registry.yarnpkg.com/setimmediate/-/setimmediate-1.0.4.tgz#20e81de622d4a02588ce0c8da8973cbcf1d3138f"
-  integrity sha512-/TjEmXQVEzdod/FFskf3o7oOAsGhHf2j1dZqRFbDzq4F3mvvxflIIi4Hd3bLQE9y/CpwqfSQam5JakI/mi3Pog==
-
 setimmediate@^1.0.5:
   version "1.0.5"
   resolved "https://registry.yarnpkg.com/setimmediate/-/setimmediate-1.0.5.tgz#290cbb232e306942d7d7ea9b83732ab7856f8285"
@@ -11267,9 +12127,9 @@ shebang-regex@^3.0.0:
   integrity sha512-7++dFhtcx3353uBaq8DDR4NuxBetBzC7ZQOhmTQInHEd6bSrXdiEyzCvG07Z44UYdLShWUyXt5M/yhz8ekcb1A==
 
 shell-quote@^1.6.1:
-  version "1.7.4"
-  resolved "https://registry.yarnpkg.com/shell-quote/-/shell-quote-1.7.4.tgz#33fe15dee71ab2a81fcbd3a52106c5cfb9fb75d8"
-  integrity sha512-8o/QEhSSRb1a5i7TFR0iM4G16Z0vYB2OQVs4G3aAFXjn3T6yEx8AZxy1PgDF7I00LZHYA3WxaSYIf5e5sAX8Rw==
+  version "1.8.1"
+  resolved "https://registry.yarnpkg.com/shell-quote/-/shell-quote-1.8.1.tgz#6dbf4db75515ad5bac63b4f1894c3a154c766680"
+  integrity sha512-6j1W9l1iAs/4xYBI1SYOVZyFcCis9b4KCLQ8fgAGG07QvzaRLVVRQvAy85yNmmZSjYjg4MWh4gNvlPujU/5LpA==
 
 shelljs@^0.8.3:
   version "0.8.5"
@@ -11328,15 +12188,6 @@ slash@^3.0.0:
   resolved "https://registry.yarnpkg.com/slash/-/slash-3.0.0.tgz#6539be870c165adbd5240220dbe361f1bc4d4634"
   integrity sha512-g9Q1haeby36OSStwb4ntCGGGaKsaVSjQ68fBxoQcutl5fS1vuY18H3wSt3jFyFtrkx+Kz0V1G85A4MyAdDMi2Q==
 
-slice-ansi@^2.1.0:
-  version "2.1.0"
-  resolved "https://registry.yarnpkg.com/slice-ansi/-/slice-ansi-2.1.0.tgz#cacd7693461a637a5788d92a7dd4fba068e81636"
-  integrity sha512-Qu+VC3EwYLldKa1fCxuuvULvSJOKEgk9pi8dZeCVK7TqBfUNTH4sFkk4joj8afVSfAYgJoSOetjx9QWOJ5mYoQ==
-  dependencies:
-    ansi-styles "^3.2.0"
-    astral-regex "^1.0.0"
-    is-fullwidth-code-point "^2.0.0"
-
 slice-ansi@^4.0.0:
   version "4.0.0"
   resolved "https://registry.yarnpkg.com/slice-ansi/-/slice-ansi-4.0.0.tgz#500e8dd0fd55b05815086255b3195adf2a45fe6b"
@@ -11429,27 +12280,30 @@ solc@^0.6.3:
     semver "^5.5.0"
     tmp "0.0.33"
 
-solhint@^3.3.2:
-  version "3.3.7"
-  resolved "https://registry.yarnpkg.com/solhint/-/solhint-3.3.7.tgz#b5da4fedf7a0fee954cb613b6c55a5a2b0063aa7"
-  integrity sha512-NjjjVmXI3ehKkb3aNtRJWw55SUVJ8HMKKodwe0HnejA+k0d2kmhw7jvpa+MCTbcEgt8IWSwx0Hu6aCo/iYOZzQ==
+solhint@^3.3.2, solhint@^3.6.2:
+  version "3.6.2"
+  resolved "https://registry.yarnpkg.com/solhint/-/solhint-3.6.2.tgz#2b2acbec8fdc37b2c68206a71ba89c7f519943fe"
+  integrity sha512-85EeLbmkcPwD+3JR7aEMKsVC9YrRSxd4qkXuMzrlf7+z2Eqdfm1wHWq1ffTuo5aDhoZxp2I9yF3QkxZOxOL7aQ==
   dependencies:
-    "@solidity-parser/parser" "^0.14.1"
-    ajv "^6.6.1"
-    antlr4 "4.7.1"
-    ast-parents "0.0.1"
-    chalk "^2.4.2"
-    commander "2.18.0"
-    cosmiconfig "^5.0.7"
-    eslint "^5.6.0"
-    fast-diff "^1.1.2"
-    glob "^7.1.3"
-    ignore "^4.0.6"
-    js-yaml "^3.12.0"
-    lodash "^4.17.11"
-    semver "^6.3.0"
+    "@solidity-parser/parser" "^0.16.0"
+    ajv "^6.12.6"
+    antlr4 "^4.11.0"
+    ast-parents "^0.0.1"
+    chalk "^4.1.2"
+    commander "^10.0.0"
+    cosmiconfig "^8.0.0"
+    fast-diff "^1.2.0"
+    glob "^8.0.3"
+    ignore "^5.2.4"
+    js-yaml "^4.1.0"
+    lodash "^4.17.21"
+    pluralize "^8.0.0"
+    semver "^7.5.2"
+    strip-ansi "^6.0.1"
+    table "^6.8.1"
+    text-table "^0.2.0"
   optionalDependencies:
-    prettier "^1.14.3"
+    prettier "^2.8.3"
 
 solidity-comments-extractor@^0.0.7:
   version "0.0.7"
@@ -11457,9 +12311,9 @@ solidity-comments-extractor@^0.0.7:
   integrity sha512-wciNMLg/Irp8OKGrh3S2tfvZiZ0NEyILfcRCXCD4mp7SgK/i9gzLfhY2hY7VMCQJ3kH9UB9BzNdibIVMchzyYw==
 
 solidity-coverage@^0.8.2:
-  version "0.8.4"
-  resolved "https://registry.yarnpkg.com/solidity-coverage/-/solidity-coverage-0.8.4.tgz#c57a21979f5e86859c5198de9fbae2d3bc6324a5"
-  integrity sha512-xeHOfBOjdMF6hWTbt42iH4x+7j1Atmrf5OldDPMxI+i/COdExUxszOswD9qqvcBTaLGiOrrpnh9UZjSpt4rBsg==
+  version "0.8.5"
+  resolved "https://registry.yarnpkg.com/solidity-coverage/-/solidity-coverage-0.8.5.tgz#64071c3a0c06a0cecf9a7776c35f49edc961e875"
+  integrity sha512-6C6N6OV2O8FQA0FWA95FdzVH+L16HU94iFgg5wAFZ29UpLFkgNI/DRR2HotG1bC0F4gAc/OMs2BJI44Q/DYlKQ==
   dependencies:
     "@ethersproject/abi" "^5.0.9"
     "@solidity-parser/parser" "^0.16.0"
@@ -11473,7 +12327,7 @@ solidity-coverage@^0.8.2:
     globby "^10.0.1"
     jsonschema "^1.2.4"
     lodash "^4.17.15"
-    mocha "7.1.2"
+    mocha "10.2.0"
     node-emoji "^1.10.0"
     pify "^4.0.1"
     recursive-readdir "^2.2.2"
@@ -11562,9 +12416,9 @@ source-map@~0.2.0:
     amdefine ">=0.0.4"
 
 spdx-correct@^3.0.0:
-  version "3.1.1"
-  resolved "https://registry.yarnpkg.com/spdx-correct/-/spdx-correct-3.1.1.tgz#dece81ac9c1e6713e5f7d1b6f17d468fa53d89a9"
-  integrity sha512-cOYcUWwhCuHCXi49RhFRCyJEK3iPj1Ziz9DpViV3tbZOwXD49QzIN3MpOLJNxh2qwq2lJJZaKMVw9qNi4jTC0w==
+  version "3.2.0"
+  resolved "https://registry.yarnpkg.com/spdx-correct/-/spdx-correct-3.2.0.tgz#4f5ab0668f0059e34f9c00dce331784a12de4e9c"
+  integrity sha512-kN9dJbvnySHULIluDHy32WHRUu3Og7B9sbY7tsFLctQkIqnMh3hErYgdMjTYuqmcXX+lK5T1lnUt3G7zNswmZA==
   dependencies:
     spdx-expression-parse "^3.0.0"
     spdx-license-ids "^3.0.0"
@@ -11583,9 +12437,9 @@ spdx-expression-parse@^3.0.0:
     spdx-license-ids "^3.0.0"
 
 spdx-license-ids@^3.0.0:
-  version "3.0.12"
-  resolved "https://registry.yarnpkg.com/spdx-license-ids/-/spdx-license-ids-3.0.12.tgz#69077835abe2710b65f03969898b6637b505a779"
-  integrity sha512-rr+VVSXtRhO4OHbXUiAF7xW3Bo9DuuF6C5jH+q/x15j2jniycgKbxU09Hr0WqlSLUs4i4ltHGXqTe7VHclYWyA==
+  version "3.0.16"
+  resolved "https://registry.yarnpkg.com/spdx-license-ids/-/spdx-license-ids-3.0.16.tgz#a14f64e0954f6e25cc6587bd4f392522db0d998f"
+  integrity sha512-eWN+LnM3GR6gPu35WxNgbGl8rmY1AEmoMDvL/QD6zYmPWgywxWqJWNdLGT+ke8dKNWrcYgYjPpG5gbTfghP8rw==
 
 split-ca@^1.0.0, split-ca@^1.0.1:
   version "1.0.1"
@@ -11599,26 +12453,31 @@ split-string@^3.0.1, split-string@^3.0.2:
   dependencies:
     extend-shallow "^3.0.0"
 
+split2@^4.1.0:
+  version "4.2.0"
+  resolved "https://registry.yarnpkg.com/split2/-/split2-4.2.0.tgz#c9c5920904d148bab0b9f67145f245a86aadbfa4"
+  integrity sha512-UcjcJOWknrNkF6PLX83qcHM6KHgVKNkV62Y8a5uYDVv9ydGQVwAHMKqHdJje1VTWpljG0WYpCDhrCdAOYH4TWg==
+
 sprintf-js@~1.0.2:
   version "1.0.3"
   resolved "https://registry.yarnpkg.com/sprintf-js/-/sprintf-js-1.0.3.tgz#04e6926f662895354f3dd015203633b857297e2c"
   integrity sha512-D9cPgkvLlV3t3IzL0D0YLvGA9Ahk4PcvVwUbN0dSGr1aP0Nrt4AEnTUbuGvquEC0mA64Gqt1fzirlRs5ibXx8g==
 
 ssh2@^1.11.0:
-  version "1.11.0"
-  resolved "https://registry.yarnpkg.com/ssh2/-/ssh2-1.11.0.tgz#ce60186216971e12f6deb553dcf82322498fe2e4"
-  integrity sha512-nfg0wZWGSsfUe/IBJkXVll3PEZ//YH2guww+mP88gTpuSU4FtZN7zu9JoeTGOyCNx2dTDtT9fOpWwlzyj4uOOw==
+  version "1.14.0"
+  resolved "https://registry.yarnpkg.com/ssh2/-/ssh2-1.14.0.tgz#8f68440e1b768b66942c9e4e4620b2725b3555bb"
+  integrity sha512-AqzD1UCqit8tbOKoj6ztDDi1ffJZ2rV2SwlgrVVrHPkV5vWqGJOVp5pmtj18PunkPJAuKQsnInyKV+/Nb2bUnA==
   dependencies:
-    asn1 "^0.2.4"
+    asn1 "^0.2.6"
     bcrypt-pbkdf "^1.0.2"
   optionalDependencies:
-    cpu-features "~0.0.4"
-    nan "^2.16.0"
+    cpu-features "~0.0.8"
+    nan "^2.17.0"
 
 sshpk@^1.7.0:
-  version "1.17.0"
-  resolved "https://registry.yarnpkg.com/sshpk/-/sshpk-1.17.0.tgz#578082d92d4fe612b13007496e543fa0fbcbe4c5"
-  integrity sha512-/9HIEs1ZXGhSPE8X6Ccm7Nam1z8KcoCqPdI7ecm1N33EzAetWahvQWVqLZtaZQ+IDKX4IyA2o0gBzqIMkAagHQ==
+  version "1.18.0"
+  resolved "https://registry.yarnpkg.com/sshpk/-/sshpk-1.18.0.tgz#1663e55cddf4d688b86a46b77f0d5fe363aba028"
+  integrity sha512-2p2KJZTSqQ/I3+HX42EpYOa2l3f8Erv8MWKsy2I9uf4wA7yFIkXRffYdsx86y6z4vHtV8u7g+pPlr8/4ouAxsQ==
   dependencies:
     asn1 "~0.2.3"
     assert-plus "^1.0.0"
@@ -11631,9 +12490,9 @@ sshpk@^1.7.0:
     tweetnacl "~0.14.0"
 
 stack-utils@^2.0.3:
-  version "2.0.5"
-  resolved "https://registry.yarnpkg.com/stack-utils/-/stack-utils-2.0.5.tgz#d25265fca995154659dbbfba3b49254778d2fdd5"
-  integrity sha512-xrQcmYhOsn/1kX+Vraq+7j4oE2j/6BFscZ0etmYg81xuM8Gq0022Pxb8+IqgOFUIaxHs0KaSb7T1+OegiNrNFA==
+  version "2.0.6"
+  resolved "https://registry.yarnpkg.com/stack-utils/-/stack-utils-2.0.6.tgz#aaf0748169c02fc33c8232abccf933f54a1cc34f"
+  integrity sha512-XlkWvfIm6RmsWtNJx+uqtKLS8eqFbxUg0ZzLXqY0caEy9l7hruX8IpiDnjsLavoBgqCCR71TqWO8MaXYheJ3RQ==
   dependencies:
     escape-string-regexp "^2.0.0"
 
@@ -11657,11 +12516,6 @@ statuses@2.0.1:
   resolved "https://registry.yarnpkg.com/statuses/-/statuses-2.0.1.tgz#55cb000ccf1d48728bd23c685a063998cf1a1b63"
   integrity sha512-RwNA9Z/7PrK06rYLIzFMlaF+l73iwpzsqRIFgbMLbTcLD6cOao82TaWefPXQvB2fOC4AjuYSEndS7N/mTCbkdQ==
 
-stealthy-require@^1.1.1:
-  version "1.1.1"
-  resolved "https://registry.yarnpkg.com/stealthy-require/-/stealthy-require-1.1.1.tgz#35b09875b4ff49f26a777e509b3090a3226bf24b"
-  integrity sha512-ZnWpYnYugiOVEY5GkcuJK1io5V8QmNYChG62gSit9pQVGErXtrKuPC55ITaVSukmMta5qpMU7vqLt2Lnni4f/g==
-
 stream-to-pull-stream@^1.7.1:
   version "1.7.3"
   resolved "https://registry.yarnpkg.com/stream-to-pull-stream/-/stream-to-pull-stream-1.7.3.tgz#4161aa2d2eb9964de60bfa1af7feaf917e874ece"
@@ -11670,16 +12524,16 @@ stream-to-pull-stream@^1.7.1:
     looper "^3.0.0"
     pull-stream "^3.2.3"
 
-streamsearch@^1.1.0:
-  version "1.1.0"
-  resolved "https://registry.yarnpkg.com/streamsearch/-/streamsearch-1.1.0.tgz#404dd1e2247ca94af554e841a8ef0eaa238da764"
-  integrity sha512-Mcc5wHehp9aXz1ax6bZUyY5afg9u2rv5cqQI3mRrYkGC8rW2hM02jWuwjtL++LS5qinSyhj2QfLyNsuc+VsExg==
-
 strict-uri-encode@^1.0.0:
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/strict-uri-encode/-/strict-uri-encode-1.1.0.tgz#279b225df1d582b1f54e65addd4352e18faa0713"
   integrity sha512-R3f198pcvnB+5IpnBlRkphuE9n46WyVl8I39W/ZUTZLz4nqSP/oLYUrcnJrw462Ds8he4YKMov2efsTIw1BDGQ==
 
+string-format@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/string-format/-/string-format-2.0.0.tgz#f2df2e7097440d3b65de31b6d40d54c96eaffb9b"
+  integrity sha512-bbEs3scLeYNXLecRRuk6uJxdXUSj6le/8rNPHChIJTn2V79aXVTR1EH2OH5zLKKoz0V02fOUKZZcw01pLUShZA==
+
 string-length@^4.0.1:
   version "4.0.2"
   resolved "https://registry.yarnpkg.com/string-length/-/string-length-4.0.2.tgz#a8a8dc7bd5c1a82b9b3c8b87e125f66871b6e57a"
@@ -11697,7 +12551,7 @@ string-width@^1.0.1:
     is-fullwidth-code-point "^1.0.0"
     strip-ansi "^3.0.0"
 
-"string-width@^1.0.2 || 2", string-width@^2.1.0, string-width@^2.1.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"
   integrity sha512-nOqH59deCq9SRHlxq1Aw85Jnt4w6KvLKqWVik6oA9ZklXLNIOlqg4F2yrT1MVaTjAqvVwdfeZ7w7aCvJD7ugkw==
@@ -11705,15 +12559,6 @@ string-width@^1.0.1:
     is-fullwidth-code-point "^2.0.0"
     strip-ansi "^4.0.0"
 
-string-width@^3.0.0, string-width@^3.1.0:
-  version "3.1.0"
-  resolved "https://registry.yarnpkg.com/string-width/-/string-width-3.1.0.tgz#22767be21b62af1081574306f69ac51b62203961"
-  integrity sha512-vafcv6KjVZKSgz06oM/H6GDBrAtz8vdhQakGjFIvNrHA6y3HCF1CInLy+QLq8dTJPQ1b+KDUqDFctkdRW44e1w==
-  dependencies:
-    emoji-regex "^7.0.1"
-    is-fullwidth-code-point "^2.0.0"
-    strip-ansi "^5.1.0"
-
 string-width@^4.1.0, string-width@^4.2.0, string-width@^4.2.3:
   version "4.2.3"
   resolved "https://registry.yarnpkg.com/string-width/-/string-width-4.2.3.tgz#269c7117d27b05ad2e536830a8ec895ef9c6d010"
@@ -11724,58 +12569,40 @@ string-width@^4.1.0, string-width@^4.2.0, string-width@^4.2.3:
     strip-ansi "^6.0.1"
 
 string.prototype.padend@^3.0.0:
-  version "3.1.3"
-  resolved "https://registry.yarnpkg.com/string.prototype.padend/-/string.prototype.padend-3.1.3.tgz#997a6de12c92c7cb34dc8a201a6c53d9bd88a5f1"
-  integrity sha512-jNIIeokznm8SD/TZISQsZKYu7RJyheFNt84DUPrh482GC8RVp2MKqm2O5oBRdGxbDQoXrhhWtPIWQOiy20svUg==
-  dependencies:
-    call-bind "^1.0.2"
-    define-properties "^1.1.3"
-    es-abstract "^1.19.1"
-
-string.prototype.trim@~1.2.7:
-  version "1.2.7"
-  resolved "https://registry.yarnpkg.com/string.prototype.trim/-/string.prototype.trim-1.2.7.tgz#a68352740859f6893f14ce3ef1bb3037f7a90533"
-  integrity sha512-p6TmeT1T3411M8Cgg9wBTMRtY2q9+PNy9EV1i2lIXUN/btt763oIfxwN3RR8VU6wHX8j/1CFy0L+YuThm6bgOg==
-  dependencies:
-    call-bind "^1.0.2"
-    define-properties "^1.1.4"
-    es-abstract "^1.20.4"
-
-string.prototype.trimend@^1.0.5:
-  version "1.0.5"
-  resolved "https://registry.yarnpkg.com/string.prototype.trimend/-/string.prototype.trimend-1.0.5.tgz#914a65baaab25fbdd4ee291ca7dde57e869cb8d0"
-  integrity sha512-I7RGvmjV4pJ7O3kdf+LXFpVfdNOxtCW/2C8f6jNiW4+PQchwxkCDzlk1/7p+Wl4bqFIZeF47qAHXLuHHWKAxog==
+  version "3.1.5"
+  resolved "https://registry.yarnpkg.com/string.prototype.padend/-/string.prototype.padend-3.1.5.tgz#311ef3a4e3c557dd999cdf88fbdde223f2ac0f95"
+  integrity sha512-DOB27b/2UTTD+4myKUFh+/fXWcu/UDyASIXfg+7VzoCNNGOfWvoyU/x5pvVHr++ztyt/oSYI1BcWBBG/hmlNjA==
   dependencies:
     call-bind "^1.0.2"
-    define-properties "^1.1.4"
-    es-abstract "^1.19.5"
+    define-properties "^1.2.0"
+    es-abstract "^1.22.1"
 
-string.prototype.trimend@^1.0.6:
-  version "1.0.6"
-  resolved "https://registry.yarnpkg.com/string.prototype.trimend/-/string.prototype.trimend-1.0.6.tgz#c4a27fa026d979d79c04f17397f250a462944533"
-  integrity sha512-JySq+4mrPf9EsDBEDYMOb/lM7XQLulwg5R/m1r0PXEFqrV0qHvl58sdTilSXtKOflCsK2E8jxf+GKC0T07RWwQ==
+string.prototype.trim@^1.2.8, string.prototype.trim@~1.2.8:
+  version "1.2.8"
+  resolved "https://registry.yarnpkg.com/string.prototype.trim/-/string.prototype.trim-1.2.8.tgz#f9ac6f8af4bd55ddfa8895e6aea92a96395393bd"
+  integrity sha512-lfjY4HcixfQXOfaqCvcBuOIapyaroTXhbkfJN3gcB1OtyupngWK4sEET9Knd0cXd28kTUqu/kHoV4HKSJdnjiQ==
   dependencies:
     call-bind "^1.0.2"
-    define-properties "^1.1.4"
-    es-abstract "^1.20.4"
+    define-properties "^1.2.0"
+    es-abstract "^1.22.1"
 
-string.prototype.trimstart@^1.0.5:
-  version "1.0.5"
-  resolved "https://registry.yarnpkg.com/string.prototype.trimstart/-/string.prototype.trimstart-1.0.5.tgz#5466d93ba58cfa2134839f81d7f42437e8c01fef"
-  integrity sha512-THx16TJCGlsN0o6dl2o6ncWUsdgnLRSA23rRE5pyGBw/mLr3Ej/R2LaqCtgP8VNMGZsvMWnf9ooZPyY2bHvUFg==
+string.prototype.trimend@^1.0.7:
+  version "1.0.7"
+  resolved "https://registry.yarnpkg.com/string.prototype.trimend/-/string.prototype.trimend-1.0.7.tgz#1bb3afc5008661d73e2dc015cd4853732d6c471e"
+  integrity sha512-Ni79DqeB72ZFq1uH/L6zJ+DKZTkOtPIHovb3YZHQViE+HDouuU4mBrLOLDn5Dde3RF8qw5qVETEjhu9locMLvA==
   dependencies:
     call-bind "^1.0.2"
-    define-properties "^1.1.4"
-    es-abstract "^1.19.5"
+    define-properties "^1.2.0"
+    es-abstract "^1.22.1"
 
-string.prototype.trimstart@^1.0.6:
-  version "1.0.6"
-  resolved "https://registry.yarnpkg.com/string.prototype.trimstart/-/string.prototype.trimstart-1.0.6.tgz#e90ab66aa8e4007d92ef591bbf3cd422c56bdcf4"
-  integrity sha512-omqjMDaY92pbn5HOX7f9IccLA+U1tA9GvtU4JrodiXFfYB7jPzzHpRzpglLAjtUV6bB557zwClJezTqnAiYnQA==
+string.prototype.trimstart@^1.0.7:
+  version "1.0.7"
+  resolved "https://registry.yarnpkg.com/string.prototype.trimstart/-/string.prototype.trimstart-1.0.7.tgz#d4cdb44b83a4737ffbac2d406e405d43d0184298"
+  integrity sha512-NGhtDFu3jCEm7B4Fy0DpLewdJQOZcQ0rGbwQ/+stjnrp2i+rlKeCvos9hOIeCmqwratM47OBxY7uFZzjxHXmrg==
   dependencies:
     call-bind "^1.0.2"
-    define-properties "^1.1.4"
-    es-abstract "^1.20.4"
+    define-properties "^1.2.0"
+    es-abstract "^1.22.1"
 
 string_decoder@^1.1.1:
   version "1.3.0"
@@ -11810,7 +12637,7 @@ strip-ansi@^4.0.0:
   dependencies:
     ansi-regex "^3.0.0"
 
-strip-ansi@^5.0.0, strip-ansi@^5.1.0, strip-ansi@^5.2.0:
+strip-ansi@^5.1.0:
   version "5.2.0"
   resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-5.2.0.tgz#8c9a536feb6afc962bdfa5b104a5091c1ad9c0ae"
   integrity sha512-DuRs1gKbBqsMKIZlrffwlug8MHkcnpjs5VPmL1PAh+mA30U0DTotfDZ0d2UUsXpPmPmMMJ6W773MaA3J+lbiWA==
@@ -11846,6 +12673,11 @@ strip-final-newline@^2.0.0:
   resolved "https://registry.yarnpkg.com/strip-final-newline/-/strip-final-newline-2.0.0.tgz#89b852fb2fcbe936f6f4b3187afb0a12c1ab58ad"
   integrity sha512-BrpvfNAE3dcvq7ll3xVumzjKjZQ5tI1sEUIKr3Uoks0XUl45St3FlatVqef9prk4jRDzhW6WZg+3bk93y6pLjA==
 
+strip-final-newline@^3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/strip-final-newline/-/strip-final-newline-3.0.0.tgz#52894c313fbff318835280aed60ff71ebf12b8fd"
+  integrity sha512-dOESqjYr96iWYylGObzd39EuNTa5VJxyvVAEm5Jnh7KGo75V43Hk1odPQkNDyXNmUR6k+gEiDVXnjB8HJ3crXw==
+
 strip-hex-prefix@1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/strip-hex-prefix/-/strip-hex-prefix-1.0.0.tgz#0c5f155fef1151373377de9dbb588da05500e36f"
@@ -11853,22 +12685,15 @@ strip-hex-prefix@1.0.0:
   dependencies:
     is-hex-prefixed "1.0.0"
 
-strip-json-comments@2.0.1, strip-json-comments@^2.0.1, strip-json-comments@~2.0.1:
-  version "2.0.1"
-  resolved "https://registry.yarnpkg.com/strip-json-comments/-/strip-json-comments-2.0.1.tgz#3c531942e908c2697c0ec344858c286c7ca0a60a"
-  integrity sha512-4gB8na07fecVVkOI6Rs4e7T6NOTki5EmL7TUduTs6bu3EdnSycntVJ4re8kgZA+wx9IueI2Y11bfbgwtzuE0KQ==
-
-strip-json-comments@3.1.1, strip-json-comments@^3.1.0, strip-json-comments@^3.1.1:
+strip-json-comments@3.1.1, strip-json-comments@^3.1.0, strip-json-comments@^3.1.1, strip-json-comments@~3.1.1:
   version "3.1.1"
   resolved "https://registry.yarnpkg.com/strip-json-comments/-/strip-json-comments-3.1.1.tgz#31f1281b3832630434831c310c01cccda8cbe006"
   integrity sha512-6fPc+R4ihwqP6N/aIv2f1gMH8lOVtWQHoqC4yK6oSDVVocumAsfCqjkXnqiYMhmMwS/mEHLp7Vehlt3ql6lEig==
 
-supports-color@6.0.0:
-  version "6.0.0"
-  resolved "https://registry.yarnpkg.com/supports-color/-/supports-color-6.0.0.tgz#76cfe742cf1f41bb9b1c29ad03068c05b4c0e40a"
-  integrity sha512-on9Kwidc1IUQo+bQdhi8+Tijpo0e1SS6RoGo2guUwn5vdaxw8RXOF9Vb2ws+ihWOmh4JnCJOvaziZWP1VABaLg==
-  dependencies:
-    has-flag "^3.0.0"
+strip-json-comments@~2.0.1:
+  version "2.0.1"
+  resolved "https://registry.yarnpkg.com/strip-json-comments/-/strip-json-comments-2.0.1.tgz#3c531942e908c2697c0ec344858c286c7ca0a60a"
+  integrity sha512-4gB8na07fecVVkOI6Rs4e7T6NOTki5EmL7TUduTs6bu3EdnSycntVJ4re8kgZA+wx9IueI2Y11bfbgwtzuE0KQ==
 
 supports-color@8.1.1, supports-color@^8.0.0:
   version "8.1.1"
@@ -11941,17 +12766,25 @@ sync-rpc@^1.2.1:
   dependencies:
     get-port "^3.1.0"
 
-table@^5.2.3:
-  version "5.4.6"
-  resolved "https://registry.yarnpkg.com/table/-/table-5.4.6.tgz#1292d19500ce3f86053b05f0e8e7e4a3bb21079e"
-  integrity sha512-wmEc8m4fjnob4gt5riFRtTu/6+4rSe12TpAELNSqHMfF3IqnA+CH37USM6/YR3qRZv7e56kAEAtd6nKZaxe0Ug==
+synckit@^0.8.5:
+  version "0.8.5"
+  resolved "https://registry.yarnpkg.com/synckit/-/synckit-0.8.5.tgz#b7f4358f9bb559437f9f167eb6bc46b3c9818fa3"
+  integrity sha512-L1dapNV6vu2s/4Sputv8xGsCdAVlb5nRDMFU/E27D44l5U6cw1g0dGd45uLc+OXjNMmF4ntiMdCimzcjFKQI8Q==
+  dependencies:
+    "@pkgr/utils" "^2.3.1"
+    tslib "^2.5.0"
+
+table-layout@^1.0.2:
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/table-layout/-/table-layout-1.0.2.tgz#c4038a1853b0136d63365a734b6931cf4fad4a04"
+  integrity sha512-qd/R7n5rQTRFi+Zf2sk5XVVd9UQl6ZkduPFC3S7WEGJAmetDTjY3qPN50eSKzwuzEyQKy5TN2TiZdkIjos2L6A==
   dependencies:
-    ajv "^6.10.2"
-    lodash "^4.17.14"
-    slice-ansi "^2.1.0"
-    string-width "^3.0.0"
+    array-back "^4.0.1"
+    deep-extend "~0.6.0"
+    typical "^5.2.0"
+    wordwrapjs "^4.0.0"
 
-table@^6.0.9, table@^6.8.0:
+table@^6.0.9, table@^6.8.0, table@^6.8.1:
   version "6.8.1"
   resolved "https://registry.yarnpkg.com/table/-/table-6.8.1.tgz#ea2b71359fe03b017a5fbc296204471158080bdf"
   integrity sha512-Y4X9zqrCftUhMeH2EptSSERdVKt/nEdijTOacGD/97EKjhQ/Qs8RTlEGABSJNNN8lac9kheH+af7yAkEWlgneA==
@@ -11974,11 +12807,18 @@ tabtab@^3.0.2:
     mkdirp "^0.5.1"
     untildify "^3.0.3"
 
+tapable@^2.2.0:
+  version "2.2.1"
+  resolved "https://registry.yarnpkg.com/tapable/-/tapable-2.2.1.tgz#1967a73ef4060a82f12ab96af86d52fdb76eeca0"
+  integrity sha512-GNzQvQTOIP6RyTfE2Qxb8ZVlNmw0n88vp1szwWRimP02mnTsx3Wtn5qRdqY9w2XduFNUgvOwhNnQsjwCp+kqaQ==
+
 tape@^4.6.3:
-  version "4.16.2"
-  resolved "https://registry.yarnpkg.com/tape/-/tape-4.16.2.tgz#7565e6af20426565557266e9dda7215869b297b6"
-  integrity sha512-TUChV+q0GxBBCEbfCYkGLkv8hDJYjMdSWdE0/Lr331sB389dsvFUHNV9ph5iQqKzt8Ss9drzcda/YeexclBFqg==
+  version "4.17.0"
+  resolved "https://registry.yarnpkg.com/tape/-/tape-4.17.0.tgz#de89f3671ddc5dad178d04c28dc6b0183f42268e"
+  integrity sha512-KCuXjYxCZ3ru40dmND+oCLsXyuA8hoseu2SS404Px5ouyS0A99v8X/mdiLqsR5MTAyamMBN7PRwt2Dv3+xGIxw==
   dependencies:
+    "@ljharb/resumer" "~0.0.1"
+    "@ljharb/through" "~2.3.9"
     call-bind "~1.0.2"
     deep-equal "~1.1.1"
     defined "~1.0.1"
@@ -11988,12 +12828,11 @@ tape@^4.6.3:
     has "~1.0.3"
     inherits "~2.0.4"
     is-regex "~1.1.4"
-    minimist "~1.2.7"
+    minimist "~1.2.8"
+    mock-property "~1.0.0"
     object-inspect "~1.12.3"
-    resolve "~1.22.1"
-    resumer "~0.0.0"
-    string.prototype.trim "~1.2.7"
-    through "~2.3.8"
+    resolve "~1.22.6"
+    string.prototype.trim "~1.2.8"
 
 tar-fs@~1.16.3:
   version "1.16.3"
@@ -12052,6 +12891,16 @@ tar@^4.0.2:
     safe-buffer "^5.2.1"
     yallist "^3.1.1"
 
+template-file@^6.0.1:
+  version "6.0.1"
+  resolved "https://registry.yarnpkg.com/template-file/-/template-file-6.0.1.tgz#ce4d1f48e56d637cc94bb97ec205e6e035bbb2a5"
+  integrity sha512-02hOa1psJUOsahWfx8w3p40CCulA2/InNFFPh5xLq5rUUm2XTzvmtOn/SXV+KZaq7ylG58SYSnT4yW3y/Smn4w==
+  dependencies:
+    "@blakek/deep" "^2.2.0"
+    glob "^7.1.6"
+    mkdirp "^1.0.4"
+    p-limit "^4.0.0"
+
 test-exclude@^6.0.0:
   version "6.0.0"
   resolved "https://registry.yarnpkg.com/test-exclude/-/test-exclude-6.0.0.tgz#04a8698661d805ea6fa293b6cb9e63ac044ef15e"
@@ -12118,7 +12967,7 @@ through2@^2.0.3:
     readable-stream "~2.3.6"
     xtend "~4.0.1"
 
-"through@>=2.2.7 <3", through@^2.3.6, through@~2.3.4, through@~2.3.8:
+"through@>=2.2.7 <3", through@^2.3.6:
   version "2.3.8"
   resolved "https://registry.yarnpkg.com/through/-/through-2.3.8.tgz#0dd4c9ffaabc357960b1b724115d7e0e86a2e1f5"
   integrity sha512-w89qg7PI8wAdvX60bMDP+bFoD5Dvhm9oLheFp5O4a2QF0cSBGsBX4qZmadPMvVqlLJBBci+WqGGOAPvcDeNSVg==
@@ -12128,6 +12977,11 @@ timed-out@^4.0.1:
   resolved "https://registry.yarnpkg.com/timed-out/-/timed-out-4.0.1.tgz#f32eacac5a175bea25d7fab565ab3ed8741ef56f"
   integrity sha512-G7r3AhovYtr5YKOWQkta8RKAPb+J9IsO4uVmzjl8AZwfhs8UcUwTiD6gcJYSgOtzyjvQKrKYn41syHbUWMkafA==
 
+titleize@^3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/titleize/-/titleize-3.0.0.tgz#71c12eb7fdd2558aa8a44b0be83b8a76694acd53"
+  integrity sha512-KxVu8EYHDPBdUYdKZdKtU2aj2XfEx9AfjXxE/Aj0vT06w2icA09Vus1rh6eSu1y01akYg6BjIK/hxyLJINoMLQ==
+
 tmp@0.0.33, tmp@^0.0.33:
   version "0.0.33"
   resolved "https://registry.yarnpkg.com/tmp/-/tmp-0.0.33.tgz#6d34335889768d21b2bcda0aa277ced3b1bfadf9"
@@ -12204,7 +13058,7 @@ toidentifier@1.0.1:
   resolved "https://registry.yarnpkg.com/toidentifier/-/toidentifier-1.0.1.tgz#3be34321a88a820ed1bd80dfaa33e479fbb8dd35"
   integrity sha512-o5sSPKEkg/DIQNmH43V0/uerLrpzVedkUh8tGNvaeXpfpuwjKenlSox/2O/BTlZUtEe+JG7s5YhEz608PlAHRA==
 
-tough-cookie@^2.3.3, tough-cookie@~2.5.0:
+tough-cookie@~2.5.0:
   version "2.5.0"
   resolved "https://registry.yarnpkg.com/tough-cookie/-/tough-cookie-2.5.0.tgz#cd9fb2a0aa1d5a12b473bd9fb96fa3dcff65ade2"
   integrity sha512-nlLsUzgm1kfLXSXfRZMc1KLAugd4hqJHDTvc2hDIwS3mZAfMEuMbc03SujMF+GEcpaX/qboeycw6iO8JwVv2+g==
@@ -12227,6 +13081,21 @@ trim-right@^1.0.1:
   resolved "https://registry.yarnpkg.com/trim-right/-/trim-right-1.0.1.tgz#cb2e1203067e0c8de1f614094b9fe45704ea6003"
   integrity sha512-WZGXGstmCWgeevgTL54hrCuw1dyMQIzWy7ZfqRJfSmJZBwklI15egmQytFP6bPidmw3M8d5yEowl1niq4vmqZw==
 
+ts-api-utils@^1.0.1:
+  version "1.0.3"
+  resolved "https://registry.yarnpkg.com/ts-api-utils/-/ts-api-utils-1.0.3.tgz#f12c1c781d04427313dbac808f453f050e54a331"
+  integrity sha512-wNMeqtMz5NtwpT/UZGY5alT+VoKdSsOOP/kqHFcUW1P/VRhH2wJ48+DN2WwUliNbQ976ETwDL0Ifd2VVvgonvg==
+
+ts-command-line-args@^2.2.0:
+  version "2.5.1"
+  resolved "https://registry.yarnpkg.com/ts-command-line-args/-/ts-command-line-args-2.5.1.tgz#e64456b580d1d4f6d948824c274cf6fa5f45f7f0"
+  integrity sha512-H69ZwTw3rFHb5WYpQya40YAX2/w7Ut75uUECbgBIsLmM+BNuYnxsltfyyLMxy6sEeKxgijLTnQtLd0nKd6+IYw==
+  dependencies:
+    chalk "^4.1.0"
+    command-line-args "^5.1.1"
+    command-line-usage "^6.1.0"
+    string-format "^2.0.0"
+
 ts-essentials@^1.0.0:
   version "1.0.4"
   resolved "https://registry.yarnpkg.com/ts-essentials/-/ts-essentials-1.0.4.tgz#ce3b5dade5f5d97cf69889c11bf7d2da8555b15a"
@@ -12258,19 +13127,27 @@ ts-generator@^0.1.1:
     ts-essentials "^1.0.0"
 
 ts-jest@^29.0.1:
-  version "29.0.3"
-  resolved "https://registry.yarnpkg.com/ts-jest/-/ts-jest-29.0.3.tgz#63ea93c5401ab73595440733cefdba31fcf9cb77"
-  integrity sha512-Ibygvmuyq1qp/z3yTh9QTwVVAbFdDy/+4BtIQR2sp6baF2SJU/8CKK/hhnGIDY2L90Az2jIqTwZPnN2p+BweiQ==
+  version "29.1.1"
+  resolved "https://registry.yarnpkg.com/ts-jest/-/ts-jest-29.1.1.tgz#f58fe62c63caf7bfcc5cc6472082f79180f0815b"
+  integrity sha512-D6xjnnbP17cC85nliwGiL+tpoKN0StpgE0TeOjXQTU6MVCfsB4v7aW05CgQ/1OywGb0x/oy9hHFnN+sczTiRaA==
   dependencies:
     bs-logger "0.x"
     fast-json-stable-stringify "2.x"
     jest-util "^29.0.0"
-    json5 "^2.2.1"
+    json5 "^2.2.3"
     lodash.memoize "4.x"
     make-error "1.x"
-    semver "7.x"
+    semver "^7.5.3"
     yargs-parser "^21.0.1"
 
+ts-morph@^19.0.0:
+  version "19.0.0"
+  resolved "https://registry.yarnpkg.com/ts-morph/-/ts-morph-19.0.0.tgz#43e95fb0156c3fe3c77c814ac26b7d0be2f93169"
+  integrity sha512-D6qcpiJdn46tUqV45vr5UGM2dnIEuTGNxVhg0sk5NX11orcouwj6i1bMqZIz2mZTZB1Hcgy7C3oEVhAT+f6mbQ==
+  dependencies:
+    "@ts-morph/common" "~0.20.0"
+    code-block-writer "^12.0.0"
+
 ts-node@^10.1.0, ts-node@^10.7.0:
   version "10.9.1"
   resolved "https://registry.yarnpkg.com/ts-node/-/ts-node-10.9.1.tgz#e73de9102958af9e1f0b168a6ff320e25adcff4b"
@@ -12290,11 +13167,26 @@ ts-node@^10.1.0, ts-node@^10.7.0:
     v8-compile-cache-lib "^3.0.1"
     yn "3.1.1"
 
+tsconfig-paths@^3.14.2:
+  version "3.14.2"
+  resolved "https://registry.yarnpkg.com/tsconfig-paths/-/tsconfig-paths-3.14.2.tgz#6e32f1f79412decd261f92d633a9dc1cfa99f088"
+  integrity sha512-o/9iXgCYc5L/JxCHPe3Hvh8Q/2xm5Z+p18PESBU6Ff33695QnCHBEjcytY2q19ua7Mbl/DavtBOLq+oG0RCL+g==
+  dependencies:
+    "@types/json5" "^0.0.29"
+    json5 "^1.0.2"
+    minimist "^1.2.6"
+    strip-bom "^3.0.0"
+
 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"
   integrity sha512-Xni35NKzjgMrwevysHTCArtLDpPvye8zV/0E4EyYn43P7/7qvQwPh9BGkHewbMulVntbigmcT7rdX3BNo9wRJg==
 
+tslib@^2.5.0, tslib@^2.6.0:
+  version "2.6.2"
+  resolved "https://registry.yarnpkg.com/tslib/-/tslib-2.6.2.tgz#703ac29425e7b37cd6fd456e92404d46d1f3e4ae"
+  integrity sha512-AEYxH93jGFPn/a2iVAwW87VuUIkR1FVUKB77NwMF7nBTDkDrrT/Hpt/IrCJ0QXhW27jTBDcf5ZY7w6RiqTMw2Q==
+
 tsort@0.0.1:
   version "0.0.1"
   resolved "https://registry.yarnpkg.com/tsort/-/tsort-0.0.1.tgz#e2280f5e817f8bf4275657fd0f9aebd44f5a2786"
@@ -12343,7 +13235,7 @@ type-check@~0.3.2:
   dependencies:
     prelude-ls "~1.1.2"
 
-type-detect@4.0.8, type-detect@^4.0.0, type-detect@^4.0.5:
+type-detect@4.0.8, type-detect@^4.0.0, type-detect@^4.0.8:
   version "4.0.8"
   resolved "https://registry.yarnpkg.com/type-detect/-/type-detect-4.0.8.tgz#7646fb5f18871cfbb7749e69bd39a6388eb7450c"
   integrity sha512-0fr/mIH1dlO+x7TlcMy+bIDqKPsw/70tVyeHW787goQjhmqaZe10uwLujubK9q9Lg6Fiho1KUKDYz0Z7k7g5/g==
@@ -12407,6 +13299,52 @@ typechain@^4.0.0:
     ts-essentials "^7.0.1"
     ts-generator "^0.1.1"
 
+typechain@^8.1.1:
+  version "8.3.2"
+  resolved "https://registry.yarnpkg.com/typechain/-/typechain-8.3.2.tgz#1090dd8d9c57b6ef2aed3640a516bdbf01b00d73"
+  integrity sha512-x/sQYr5w9K7yv3es7jo4KTX05CLxOf7TRWwoHlrjRh8H82G64g+k7VuWPJlgMo6qrjfCulOdfBjiaDtmhFYD/Q==
+  dependencies:
+    "@types/prettier" "^2.1.1"
+    debug "^4.3.1"
+    fs-extra "^7.0.0"
+    glob "7.1.7"
+    js-sha3 "^0.8.0"
+    lodash "^4.17.15"
+    mkdirp "^1.0.4"
+    prettier "^2.3.1"
+    ts-command-line-args "^2.2.0"
+    ts-essentials "^7.0.1"
+
+typed-array-buffer@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/typed-array-buffer/-/typed-array-buffer-1.0.0.tgz#18de3e7ed7974b0a729d3feecb94338d1472cd60"
+  integrity sha512-Y8KTSIglk9OZEr8zywiIHG/kmQ7KWyjseXs1CbSo8vC42w7hg2HgYTxSWwP0+is7bWDc1H+Fo026CpHFwm8tkw==
+  dependencies:
+    call-bind "^1.0.2"
+    get-intrinsic "^1.2.1"
+    is-typed-array "^1.1.10"
+
+typed-array-byte-length@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/typed-array-byte-length/-/typed-array-byte-length-1.0.0.tgz#d787a24a995711611fb2b87a4052799517b230d0"
+  integrity sha512-Or/+kvLxNpeQ9DtSydonMxCx+9ZXOswtwJn17SNLvhptaXYDJvkFFP5zbfU/uLmvnBJlI4yrnXRxpdWH/M5tNA==
+  dependencies:
+    call-bind "^1.0.2"
+    for-each "^0.3.3"
+    has-proto "^1.0.1"
+    is-typed-array "^1.1.10"
+
+typed-array-byte-offset@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/typed-array-byte-offset/-/typed-array-byte-offset-1.0.0.tgz#cbbe89b51fdef9cd6aaf07ad4707340abbc4ea0b"
+  integrity sha512-RD97prjEt9EL8YgAgpOkf3O4IF9lhJFr9g0htQkm0rchFp/Vx7LW5Q8fSXXub7BXAODyUQohRMyOc3faCPd0hg==
+  dependencies:
+    available-typed-arrays "^1.0.5"
+    call-bind "^1.0.2"
+    for-each "^0.3.3"
+    has-proto "^1.0.1"
+    is-typed-array "^1.1.10"
+
 typed-array-length@^1.0.4:
   version "1.0.4"
   resolved "https://registry.yarnpkg.com/typed-array-length/-/typed-array-length-1.0.4.tgz#89d83785e5c4098bec72e08b319651f0eac9c1bb"
@@ -12428,10 +13366,15 @@ typedarray@^0.0.6:
   resolved "https://registry.yarnpkg.com/typedarray/-/typedarray-0.0.6.tgz#867ac74e3864187b1d3d47d996a78ec5c8830777"
   integrity sha512-/aCDEGatGvZ2BIk+HmLf4ifCJFwvKFNb9/JeZPMulfgFracn9QFcAf5GO8B/mweUjSoblS5In0cWhqpfs/5PQA==
 
-typescript@^4.3.5, typescript@^4.5.5:
-  version "4.8.4"
-  resolved "https://registry.yarnpkg.com/typescript/-/typescript-4.8.4.tgz#c464abca159669597be5f96b8943500b238e60e6"
-  integrity sha512-QCh+85mCy+h0IGff8r5XWzOVSbBO+KfeYrMQh7NJ58QujwcE22u+NUSmUxqF+un70P9GXKxa2HCNiTTMJknyjQ==
+typescript@^4.3.5, typescript@^4.5.5, typescript@^4.6.4:
+  version "4.9.5"
+  resolved "https://registry.yarnpkg.com/typescript/-/typescript-4.9.5.tgz#095979f9bcc0d09da324d58d03ce8f8374cbe65a"
+  integrity sha512-1FXk9E2Hm+QzZQ7z+McJiHL4NW1F2EzMu9Nq9i3zAaGqibafqYwCVU6WyWAuyQRRzOlxou8xZSyXLEN8oKj24g==
+
+typescript@^5.2.2:
+  version "5.2.2"
+  resolved "https://registry.yarnpkg.com/typescript/-/typescript-5.2.2.tgz#5ebb5e5a5b75f085f22bc3f8460fba308310fa78"
+  integrity sha512-mI4WrpHsbCIcwT9cF4FZvr80QUeKvsUsUvKDoR+X/7XHQH98xYD8YHZg7ANtz2GtZt/CBq2QJ0thkGJMHfqc1w==
 
 typewise-core@^1.2, typewise-core@^1.2.0:
   version "1.2.0"
@@ -12455,6 +13398,16 @@ typical@^2.6.0, typical@^2.6.1:
   resolved "https://registry.yarnpkg.com/typical/-/typical-2.6.1.tgz#5c080e5d661cbbe38259d2e70a3c7253e873881d"
   integrity sha512-ofhi8kjIje6npGozTip9Fr8iecmYfEbS06i0JnIg+rh51KakryWF4+jX8lLKZVhy6N+ID45WYSFCxPOdTWCzNg==
 
+typical@^4.0.0:
+  version "4.0.0"
+  resolved "https://registry.yarnpkg.com/typical/-/typical-4.0.0.tgz#cbeaff3b9d7ae1e2bbfaf5a4e6f11eccfde94fc4"
+  integrity sha512-VAH4IvQ7BDFYglMd7BPRDfLgxZZX4O4TFcRDA6EN5X7erNJJq+McIEp8np9aVtxrCJ6qx4GTYVfOWNjcqwZgRw==
+
+typical@^5.2.0:
+  version "5.2.0"
+  resolved "https://registry.yarnpkg.com/typical/-/typical-5.2.0.tgz#4daaac4f2b5315460804f0acf6cb69c52bb93066"
+  integrity sha512-dvdQgNDNJo+8B2uBQoqdb11eUCE1JQXhvjC/CZtgvZseVd5TYMXnq0+vuUemXbd/Se29cTaUuPX3YIc2xgbvIg==
+
 uc.micro@^1.0.1, uc.micro@^1.0.5:
   version "1.0.6"
   resolved "https://registry.yarnpkg.com/uc.micro/-/uc.micro-1.0.6.tgz#9c411a802a409a91fc6cf74081baba34b24499ac"
@@ -12485,19 +13438,17 @@ underscore@1.9.1:
   resolved "https://registry.yarnpkg.com/underscore/-/underscore-1.9.1.tgz#06dce34a0e68a7babc29b365b8e74b8925203961"
   integrity sha512-5/4etnCkd9c8gwgowi5/om/mYO5ajCaOgdzj/oW+0eQV9WxKBDZw5+ycmKmeaTXjInS/W0BzpGLo2xR2aBwZdg==
 
-undici@^5.14.0:
-  version "5.22.1"
-  resolved "https://registry.yarnpkg.com/undici/-/undici-5.22.1.tgz#877d512effef2ac8be65e695f3586922e1a57d7b"
-  integrity sha512-Ji2IJhFXZY0x/0tVBXeQwgPlLWw13GVzpsWPQ3rV50IFMMof2I55PZZxtm4P6iNq+L5znYN9nSTAq0ZyE6lSJw==
-  dependencies:
-    busboy "^1.6.0"
+undici-types@~5.26.4:
+  version "5.26.5"
+  resolved "https://registry.yarnpkg.com/undici-types/-/undici-types-5.26.5.tgz#bcd539893d00b56e964fd2657a4866b221a65617"
+  integrity sha512-JlCMO+ehdEIKqlFxk6IfVoAUVmgz7cU7zD/h9XZ0qzeosSHmUJVOzSQvvYSYWXkFXC+IfLKSIffhv0sVZup6pA==
 
-undici@^5.4.0:
-  version "5.12.0"
-  resolved "https://registry.yarnpkg.com/undici/-/undici-5.12.0.tgz#c758ffa704fbcd40d506e4948860ccaf4099f531"
-  integrity sha512-zMLamCG62PGjd9HHMpo05bSLvvwWOZgGeiWlN/vlqu3+lRo3elxktVGEyLMX+IO7c2eflLjcW74AlkhEZm15mg==
+undici@^5.14.0:
+  version "5.27.0"
+  resolved "https://registry.yarnpkg.com/undici/-/undici-5.27.0.tgz#789f2e40ce982b5507899abc2c2ddeb2712b4554"
+  integrity sha512-l3ydWhlhOJzMVOYkymLykcRRXqbUaQriERtR70B9LzNkZ4bX52Fc8wbTDneMiwo8T+AemZXvXaTx+9o5ROxrXg==
   dependencies:
-    busboy "^1.6.0"
+    "@fastify/busboy" "^2.0.0"
 
 union-value@^1.0.0:
   version "1.0.1"
@@ -12542,10 +13493,15 @@ untildify@^3.0.3:
   resolved "https://registry.yarnpkg.com/untildify/-/untildify-3.0.3.tgz#1e7b42b140bcfd922b22e70ca1265bfe3634c7c9"
   integrity sha512-iSk/J8efr8uPT/Z4eSUywnqyrQU7DSdMfdqK4iWEaUVVmcP5JcnpRqmVMwcwcnmI1ATFNgC5V90u09tBynNFKA==
 
-update-browserslist-db@^1.0.9:
-  version "1.0.10"
-  resolved "https://registry.yarnpkg.com/update-browserslist-db/-/update-browserslist-db-1.0.10.tgz#0f54b876545726f17d00cd9a2561e6dade943ff3"
-  integrity sha512-OztqDenkfFkbSG+tRxBeAnCVPckDBcvibKd35yDONx6OU8N7sqgwc7rCbkJ/WcYtVRZ4ba68d6byhC21GFh7sQ==
+untildify@^4.0.0:
+  version "4.0.0"
+  resolved "https://registry.yarnpkg.com/untildify/-/untildify-4.0.0.tgz#2bc947b953652487e4600949fb091e3ae8cd919b"
+  integrity sha512-KK8xQ1mkzZeg9inewmFVDNkg3l5LUhoq9kN6iWYB/CC9YMG8HA+c1Q8HwDe6dEX7kErrEVNVBO3fWsVq5iDgtw==
+
+update-browserslist-db@^1.0.13:
+  version "1.0.13"
+  resolved "https://registry.yarnpkg.com/update-browserslist-db/-/update-browserslist-db-1.0.13.tgz#3c5e4f5c083661bd38ef64b6328c26ed6c8248c4"
+  integrity sha512-xebP81SNcPuNpPP3uzeW1NYXxI3rxyJzF3pD6sH4jE7o/IX+WtSpwnVU+qIsDPyk0d3hmFQ7mjqc6AtV604hbg==
   dependencies:
     escalade "^3.1.1"
     picocolors "^1.0.0"
@@ -12575,12 +13531,12 @@ url-set-query@^1.0.0:
   integrity sha512-3AChu4NiXquPfeckE5R5cGdiHCMWJx1dwCWOmWIL4KHAziJNOFIYJlpGFeKDvwLPHovZRCxK3cYlwzqI9Vp+Gg==
 
 url@^0.11.0:
-  version "0.11.0"
-  resolved "https://registry.yarnpkg.com/url/-/url-0.11.0.tgz#3838e97cfc60521eb73c525a8e55bfdd9e2e28f1"
-  integrity sha512-kbailJa29QrtXnxgq+DdCEGlbTeYM2eJUxsz6vjZavrCYPMIFHMKQmSKYAIuUK2i7hgPm28a8piX5NTUtM/LKQ==
+  version "0.11.3"
+  resolved "https://registry.yarnpkg.com/url/-/url-0.11.3.tgz#6f495f4b935de40ce4a0a52faee8954244f3d3ad"
+  integrity sha512-6hxOLGfZASQK/cijlZnZJTq8OXAkt/3YGfQX45vvMYXpZoo8NdWZcY73K108Jf759lS1Bv/8wXnHDTSz17dSRw==
   dependencies:
-    punycode "1.3.2"
-    querystring "0.2.0"
+    punycode "^1.4.1"
+    qs "^6.11.2"
 
 use@^3.1.0:
   version "3.1.1"
@@ -12605,15 +13561,17 @@ util-deprecate@^1.0.1, util-deprecate@~1.0.1:
   integrity sha512-EPD5q1uXyFxJpCrLnCc1nHnq3gOa6DZBocAIiI2TaSCA7VCJ1UJDMagCzIkXNsUYfD1daK//LTEQ8xiIbrHtcw==
 
 util.promisify@^1.0.0:
-  version "1.1.1"
-  resolved "https://registry.yarnpkg.com/util.promisify/-/util.promisify-1.1.1.tgz#77832f57ced2c9478174149cae9b96e9918cd54b"
-  integrity sha512-/s3UsZUrIfa6xDhr7zZhnE9SLQ5RIXyYfiVnMMyMDzOc8WhWN4Nbh36H842OyurKbCDAesZOJaVyvmSl6fhGQw==
+  version "1.1.2"
+  resolved "https://registry.yarnpkg.com/util.promisify/-/util.promisify-1.1.2.tgz#02b3dbadbb80071eee4c43aed58747afdfc516db"
+  integrity sha512-PBdZ03m1kBnQ5cjjO0ZvJMJS+QsbyIcFwi4hY4U76OQsCO9JrOYjbCFgIF76ccFg9xnJo7ZHPkqyj1GqmdS7MA==
   dependencies:
-    call-bind "^1.0.0"
-    define-properties "^1.1.3"
+    call-bind "^1.0.2"
+    define-properties "^1.2.0"
     for-each "^0.3.3"
-    has-symbols "^1.0.1"
-    object.getownpropertydescriptors "^2.1.1"
+    has-proto "^1.0.1"
+    has-symbols "^1.0.3"
+    object.getownpropertydescriptors "^2.1.6"
+    safe-array-concat "^1.0.0"
 
 util@^0.10.3:
   version "0.10.4"
@@ -12627,11 +13585,6 @@ utils-merge@1.0.1:
   resolved "https://registry.yarnpkg.com/utils-merge/-/utils-merge-1.0.1.tgz#9f95710f50a267947b2ccc124741c1028427e713"
   integrity sha512-pMZTvIkT1d+TFGvDOqodOclx0QWkkgi6Tdoa8gC8ffGAAqz9pzPTZWAybbsHHoED/ztMtkv/VoYTYyShUn81hA==
 
-uuid@2.0.1:
-  version "2.0.1"
-  resolved "https://registry.yarnpkg.com/uuid/-/uuid-2.0.1.tgz#c2a30dedb3e535d72ccf82e343941a50ba8533ac"
-  integrity sha512-nWg9+Oa3qD2CQzHIP4qKUqwNfzKn8P0LtFhotaCTFchsV7ZfDhAybeip/HZVeMIpZi9JgY1E3nUlwaCmZT1sEg==
-
 uuid@3.3.2:
   version "3.3.2"
   resolved "https://registry.yarnpkg.com/uuid/-/uuid-3.3.2.tgz#1b4af4955eb3077c501c23872fc6513811587131"
@@ -12653,18 +13606,18 @@ v8-compile-cache-lib@^3.0.1:
   integrity sha512-wa7YjyUGfNZngI/vtK0UHAN+lgDCxBPCylVXGp0zu59Fz5aiGtNXaq3DhIov063MorB+VfufLh3JlF2KdTK3xg==
 
 v8-compile-cache@^2.0.3:
-  version "2.3.0"
-  resolved "https://registry.yarnpkg.com/v8-compile-cache/-/v8-compile-cache-2.3.0.tgz#2de19618c66dc247dcfb6f99338035d8245a2cee"
-  integrity sha512-l8lCEmLcLYZh4nbunNZvQCJc5pv7+RCwa8q/LdUx8u7lsWvPDKmpodJAJNwkAhJC//dFY48KuIEmjtd4RViDrA==
+  version "2.4.0"
+  resolved "https://registry.yarnpkg.com/v8-compile-cache/-/v8-compile-cache-2.4.0.tgz#cdada8bec61e15865f05d097c5f4fd30e94dc128"
+  integrity sha512-ocyWc3bAHBB/guyqJQVI5o4BZkPhznPYUG2ea80Gond/BgNWpap8TOmLSeeQG7bnh2KMISxskdADG59j7zruhw==
 
 v8-to-istanbul@^9.0.1:
-  version "9.0.1"
-  resolved "https://registry.yarnpkg.com/v8-to-istanbul/-/v8-to-istanbul-9.0.1.tgz#b6f994b0b5d4ef255e17a0d17dc444a9f5132fa4"
-  integrity sha512-74Y4LqY74kLE6IFyIjPtkSTWzUZmj8tdHT9Ii/26dvQ6K9Dl2NbEfj0XgU2sHCtKgt5VupqhlO/5aWuqS+IY1w==
+  version "9.1.3"
+  resolved "https://registry.yarnpkg.com/v8-to-istanbul/-/v8-to-istanbul-9.1.3.tgz#ea456604101cd18005ac2cae3cdd1aa058a6306b"
+  integrity sha512-9lDD+EVI2fjFsMWXc6dy5JJzBsVTcQ2fVkfBvncZ6xJWG9wtBhOldG+mHkSL0+V1K/xgZz0JDO5UT5hFwHUghg==
   dependencies:
     "@jridgewell/trace-mapping" "^0.3.12"
     "@types/istanbul-lib-coverage" "^2.0.1"
-    convert-source-map "^1.6.0"
+    convert-source-map "^2.0.0"
 
 validate-npm-package-license@^3.0.1:
   version "3.0.4"
@@ -12957,27 +13910,15 @@ web3-utils@1.2.11:
     underscore "1.9.1"
     utf8 "3.0.0"
 
-web3-utils@^1.0.0-beta.31, web3-utils@^1.3.4:
-  version "1.8.1"
-  resolved "https://registry.yarnpkg.com/web3-utils/-/web3-utils-1.8.1.tgz#f2f7ca7eb65e6feb9f3d61056d0de6bbd57125ff"
-  integrity sha512-LgnM9p6V7rHHUGfpMZod+NST8cRfGzJ1BTXAyNo7A9cJX9LczBfSRxJp+U/GInYe9mby40t3v22AJdlELibnsQ==
-  dependencies:
-    bn.js "^5.2.1"
-    ethereum-bloom-filters "^1.0.6"
-    ethereumjs-util "^7.1.0"
-    ethjs-unit "0.1.6"
-    number-to-bn "1.7.0"
-    randombytes "^2.1.0"
-    utf8 "3.0.0"
-
-web3-utils@^1.3.6:
-  version "1.9.0"
-  resolved "https://registry.yarnpkg.com/web3-utils/-/web3-utils-1.9.0.tgz#7c5775a47586cefb4ad488831be8f6627be9283d"
-  integrity sha512-p++69rCNNfu2jM9n5+VD/g26l+qkEOQ1m6cfRQCbH8ZRrtquTmrirJMgTmyOoax5a5XRYOuws14aypCOs51pdQ==
+web3-utils@^1.0.0-beta.31, web3-utils@^1.3.4, web3-utils@^1.3.6:
+  version "1.10.3"
+  resolved "https://registry.yarnpkg.com/web3-utils/-/web3-utils-1.10.3.tgz#f1db99c82549c7d9f8348f04ffe4e0188b449714"
+  integrity sha512-OqcUrEE16fDBbGoQtZXWdavsPzbGIDc5v3VrRTZ0XrIpefC/viZ1ZU9bGEemazyS0catk/3rkOOxpzTfY+XsyQ==
   dependencies:
+    "@ethereumjs/util" "^8.1.0"
     bn.js "^5.2.1"
     ethereum-bloom-filters "^1.0.6"
-    ethereumjs-util "^7.1.0"
+    ethereum-cryptography "^2.1.2"
     ethjs-unit "0.1.6"
     number-to-bn "1.7.0"
     randombytes "^2.1.0"
@@ -13054,29 +13995,16 @@ which-module@^1.0.0:
   resolved "https://registry.yarnpkg.com/which-module/-/which-module-1.0.0.tgz#bba63ca861948994ff307736089e3b96026c2a4f"
   integrity sha512-F6+WgncZi/mJDrammbTuHe1q0R5hOXv/mBaiNA2TCNT/LTHusX0V+CJnj9XT8ki5ln2UZyyddDgHfCzyrOH7MQ==
 
-which-module@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/which-module/-/which-module-2.0.0.tgz#d9ef07dce77b9902b8a3a8fa4b31c3e3f7e6e87a"
-  integrity sha512-B+enWhmw6cjfVC7kS8Pj9pCrKSc5txArRyaYGe088shv/FGWH+0Rjx/xPgtsWfsUtS27FkP697E4DDhgrgoc0Q==
-
-which-typed-array@^1.1.9:
-  version "1.1.9"
-  resolved "https://registry.yarnpkg.com/which-typed-array/-/which-typed-array-1.1.9.tgz#307cf898025848cf995e795e8423c7f337efbde6"
-  integrity sha512-w9c4xkx6mPidwp7180ckYWfMmvxpjlZuIudNtDf4N/tTAUB8VJbX25qZoAsrtGuYNnGw3pa0AXgbGKRB8/EceA==
+which-typed-array@^1.1.11, which-typed-array@^1.1.13:
+  version "1.1.13"
+  resolved "https://registry.yarnpkg.com/which-typed-array/-/which-typed-array-1.1.13.tgz#870cd5be06ddb616f504e7b039c4c24898184d36"
+  integrity sha512-P5Nra0qjSncduVPEAr7xhoF5guty49ArDTwzJ/yNuPIbZppyRxFQsRCWrocxIY+CnMVG+qfbU2FmDKyvSGClow==
   dependencies:
     available-typed-arrays "^1.0.5"
-    call-bind "^1.0.2"
+    call-bind "^1.0.4"
     for-each "^0.3.3"
     gopd "^1.0.1"
     has-tostringtag "^1.0.0"
-    is-typed-array "^1.1.10"
-
-which@1.3.1, which@^1.1.1, which@^1.2.9, which@^1.3.1:
-  version "1.3.1"
-  resolved "https://registry.yarnpkg.com/which/-/which-1.3.1.tgz#a45043d54f5805316da8d62f9f50918d3da70b0a"
-  integrity sha512-HxJdYWq1MTIQbJ3nw0cqssHoTNU267KlrDuGZ1WYlxDStUtKUhOaJmh112/TZmHxxUfuJqPXSOm7tDyas0OSIQ==
-  dependencies:
-    isexe "^2.0.0"
 
 which@2.0.2, which@^2.0.1:
   version "2.0.2"
@@ -13085,28 +14013,36 @@ which@2.0.2, which@^2.0.1:
   dependencies:
     isexe "^2.0.0"
 
-wide-align@1.1.3:
-  version "1.1.3"
-  resolved "https://registry.yarnpkg.com/wide-align/-/wide-align-1.1.3.tgz#ae074e6bdc0c14a431e804e624549c633b000457"
-  integrity sha512-QGkOQc8XL6Bt5PwnsExKBPuMKBxnGxWWW3fU55Xt4feHozMUhdUMaBCk290qpm/wG5u/RSKzwdAC4i51YigihA==
+which@^1.1.1, which@^1.2.9, which@^1.3.1:
+  version "1.3.1"
+  resolved "https://registry.yarnpkg.com/which/-/which-1.3.1.tgz#a45043d54f5805316da8d62f9f50918d3da70b0a"
+  integrity sha512-HxJdYWq1MTIQbJ3nw0cqssHoTNU267KlrDuGZ1WYlxDStUtKUhOaJmh112/TZmHxxUfuJqPXSOm7tDyas0OSIQ==
   dependencies:
-    string-width "^1.0.2 || 2"
+    isexe "^2.0.0"
 
 window-size@^0.2.0:
   version "0.2.0"
   resolved "https://registry.yarnpkg.com/window-size/-/window-size-0.2.0.tgz#b4315bb4214a3d7058ebeee892e13fa24d98b075"
   integrity sha512-UD7d8HFA2+PZsbKyaOCEy8gMh1oDtHgJh1LfgjQ4zVXmYjAT/kvz3PueITKuqDiIXQe7yzpPnxX3lNc+AhQMyw==
 
-word-wrap@^1.2.3, word-wrap@~1.2.3:
-  version "1.2.3"
-  resolved "https://registry.yarnpkg.com/word-wrap/-/word-wrap-1.2.3.tgz#610636f6b1f703891bd34771ccb17fb93b47079c"
-  integrity sha512-Hz/mrNwitNRh/HUAtM/VT/5VH+ygD6DV7mYKZAtHOrbs8U7lvPS6xf7EJKMF0uW1KJCl0H701g3ZGus+muE5vQ==
+word-wrap@~1.2.3:
+  version "1.2.5"
+  resolved "https://registry.yarnpkg.com/word-wrap/-/word-wrap-1.2.5.tgz#d2c45c6dd4fbce621a66f136cbe328afd0410b34"
+  integrity sha512-BN22B5eaMMI9UMtjrGd5g5eCYPpCPDUy0FJXbYsaT5zYxjFOckS53SQDE3pWkVoWpHXVb3BrYcEN4Twa55B5cA==
 
 wordwrap@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/wordwrap/-/wordwrap-1.0.0.tgz#27584810891456a4171c8d0226441ade90cbcaeb"
   integrity sha512-gvVzJFlPycKc5dZN4yPkP8w7Dc37BtP1yczEneOb4uq34pXZcvrtRTmWV8W+Ume+XCxKgbjM+nevkyFPMybd4Q==
 
+wordwrapjs@^4.0.0:
+  version "4.0.1"
+  resolved "https://registry.yarnpkg.com/wordwrapjs/-/wordwrapjs-4.0.1.tgz#d9790bccfb110a0fc7836b5ebce0937b37a8b98f"
+  integrity sha512-kKlNACbvHrkpIw6oPeYDSmdCTu2hdMHoyXLTcUKala++lx5Y+wjJ/e474Jqv5abnVmwxw08DiTuHmw69lJGksA==
+  dependencies:
+    reduce-flatten "^2.0.0"
+    typical "^5.2.0"
+
 workerpool@6.2.0:
   version "6.2.0"
   resolved "https://registry.yarnpkg.com/workerpool/-/workerpool-6.2.0.tgz#827d93c9ba23ee2019c3ffaff5c27fccea289e8b"
@@ -13125,15 +14061,6 @@ wrap-ansi@^2.0.0:
     string-width "^1.0.1"
     strip-ansi "^3.0.1"
 
-wrap-ansi@^5.1.0:
-  version "5.1.0"
-  resolved "https://registry.yarnpkg.com/wrap-ansi/-/wrap-ansi-5.1.0.tgz#1fd1f67235d5b6d0fee781056001bfb694c03b09"
-  integrity sha512-QC1/iN/2/RPVJ5jYK8BGttj5z83LmSKmvbvrXPNCLZSEb32KKVDJDl/MOt2N01qU2H/FkzEa9PKto1BqDjtd7Q==
-  dependencies:
-    ansi-styles "^3.2.0"
-    string-width "^3.0.0"
-    strip-ansi "^5.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"
@@ -13148,7 +14075,7 @@ wrappy@1:
   resolved "https://registry.yarnpkg.com/wrappy/-/wrappy-1.0.2.tgz#b5243d8f3ec1aa35f1364605bc0d1036e30ab69f"
   integrity sha512-l4Sp/DRseor9wL6EvV2+TuQn63dMkPjZ/sp9XkghTEbV9KlPS1xUsZ3u7/IQO4wxtcFB4bgpQPRcR3QCvezPcQ==
 
-write-file-atomic@^4.0.1:
+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"
   integrity sha512-7KxauUdBmSdWnmpaGFg+ppNjKF8uNLry8LyzjauQDOVONfFLNKrKvQOxZ/VuTIcS/gge/YNahf5RIIQWTSarlg==
@@ -13156,13 +14083,6 @@ write-file-atomic@^4.0.1:
     imurmurhash "^0.1.4"
     signal-exit "^3.0.7"
 
-write@1.0.3:
-  version "1.0.3"
-  resolved "https://registry.yarnpkg.com/write/-/write-1.0.3.tgz#0800e14523b923a387e415123c865616aae0f5c3"
-  integrity sha512-/lg70HAjtkUgWPVZhZcm+T4hkL8Zbtp1nFNOn3lRrxnlv50SRBv7cR7RqR+GMsd3hUXy9hWBo4CHTbFTcOYwig==
-  dependencies:
-    mkdirp "^0.5.1"
-
 ws@7.4.6:
   version "7.4.6"
   resolved "https://registry.yarnpkg.com/ws/-/ws-7.4.6.tgz#5654ca8ecdeee47c33a9a4bf6d28e2be2980377c"
@@ -13231,10 +14151,10 @@ xhr@^2.0.4, xhr@^2.2.0, xhr@^2.3.3:
     parse-headers "^2.0.0"
     xtend "^4.0.0"
 
-xmlhttprequest@1.8.0:
-  version "1.8.0"
-  resolved "https://registry.yarnpkg.com/xmlhttprequest/-/xmlhttprequest-1.8.0.tgz#67fe075c5c24fef39f9d65f5f7b7fe75171968fc"
-  integrity sha512-58Im/U0mlVBLM38NdZjHyhuMtCqa61469k2YP/AaPbvCoV9aQGUpbJBj1QRm2ytRiVQBD/fsw7L2bJGDVQswBA==
+xregexp@3.1.0:
+  version "3.1.0"
+  resolved "https://registry.yarnpkg.com/xregexp/-/xregexp-3.1.0.tgz#14d8461e0bdd38224bfee5039a0898fc42fcd336"
+  integrity sha512-4Y1x6DyB8xRoxosooa6PlGWqmmSKatbzhrftZ7Purmm4B8R4qIEJG1A2hZsdz5DhmIqS0msC0I7KEq93GphEVg==
 
 xtend@^4.0.0, xtend@^4.0.1, xtend@~4.0.0, xtend@~4.0.1:
   version "4.0.2"
@@ -13253,11 +14173,6 @@ y18n@^3.2.1:
   resolved "https://registry.yarnpkg.com/y18n/-/y18n-3.2.2.tgz#85c901bd6470ce71fc4bb723ad209b70f7f28696"
   integrity sha512-uGZHXkHnhF0XeeAPgnKfPv1bgKAYyVvmNL1xlKsPYZPaIHxGti2hHqvOCQv71XMsLxu1QjergkqogUnms5D3YQ==
 
-y18n@^4.0.0:
-  version "4.0.3"
-  resolved "https://registry.yarnpkg.com/y18n/-/y18n-4.0.3.tgz#b5f259c82cd6e336921efd7bfd8bf560de9eeedf"
-  integrity sha512-JKhqTOwSrqNA1NY5lSztJ1GrBiUodLMmIZuLiDaMRJ+itFd+ABVE8XBjOvIWL+rSqNDC74LCSFmlb/U4UZ4hJQ==
-
 y18n@^5.0.5:
   version "5.0.8"
   resolved "https://registry.yarnpkg.com/y18n/-/y18n-5.0.8.tgz#7f4934d0f7ca8c56f95314939ddcd2dd91ce1d55"
@@ -13283,14 +14198,6 @@ yaml@^1.10.2:
   resolved "https://registry.yarnpkg.com/yaml/-/yaml-1.10.2.tgz#2301c5ffbf12b467de8da2333a459e29e7920e4b"
   integrity sha512-r3vXyErRCYJ7wg28yvBY5VSoAF8ZvlcW9/BwUzEtUsjvX/DKs24dIkuwjtuprwJJHsbyUbLApepYTR1BN4uHrg==
 
-yargs-parser@13.1.2, yargs-parser@^13.1.2:
-  version "13.1.2"
-  resolved "https://registry.yarnpkg.com/yargs-parser/-/yargs-parser-13.1.2.tgz#130f09702ebaeef2650d54ce6e3e5706f7a4fb38"
-  integrity sha512-3lbsNRf/j+A4QuSZfDRA7HRSfWrzO0YjqTJd5kjAq37Zep1CEgaYmrH9Q3GwPiB9cHyd1Y1UwggGhJGoxipbzg==
-  dependencies:
-    camelcase "^5.0.0"
-    decamelize "^1.2.0"
-
 yargs-parser@20.2.4:
   version "20.2.4"
   resolved "https://registry.yarnpkg.com/yargs-parser/-/yargs-parser-20.2.4.tgz#b42890f14566796f85ae8e3a25290d205f154a54"
@@ -13309,20 +14216,11 @@ yargs-parser@^20.2.2:
   resolved "https://registry.yarnpkg.com/yargs-parser/-/yargs-parser-20.2.9.tgz#2eb7dc3b0289718fc295f362753845c41a0c94ee"
   integrity sha512-y11nGElTIV+CT3Zv9t7VKl+Q3hTQoT9a1Qzezhhl6Rp21gJ/IVTW7Z3y9EWXhuUBC2Shnf+DX0antecpAwSP8w==
 
-yargs-parser@^21.0.0, yargs-parser@^21.0.1:
+yargs-parser@^21.0.1, yargs-parser@^21.1.1:
   version "21.1.1"
   resolved "https://registry.yarnpkg.com/yargs-parser/-/yargs-parser-21.1.1.tgz#9096bceebf990d21bb31fa9516e0ede294a77d35"
   integrity sha512-tVpsJW7DdjecAiFpbIB1e3qxIQsE6NoPc5/eTdrbbIC4h0LVsWhnoa3g+m2HclBIujHzsxZ4VJVA+GUuc2/LBw==
 
-yargs-unparser@1.6.0:
-  version "1.6.0"
-  resolved "https://registry.yarnpkg.com/yargs-unparser/-/yargs-unparser-1.6.0.tgz#ef25c2c769ff6bd09e4b0f9d7c605fb27846ea9f"
-  integrity sha512-W9tKgmSn0DpSatfri0nx52Joq5hVXgeLiqR/5G0sZNDoLZFOr/xjBUDcShCOGNsBnEMNo1KAMBkTej1Hm62HTw==
-  dependencies:
-    flat "^4.1.0"
-    lodash "^4.17.15"
-    yargs "^13.3.0"
-
 yargs-unparser@2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/yargs-unparser/-/yargs-unparser-2.0.0.tgz#f131f9226911ae5d9ad38c432fe809366c2325eb"
@@ -13333,22 +14231,6 @@ yargs-unparser@2.0.0:
     flat "^5.0.2"
     is-plain-obj "^2.1.0"
 
-yargs@13.3.2, yargs@^13.3.0:
-  version "13.3.2"
-  resolved "https://registry.yarnpkg.com/yargs/-/yargs-13.3.2.tgz#ad7ffefec1aa59565ac915f82dccb38a9c31a2dd"
-  integrity sha512-AX3Zw5iPruN5ie6xGRIDgqkT+ZhnRlZMLMHAs8tg7nRruy2Nb+i5o9bwghAogtM08q1dpr2LVoS8KSTMYpWXUw==
-  dependencies:
-    cliui "^5.0.0"
-    find-up "^3.0.0"
-    get-caller-file "^2.0.1"
-    require-directory "^2.1.1"
-    require-main-filename "^2.0.0"
-    set-blocking "^2.0.0"
-    string-width "^3.0.0"
-    which-module "^2.0.0"
-    y18n "^4.0.0"
-    yargs-parser "^13.1.2"
-
 yargs@16.2.0:
   version "16.2.0"
   resolved "https://registry.yarnpkg.com/yargs/-/yargs-16.2.0.tgz#1c82bf0f6b6a66eafce7ef30e376f49a12477f66"
@@ -13363,9 +14245,9 @@ yargs@16.2.0:
     yargs-parser "^20.2.2"
 
 yargs@^17.3.1:
-  version "17.6.1"
-  resolved "https://registry.yarnpkg.com/yargs/-/yargs-17.6.1.tgz#712508771045019cda059bc1ba3ae091aaa1402e"
-  integrity sha512-leBuCGrL4dAd6ispNOGsJlhd0uZ6Qehkbu/B9KCR+Pxa/NVdNwi+i31lo0buCm6XxhJQFshXCD0/evfV4xfoUg==
+  version "17.7.2"
+  resolved "https://registry.yarnpkg.com/yargs/-/yargs-17.7.2.tgz#991df39aca675a192b816e1e0363f9d75d2aa269"
+  integrity sha512-7dSzzRQ++CKnNI/krKnYRV7JKKPUXMEh61soaHKg9mrWEhzFWhFnxPxGl+69cD1Ou63C13NUPCnmIcrvqCuM6w==
   dependencies:
     cliui "^8.0.1"
     escalade "^3.1.1"
@@ -13373,7 +14255,7 @@ yargs@^17.3.1:
     require-directory "^2.1.1"
     string-width "^4.2.3"
     y18n "^5.0.5"
-    yargs-parser "^21.0.0"
+    yargs-parser "^21.1.1"
 
 yargs@^4.7.1:
   version "4.8.1"
@@ -13405,12 +14287,17 @@ yocto-queue@^0.1.0:
   resolved "https://registry.yarnpkg.com/yocto-queue/-/yocto-queue-0.1.0.tgz#0294eb3dee05028d31ee1a5fa2c556a6aaf10a1b"
   integrity sha512-rVksvsnNCdJ/ohGc6xgPwyN8eheCxsiLM8mxuE/t/mOVqJewPuO1miLpTHQiRgTKCLexL4MeAFVagts7HmNZ2Q==
 
+yocto-queue@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/yocto-queue/-/yocto-queue-1.0.0.tgz#7f816433fb2cbc511ec8bf7d263c3b58a1a3c251"
+  integrity sha512-9bnSc/HEW2uRy67wc+T8UwauLuPJVn28jb+GtJY16iiKWyvmYJRXVT4UamsAEGQfPohgr2q4Tq0sQbQlxTfi1g==
+
 zksync-web3@^0.14.3:
   version "0.14.3"
   resolved "https://registry.yarnpkg.com/zksync-web3/-/zksync-web3-0.14.3.tgz#64ac2a16d597464c3fc4ae07447a8007631c57c9"
   integrity sha512-hT72th4AnqyLW1d5Jlv8N2B/qhEnl2NePK2A3org7tAa24niem/UAaHMkEvmWI3SF9waYUPtqAtjpf+yvQ9zvQ==
 
-zksync-web3@^0.15.5:
+zksync-web3@^0.15.4, zksync-web3@^0.15.5:
   version "0.15.5"
   resolved "https://registry.yarnpkg.com/zksync-web3/-/zksync-web3-0.15.5.tgz#aabe379464963ab573e15948660a709f409b5316"
   integrity sha512-97gB7OKJL4spegl8fGO54g6cvTd/75G6yFWZWEa2J09zhjTrfqabbwE/GwiUJkFQ5BbzoH4JaTlVz1hoYZI+DQ==