diff --git a/.dockerignore b/.dockerignore
index 271d170e7d01..6b89f6c2c841 100644
--- a/.dockerignore
+++ b/.dockerignore
@@ -2,6 +2,7 @@
 !docker/prover/prover-entry.sh
 !docker/zk/entrypoint.sh
 !docker/local-node/entrypoint.sh
+!docker/external-node/entrypoint.sh
 !docker/contract-verifier/install-all-solc.sh
 !etc/test_config
 !etc/env/dev.env.example
@@ -16,11 +17,13 @@ keys/setup
 !db/
 !backups/
 !core/
+!prover/
 !yarn.lock
 !package.json
 !Cargo.lock
 !Cargo.toml
 !contracts/
+!setup_2\^26.key
 # It's required to remove .git from contracts,
 # otherwise yarn tries to use .git parent directory that
 # doesn't exist.
@@ -30,7 +33,11 @@ contracts/.git
 !sdk/zksync-rs
 !sdk/zksync-web3.js
 !etc/system-contracts/bootloader/build/artifacts
+!etc/system-contracts/contracts/artifacts
+!etc/system-contracts/contracts/precompiles/artifacts
 !etc/system-contracts/artifacts-zk
+!etc/multivm_bootloaders
 !cargo
 !bellman-cuda
 !core/bin/verification_key_generator_and_server/data/
+!prover/vk_setup_data_generator_server_fri/data/
diff --git a/prover/setup_key_generator_and_server/data/.gitkeep b/.env
similarity index 100%
rename from prover/setup_key_generator_and_server/data/.gitkeep
rename to .env
diff --git a/.gitignore b/.gitignore
index 8e2006d87520..8d3d81418b78 100644
--- a/.gitignore
+++ b/.gitignore
@@ -15,6 +15,7 @@ a.out
 cobertura.xml
 tags
 *.orig
+.direnv
 
 # Yarn files
 .yarn/
@@ -26,11 +27,9 @@ todo
 
 Cargo.lock
 !/Cargo.lock
-!/core/bin/prover/Cargo.lock
-!/core/bin/circuit_synthesizer/Cargo.lock
-!/core/bin/setup_key_generator_and_server/Cargo.lock
 !/core/bin/verification_key_generator_and_server/Cargo.lock
 !/infrastructure/zksync-crypto/Cargo.lock
+!/prover/Cargo.lock
 
 /etc/env/*
 !/etc/env/base
@@ -39,7 +38,9 @@ Cargo.lock
 !/etc/env/ext-node-docker.toml
 /etc/tokens/localhost.json
 /etc/zksolc-bin/*
+/etc/zkvyper-bin/*
 /etc/solc-bin/*
+/etc/vyper-bin/*
 !/keys
 /keys/*
 !/keys/packed
@@ -69,5 +70,3 @@ artifacts-zk/
 cache-zk/
 zksolc
 verified_sources
-
-.github
diff --git a/.gitmodules b/.gitmodules
index 2cc82ba95cb4..47c6f801432c 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -1,6 +1,6 @@
 [submodule "etc/system-contracts"]
-	path = etc/system-contracts
-	url = https://github.com/matter-labs/era-system-contracts.git
+path = etc/system-contracts
+url = https://github.com/matter-labs/era-system-contracts.git
 [submodule "contracts"]
-	path = contracts
-	url = https://github.com/matter-labs/era-contracts.git
+path = contracts
+url = https://github.com/matter-labs/era-contracts.git
diff --git a/.nvmrc b/.nvmrc
new file mode 100644
index 000000000000..6aab9b43fa34
--- /dev/null
+++ b/.nvmrc
@@ -0,0 +1 @@
+v18.18.0
diff --git a/.prettierignore b/.prettierignore
index 05ba7370295a..fd0d65050de8 100644
--- a/.prettierignore
+++ b/.prettierignore
@@ -1,2 +1,5 @@
 # Ignore submodule
 bellman-cuda
+sdk/zksync-web3.js/CHANGELOG.md
+sdk/zksync-rs/CHANGELOG.md
+CHANGELOG.md
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index f129e606f7a5..dd3d4584296f 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -1,9 +1,44 @@
 # Contribution Guidelines
 
-Thank you for considering helping out with the source code! We are extremely grateful for any consideration of
-contributions to this repository. However, at this time, we generally do not accept external contributions. This policy
-will change in the future, so please check back regularly for updates.
+Hello! Thanks for your interest in joining the mission to accelerate the mass adoption of crypto for personal
+sovereignty! We welcome contributions from anyone on the internet, and are grateful for even the smallest of fixes!
 
-For security issues, please contact us at [security@matterlabs.dev](mailto:security@matterlabs.dev).
+## Ways to contribute
 
-Thank you for your support in accelerating the mass adoption of crypto for personal sovereignty!
+There are many ways to contribute to the ZK Stack:
+
+1. Open issues: if you find a bug, have something you believe needs to be fixed, or have an idea for a feature, please
+   open an issue.
+2. Add color to existing issues: provide screenshots, code snippets, and whatever you think would be helpful to resolve
+   issues.
+3. Resolve issues: either by showing an issue isn't a problem and the current state is ok as is or by fixing the problem
+   and opening a PR.
+4. Report security issues, see [our security policy](./github/SECURITY.md).
+5. [Join the team!](https://matterlabs.notion.site/Shape-the-future-of-Ethereum-at-Matter-Labs-dfb3b5a037044bb3a8006af2eb0575e0)
+
+## Fixing issues
+
+To contribute code fixing issues, please fork the repo, fix an issue, commit, add documentation as per the PR template,
+and the repo's maintainers will review the PR.
+[here](https://docs.github.com/en/pull-requests/collaborating-with-pull-requests/proposing-changes-to-your-work-with-pull-requests/creating-a-pull-request-from-a-fork)
+for guidance how to work with PRs created from a fork.
+
+## Licenses
+
+If you contribute to this project, your contributions will be made to the project under both Apache 2.0 and the MIT
+license.
+
+## Resources
+
+We aim to make it as easy as possible to contribute to the mission. This is still WIP, and we're happy for contributions
+and suggestions here too. Some resources to help:
+
+1. [In-repo docs aimed at developers](docs)
+2. [zkSync Era docs!](https://era.zksync.io/docs/)
+3. Company links can be found in the [repo's readme](README.md)
+
+## Code of Conduct
+
+Be polite and respectful.
+
+### Thank you
diff --git a/Cargo.lock b/Cargo.lock
index cefaa683877c..6afde668dc0b 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -2,12 +2,6 @@
 # It is not intended for manual editing.
 version = 3
 
-[[package]]
-name = "Inflector"
-version = "0.11.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fe438c63458706e03479442743baae6c88256498e6431708f6dfc520a26515d3"
-
 [[package]]
 name = "actix-codec"
 version = "0.5.1"
@@ -85,7 +79,7 @@ version = "0.2.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "465a6172cf69b960917811022d8f29bc0b7fa1398bc4f78b3c466673db1213b6"
 dependencies = [
- "quote 1.0.28",
+ "quote 1.0.33",
  "syn 1.0.109",
 ]
 
@@ -201,7 +195,7 @@ checksum = "2262160a7ae29e3415554a3f1fc04c764b1540c116aa524683208078b7a75bc9"
 dependencies = [
  "actix-router",
  "proc-macro2 1.0.66",
- "quote 1.0.28",
+ "quote 1.0.33",
  "syn 1.0.109",
 ]
 
@@ -315,12 +309,6 @@ dependencies = [
  "memchr",
 ]
 
-[[package]]
-name = "aliasable"
-version = "0.1.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "250f629c0161ad8107cf89319e990051fae62832fd343083bea452d93e2205fd"
-
 [[package]]
 name = "alloc-no-stdlib"
 version = "2.0.4"
@@ -438,7 +426,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "0609c78bd572f4edc74310dfb63a01f5609d53fa8b4dd7c4d98aef3b3e8d72d1"
 dependencies = [
  "proc-macro-hack",
- "quote 1.0.28",
+ "quote 1.0.33",
  "syn 1.0.109",
 ]
 
@@ -518,7 +506,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "16e62a023e7c117e27523144c5d2459f4397fcc3cab0085af8e2224f643a0193"
 dependencies = [
  "proc-macro2 1.0.66",
- "quote 1.0.28",
+ "quote 1.0.33",
  "syn 2.0.27",
 ]
 
@@ -529,7 +517,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "b9ccdd8f2a161be9bd5c023df56f1b2a0bd1d83872ae53b71a84a12c9bf6e842"
 dependencies = [
  "proc-macro2 1.0.66",
- "quote 1.0.28",
+ "quote 1.0.33",
  "syn 2.0.27",
 ]
 
@@ -740,7 +728,7 @@ dependencies = [
  "peeking_take_while",
  "prettyplease",
  "proc-macro2 1.0.66",
- "quote 1.0.28",
+ "quote 1.0.33",
  "regex",
  "rustc-hash",
  "shlex",
@@ -1120,7 +1108,7 @@ dependencies = [
 [[package]]
 name = "circuit_testing"
 version = "0.1.0"
-source = "git+https://github.com/matter-labs/era-circuit_testing.git?branch=main#abd44b507840f836da6e084aaacb2ba8a7cb1df6"
+source = "git+https://github.com/matter-labs/era-circuit_testing.git?branch=main#ddc4684b2e81a1d37c36d20585e445439aa2751c"
 dependencies = [
  "bellman_ce",
 ]
@@ -1195,7 +1183,7 @@ checksum = "b8cd2b2a819ad6eec39e8f1d6b53001af1e5469f8c177579cdaeb313115b825f"
 dependencies = [
  "heck 0.4.1",
  "proc-macro2 1.0.66",
- "quote 1.0.28",
+ "quote 1.0.33",
  "syn 2.0.27",
 ]
 
@@ -1407,7 +1395,7 @@ dependencies = [
 
 [[package]]
 name = "cross_external_nodes_checker"
-version = "1.0.0"
+version = "0.1.0"
 dependencies = [
  "anyhow",
  "ctrlc",
@@ -1416,6 +1404,7 @@ dependencies = [
  "serde",
  "serde_json",
  "tokio",
+ "tracing",
  "vlog",
  "zksync_types",
  "zksync_utils",
@@ -1626,7 +1615,7 @@ source = "git+https://github.com/matter-labs/era-sync_vm.git?tag=v1.3.3-rc0#23be
 dependencies = [
  "proc-macro-error",
  "proc-macro2 1.0.66",
- "quote 1.0.28",
+ "quote 1.0.33",
  "serde",
  "syn 1.0.109",
 ]
@@ -1669,7 +1658,7 @@ dependencies = [
  "fnv",
  "ident_case",
  "proc-macro2 1.0.66",
- "quote 1.0.28",
+ "quote 1.0.33",
  "strsim 0.10.0",
  "syn 1.0.109",
 ]
@@ -1681,7 +1670,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "9c972679f83bdf9c42bd905396b6c3588a843a17f0f16dfcfa3e2c5d57441835"
 dependencies = [
  "darling_core",
- "quote 1.0.28",
+ "quote 1.0.33",
  "syn 1.0.109",
 ]
 
@@ -1703,7 +1692,7 @@ name = "db_test_macro"
 version = "0.1.0"
 dependencies = [
  "proc-macro2 1.0.66",
- "quote 1.0.28",
+ "quote 1.0.33",
  "syn 1.0.109",
 ]
 
@@ -1745,7 +1734,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "fcc3dd5e9e9c0b295d6e1e4d811fb6f157d5ffd784b8d202fc62eac8035a770b"
 dependencies = [
  "proc-macro2 1.0.66",
- "quote 1.0.28",
+ "quote 1.0.33",
  "syn 1.0.109",
 ]
 
@@ -1757,7 +1746,7 @@ checksum = "4fb810d30a7c1953f91334de7244731fc3f3c10d7fe163338a35b9f640960321"
 dependencies = [
  "convert_case 0.4.0",
  "proc-macro2 1.0.66",
- "quote 1.0.28",
+ "quote 1.0.33",
  "rustc_version",
  "syn 1.0.109",
 ]
@@ -1817,6 +1806,12 @@ version = "0.15.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "77c90badedccf4105eca100756a0b1289e191f6fcbdadd3cee1d2f614f97da8f"
 
+[[package]]
+name = "dtoa"
+version = "1.0.9"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "dcbb2bf8e87535c23f7a8a321e364ce21462d0ff10cb6407820e8e96dfff6653"
+
 [[package]]
 name = "ecdsa"
 version = "0.14.8"
@@ -1858,6 +1853,15 @@ dependencies = [
  "zeroize",
 ]
 
+[[package]]
+name = "elsa"
+version = "1.9.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "714f766f3556b44e7e4776ad133fcc3445a489517c25c704ace411bb14790194"
+dependencies = [
+ "stable_deref_trait",
+]
+
 [[package]]
 name = "encode_unicode"
 version = "0.3.6"
@@ -1873,16 +1877,6 @@ dependencies = [
  "cfg-if 1.0.0",
 ]
 
-[[package]]
-name = "enumeration_indices_migration"
-version = "0.1.0"
-dependencies = [
- "tokio",
- "vlog",
- "zksync_core",
- "zksync_dal",
-]
-
 [[package]]
 name = "env_logger"
 version = "0.9.3"
@@ -2060,7 +2054,7 @@ dependencies = [
  "num-integer",
  "num-traits",
  "proc-macro2 1.0.66",
- "quote 1.0.28",
+ "quote 1.0.33",
  "serde",
  "syn 1.0.109",
 ]
@@ -2101,12 +2095,6 @@ dependencies = [
  "static_assertions",
 ]
 
-[[package]]
-name = "fixedbitset"
-version = "0.4.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0ce7134b9999ecaf8bcd65542e436736ef32ddca1b3e06094cb6ec5755203b80"
-
 [[package]]
 name = "flate2"
 version = "1.0.26"
@@ -2284,7 +2272,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "89ca545a94061b6365f2c7355b4b32bd20df3ff95f02da9329b34ccc3bd6ee72"
 dependencies = [
  "proc-macro2 1.0.66",
- "quote 1.0.28",
+ "quote 1.0.33",
  "syn 2.0.27",
 ]
 
@@ -2594,8 +2582,14 @@ name = "hashbrown"
 version = "0.12.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "8a9ee70c43aaf417c914396645a0fa852624801b24ebb7ae78fe8272889ac888"
+
+[[package]]
+name = "hashbrown"
+version = "0.13.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "33ff8ae62cd3a9102e5637afc8452c55acf3844001bd5374e0b0bd7b6616c038"
 dependencies = [
- "ahash 0.7.6",
+ "ahash 0.8.3",
 ]
 
 [[package]]
@@ -2823,18 +2817,6 @@ dependencies = [
  "tokio-rustls",
 ]
 
-[[package]]
-name = "hyper-timeout"
-version = "0.4.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bbb958482e8c7be4bc3cf272a766a2b0bf1a6755e7a6ae777f017a31d11b13b1"
-dependencies = [
- "hyper",
- "pin-project-lite",
- "tokio",
- "tokio-io-timeout",
-]
-
 [[package]]
 name = "hyper-tls"
 version = "0.5.0"
@@ -2945,7 +2927,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "11d7a9f6330b71fea57921c9b61c47ee6e84f72d394754eff6163ae67e7395eb"
 dependencies = [
  "proc-macro2 1.0.66",
- "quote 1.0.28",
+ "quote 1.0.33",
  "syn 1.0.109",
 ]
 
@@ -3128,7 +3110,7 @@ source = "git+https://github.com/matter-labs/jsonrpc.git?branch=master#12c53e3e2
 dependencies = [
  "proc-macro-crate 0.1.5",
  "proc-macro2 1.0.66",
- "quote 1.0.28",
+ "quote 1.0.33",
  "syn 1.0.109",
 ]
 
@@ -3287,7 +3269,7 @@ dependencies = [
  "heck 0.4.1",
  "proc-macro-crate 1.3.1",
  "proc-macro2 1.0.66",
- "quote 1.0.28",
+ "quote 1.0.33",
  "syn 1.0.109",
 ]
 
@@ -3473,6 +3455,26 @@ version = "0.5.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "0717cef1bc8b636c6e1c1bbdefc09e6322da8a9321966e8928ef80d20f7f770f"
 
+[[package]]
+name = "linkme"
+version = "0.3.15"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9f948366ad5bb46b5514ba7a7a80643726eef08b06632592699676748c8bc33b"
+dependencies = [
+ "linkme-impl",
+]
+
+[[package]]
+name = "linkme-impl"
+version = "0.3.15"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "bc28438cad73dcc90ff3466fc329a9252b1b8ba668eb0d5668ba97088cf4eef0"
+dependencies = [
+ "proc-macro2 1.0.66",
+ "quote 1.0.33",
+ "syn 2.0.27",
+]
+
 [[package]]
 name = "linux-raw-sys"
 version = "0.3.8"
@@ -3500,9 +3502,11 @@ dependencies = [
  "static_assertions",
  "thiserror",
  "tokio",
+ "tracing",
  "vlog",
  "zksync",
  "zksync_config",
+ "zksync_contracts",
  "zksync_eth_client",
  "zksync_eth_signer",
  "zksync_types",
@@ -3553,6 +3557,15 @@ dependencies = [
  "libc",
 ]
 
+[[package]]
+name = "mach2"
+version = "0.4.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6d0d1830bcd151a6fc4aea1369af235b36c1528fe976b8ff678683c9995eade8"
+dependencies = [
+ "libc",
+]
+
 [[package]]
 name = "match_cfg"
 version = "0.1.0"
@@ -3615,29 +3628,28 @@ dependencies = [
 
 [[package]]
 name = "metrics"
-version = "0.20.1"
+version = "0.21.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7b9b8653cec6897f73b519a43fba5ee3d50f62fe9af80b428accdcc093b4a849"
+checksum = "fde3af1a009ed76a778cb84fdef9e7dbbdf5775ae3e4cc1f434a6a307f6f76c5"
 dependencies = [
- "ahash 0.7.6",
+ "ahash 0.8.3",
  "metrics-macros",
- "portable-atomic 0.3.20",
+ "portable-atomic",
 ]
 
 [[package]]
 name = "metrics-exporter-prometheus"
-version = "0.11.0"
+version = "0.12.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8603921e1f54ef386189335f288441af761e0fc61bcb552168d9cedfe63ebc70"
+checksum = "8a4964177ddfdab1e3a2b37aec7cf320e14169abb0ed73999f558136409178d5"
 dependencies = [
+ "base64 0.21.2",
  "hyper",
  "indexmap",
  "ipnet",
  "metrics",
  "metrics-util",
- "parking_lot 0.12.1",
- "portable-atomic 0.3.20",
- "quanta 0.10.1",
+ "quanta 0.11.1",
  "thiserror",
  "tokio",
  "tracing",
@@ -3645,29 +3657,27 @@ dependencies = [
 
 [[package]]
 name = "metrics-macros"
-version = "0.6.0"
+version = "0.7.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "731f8ecebd9f3a4aa847dfe75455e4757a45da40a7793d2f0b1f9b6ed18b23f3"
+checksum = "ddece26afd34c31585c74a4db0630c376df271c285d682d1e55012197830b6df"
 dependencies = [
  "proc-macro2 1.0.66",
- "quote 1.0.28",
- "syn 1.0.109",
+ "quote 1.0.33",
+ "syn 2.0.27",
 ]
 
 [[package]]
 name = "metrics-util"
-version = "0.14.0"
+version = "0.15.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f7d24dc2dbae22bff6f1f9326ffce828c9f07ef9cc1e8002e5279f845432a30a"
+checksum = "4de2ed6e491ed114b40b732e4d1659a9d53992ebd87490c44a6ffe23739d973e"
 dependencies = [
  "crossbeam-epoch 0.9.15",
  "crossbeam-utils 0.8.16",
- "hashbrown 0.12.3",
+ "hashbrown 0.13.1",
  "metrics",
  "num_cpus",
- "parking_lot 0.12.1",
- "portable-atomic 0.3.20",
- "quanta 0.10.1",
+ "quanta 0.11.1",
  "sketches-ddsketch",
 ]
 
@@ -3781,18 +3791,13 @@ dependencies = [
  "ws2_32-sys",
 ]
 
-[[package]]
-name = "multimap"
-version = "0.8.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e5ce46fe64a9d73be07dcbe690a38ce1b293be448fd8ce1e6c1b8062c9f72c6a"
-
 [[package]]
 name = "multivm"
 version = "0.1.0"
 dependencies = [
  "vlog",
  "vm",
+ "vm_1_3_2",
  "vm_m5",
  "vm_m6",
  "zksync_contracts",
@@ -3986,7 +3991,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "876a53fff98e03a936a674b29568b0e605f06b29372c2489ff4de23f1949743d"
 dependencies = [
  "proc-macro2 1.0.66",
- "quote 1.0.28",
+ "quote 1.0.33",
  "syn 1.0.109",
 ]
 
@@ -4073,7 +4078,7 @@ checksum = "96667db765a921f7b295ffee8b60472b686a51d4f21c2ee4ffdb94c7013b65a6"
 dependencies = [
  "proc-macro-crate 1.3.1",
  "proc-macro2 1.0.66",
- "quote 1.0.28",
+ "quote 1.0.33",
  "syn 2.0.27",
 ]
 
@@ -4132,7 +4137,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "a948666b637a0f465e8564c73e89d4dde00d72d4d473cc972f390fc3dcee7d9c"
 dependencies = [
  "proc-macro2 1.0.66",
- "quote 1.0.28",
+ "quote 1.0.33",
  "syn 2.0.27",
 ]
 
@@ -4154,68 +4159,6 @@ dependencies = [
  "vcpkg",
 ]
 
-[[package]]
-name = "opentelemetry"
-version = "0.17.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6105e89802af13fdf48c49d7646d3b533a70e536d818aae7e78ba0433d01acb8"
-dependencies = [
- "async-trait",
- "crossbeam-channel 0.5.8",
- "futures-channel",
- "futures-executor",
- "futures-util",
- "js-sys",
- "lazy_static",
- "percent-encoding",
- "pin-project",
- "rand 0.8.5",
- "thiserror",
-]
-
-[[package]]
-name = "opentelemetry-http"
-version = "0.6.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "449048140ee61e28f57abe6e9975eedc1f3a29855c7407bd6c12b18578863379"
-dependencies = [
- "async-trait",
- "bytes 1.4.0",
- "http",
- "opentelemetry",
- "reqwest",
-]
-
-[[package]]
-name = "opentelemetry-otlp"
-version = "0.10.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9d1a6ca9de4c8b00aa7f1a153bd76cb263287155cec642680d79d98706f3d28a"
-dependencies = [
- "async-trait",
- "futures 0.3.28",
- "futures-util",
- "http",
- "opentelemetry",
- "opentelemetry-http",
- "prost",
- "prost-build",
- "reqwest",
- "thiserror",
- "tokio",
- "tonic",
- "tonic-build",
-]
-
-[[package]]
-name = "opentelemetry-semantic-conventions"
-version = "0.9.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "985cc35d832d412224b2cffe2f9194b1b89b6aa5d0bef76d080dce09d90e62bd"
-dependencies = [
- "opentelemetry",
-]
-
 [[package]]
 name = "os_info"
 version = "3.7.0"
@@ -4233,29 +4176,6 @@ version = "6.5.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "4d5d9eb14b174ee9aa2ef96dc2b94637a2d4b6e7cb873c7e171f0c20c6cf3eac"
 
-[[package]]
-name = "ouroboros"
-version = "0.15.6"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e1358bd1558bd2a083fed428ffeda486fbfb323e698cdda7794259d592ca72db"
-dependencies = [
- "aliasable",
- "ouroboros_macro",
-]
-
-[[package]]
-name = "ouroboros_macro"
-version = "0.15.6"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5f7d21ccd03305a674437ee1248f3ab5d4b1db095cf1caf49f1713ddf61956b7"
-dependencies = [
- "Inflector",
- "proc-macro-error",
- "proc-macro2 1.0.66",
- "quote 1.0.28",
- "syn 1.0.109",
-]
-
 [[package]]
 name = "overload"
 version = "0.1.1"
@@ -4335,7 +4255,7 @@ checksum = "1557010476e0595c9b568d16dcfb81b93cdeb157612726f5170d31aa707bed27"
 dependencies = [
  "proc-macro-crate 1.3.1",
  "proc-macro2 1.0.66",
- "quote 1.0.28",
+ "quote 1.0.33",
  "syn 1.0.109",
 ]
 
@@ -4347,7 +4267,7 @@ checksum = "2b6937b5e67bfba3351b87b040d48352a2fcb6ad72f81855412ce97b45c8f110"
 dependencies = [
  "proc-macro-crate 1.3.1",
  "proc-macro2 1.0.66",
- "quote 1.0.28",
+ "quote 1.0.33",
  "syn 1.0.109",
 ]
 
@@ -4514,7 +4434,7 @@ dependencies = [
  "pest",
  "pest_meta",
  "proc-macro2 1.0.66",
- "quote 1.0.28",
+ "quote 1.0.33",
  "syn 2.0.27",
 ]
 
@@ -4529,16 +4449,6 @@ dependencies = [
  "sha2 0.10.6",
 ]
 
-[[package]]
-name = "petgraph"
-version = "0.6.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4dd7d28ee937e54fe3080c91faa1c3a46c06de6252988a7f4592ba2310ef22a4"
-dependencies = [
- "fixedbitset",
- "indexmap",
-]
-
 [[package]]
 name = "pin-project"
 version = "1.1.0"
@@ -4555,7 +4465,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "39407670928234ebc5e6e580247dd567ad73a3578460c5990f9503df207e8f07"
 dependencies = [
  "proc-macro2 1.0.66",
- "quote 1.0.28",
+ "quote 1.0.33",
  "syn 2.0.27",
 ]
 
@@ -4637,15 +4547,6 @@ dependencies = [
  "plotters-backend",
 ]
 
-[[package]]
-name = "portable-atomic"
-version = "0.3.20"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e30165d31df606f5726b090ec7592c308a0eaf61721ff64c9a3018e344a8753e"
-dependencies = [
- "portable-atomic 1.3.3",
-]
-
 [[package]]
 name = "portable-atomic"
 version = "1.3.3"
@@ -4721,7 +4622,7 @@ checksum = "da25490ff9892aab3fcf7c36f08cfb902dd3e71ca0f9f9517bea02a73a5ce38c"
 dependencies = [
  "proc-macro-error-attr",
  "proc-macro2 1.0.66",
- "quote 1.0.28",
+ "quote 1.0.33",
  "syn 1.0.109",
  "version_check",
 ]
@@ -4733,7 +4634,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "a1be40180e52ecc98ad80b184934baf3d0d29f979574e439af5a55274b35f869"
 dependencies = [
  "proc-macro2 1.0.66",
- "quote 1.0.28",
+ "quote 1.0.33",
  "version_check",
 ]
 
@@ -4762,66 +4663,36 @@ dependencies = [
 ]
 
 [[package]]
-name = "prometheus_exporter"
-version = "1.0.0"
-dependencies = [
- "metrics",
- "metrics-exporter-prometheus",
- "tokio",
- "vlog",
-]
-
-[[package]]
-name = "prost"
-version = "0.9.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "444879275cb4fd84958b1a1d5420d15e6fcf7c235fe47f053c9c2a80aceb6001"
-dependencies = [
- "bytes 1.4.0",
- "prost-derive",
-]
-
-[[package]]
-name = "prost-build"
-version = "0.9.0"
+name = "prometheus-client"
+version = "0.21.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "62941722fb675d463659e49c4f3fe1fe792ff24fe5bbaa9c08cd3b98a1c354f5"
+checksum = "3c99afa9a01501019ac3a14d71d9f94050346f55ca471ce90c799a15c58f61e2"
 dependencies = [
- "bytes 1.4.0",
- "heck 0.3.3",
- "itertools",
- "lazy_static",
- "log",
- "multimap",
- "petgraph",
- "prost",
- "prost-types",
- "regex",
- "tempfile",
- "which",
+ "dtoa",
+ "itoa",
+ "parking_lot 0.12.1",
+ "prometheus-client-derive-encode",
 ]
 
 [[package]]
-name = "prost-derive"
-version = "0.9.0"
+name = "prometheus-client-derive-encode"
+version = "0.4.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f9cc1a3263e07e0bf68e96268f37665207b49560d98739662cdfaae215c720fe"
+checksum = "440f724eba9f6996b75d63681b0a92b06947f1457076d503a4d2e2c8f56442b8"
 dependencies = [
- "anyhow",
- "itertools",
  "proc-macro2 1.0.66",
- "quote 1.0.28",
- "syn 1.0.109",
+ "quote 1.0.33",
+ "syn 2.0.27",
 ]
 
 [[package]]
-name = "prost-types"
-version = "0.9.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "534b7a0e836e3c482d2693070f982e39e7611da9695d4d1f5a4b186b51faef0a"
+name = "prometheus_exporter"
+version = "0.1.0"
 dependencies = [
- "bytes 1.4.0",
- "prost",
+ "anyhow",
+ "metrics",
+ "tokio",
+ "vise-exporter",
 ]
 
 [[package]]
@@ -4853,16 +4724,16 @@ dependencies = [
 
 [[package]]
 name = "quanta"
-version = "0.10.1"
+version = "0.11.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b7e31331286705f455e56cca62e0e717158474ff02b7936c1fa596d983f4ae27"
+checksum = "a17e662a7a8291a865152364c20c7abc5e60486ab2001e8ec10b24862de0b9ab"
 dependencies = [
  "crossbeam-utils 0.8.16",
  "libc",
- "mach",
+ "mach2",
  "once_cell",
  "raw-cpuid",
- "wasi 0.10.2+wasi-snapshot-preview1",
+ "wasi 0.11.0+wasi-snapshot-preview1",
  "web-sys",
  "winapi 0.3.9",
 ]
@@ -4878,9 +4749,9 @@ dependencies = [
 
 [[package]]
 name = "quote"
-version = "1.0.28"
+version = "1.0.33"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1b9ab9c7eadfd8df19006f1cf1a4aed13540ed5cbc047010ece5826e10825488"
+checksum = "5267fca4496028628a95160fc423a33e8b2e6af8a5302579e322e4b520293cae"
 dependencies = [
  "proc-macro2 1.0.66",
 ]
@@ -5735,7 +5606,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "b23f7ade6f110613c0d63858ddb8b94c1041f550eab58a16b371bdf2c9c80ab4"
 dependencies = [
  "proc-macro2 1.0.66",
- "quote 1.0.28",
+ "quote 1.0.33",
  "syn 2.0.27",
 ]
 
@@ -5792,7 +5663,7 @@ checksum = "e182d6ec6f05393cc0e5ed1bf81ad6db3a8feedf8ee515ecdd369809bcce8082"
 dependencies = [
  "darling",
  "proc-macro2 1.0.66",
- "quote 1.0.28",
+ "quote 1.0.33",
  "syn 1.0.109",
 ]
 
@@ -6121,7 +5992,7 @@ dependencies = [
  "hex",
  "once_cell",
  "proc-macro2 1.0.66",
- "quote 1.0.28",
+ "quote 1.0.33",
  "serde",
  "serde_json",
  "sha2 0.10.6",
@@ -6143,12 +6014,28 @@ dependencies = [
  "tokio-native-tls",
 ]
 
+[[package]]
+name = "stable_deref_trait"
+version = "1.2.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a8f112729512f8e442d81f95a8a7ddf2b7c6b8a1a6f509a95864142b30cab2d3"
+
 [[package]]
 name = "static_assertions"
 version = "1.1.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "a2eb9349b6444b326872e140eb1cf5e7c522154d69e7a0ffb0fb81c06b37543f"
 
+[[package]]
+name = "storage_logs_dedup_migration"
+version = "0.1.0"
+dependencies = [
+ "clap 4.3.4",
+ "tokio",
+ "zksync_dal",
+ "zksync_types",
+]
+
 [[package]]
 name = "stringprep"
 version = "0.1.2"
@@ -6191,7 +6078,7 @@ dependencies = [
  "heck 0.3.3",
  "proc-macro-error",
  "proc-macro2 1.0.66",
- "quote 1.0.28",
+ "quote 1.0.33",
  "syn 1.0.109",
 ]
 
@@ -6212,7 +6099,7 @@ checksum = "1e385be0d24f186b4ce2f9982191e7101bb737312ad61c1f2f984f34bcf85d59"
 dependencies = [
  "heck 0.4.1",
  "proc-macro2 1.0.66",
- "quote 1.0.28",
+ "quote 1.0.33",
  "rustversion",
  "syn 1.0.109",
 ]
@@ -6241,7 +6128,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "72b64191b275b66ffe2469e8af2c1cfe3bafa67b529ead792a6d0160888b4237"
 dependencies = [
  "proc-macro2 1.0.66",
- "quote 1.0.28",
+ "quote 1.0.33",
  "unicode-ident",
 ]
 
@@ -6252,7 +6139,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "b60f673f44a8255b9c8c657daf66a596d435f2da81a555b06dc644d080ba45e0"
 dependencies = [
  "proc-macro2 1.0.66",
- "quote 1.0.28",
+ "quote 1.0.33",
  "unicode-ident",
 ]
 
@@ -6278,7 +6165,7 @@ dependencies = [
  "sha2 0.10.6",
  "sha3 0.10.6",
  "smallvec",
- "zk_evm 1.3.3",
+ "zk_evm 1.3.3 (git+https://github.com/matter-labs/era-zk_evm.git?tag=v1.3.3-rc0)",
  "zkevm_opcode_defs 1.3.2",
 ]
 
@@ -6288,21 +6175,6 @@ version = "0.1.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "2047c6ded9c721764247e62cd3b03c09ffc529b2ba5b10ec482ae507a4a70160"
 
-[[package]]
-name = "system-constants-generator"
-version = "0.1.0"
-dependencies = [
- "codegen 0.2.0",
- "once_cell",
- "serde",
- "serde_json",
- "vm",
- "zksync_contracts",
- "zksync_state",
- "zksync_types",
- "zksync_utils",
-]
-
 [[package]]
 name = "tagptr"
 version = "0.2.0"
@@ -6355,7 +6227,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "d9601d162c1d77e62c1ea0bc8116cd1caf143ce3af947536c3c9052a1677fe0c"
 dependencies = [
  "proc-macro2 1.0.66",
- "quote 1.0.28",
+ "quote 1.0.33",
  "syn 1.0.109",
 ]
 
@@ -6390,7 +6262,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "f9456a42c5b0d803c8cd86e73dd7cc9edd429499f37a3550d286d5e86720569f"
 dependencies = [
  "proc-macro2 1.0.66",
- "quote 1.0.28",
+ "quote 1.0.33",
  "syn 2.0.27",
 ]
 
@@ -6523,16 +6395,6 @@ dependencies = [
  "windows-sys 0.48.0",
 ]
 
-[[package]]
-name = "tokio-io-timeout"
-version = "1.2.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "30b74022ada614a1b4834de765f9bb43877f910cc8ce4be40e89042c9223a8bf"
-dependencies = [
- "pin-project-lite",
- "tokio",
-]
-
 [[package]]
 name = "tokio-macros"
 version = "2.1.0"
@@ -6540,7 +6402,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "630bdcf245f78637c13ec01ffae6187cca34625e8c63150d424b59e55af2675e"
 dependencies = [
  "proc-macro2 1.0.66",
- "quote 1.0.28",
+ "quote 1.0.33",
  "syn 2.0.27",
 ]
 
@@ -6641,49 +6503,6 @@ dependencies = [
  "winnow",
 ]
 
-[[package]]
-name = "tonic"
-version = "0.6.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ff08f4649d10a70ffa3522ca559031285d8e421d727ac85c60825761818f5d0a"
-dependencies = [
- "async-stream",
- "async-trait",
- "base64 0.13.1",
- "bytes 1.4.0",
- "futures-core",
- "futures-util",
- "h2",
- "http",
- "http-body",
- "hyper",
- "hyper-timeout",
- "percent-encoding",
- "pin-project",
- "prost",
- "prost-derive",
- "tokio",
- "tokio-stream",
- "tokio-util 0.6.10",
- "tower",
- "tower-layer",
- "tower-service",
- "tracing",
- "tracing-futures",
-]
-
-[[package]]
-name = "tonic-build"
-version = "0.6.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9403f1bafde247186684b230dc6f38b5cd514584e8bec1dd32514be4745fa757"
-dependencies = [
- "proc-macro2 1.0.66",
- "prost-build",
- "quote 1.0.28",
- "syn 1.0.109",
-]
-
 [[package]]
 name = "tower"
 version = "0.4.13"
@@ -6767,7 +6586,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "0f57e3ca2a01450b1a921183a9c9cbfda207fd822cef4ccb00a65402cbba7a74"
 dependencies = [
  "proc-macro2 1.0.66",
- "quote 1.0.28",
+ "quote 1.0.33",
  "syn 2.0.27",
 ]
 
@@ -6781,16 +6600,6 @@ dependencies = [
  "valuable",
 ]
 
-[[package]]
-name = "tracing-futures"
-version = "0.2.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "97d095ae15e245a057c8e8451bab9b3ee1e1f68e9ba2b4fbc18d0ac5237835f2"
-dependencies = [
- "pin-project",
- "tracing",
-]
-
 [[package]]
 name = "tracing-log"
 version = "0.1.3"
@@ -6802,20 +6611,6 @@ dependencies = [
  "tracing-core",
 ]
 
-[[package]]
-name = "tracing-opentelemetry"
-version = "0.17.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fbbe89715c1dbbb790059e2565353978564924ee85017b5fff365c872ff6721f"
-dependencies = [
- "once_cell",
- "opentelemetry",
- "tracing",
- "tracing-core",
- "tracing-log",
- "tracing-subscriber",
-]
-
 [[package]]
 name = "tracing-serde"
 version = "0.1.3"
@@ -7024,18 +6819,49 @@ version = "0.9.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "49874b5167b65d7193b8aba1567f5c7d93d001cafc34600cee003eda787e483f"
 
+[[package]]
+name = "vise"
+version = "0.1.0"
+source = "git+https://github.com/matter-labs/vise.git?rev=856eedd0a36a2ff2c8d965b0f0186d4bb8465d8c#856eedd0a36a2ff2c8d965b0f0186d4bb8465d8c"
+dependencies = [
+ "elsa",
+ "linkme",
+ "once_cell",
+ "prometheus-client",
+ "vise-macros",
+]
+
+[[package]]
+name = "vise-exporter"
+version = "0.1.0"
+source = "git+https://github.com/matter-labs/vise.git?rev=856eedd0a36a2ff2c8d965b0f0186d4bb8465d8c#856eedd0a36a2ff2c8d965b0f0186d4bb8465d8c"
+dependencies = [
+ "hyper",
+ "metrics-exporter-prometheus",
+ "once_cell",
+ "tokio",
+ "tracing",
+ "vise",
+]
+
+[[package]]
+name = "vise-macros"
+version = "0.1.0"
+source = "git+https://github.com/matter-labs/vise.git?rev=856eedd0a36a2ff2c8d965b0f0186d4bb8465d8c#856eedd0a36a2ff2c8d965b0f0186d4bb8465d8c"
+dependencies = [
+ "proc-macro2 1.0.66",
+ "quote 1.0.33",
+ "syn 2.0.27",
+]
+
 [[package]]
 name = "vlog"
-version = "1.0.0"
+version = "0.1.0"
 dependencies = [
  "chrono",
- "opentelemetry",
- "opentelemetry-otlp",
- "opentelemetry-semantic-conventions",
  "sentry",
  "serde_json",
  "tracing",
- "tracing-opentelemetry",
  "tracing-subscriber",
 ]
 
@@ -7051,13 +6877,13 @@ dependencies = [
  "once_cell",
  "thiserror",
  "tokio",
- "vlog",
- "zk_evm 1.3.3",
- "zkevm-assembly 1.3.2",
+ "tracing",
+ "zk_evm 1.3.3 (git+https://github.com/matter-labs/era-zk_evm.git?branch=v1.3.3)",
  "zksync_config",
  "zksync_contracts",
  "zksync_eth_signer",
  "zksync_state",
+ "zksync_test_account",
  "zksync_types",
  "zksync_utils",
 ]
@@ -7079,11 +6905,33 @@ name = "vm-benchmark-harness"
 version = "0.1.0"
 dependencies = [
  "once_cell",
- "ouroboros",
  "vm",
- "zk_evm 1.3.3",
+ "zk_evm 1.3.3 (git+https://github.com/matter-labs/era-zk_evm.git?branch=v1.3.3)",
+ "zksync_config",
+ "zksync_contracts",
+ "zksync_state",
+ "zksync_types",
+ "zksync_utils",
+]
+
+[[package]]
+name = "vm_1_3_2"
+version = "0.1.0"
+dependencies = [
+ "anyhow",
+ "ethabi",
+ "hex",
+ "itertools",
+ "metrics",
+ "once_cell",
+ "thiserror",
+ "tokio",
+ "tracing",
+ "zk_evm 1.3.3 (git+https://github.com/matter-labs/era-zk_evm.git?branch=v1.3.3)",
+ "zkevm-assembly 1.3.2",
  "zksync_config",
  "zksync_contracts",
+ "zksync_eth_signer",
  "zksync_state",
  "zksync_types",
  "zksync_utils",
@@ -7195,7 +7043,7 @@ dependencies = [
  "log",
  "once_cell",
  "proc-macro2 1.0.66",
- "quote 1.0.28",
+ "quote 1.0.33",
  "syn 2.0.27",
  "wasm-bindgen-shared",
 ]
@@ -7218,7 +7066,7 @@ version = "0.2.87"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "dee495e55982a3bd48105a7b947fd2a9b4a8ae3010041b9e0faab3f9cd028f1d"
 dependencies = [
- "quote 1.0.28",
+ "quote 1.0.33",
  "wasm-bindgen-macro-support",
 ]
 
@@ -7229,7 +7077,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "54681b18a46765f095758388f2d0cf16eb8d4169b639ab575a8f5693af210c7b"
 dependencies = [
  "proc-macro2 1.0.66",
- "quote 1.0.28",
+ "quote 1.0.33",
  "syn 2.0.27",
  "wasm-bindgen-backend",
  "wasm-bindgen-shared",
@@ -7323,17 +7171,6 @@ dependencies = [
  "rustls-webpki 0.101.1",
 ]
 
-[[package]]
-name = "which"
-version = "4.4.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2441c784c52b289a054b7201fc93253e288f094e2f4be9058343127c4226a269"
-dependencies = [
- "either",
- "libc",
- "once_cell",
-]
-
 [[package]]
 name = "whoami"
 version = "1.4.0"
@@ -7604,7 +7441,7 @@ checksum = "2a0956f1ba7c7909bfb66c2e9e4124ab6f6482560f6628b5aaeba39207c9aad9"
 [[package]]
 name = "zk_evm"
 version = "1.3.1"
-source = "git+https://github.com/matter-labs/era-zk_evm.git?branch=v1.3.1#877ba31cc1d82316fd924e8d83a9f5f1a77b1b9a"
+source = "git+https://github.com/matter-labs/era-zk_evm.git?tag=v1.3.1-rc0#877ba31cc1d82316fd924e8d83a9f5f1a77b1b9a"
 dependencies = [
  "blake2 0.10.6",
  "k256",
@@ -7633,10 +7470,25 @@ dependencies = [
  "zkevm_opcode_defs 1.3.2",
 ]
 
+[[package]]
+name = "zk_evm"
+version = "1.3.3"
+source = "git+https://github.com/matter-labs/era-zk_evm.git?branch=v1.3.3#fe8215a7047d24430ad470cf15a19bedb4d6ba0b"
+dependencies = [
+ "anyhow",
+ "lazy_static",
+ "num 0.4.0",
+ "serde",
+ "serde_json",
+ "static_assertions",
+ "zk_evm_abstractions",
+ "zkevm_opcode_defs 1.3.2",
+]
+
 [[package]]
 name = "zk_evm_abstractions"
 version = "0.1.0"
-source = "git+https://github.com/matter-labs/era-zk_evm_abstractions.git#973a1f661c045e0e8b9a287505f353659279b3b3"
+source = "git+https://github.com/matter-labs/era-zk_evm_abstractions.git#7502a661d7d38906d849dcd3e7a15e5848af6581"
 dependencies = [
  "anyhow",
  "serde",
@@ -7647,7 +7499,7 @@ dependencies = [
 [[package]]
 name = "zkevm-assembly"
 version = "1.3.1"
-source = "git+https://github.com/matter-labs/era-zkEVM-assembly.git?branch=v1.3.1#dabbb07e84dd886ee90dde2b5dde0acbf9b0123a"
+source = "git+https://github.com/matter-labs/era-zkEVM-assembly.git?tag=v1.3.1-rc0#dabbb07e84dd886ee90dde2b5dde0acbf9b0123a"
 dependencies = [
  "env_logger",
  "hex",
@@ -7666,7 +7518,7 @@ dependencies = [
 [[package]]
 name = "zkevm-assembly"
 version = "1.3.2"
-source = "git+https://github.com/matter-labs/era-zkEVM-assembly.git?branch=v1.3.2#edc364e59a2eea9c4b1d4ce79f15d0b7c6b55b98"
+source = "git+https://github.com/matter-labs/era-zkEVM-assembly.git?branch=v1.3.2#3c61d450cbe6548068be8f313ed02f1bd229a865"
 dependencies = [
  "env_logger",
  "hex",
@@ -7696,7 +7548,7 @@ dependencies = [
 [[package]]
 name = "zkevm_opcode_defs"
 version = "1.3.2"
-source = "git+https://github.com/matter-labs/era-zkevm_opcode_defs.git?branch=v1.3.2#2147cca9dce12749149739f6c750f66c2c43a055"
+source = "git+https://github.com/matter-labs/era-zkevm_opcode_defs.git?branch=v1.3.2#a40648727910621b46a1023d940befefb0469cba"
 dependencies = [
  "bitflags 2.3.2",
  "blake2 0.10.6",
@@ -7710,7 +7562,7 @@ dependencies = [
 [[package]]
 name = "zkevm_test_harness"
 version = "1.3.3"
-source = "git+https://github.com/matter-labs/era-zkevm_test_harness.git?tag=v1.3.3-rc1#46391e83330c77f6d79ff7c5fc19bae3d5b3ab82"
+source = "git+https://github.com/matter-labs/era-zkevm_test_harness.git?branch=v1.3.3#46391e83330c77f6d79ff7c5fc19bae3d5b3ab82"
 dependencies = [
  "bincode",
  "circuit_testing",
@@ -7730,7 +7582,7 @@ dependencies = [
  "sync_vm",
  "test-log",
  "tracing",
- "zk_evm 1.3.3",
+ "zk_evm 1.3.3 (git+https://github.com/matter-labs/era-zk_evm.git?tag=v1.3.3-rc0)",
  "zkevm-assembly 1.3.2",
 ]
 
@@ -7754,7 +7606,7 @@ dependencies = [
 
 [[package]]
 name = "zksync_basic_types"
-version = "1.0.0"
+version = "0.1.0"
 dependencies = [
  "serde",
  "web3",
@@ -7762,8 +7614,9 @@ dependencies = [
 
 [[package]]
 name = "zksync_circuit_breaker"
-version = "1.0.0"
+version = "0.1.0"
 dependencies = [
+ "anyhow",
  "assert_matches",
  "async-trait",
  "backon",
@@ -7782,10 +7635,11 @@ dependencies = [
 
 [[package]]
 name = "zksync_config"
-version = "1.0.0"
+version = "0.1.0"
 dependencies = [
  "bigdecimal",
  "envy",
+ "hex",
  "num 0.3.1",
  "once_cell",
  "serde",
@@ -7815,6 +7669,7 @@ dependencies = [
  "tempfile",
  "thiserror",
  "tokio",
+ "tracing",
  "vlog",
  "zksync_config",
  "zksync_contracts",
@@ -7826,8 +7681,9 @@ dependencies = [
 
 [[package]]
 name = "zksync_contracts"
-version = "1.0.0"
+version = "0.1.0"
 dependencies = [
+ "envy",
  "ethabi",
  "hex",
  "once_cell",
@@ -7838,7 +7694,7 @@ dependencies = [
 
 [[package]]
 name = "zksync_core"
-version = "1.0.0"
+version = "0.1.0"
 dependencies = [
  "actix-cors",
  "actix-rt",
@@ -7896,6 +7752,7 @@ dependencies = [
  "zksync_queued_job_processor",
  "zksync_state",
  "zksync_storage",
+ "zksync_test_account",
  "zksync_types",
  "zksync_utils",
  "zksync_verification_key_generator_and_server",
@@ -7904,7 +7761,7 @@ dependencies = [
 
 [[package]]
 name = "zksync_crypto"
-version = "1.0.0"
+version = "0.1.0"
 dependencies = [
  "base64 0.13.1",
  "blake2 0.10.6",
@@ -7919,7 +7776,7 @@ dependencies = [
 
 [[package]]
 name = "zksync_dal"
-version = "1.0.0"
+version = "0.1.0"
 dependencies = [
  "anyhow",
  "assert_matches",
@@ -7937,7 +7794,7 @@ dependencies = [
  "strum",
  "thiserror",
  "tokio",
- "vlog",
+ "tracing",
  "zksync_config",
  "zksync_contracts",
  "zksync_health_check",
@@ -7947,7 +7804,7 @@ dependencies = [
 
 [[package]]
 name = "zksync_eth_client"
-version = "1.0.0"
+version = "0.1.0"
 dependencies = [
  "anyhow",
  "async-trait",
@@ -7957,7 +7814,7 @@ dependencies = [
  "serde",
  "thiserror",
  "tokio",
- "vlog",
+ "tracing",
  "zksync_config",
  "zksync_contracts",
  "zksync_eth_signer",
@@ -7966,7 +7823,7 @@ dependencies = [
 
 [[package]]
 name = "zksync_eth_signer"
-version = "1.0.0"
+version = "0.1.0"
 dependencies = [
  "actix-rt",
  "actix-web",
@@ -7988,14 +7845,16 @@ dependencies = [
 
 [[package]]
 name = "zksync_external_node"
-version = "1.0.0"
+version = "0.1.0"
 dependencies = [
  "anyhow",
+ "clap 4.3.4",
  "envy",
  "futures 0.3.28",
  "prometheus_exporter",
  "serde",
  "tokio",
+ "tracing",
  "url",
  "vlog",
  "zksync_basic_types",
@@ -8021,26 +7880,26 @@ dependencies = [
  "serde",
  "serde_json",
  "tokio",
+ "tracing",
 ]
 
 [[package]]
 name = "zksync_mempool"
-version = "1.0.0"
+version = "0.1.0"
 dependencies = [
  "metrics",
- "vlog",
+ "tracing",
  "zksync_types",
 ]
 
 [[package]]
 name = "zksync_merkle_tree"
-version = "1.0.0"
+version = "0.1.0"
 dependencies = [
  "assert_matches",
  "clap 4.3.4",
  "insta",
  "leb128",
- "metrics",
  "once_cell",
  "rand 0.8.5",
  "rayon",
@@ -8049,7 +7908,8 @@ dependencies = [
  "serde_with",
  "tempfile",
  "thiserror",
- "vlog",
+ "tracing",
+ "vise",
  "zksync_config",
  "zksync_crypto",
  "zksync_storage",
@@ -8058,7 +7918,7 @@ dependencies = [
 
 [[package]]
 name = "zksync_mini_merkle_tree"
-version = "1.0.0"
+version = "0.1.0"
 dependencies = [
  "criterion",
  "once_cell",
@@ -8068,7 +7928,7 @@ dependencies = [
 
 [[package]]
 name = "zksync_object_store"
-version = "1.0.0"
+version = "0.1.0"
 dependencies = [
  "async-trait",
  "bincode",
@@ -8078,15 +7938,16 @@ dependencies = [
  "metrics",
  "tempdir",
  "tokio",
- "vlog",
+ "tracing",
  "zksync_config",
  "zksync_types",
 ]
 
 [[package]]
 name = "zksync_prover_utils"
-version = "1.0.0"
+version = "0.1.0"
 dependencies = [
+ "anyhow",
  "async-trait",
  "ctrlc",
  "futures 0.3.28",
@@ -8095,50 +7956,69 @@ dependencies = [
  "reqwest",
  "tokio",
  "toml_edit 0.14.4",
- "vlog",
+ "tracing",
  "zksync_config",
+ "zksync_object_store",
+ "zksync_types",
  "zksync_utils",
 ]
 
 [[package]]
 name = "zksync_queued_job_processor"
-version = "1.0.0"
+version = "0.1.0"
 dependencies = [
+ "anyhow",
  "async-trait",
  "tokio",
- "vlog",
+ "tracing",
  "zksync_utils",
 ]
 
 [[package]]
 name = "zksync_state"
-version = "1.0.0"
+version = "0.1.0"
 dependencies = [
+ "anyhow",
  "db_test_macro",
  "metrics",
  "mini-moka",
+ "rand 0.8.5",
  "tempfile",
  "tokio",
- "vlog",
+ "tracing",
  "zksync_dal",
  "zksync_storage",
  "zksync_types",
+ "zksync_utils",
 ]
 
 [[package]]
 name = "zksync_storage"
-version = "1.0.0"
+version = "0.1.0"
 dependencies = [
  "metrics",
  "num_cpus",
  "rocksdb",
  "tempfile",
- "vlog",
+ "tracing",
+]
+
+[[package]]
+name = "zksync_test_account"
+version = "0.1.0"
+dependencies = [
+ "ethabi",
+ "hex",
+ "zksync_config",
+ "zksync_contracts",
+ "zksync_eth_signer",
+ "zksync_types",
+ "zksync_utils",
 ]
 
 [[package]]
 name = "zksync_types"
-version = "1.0.0"
+version = "0.1.0"
 dependencies = [
  "blake2 0.10.6",
  "chrono",
@@ -8158,7 +8038,7 @@ dependencies = [
  "strum",
  "thiserror",
  "tokio",
- "zk_evm 1.3.3",
+ "zk_evm 1.3.3 (git+https://github.com/matter-labs/era-zk_evm.git?branch=v1.3.3)",
  "zkevm_test_harness",
  "zksync_basic_types",
  "zksync_config",
@@ -8169,7 +8049,7 @@ dependencies = [
 
 [[package]]
 name = "zksync_utils"
-version = "1.0.0"
+version = "0.1.0"
 dependencies = [
  "anyhow",
  "bigdecimal",
@@ -8184,14 +8064,15 @@ dependencies = [
  "serde_json",
  "thiserror",
  "tokio",
+ "tracing",
  "vlog",
- "zk_evm 1.3.3",
+ "zk_evm 1.3.3 (git+https://github.com/matter-labs/era-zk_evm.git?branch=v1.3.3)",
  "zksync_basic_types",
 ]
 
 [[package]]
 name = "zksync_verification_key_generator_and_server"
-version = "1.0.0"
+version = "0.1.0"
 dependencies = [
  "bincode",
  "circuit_testing",
@@ -8201,6 +8082,7 @@ dependencies = [
  "once_cell",
  "serde_json",
  "structopt",
+ "tracing",
  "vlog",
  "zksync_prover_utils",
  "zksync_types",
@@ -8208,7 +8090,7 @@ dependencies = [
 
 [[package]]
 name = "zksync_web3_decl"
-version = "1.0.0"
+version = "0.1.0"
 dependencies = [
  "bigdecimal",
  "chrono",
diff --git a/Cargo.toml b/Cargo.toml
index 5c47da13111f..547f0055f348 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -1,24 +1,15 @@
 [workspace]
 members = [
-    # Prover
-    #    We don't include `prove` image here since it cannot be built with stable rust
-    #    and we don't want to use nightly for the whole workspace
-    # "core/bin/prover",
     # Server
     "core/bin/zksync_core",
     "core/bin/external_node",
-    "core/bin/system-constants-generator",
+    # "core/bin/system-constants-generator",
     "core/tests/cross_external_nodes_checker",
     # Contract verifier
     "core/bin/contract-verifier",
-    # Setup key generator and server: its commented as it cannot be built with stable rust.
-    # "core/bin/setup_key_generator_and_server",
     # Verification key generator and server
     "core/bin/verification_key_generator_and_server",
-    #"core/bin/witness_generator",
-    # circuit synthesizer: its commented as it cannot be built with stable rust.
-    # "core/bin/circuit_synthesizer",
-    "core/bin/enumeration_indices_migration",
+    "core/bin/storage_logs_dedup_migration",
     # Libraries
     "core/lib/basic_types",
     "core/lib/config",
@@ -31,8 +22,8 @@ members = [
     "core/lib/eth_signer",
     "core/lib/mempool",
     "core/lib/merkle_tree",
-    "core/lib/object_store",
     "core/lib/mini_merkle_tree",
+    "core/lib/object_store",
     "core/lib/prometheus_exporter",
     "core/lib/queued_job_processor",
     "core/lib/state",
@@ -41,9 +32,10 @@ members = [
     "core/lib/prover_utils",
     "core/lib/utils",
     "core/lib/vlog",
-    "core/lib/vm",
     "core/lib/multivm",
+    "core/lib/vm",
     "core/lib/web3_decl",
+    "core/lib/test_account",
 
     # MultiVM dependencies
     "core/multivm_deps/vm_m5",
diff --git a/README.md b/README.md
index d6e2e81b6837..25030ac34216 100644
--- a/README.md
+++ b/README.md
@@ -19,6 +19,11 @@ The following questions will be answered by the following resources:
 | What is the logical project structure and architecture? | [architecture.md](docs/architecture.md) |
 | Where can I find developer docs?                        | [docs](https://v2-docs.zksync.io/dev/)  |
 
+## Policies
+
+- [Security policy](.github/SECURITY.md)
+- [Contribution policy](CONTRIBUTING.md)
+
 ## License
 
 zkSync Era is distributed under the terms of either
@@ -32,6 +37,7 @@ at your option.
 
 - [Website](https://zksync.io/)
 - [GitHub](https://github.com/matter-labs)
+- [ZK Credo](https://github.com/zksync/credo)
 - [Twitter](https://twitter.com/zksync)
 - [Twitter for Devs](https://twitter.com/zkSyncDevs)
 - [Discord](https://discord.gg/nMaPGrDDwk)
diff --git a/contracts b/contracts
index 0697bcc39547..67f38daa255c 160000
--- a/contracts
+++ b/contracts
@@ -1 +1 @@
-Subproject commit 0697bcc395476402ffdcdc698c5c963ad7ddceba
+Subproject commit 67f38daa255c31e778e9a6f8c673f36914513fa1
diff --git a/core/CHANGELOG.md b/core/CHANGELOG.md
index 0ab823892422..06ee1328d4ba 100644
--- a/core/CHANGELOG.md
+++ b/core/CHANGELOG.md
@@ -1,5 +1,279 @@
 # Changelog
 
+## [9.0.0](https://github.com/matter-labs/zksync-2-dev/compare/core-v8.7.0...core-v9.0.0) (2023-09-21)
+
+
+### ⚠ BREAKING CHANGES
+
+* update verification keys, protocol version 15 ([#2602](https://github.com/matter-labs/zksync-2-dev/issues/2602))
+
+### Features
+
+* **contracts:** Allow reading contracts code from other directories ([#2613](https://github.com/matter-labs/zksync-2-dev/issues/2613)) ([1481eb8](https://github.com/matter-labs/zksync-2-dev/commit/1481eb84cbac891586a41d6d9739ae343e3c1bb8))
+* make data returned from the VM to have arbitrary length ([#2479](https://github.com/matter-labs/zksync-2-dev/issues/2479)) ([9251690](https://github.com/matter-labs/zksync-2-dev/commit/92516901cb2db61987554ddf0f8e080a15e7e72e))
+* **prover-fri:** added picked-by column in prover fri related tables ([#2600](https://github.com/matter-labs/zksync-2-dev/issues/2600)) ([9e604ab](https://github.com/matter-labs/zksync-2-dev/commit/9e604abf3bae11b6f583f2abd39c07a85dc20f0a))
+* update verification keys, protocol version 15 ([#2602](https://github.com/matter-labs/zksync-2-dev/issues/2602)) ([2fff59b](https://github.com/matter-labs/zksync-2-dev/commit/2fff59bab00849996864b68e932739135337ebd7))
+* **vlog:** Rework the observability configuration subsystem ([#2608](https://github.com/matter-labs/zksync-2-dev/issues/2608)) ([377f0c5](https://github.com/matter-labs/zksync-2-dev/commit/377f0c5f734c979bc990b429dff0971466872e71))
+* **vm:** Multivm tracer support ([#2601](https://github.com/matter-labs/zksync-2-dev/issues/2601)) ([4a7467b](https://github.com/matter-labs/zksync-2-dev/commit/4a7467b1b1556bfd795792dbe280bcf28c93a58f))
+
+## [8.7.0](https://github.com/matter-labs/zksync-2-dev/compare/core-v8.6.0...core-v8.7.0) (2023-09-19)
+
+
+### Features
+
+* Rework metrics approach ([#2387](https://github.com/matter-labs/zksync-2-dev/issues/2387)) ([4855546](https://github.com/matter-labs/zksync-2-dev/commit/48555465d32f8524f6cf488859e8ae8259ecf5da))
+
+
+### Bug Fixes
+
+* **db:** Vacuum `storage_logs` table along with removing duplicate rows ([#2583](https://github.com/matter-labs/zksync-2-dev/issues/2583)) ([84f472d](https://github.com/matter-labs/zksync-2-dev/commit/84f472deb14a92bd2b90f8160c9316d21b646ff4))
+* **prover_fri:** drop not null constraint from proof_compression_jobs_fri fri_proof_blob_url column ([#2590](https://github.com/matter-labs/zksync-2-dev/issues/2590)) ([5e41fee](https://github.com/matter-labs/zksync-2-dev/commit/5e41fee69c869c53d999c3ee53e3e7dd6735e603))
+* **state-keeper:** deduplication logic ([#2597](https://github.com/matter-labs/zksync-2-dev/issues/2597)) ([7122a2b](https://github.com/matter-labs/zksync-2-dev/commit/7122a2b0cc33a96a4c117186437db8e290388356))
+* **storage:** Ignore non-committed factory deps in RocksDB ([#2585](https://github.com/matter-labs/zksync-2-dev/issues/2585)) ([b3da824](https://github.com/matter-labs/zksync-2-dev/commit/b3da82483639728bd899fb9388b9b2868cb28159))
+* **vm:** Handle near call gas correctly ([#2587](https://github.com/matter-labs/zksync-2-dev/issues/2587)) ([c925259](https://github.com/matter-labs/zksync-2-dev/commit/c9252597ce330d0c982365bb703c373191d03506))
+
+## [8.6.0](https://github.com/matter-labs/zksync-2-dev/compare/core-v8.5.0...core-v8.6.0) (2023-09-15)
+
+
+### Features
+
+* **prover-fri:** insert missing protocol version in FRI witness-gen table ([#2577](https://github.com/matter-labs/zksync-2-dev/issues/2577)) ([b9af6a5](https://github.com/matter-labs/zksync-2-dev/commit/b9af6a5784b0e6538bd542830593d16f3caf5fe5))
+* **prover-server-api:** Add SkippedProofGeneration in SubmitProofRequest ([#2575](https://github.com/matter-labs/zksync-2-dev/issues/2575)) ([9c2653e](https://github.com/matter-labs/zksync-2-dev/commit/9c2653e5bc0e56b2906e9d25be3cb2887ad7d35d))
+
+## [8.5.0](https://github.com/matter-labs/zksync-2-dev/compare/core-v8.4.0...core-v8.5.0) (2023-09-15)
+
+
+### Features
+
+* **API:** enable request translator for ws api ([#2568](https://github.com/matter-labs/zksync-2-dev/issues/2568)) ([ccb6cad](https://github.com/matter-labs/zksync-2-dev/commit/ccb6cad57c9ba0ca58114701c256dbc44a457459))
+* Use tracing directly instead of vlog macros ([#2566](https://github.com/matter-labs/zksync-2-dev/issues/2566)) ([53d53af](https://github.com/matter-labs/zksync-2-dev/commit/53d53afc9157214fb911aa0934a97f8b5103e1ec))
+* **witness-generator:** Get wit inputs from MerklePath instead of SK ([#2559](https://github.com/matter-labs/zksync-2-dev/issues/2559)) ([da1c2fa](https://github.com/matter-labs/zksync-2-dev/commit/da1c2fa2b043bc4e31075a0454dc0e09937c93ad))
+
+
+### Bug Fixes
+
+* Do not automatically emit sentry events on vlog::error ([#2560](https://github.com/matter-labs/zksync-2-dev/issues/2560)) ([aebcd86](https://github.com/matter-labs/zksync-2-dev/commit/aebcd8634a0984aaf357b03d925932807848b6b8))
+* filter_near_call performance ([#2523](https://github.com/matter-labs/zksync-2-dev/issues/2523)) ([eccb06b](https://github.com/matter-labs/zksync-2-dev/commit/eccb06b649621b6866476c6c5a95545e3359d79b))
+
+## [8.4.0](https://github.com/matter-labs/zksync-2-dev/compare/core-v8.3.1...core-v8.4.0) (2023-09-14)
+
+
+### Features
+
+* **API:** new translator for virtual blocks for zks_getLogs endpoint ([#2505](https://github.com/matter-labs/zksync-2-dev/issues/2505)) ([35b0553](https://github.com/matter-labs/zksync-2-dev/commit/35b05537dc8fecf11be477bd156da332d75b1320))
+* **contract-verifier:** Add zkvyper v1.3.10 ([#2554](https://github.com/matter-labs/zksync-2-dev/issues/2554)) ([711c5db](https://github.com/matter-labs/zksync-2-dev/commit/711c5db4bd48e9b4b166256e8c9554ef0e54fad8))
+* **contract-verifier:** Support verification for zksolc v1.3.14  ([#2546](https://github.com/matter-labs/zksync-2-dev/issues/2546)) ([adea3ef](https://github.com/matter-labs/zksync-2-dev/commit/adea3efd39099ef9599e24d47de6c7cffe6b0287))
+* Decrease crate versions back to 0.1.0 ([#2528](https://github.com/matter-labs/zksync-2-dev/issues/2528)) ([adb7614](https://github.com/matter-labs/zksync-2-dev/commit/adb76142882dde197cd64b1aaaffb01906427054))
+* **prover-fri:** Restrict prover to pick jobs for which they have vk's ([#2541](https://github.com/matter-labs/zksync-2-dev/issues/2541)) ([cedba03](https://github.com/matter-labs/zksync-2-dev/commit/cedba03ea66fc0da479e60d5ca30d8f67e32358a))
+* **vm:** Make execute interface more obvious ([#2536](https://github.com/matter-labs/zksync-2-dev/issues/2536)) ([4cb18cb](https://github.com/matter-labs/zksync-2-dev/commit/4cb18cb06e87628ad122fc9857c789d1411a7f77))
+
+
+### Bug Fixes
+
+* **multi_vm:** Fix executing eth_call for old vm version ([#2558](https://github.com/matter-labs/zksync-2-dev/issues/2558)) ([0f3b990](https://github.com/matter-labs/zksync-2-dev/commit/0f3b990735caab8c905a9b51256608f4f7614ff1))
+* **vm:** Add trait for convinient usage of tracers ([#2550](https://github.com/matter-labs/zksync-2-dev/issues/2550)) ([bc2ed11](https://github.com/matter-labs/zksync-2-dev/commit/bc2ed1188cf545cfae1266302f1d5c2ef1feab0f))
+
+
+### Performance Improvements
+
+* **state-keeper:** only persist unique storage logs per miniblock ([#1793](https://github.com/matter-labs/zksync-2-dev/issues/1793)) ([d0ef78b](https://github.com/matter-labs/zksync-2-dev/commit/d0ef78b294c4e29692170c9b244414c7a5b9aa6c))
+
+## [8.3.1](https://github.com/matter-labs/zksync-2-dev/compare/core-v8.3.0...core-v8.3.1) (2023-09-12)
+
+
+### Bug Fixes
+
+* **house-keeper:** remove extra ! from status column ([#2539](https://github.com/matter-labs/zksync-2-dev/issues/2539)) ([583dadb](https://github.com/matter-labs/zksync-2-dev/commit/583dadb91885e664b79b299fc2cd84d5077cc2cd))
+
+## [8.3.0](https://github.com/matter-labs/zksync-2-dev/compare/core-v8.2.1...core-v8.3.0) (2023-09-11)
+
+
+### Features
+
+* **api:** Report some metrics more often ([#2519](https://github.com/matter-labs/zksync-2-dev/issues/2519)) ([eede188](https://github.com/matter-labs/zksync-2-dev/commit/eede188f6160fa383496c7c8ae8409c68bc54114))
+* **housekeeper:** add proof compressor retry and queued jobs reporting ([#2526](https://github.com/matter-labs/zksync-2-dev/issues/2526)) ([4321545](https://github.com/matter-labs/zksync-2-dev/commit/432154527dc85a17fc83c9e866b772a8d6f47673))
+* **metrics:** add more metrics to dry run ([#2529](https://github.com/matter-labs/zksync-2-dev/issues/2529)) ([0abdbb8](https://github.com/matter-labs/zksync-2-dev/commit/0abdbb8bd3229d2907f1f82493b2cf8e7a6a3254))
+* **vm:** New vm intregration ([#2198](https://github.com/matter-labs/zksync-2-dev/issues/2198)) ([f5e7e7a](https://github.com/matter-labs/zksync-2-dev/commit/f5e7e7a6fa81ab46289016f57a6123ffec83bcf6))
+
+
+### Bug Fixes
+
+* **vm:** Add bootloader tip execution mode ([#2535](https://github.com/matter-labs/zksync-2-dev/issues/2535)) ([2d64a3a](https://github.com/matter-labs/zksync-2-dev/commit/2d64a3a0947d131a4f9baf57afd1e26bccbc7b81))
+
+
+### Performance Improvements
+
+* **db:** Support previous blocks in VM values cache ([#2474](https://github.com/matter-labs/zksync-2-dev/issues/2474)) ([5eb32c5](https://github.com/matter-labs/zksync-2-dev/commit/5eb32c588b4ae1c85ef8fc95f70e03921eb19625))
+
+## [8.2.1](https://github.com/matter-labs/zksync-2-dev/compare/core-v8.2.0...core-v8.2.1) (2023-09-07)
+
+
+### Bug Fixes
+
+* **api:** miniblock_hash loading ([#2513](https://github.com/matter-labs/zksync-2-dev/issues/2513)) ([c553dae](https://github.com/matter-labs/zksync-2-dev/commit/c553daeca49a943a323cefa2017808e6c06728e9))
+
+## [8.2.0](https://github.com/matter-labs/zksync-2-dev/compare/core-v8.1.1...core-v8.2.0) (2023-09-06)
+
+
+### Features
+
+* **prover-fri-compressor:** Create a dedicated component for FRI proof conversion ([#2501](https://github.com/matter-labs/zksync-2-dev/issues/2501)) ([cd43aa7](https://github.com/matter-labs/zksync-2-dev/commit/cd43aa73095bf97b54c9fbcc9934128cc29506c2))
+* **prover-fri:** use separate object store config for FRI prover components ([#2494](https://github.com/matter-labs/zksync-2-dev/issues/2494)) ([7f2537f](https://github.com/matter-labs/zksync-2-dev/commit/7f2537fc987c55b6efec925506478d665d20c0c4))
+* **witness-generator:** Add Witness Storage, later used in Wit Gen ([#2509](https://github.com/matter-labs/zksync-2-dev/issues/2509)) ([c78ddf3](https://github.com/matter-labs/zksync-2-dev/commit/c78ddf33e7de929fd369472e8892a2a83f2b0ac2))
+* **witness-generator:** Basic Wit Gen uses multiple Storage backends ([#2510](https://github.com/matter-labs/zksync-2-dev/issues/2510)) ([1dc1f1c](https://github.com/matter-labs/zksync-2-dev/commit/1dc1f1c4e65f0f49c63a654c64596dc085911791))
+
+
+### Bug Fixes
+
+* **api:** Use multivm bootloader in debug ([#2504](https://github.com/matter-labs/zksync-2-dev/issues/2504)) ([ae2a357](https://github.com/matter-labs/zksync-2-dev/commit/ae2a357f38a57498ef527f2ccbce1d32b9b3f7b5))
+* **witnes-gen:** Fix getting bootloader memory ([#2507](https://github.com/matter-labs/zksync-2-dev/issues/2507)) ([bb8f894](https://github.com/matter-labs/zksync-2-dev/commit/bb8f89472432e9b11c538881f27dda8afdf46a4f))
+* **witness-generator:** Add Data Source config for Basic Witness Gens ([#2502](https://github.com/matter-labs/zksync-2-dev/issues/2502)) ([9126597](https://github.com/matter-labs/zksync-2-dev/commit/91265973d0eabb34e056277cd2aa730c05a9c06f))
+
+## [8.1.1](https://github.com/matter-labs/zksync-2-dev/compare/core-v8.1.0...core-v8.1.1) (2023-09-06)
+
+
+### Performance Improvements
+
+* **db:** Add `miniblocks_pending_batch` DB index ([#2496](https://github.com/matter-labs/zksync-2-dev/issues/2496)) ([dc20057](https://github.com/matter-labs/zksync-2-dev/commit/dc200570f62bb52de5fa798a353f08fae0a3fc71))
+
+## [8.1.0](https://github.com/matter-labs/zksync-2-dev/compare/core-v8.0.0...core-v8.1.0) (2023-09-05)
+
+
+### Features
+
+* **genesis:** make it possible to create genesis block with given protocol version ([#2471](https://github.com/matter-labs/zksync-2-dev/issues/2471)) ([430de1f](https://github.com/matter-labs/zksync-2-dev/commit/430de1f4ed59e9bc1eeb029dacdf88684c34a1ad))
+
+
+### Bug Fixes
+
+* **api:** Zeroes in eth_feeHistory ([#2490](https://github.com/matter-labs/zksync-2-dev/issues/2490)) ([67cd433](https://github.com/matter-labs/zksync-2-dev/commit/67cd433f57e01fdf94da7461c6b76a6948815212))
+* **db:** Fix `get_expected_l1_batch_timestamp` query ([#2492](https://github.com/matter-labs/zksync-2-dev/issues/2492)) ([660ae98](https://github.com/matter-labs/zksync-2-dev/commit/660ae98d34b48f8c97c50c8c7988049e50d90297))
+
+## [8.0.0](https://github.com/matter-labs/zksync-2-dev/compare/core-v7.2.0...core-v8.0.0) (2023-09-05)
+
+
+### ⚠ BREAKING CHANGES
+
+* Fix a bug for the ending of the upgrade ([#2478](https://github.com/matter-labs/zksync-2-dev/issues/2478))
+
+### Features
+
+* **prover-fri:** Add protocol version for FRI prover related tables ([#2458](https://github.com/matter-labs/zksync-2-dev/issues/2458)) ([784a52b](https://github.com/matter-labs/zksync-2-dev/commit/784a52bc2d2fa784fe82cc10df1d39895255ade5))
+
+
+### Bug Fixes
+
+* **api:** Use MultiVM in API ([#2476](https://github.com/matter-labs/zksync-2-dev/issues/2476)) ([683582d](https://github.com/matter-labs/zksync-2-dev/commit/683582dab2fb26d09a5e183ac9e4d0d9e61286e4))
+* Fix a bug for the ending of the upgrade ([#2478](https://github.com/matter-labs/zksync-2-dev/issues/2478)) ([5fbad97](https://github.com/matter-labs/zksync-2-dev/commit/5fbad971af10240feaa8da3062dcf7c98aca3f02))
+
+## [7.2.0](https://github.com/matter-labs/zksync-2-dev/compare/core-v7.1.0...core-v7.2.0) (2023-09-01)
+
+
+### Features
+
+* **api:** Implement rate-limiting for WebSocket jsonrpc backend ([#2468](https://github.com/matter-labs/zksync-2-dev/issues/2468)) ([db86c11](https://github.com/matter-labs/zksync-2-dev/commit/db86c11caf1c63de6fa6be5031636d95125fa6c9))
+* **api:** make gas per pubdata field  to be not optional in SDK and API for transaction details endpoint ([#2431](https://github.com/matter-labs/zksync-2-dev/issues/2431)) ([4c3636a](https://github.com/matter-labs/zksync-2-dev/commit/4c3636a33af345046d5a78ee8b65b1a4d1066e98))
+
+
+### Bug Fixes
+
+* debug and fix local node setup ([#2408](https://github.com/matter-labs/zksync-2-dev/issues/2408)) ([4f3a9e6](https://github.com/matter-labs/zksync-2-dev/commit/4f3a9e695c868a181c7ecd1dbbd647b1a2a74a4f))
+
+## [7.1.0](https://github.com/matter-labs/zksync-2-dev/compare/core-v7.0.0...core-v7.1.0) (2023-09-01)
+
+
+### Features
+
+* **api:** Support batch request size limiting in jsonrpc ([#2461](https://github.com/matter-labs/zksync-2-dev/issues/2461)) ([287d360](https://github.com/matter-labs/zksync-2-dev/commit/287d360d03914adf3e15c115470709abadf4585c))
+* **prover-gateway:** integrate snark wrapper to transform FRI proof to old ([#2413](https://github.com/matter-labs/zksync-2-dev/issues/2413)) ([60bb26b](https://github.com/matter-labs/zksync-2-dev/commit/60bb26bdc31f13f2b9253b245e848951e8e6e501))
+* **witness_generator:** Add flagged upload path on state keeper ([#2448](https://github.com/matter-labs/zksync-2-dev/issues/2448)) ([10b78cb](https://github.com/matter-labs/zksync-2-dev/commit/10b78cb6b31e2bfe6c84d6cb76f3228003e44ae7))
+
+
+### Bug Fixes
+
+* **en:** Set correct hashes for old blocks ([#2463](https://github.com/matter-labs/zksync-2-dev/issues/2463)) ([aa5d0b1](https://github.com/matter-labs/zksync-2-dev/commit/aa5d0b126b8e68a8f4e8da874611165acf145a73))
+* **en:** Set correct version for upgrade  ([#2464](https://github.com/matter-labs/zksync-2-dev/issues/2464)) ([44e5f32](https://github.com/matter-labs/zksync-2-dev/commit/44e5f32b910917f1661fbd0139f2ba35cbc9eca0))
+* **state-keeper:** Calculate miniblock hash based on protocol version ([#2462](https://github.com/matter-labs/zksync-2-dev/issues/2462)) ([01bee1d](https://github.com/matter-labs/zksync-2-dev/commit/01bee1dcd1c398374253bb8b40ab9385d9fd8547))
+
+## [7.0.0](https://github.com/matter-labs/zksync-2-dev/compare/core-v6.2.0...core-v7.0.0) (2023-08-30)
+
+
+### ⚠ BREAKING CHANGES
+
+* **vm:** replace L1 batch number and timestamp with  miniblock number and timestamp ([#1975](https://github.com/matter-labs/zksync-2-dev/issues/1975))
+
+### Features
+
+* **prover-server-split:** insert batches to be proven on proof_generation_details table ([#2417](https://github.com/matter-labs/zksync-2-dev/issues/2417)) ([504c37f](https://github.com/matter-labs/zksync-2-dev/commit/504c37fc3aeab951b335b574508289fef33e1700))
+* **vm:** replace L1 batch number and timestamp with  miniblock number and timestamp ([#1975](https://github.com/matter-labs/zksync-2-dev/issues/1975)) ([6814c7e](https://github.com/matter-labs/zksync-2-dev/commit/6814c7eafa0c6f29607e81acfffc70ac1fa5fa96))
+* **witness_generator:** Add upload_witness_inputs_to_gcs flag ([#2444](https://github.com/matter-labs/zksync-2-dev/issues/2444)) ([9f0b87e](https://github.com/matter-labs/zksync-2-dev/commit/9f0b87ef1b33defa71ef98ff2cd5fb66f6537837))
+
+
+### Bug Fixes
+
+* **api:** fix eth_call for old blocks ([#2440](https://github.com/matter-labs/zksync-2-dev/issues/2440)) ([19bba44](https://github.com/matter-labs/zksync-2-dev/commit/19bba4413f8f4197e2178e409106eecf12089d08))
+* **en:** Allow executed batch reversion ([#2442](https://github.com/matter-labs/zksync-2-dev/issues/2442)) ([a47b72d](https://github.com/matter-labs/zksync-2-dev/commit/a47b72db82527409e224467bfb07ca642426385f))
+* **en:** Insert protocol version for pending batch ([#2450](https://github.com/matter-labs/zksync-2-dev/issues/2450)) ([dd0792e](https://github.com/matter-labs/zksync-2-dev/commit/dd0792ea200f255c9f9f3e55924cb7caf0452b89))
+* **en:** Set protocol version for pending blocks in EN ([#2443](https://github.com/matter-labs/zksync-2-dev/issues/2443)) ([7464395](https://github.com/matter-labs/zksync-2-dev/commit/746439527be10ad513607094953ba7523316b843))
+
+## [6.2.0](https://github.com/matter-labs/zksync-2-dev/compare/core-v6.1.0...core-v6.2.0) (2023-08-28)
+
+
+### Features
+
+* **hyperchain:** hyperchain script ([#2410](https://github.com/matter-labs/zksync-2-dev/issues/2410)) ([52b63d3](https://github.com/matter-labs/zksync-2-dev/commit/52b63d348f634a4434d21aa2b1955e55859556d6))
+
+
+### Bug Fixes
+
+* **api:** Revert `ProtocolVersionId` serialization ([#2425](https://github.com/matter-labs/zksync-2-dev/issues/2425)) ([e2eee91](https://github.com/matter-labs/zksync-2-dev/commit/e2eee9121961fae234e8228c35ef4265b1328cf1))
+* **db:** Fix prover_jobs indices ([#2416](https://github.com/matter-labs/zksync-2-dev/issues/2416)) ([4104e7e](https://github.com/matter-labs/zksync-2-dev/commit/4104e7e1e3bd5dfc3c46827e45527dc9a40b7757))
+
+## [6.1.0](https://github.com/matter-labs/zksync-2-dev/compare/core-v6.0.0...core-v6.1.0) (2023-08-25)
+
+
+### Features
+
+* Add logging for health check changes ([#2401](https://github.com/matter-labs/zksync-2-dev/issues/2401)) ([3be83e5](https://github.com/matter-labs/zksync-2-dev/commit/3be83e5481f12745579a1d7e6c42d2fa27a0a566))
+* **api:** Measure difference from last miniblock for JSON-RPC APIs ([#2370](https://github.com/matter-labs/zksync-2-dev/issues/2370)) ([c706927](https://github.com/matter-labs/zksync-2-dev/commit/c706927d233935c20ac074968a82b10449eb4dff))
+* **eth-sender:** add support for loading new proofs from GCS ([#2392](https://github.com/matter-labs/zksync-2-dev/issues/2392)) ([54f6f53](https://github.com/matter-labs/zksync-2-dev/commit/54f6f53953ddd20c19a8d6de092700de2835ad33))
+* glue VM version, protocol version and EN ([#2411](https://github.com/matter-labs/zksync-2-dev/issues/2411)) ([c3768fc](https://github.com/matter-labs/zksync-2-dev/commit/c3768fc028afbd4b0ed8d005430a0d3a1ede72c1))
+* **prover-server-split:** consume API for fetching proof gen data and submitting proofs ([#2365](https://github.com/matter-labs/zksync-2-dev/issues/2365)) ([6e99471](https://github.com/matter-labs/zksync-2-dev/commit/6e994717086941fd2538fced7c32b4bb5eeb4eac))
+
+
+### Bug Fixes
+
+* **contract-verifier:** No panic when 2 parallel cvs insert same key ([#2396](https://github.com/matter-labs/zksync-2-dev/issues/2396)) ([f0d9081](https://github.com/matter-labs/zksync-2-dev/commit/f0d90815cc2a27b27f84c0aa434a16fff59f356f))
+* **en:** do not save protocol version for miniblocks/batches in EN ([#2403](https://github.com/matter-labs/zksync-2-dev/issues/2403)) ([75bd867](https://github.com/matter-labs/zksync-2-dev/commit/75bd867079830d4519c1e20c4a53af749ecc325d))
+* **en:** Save system tx to en ([#2402](https://github.com/matter-labs/zksync-2-dev/issues/2402)) ([0bb50a5](https://github.com/matter-labs/zksync-2-dev/commit/0bb50a5b31d5e0960ed3dec84b21170d6ccfddad))
+* save protocol versions in prover DB ([#2384](https://github.com/matter-labs/zksync-2-dev/issues/2384)) ([0fc2195](https://github.com/matter-labs/zksync-2-dev/commit/0fc21952e630f56df582b79e071998564132f67f))
+
+## [6.0.0](https://github.com/matter-labs/zksync-2-dev/compare/core-v5.28.1...core-v6.0.0) (2023-08-18)
+
+
+### ⚠ BREAKING CHANGES
+
+* new upgrade system ([#1784](https://github.com/matter-labs/zksync-2-dev/issues/1784))
+
+### Features
+
+* Add shadow_storage to enable shadow state read ([#2366](https://github.com/matter-labs/zksync-2-dev/issues/2366)) ([3269d82](https://github.com/matter-labs/zksync-2-dev/commit/3269d82de20b205feec4e4056dad51cd28e14f8f))
+* **db:** Instrument key queries in DAL ([#2318](https://github.com/matter-labs/zksync-2-dev/issues/2318)) ([eb08ed6](https://github.com/matter-labs/zksync-2-dev/commit/eb08ed69db8655dd4e0d485597568c6e4e01e5bf))
+* new upgrade system ([#1784](https://github.com/matter-labs/zksync-2-dev/issues/1784)) ([469a4c3](https://github.com/matter-labs/zksync-2-dev/commit/469a4c332a4f02b5a642b2951fd00228c9317f59))
+* **prover-fri:** Add socket listener to receive witness vector over network ([#2367](https://github.com/matter-labs/zksync-2-dev/issues/2367)) ([19c9d89](https://github.com/matter-labs/zksync-2-dev/commit/19c9d89613a5d3ab5e55d9224a512a8952aa3689))
+* **prover-server-split:** expose API from server for requesting proof gen data and submitting proof ([#2292](https://github.com/matter-labs/zksync-2-dev/issues/2292)) ([401d0ab](https://github.com/matter-labs/zksync-2-dev/commit/401d0ab51bfce89203fd82b5f8d1a6865f6d19b0))
+* **witness-vector-generator:** Perform circuit synthesis on external machine ([#2351](https://github.com/matter-labs/zksync-2-dev/issues/2351)) ([6839f3f](https://github.com/matter-labs/zksync-2-dev/commit/6839f3fbfe472fb2fd492a9648bb97d1654bbb3b))
+
+
+### Bug Fixes
+
+* Return old paths for contract-verification API ([#2356](https://github.com/matter-labs/zksync-2-dev/issues/2356)) ([605a3ac](https://github.com/matter-labs/zksync-2-dev/commit/605a3ac0951241a892ee8f0832b69336299da6c6))
+
+
+### Performance Improvements
+
+* **db:** Optimize loading L1 batch header ([#2343](https://github.com/matter-labs/zksync-2-dev/issues/2343)) ([1274469](https://github.com/matter-labs/zksync-2-dev/commit/1274469b0618582d2027bc7b8dbda779486a553d))
+
 ## [5.28.1](https://github.com/matter-labs/zksync-2-dev/compare/core-v5.28.0...core-v5.28.1) (2023-08-10)
 
 
diff --git a/core/bin/contract-verifier/Cargo.toml b/core/bin/contract-verifier/Cargo.toml
index 6a57884dff7f..875f8559a26f 100644
--- a/core/bin/contract-verifier/Cargo.toml
+++ b/core/bin/contract-verifier/Cargo.toml
@@ -11,14 +11,14 @@ description = "The zkEVM contract verifier"
 publish = false # We don't want to publish our binaries.
 
 [dependencies]
-zksync_types = { path = "../../lib/types", version = "1.0" }
-zksync_dal = { path = "../../lib/dal", version = "1.0" }
-zksync_config = { path = "../../lib/config", version = "1.0" }
-zksync_contracts = { path = "../../lib/contracts", version = "1.0" }
-zksync_queued_job_processor = { path = "../../lib/queued_job_processor", version = "1.0" }
-zksync_utils = { path = "../../lib/utils", version = "1.0" }
-prometheus_exporter = { path = "../../lib/prometheus_exporter", version = "1.0" }
-vlog = { path = "../../lib/vlog", version = "1.0" }
+zksync_types = { path = "../../lib/types" }
+zksync_dal = { path = "../../lib/dal" }
+zksync_config = { path = "../../lib/config" }
+zksync_contracts = { path = "../../lib/contracts" }
+zksync_queued_job_processor = { path = "../../lib/queued_job_processor" }
+zksync_utils = { path = "../../lib/utils" }
+prometheus_exporter = { path = "../../lib/prometheus_exporter" }
+vlog = { path = "../../lib/vlog" }
 
 tokio = { version = "1", features = ["time"] }
 futures = { version = "0.3", features = ["compat"] }
@@ -27,10 +27,11 @@ thiserror = "1.0"
 chrono = "0.4"
 serde_json = "1.0"
 ethabi = "18.0.0"
-metrics = "0.20"
+metrics = "0.21"
 hex = "0.4"
 serde = { version = "1.0", features = ["derive"] }
 structopt = "0.3.20"
 lazy_static = "1.4"
 tempfile = "3.0.2"
 regex = "1"
+tracing = "0.1"
diff --git a/core/bin/contract-verifier/src/main.rs b/core/bin/contract-verifier/src/main.rs
index b806d4e09520..24f95d8dd4f8 100644
--- a/core/bin/contract-verifier/src/main.rs
+++ b/core/bin/contract-verifier/src/main.rs
@@ -1,5 +1,6 @@
 use std::cell::RefCell;
 
+use prometheus_exporter::PrometheusExporterConfig;
 use zksync_config::{configs::PrometheusConfig, ApiConfig, ContractVerifierConfig};
 use zksync_dal::ConnectionPool;
 use zksync_queued_job_processor::JobProcessor;
@@ -129,16 +130,32 @@ async fn main() {
         listener_port: verifier_config.prometheus_port,
         ..ApiConfig::from_env().prometheus
     };
-    let pool = ConnectionPool::singleton(DbVariant::Master).build().await;
-
-    vlog::init();
-    let sentry_guard = vlog::init_sentry();
-    match sentry_guard {
-        Some(_) => vlog::info!(
-            "Starting Sentry url: {}",
-            std::env::var("MISC_SENTRY_URL").unwrap(),
-        ),
-        None => vlog::info!("No sentry url configured"),
+    let pool = ConnectionPool::singleton(DbVariant::Master)
+        .build()
+        .await
+        .unwrap();
+
+    #[allow(deprecated)] // TODO (QIT-21): Use centralized configuration approach.
+    let log_format = vlog::log_format_from_env();
+    #[allow(deprecated)] // TODO (QIT-21): Use centralized configuration approach.
+    let sentry_url = vlog::sentry_url_from_env();
+    #[allow(deprecated)] // TODO (QIT-21): Use centralized configuration approach.
+    let environment = vlog::environment_from_env();
+
+    let mut builder = vlog::ObservabilityBuilder::new().with_log_format(log_format);
+    if let Some(sentry_url) = &sentry_url {
+        builder = builder
+            .with_sentry_url(sentry_url)
+            .expect("Invalid Sentry URL")
+            .with_sentry_environment(environment);
+    }
+    let _guard = builder.build();
+
+    // Report whether sentry is running after the logging subsystem was initialized.
+    if let Some(sentry_url) = sentry_url {
+        tracing::info!("Sentry configured with URL: {sentry_url}");
+    } else {
+        tracing::info!("No sentry URL was provided");
     }
 
     let (stop_sender, stop_receiver) = watch::channel(false);
@@ -156,8 +173,13 @@ async fn main() {
 
     let contract_verifier = ContractVerifier::new(verifier_config, pool);
     let tasks = vec![
-        tokio::spawn(contract_verifier.run(stop_receiver, opt.jobs_number)),
-        prometheus_exporter::run_prometheus_exporter(prometheus_config.listener_port, None),
+        // todo PLA-335: Leftovers after the prover DB split.
+        // The prover connection pool is not used by the contract verifier, but we need to pass it
+        // since `JobProcessor` trait requires it.
+        tokio::spawn(contract_verifier.run(stop_receiver.clone(), opt.jobs_number)),
+        tokio::spawn(
+            PrometheusExporterConfig::pull(prometheus_config.listener_port).run(stop_receiver),
+        ),
     ];
 
     let particular_crypto_alerts = None;
@@ -166,7 +188,7 @@ async fn main() {
     tokio::select! {
         _ = wait_for_tasks(tasks, particular_crypto_alerts, graceful_shutdown, tasks_allowed_to_finish) => {},
         _ = stop_signal_receiver.next() => {
-            vlog::info!("Stop signal received, shutting down");
+            tracing::info!("Stop signal received, shutting down");
         },
     };
     let _ = stop_sender.send(true);
diff --git a/core/bin/contract-verifier/src/verifier.rs b/core/bin/contract-verifier/src/verifier.rs
index e39c4796a2b0..7b8bd43fe944 100644
--- a/core/bin/contract-verifier/src/verifier.rs
+++ b/core/bin/contract-verifier/src/verifier.rs
@@ -63,7 +63,7 @@ impl ContractVerifier {
             .get_contract_info_for_verification(request.req.contract_address).await
             .unwrap()
             .ok_or_else(|| {
-                vlog::warn!("Contract is missing in DB for already accepted verification request. Contract address: {:#?}", request.req.contract_address);
+                tracing::warn!("Contract is missing in DB for already accepted verification request. Contract address: {:#?}", request.req.contract_address);
                 ContractVerifierError::InternalError
             })?;
         let constructor_args = Self::decode_constructor_arguments_from_calldata(
@@ -173,7 +173,7 @@ impl ContractVerifier {
                 let bytecode = hex::decode(bytecode_str).unwrap();
                 let abi = contract["abi"].clone();
                 if !abi.is_array() {
-                    vlog::error!(
+                    tracing::error!(
                         "zksolc returned unexpected value for ABI: {}",
                         serde_json::to_string_pretty(&abi).unwrap()
                     );
@@ -424,7 +424,7 @@ impl ContractVerifier {
                     .save_verification_info(info)
                     .await
                     .unwrap();
-                vlog::info!("Successfully processed request with id = {}", request_id);
+                tracing::info!("Successfully processed request with id = {}", request_id);
             }
             Err(error) => {
                 let error_message = error.to_string();
@@ -439,7 +439,7 @@ impl ContractVerifier {
                     .save_verification_error(request_id, error_message, compilation_errors, None)
                     .await
                     .unwrap();
-                vlog::info!("Request with id = {} was failed", request_id);
+                tracing::info!("Request with id = {} was failed", request_id);
             }
         }
     }
@@ -495,7 +495,7 @@ impl JobProcessor for ContractVerifier {
     ) -> tokio::task::JoinHandle<()> {
         let connection_pool = self.connection_pool.clone();
         tokio::task::spawn(async move {
-            vlog::info!("Started to process request with id = {}", job.id);
+            tracing::info!("Started to process request with id = {}", job.id);
 
             let config: ContractVerifierConfig = ContractVerifierConfig::from_env();
             let mut connection = connection_pool.access_storage().await;
diff --git a/core/bin/enumeration_indices_migration/Cargo.toml b/core/bin/enumeration_indices_migration/Cargo.toml
deleted file mode 100644
index db33b6f00767..000000000000
--- a/core/bin/enumeration_indices_migration/Cargo.toml
+++ /dev/null
@@ -1,12 +0,0 @@
-[package]
-name = "enumeration_indices_migration"
-version = "0.1.0"
-edition = "2021"
-
-# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
-
-[dependencies]
-tokio = { version = "1" }
-zksync_dal = { path = "../../lib/dal", version = "1.0" }
-zksync_core = { path = "../../bin/zksync_core", version = "1.0" }
-vlog = { path = "../../lib/vlog", version = "1.0" }
diff --git a/core/bin/enumeration_indices_migration/src/main.rs b/core/bin/enumeration_indices_migration/src/main.rs
deleted file mode 100644
index 86d581f379b7..000000000000
--- a/core/bin/enumeration_indices_migration/src/main.rs
+++ /dev/null
@@ -1,11 +0,0 @@
-use zksync_dal::connection::DbVariant;
-use zksync_dal::ConnectionPool;
-
-#[tokio::main]
-async fn main() {
-    vlog::init();
-
-    let pool = ConnectionPool::singleton(DbVariant::Master).build().await;
-    let mut storage = pool.access_storage().await;
-    zksync_core::state_keeper::set_missing_initial_writes_indices(&mut storage).await;
-}
diff --git a/core/bin/external_node/Cargo.toml b/core/bin/external_node/Cargo.toml
index c8a0516bd1e3..f6f83c60af88 100644
--- a/core/bin/external_node/Cargo.toml
+++ b/core/bin/external_node/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "zksync_external_node"
-version = "1.0.0"
+version = "0.1.0"
 edition = "2021"
 authors = ["The Matter Labs Team <hello@matterlabs.dev>"]
 homepage = "https://zksync.io/"
@@ -11,20 +11,20 @@ categories = ["cryptography"]
 publish = false # We don't want to publish our binaries.
 
 [dependencies]
-zksync_core = { path = "../zksync_core", version = "1.0" }
-zksync_dal = { path = "../../lib/dal", version = "1.0" }
-zksync_config = { path = "../../lib/config", version = "1.0" }
-zksync_storage = { path = "../../lib/storage", version = "1.0" }
-zksync_utils = { path = "../../lib/utils", version = "1.0" }
-zksync_state = { path = "../../lib/state", version = "1.0" }
-zksync_basic_types = { path = "../../lib/basic_types", version = "1.0" }
-zksync_contracts = { path = "../../lib/contracts", version = "1.0" }
+zksync_core = { path = "../zksync_core" }
+zksync_dal = { path = "../../lib/dal" }
+zksync_config = { path = "../../lib/config" }
+zksync_storage = { path = "../../lib/storage" }
+zksync_utils = { path = "../../lib/utils" }
+zksync_state = { path = "../../lib/state" }
+zksync_basic_types = { path = "../../lib/basic_types" }
+zksync_contracts = { path = "../../lib/contracts" }
 
-prometheus_exporter = { path = "../../lib/prometheus_exporter", version = "1.0" }
-zksync_health_check = { path = "../../lib/health_check", version = "0.1.0" }
-zksync_web3_decl = { path = "../../lib/web3_decl", version = "1.0" }
-zksync_types = { path = "../../lib/types", version = "1.0" }
-vlog = { path = "../../lib/vlog", version = "1.0" }
+prometheus_exporter = { path = "../../lib/prometheus_exporter" }
+zksync_health_check = { path = "../../lib/health_check" }
+zksync_web3_decl = { path = "../../lib/web3_decl" }
+zksync_types = { path = "../../lib/types" }
+vlog = { path = "../../lib/vlog" }
 
 anyhow = "1.0"
 tokio = { version = "1", features = ["time"] }
@@ -32,3 +32,5 @@ futures = "0.3"
 serde = { version = "1.0", features = ["derive"] }
 envy = "0.4"
 url = "2.4"
+clap = { version = "4.2.4", features = ["derive"] }
+tracing = "0.1"
diff --git a/core/bin/external_node/src/config/mod.rs b/core/bin/external_node/src/config/mod.rs
index f6506c9f1dde..35b1e91bc08a 100644
--- a/core/bin/external_node/src/config/mod.rs
+++ b/core/bin/external_node/src/config/mod.rs
@@ -485,6 +485,7 @@ impl From<ExternalNodeConfig> for TxSenderConfig {
             // and they will be enforced by the main node anyway.
             max_allowed_l2_tx_gas_limit: u32::MAX,
             validation_computational_gas_limit: u32::MAX,
+            chain_id: config.remote.l2_chain_id,
         }
     }
 }
diff --git a/core/bin/external_node/src/main.rs b/core/bin/external_node/src/main.rs
index 28d60c4d3a44..a27f9bd19d22 100644
--- a/core/bin/external_node/src/main.rs
+++ b/core/bin/external_node/src/main.rs
@@ -1,10 +1,11 @@
 use anyhow::Context;
+use clap::Parser;
 use tokio::{sync::watch, task, time::sleep};
 
 use std::{sync::Arc, time::Duration};
 
-use prometheus_exporter::run_prometheus_exporter;
-use zksync_basic_types::Address;
+use prometheus_exporter::PrometheusExporterConfig;
+use zksync_basic_types::{Address, L2ChainId};
 use zksync_core::{
     api_server::{
         execution_sandbox::VmConcurrencyLimiter,
@@ -21,8 +22,7 @@ use zksync_core::{
     reorg_detector::ReorgDetector,
     setup_sigint_handler,
     state_keeper::{
-        L1BatchExecutorBuilder, MainBatchExecutorBuilder, MultiVMConfig, SealManager,
-        ZkSyncStateKeeper,
+        L1BatchExecutorBuilder, MainBatchExecutorBuilder, SealManager, ZkSyncStateKeeper,
     },
     sync_layer::{
         batch_status_updater::BatchStatusUpdater, external_io::ExternalIO,
@@ -50,7 +50,7 @@ async fn build_state_keeper(
     sync_state: SyncState,
     l2_erc20_bridge_addr: Address,
     stop_receiver: watch::Receiver<bool>,
-    use_multivm: bool,
+    chain_id: L2ChainId,
 ) -> ZkSyncStateKeeper {
     let en_sealer = ExternalNodeSealer::new(action_queue.clone());
     let main_node_url = config.required.main_node_url().unwrap();
@@ -69,28 +69,13 @@ async fn build_state_keeper(
     // We only need call traces on the external node if the `debug_` namespace is enabled.
     let save_call_traces = config.optional.api_namespaces().contains(&Namespace::Debug);
 
-    // Only supply MultiVM config if the corresponding feature is enabled.
-    let multivm_config = use_multivm.then(|| {
-        vlog::error!(
-            "Using experimental MultiVM support! The feature is not ready, use at your own risk!"
-        );
-        if main_node_url.contains("mainnet") {
-            MultiVMConfig::mainnet_config_wip()
-        } else if main_node_url.contains("testnet") {
-            MultiVMConfig::testnet_config_wip()
-        } else {
-            panic!("MultiVM can only be configured for mainnet/testnet now")
-        }
-    });
-
     let batch_executor_base: Box<dyn L1BatchExecutorBuilder> =
         Box::new(MainBatchExecutorBuilder::new(
             state_keeper_db_path,
             connection_pool.clone(),
             max_allowed_l2_tx_gas_limit,
             save_call_traces,
-            validation_computational_gas_limit,
-            multivm_config,
+            false,
         ));
 
     let io = Box::new(
@@ -100,21 +85,25 @@ async fn build_state_keeper(
             sync_state,
             main_node_url,
             l2_erc20_bridge_addr,
+            validation_computational_gas_limit,
+            chain_id,
         )
         .await,
     );
 
+    io.recalculate_miniblock_hashes().await;
+
     ZkSyncStateKeeper::new(stop_receiver, io, batch_executor_base, sealer)
 }
 
 async fn init_tasks(
     config: ExternalNodeConfig,
     connection_pool: ConnectionPool,
-) -> (
-    Vec<task::JoinHandle<()>>,
+) -> anyhow::Result<(
+    Vec<task::JoinHandle<anyhow::Result<()>>>,
     watch::Sender<bool>,
     HealthCheckHandle,
-) {
+)> {
     let main_node_url = config
         .required
         .main_node_url()
@@ -134,13 +123,16 @@ async fn init_tasks(
         sync_state.clone(),
         config.remote.l2_erc20_bridge_addr,
         stop_receiver.clone(),
-        config.optional.experimental_multivm_support,
+        config.remote.l2_chain_id,
     )
     .await;
 
     let singleton_pool_builder = ConnectionPool::singleton(DbVariant::Master);
     let fetcher = MainNodeFetcher::new(
-        singleton_pool_builder.build().await,
+        singleton_pool_builder
+            .build()
+            .await
+            .context("failed to build a connection pool for MainNodeFetcher")?,
         &main_node_url,
         action_queue.clone(),
         sync_state.clone(),
@@ -163,24 +155,41 @@ async fn init_tasks(
         &config
             .required
             .eth_client_url()
-            .expect("L1 client URL is incorrect"),
-        10,
-        singleton_pool_builder.build().await,
+            .context("L1 client URL is incorrect")?,
+        10, // TODO (BFT-97): Make it a part of a proper EN config
+        singleton_pool_builder
+            .build()
+            .await
+            .context("failed to build connection pool for ConsistencyChecker")?,
     );
 
-    let batch_status_updater =
-        BatchStatusUpdater::new(&main_node_url, singleton_pool_builder.build().await).await;
+    let batch_status_updater = BatchStatusUpdater::new(
+        &main_node_url,
+        singleton_pool_builder
+            .build()
+            .await
+            .context("failed to build a connection pool for BatchStatusUpdater")?,
+    )
+    .await;
 
     // Run the components.
     let tree_stop_receiver = stop_receiver.clone();
-    let tree_pool = singleton_pool_builder.build().await;
-    let prover_tree_pool = ConnectionPool::singleton(DbVariant::Prover).build().await;
+    let tree_pool = singleton_pool_builder
+        .build()
+        .await
+        .context("failed to build a tree_pool")?;
+    // todo: PLA-335
+    let prover_tree_pool = ConnectionPool::singleton(DbVariant::Prover)
+        .build()
+        .await
+        .context("failed to build a prover_tree_pool")?;
     let tree_handle =
         task::spawn(metadata_calculator.run(tree_pool, prover_tree_pool, tree_stop_receiver));
 
     let consistency_checker_handle = if !config.optional.experimental_multivm_support {
         Some(tokio::spawn(consistency_checker.run(stop_receiver.clone())))
     } else {
+        // TODO (BFT-264): Current behavior of consistency checker makes development of MultiVM harder.
         None
     };
 
@@ -219,7 +228,7 @@ async fn init_tasks(
             .build(
                 gas_adjuster,
                 Arc::new(vm_concurrency_limiter),
-                ApiContracts::load_from_disk(),
+                ApiContracts::load_from_disk(), // TODO (BFT-138): Allow to dynamically reload API contracts
                 storage_caches,
             )
             .await;
@@ -262,8 +271,8 @@ async fn init_tasks(
         healthchecks,
     );
     if let Some(port) = config.optional.prometheus_port {
-        let prometheus_task = run_prometheus_exporter(port, None);
-        task_handles.push(prometheus_task);
+        let prometheus_task = PrometheusExporterConfig::pull(port).run(stop_receiver.clone());
+        task_handles.push(tokio::spawn(prometheus_task));
     }
 
     task_handles.extend(http_api_handle);
@@ -279,7 +288,7 @@ async fn init_tasks(
         task_handles.push(consistency_checker);
     }
 
-    (task_handles, stop_sender, healthcheck_handle)
+    Ok((task_handles, stop_sender, healthcheck_handle))
 }
 
 async fn shutdown_components(
@@ -295,27 +304,84 @@ async fn shutdown_components(
     healthcheck_handle.stop().await;
 }
 
+#[derive(Debug, Parser)]
+#[structopt(author = "Matter Labs", version)]
+struct Cli {
+    #[arg(long)]
+    revert_pending_l1_batch: bool,
+}
+
 #[tokio::main]
 async fn main() -> anyhow::Result<()> {
     // Initial setup.
+    let opt = Cli::parse();
+
+    #[allow(deprecated)] // TODO (QIT-21): Use centralized configuration approach.
+    let log_format = vlog::log_format_from_env();
+    #[allow(deprecated)] // TODO (QIT-21): Use centralized configuration approach.
+    let sentry_url = vlog::sentry_url_from_env();
+    #[allow(deprecated)] // TODO (QIT-21): Use centralized configuration approach.
+    let environment = vlog::environment_from_env();
+
+    let mut builder = vlog::ObservabilityBuilder::new().with_log_format(log_format);
+    if let Some(sentry_url) = &sentry_url {
+        builder = builder
+            .with_sentry_url(sentry_url)
+            .expect("Invalid Sentry URL")
+            .with_sentry_environment(environment);
+    }
+    let _guard = builder.build();
+
+    // Report whether sentry is running after the logging subsystem was initialized.
+    if let Some(sentry_url) = sentry_url {
+        tracing::info!("Sentry configured with URL: {sentry_url}");
+    } else {
+        tracing::info!("No sentry URL was provided");
+    }
 
-    vlog::init();
-    let _sentry_guard = vlog::init_sentry();
     let config = ExternalNodeConfig::collect()
         .await
-        .expect("Failed to load external node config");
+        .context("Failed to load external node config")?;
     let main_node_url = config
         .required
         .main_node_url()
-        .expect("Main node URL is incorrect");
+        .context("Main node URL is incorrect")?;
+
+    let connection_pool = ConnectionPool::builder(DbVariant::Master)
+        .build()
+        .await
+        .context("failed to build a connection_pool")?;
+
+    if opt.revert_pending_l1_batch {
+        tracing::info!("Rolling pending L1 batch back..");
+        let reverter = BlockReverter::new(
+            config.required.state_cache_path,
+            config.required.merkle_tree_path,
+            None,
+            connection_pool.clone(),
+            L1ExecutedBatchesRevert::Allowed,
+        );
+
+        let mut connection = connection_pool.access_storage().await;
+        let sealed_l1_batch_number = connection.blocks_dal().get_sealed_l1_batch_number().await;
+        drop(connection);
+
+        tracing::info!("Rolling back to l1 batch number {sealed_l1_batch_number}");
+        reverter
+            .rollback_db(sealed_l1_batch_number, BlockReverterFlags::all())
+            .await;
+        tracing::info!(
+            "Rollback successfully completed, the node has to restart to continue working"
+        );
+        return Ok(());
+    }
 
-    let connection_pool = ConnectionPool::builder(DbVariant::Master).build().await;
     let sigint_receiver = setup_sigint_handler();
 
-    vlog::warn!("The external node is in the alpha phase, and should be used with caution.");
+    tracing::warn!("The external node is in the alpha phase, and should be used with caution.");
 
-    vlog::info!("Started the external node");
-    vlog::info!("Main node URL is: {}", main_node_url);
+    tracing::info!("Started the external node");
+    tracing::info!("Main node URL is: {}", main_node_url);
 
     // Make sure that genesis is performed.
     perform_genesis_if_needed(
@@ -327,7 +393,9 @@ async fn main() -> anyhow::Result<()> {
     .context("Performing genesis failed")?;
 
     let (task_handles, stop_sender, health_check_handle) =
-        init_tasks(config.clone(), connection_pool.clone()).await;
+        init_tasks(config.clone(), connection_pool.clone())
+            .await
+            .context("init_tasks")?;
 
     let reorg_detector = ReorgDetector::new(&main_node_url, connection_pool.clone());
     let reorg_detector_handle = tokio::spawn(reorg_detector.run());
@@ -338,11 +406,11 @@ async fn main() -> anyhow::Result<()> {
     tokio::select! {
         _ = wait_for_tasks(task_handles, particular_crypto_alerts, graceful_shutdown, tasks_allowed_to_finish) => {},
         _ = sigint_receiver => {
-            vlog::info!("Stop signal received, shutting down");
+            tracing::info!("Stop signal received, shutting down");
         },
         last_correct_batch = reorg_detector_handle => {
             if let Ok(last_correct_batch) = last_correct_batch {
-                vlog::info!("Performing rollback to block {}", last_correct_batch);
+                tracing::info!("Performing rollback to block {}", last_correct_batch);
                 shutdown_components(stop_sender, health_check_handle).await;
                 let reverter = BlockReverter::new(
                     config.required.state_cache_path,
@@ -354,10 +422,10 @@ async fn main() -> anyhow::Result<()> {
                 reverter
                     .rollback_db(last_correct_batch, BlockReverterFlags::all())
                     .await;
-                vlog::info!("Rollback successfully completed, the node has to restart to continue working");
+                tracing::info!("Rollback successfully completed, the node has to restart to continue working");
                 return Ok(());
             } else {
-                vlog::error!("Reorg detector actor failed");
+                tracing::error!("Reorg detector actor failed");
             }
         }
     }
diff --git a/core/bin/storage_logs_dedup_migration/Cargo.toml b/core/bin/storage_logs_dedup_migration/Cargo.toml
new file mode 100644
index 000000000000..44e8057aa93b
--- /dev/null
+++ b/core/bin/storage_logs_dedup_migration/Cargo.toml
@@ -0,0 +1,18 @@
+[package]
+name = "storage_logs_dedup_migration"
+version = "0.1.0"
+edition = "2021"
+
+[[bin]]
+name = "storage_logs_dedup_migration"
+path = "src/main.rs"
+
+[[bin]]
+name = "storage_logs_dedup_migration_consistency_checker"
+path = "src/consistency.rs"
+
+[dependencies]
+tokio = { version = "1" }
+zksync_dal = { path = "../../lib/dal" }
+zksync_types = { path = "../../lib/types" }
+clap = { version = "4.2.4", features = ["derive"] }
diff --git a/core/bin/storage_logs_dedup_migration/src/consistency.rs b/core/bin/storage_logs_dedup_migration/src/consistency.rs
new file mode 100644
index 000000000000..bf96232a875d
--- /dev/null
+++ b/core/bin/storage_logs_dedup_migration/src/consistency.rs
@@ -0,0 +1,65 @@
+use clap::Parser;
+
+use zksync_dal::connection::DbVariant;
+use zksync_dal::ConnectionPool;
+use zksync_types::MiniblockNumber;
+
+const MIGRATED_TABLE: &str = "storage_logs";
+const NOT_MIGRATED_TABLE: &str = "storage_logs_backup";
+
+#[derive(Debug, Parser)]
+#[command(
+    author = "Matter Labs",
+    about = "Consistency checker for the migration"
+)]
+struct Cli {
+    /// Miniblock number to start check from.
+    #[arg(long)]
+    from_miniblock: u32,
+    /// Miniblock number to check up to.
+    #[arg(long)]
+    to_miniblock: u32,
+}
+
+#[tokio::main]
+async fn main() {
+    let opt = Cli::parse();
+    let pool = ConnectionPool::singleton(DbVariant::Replica)
+        .build()
+        .await
+        .unwrap();
+    let mut connection = pool.access_storage().await;
+
+    println!(
+        "Consistency check started for miniblock range {}..={}",
+        opt.from_miniblock, opt.to_miniblock
+    );
+
+    for miniblock_number in opt.from_miniblock..=opt.to_miniblock {
+        let miniblock_number = MiniblockNumber(miniblock_number);
+        // Load all storage logs of miniblock.
+        let storage_logs = connection
+            .storage_logs_dal()
+            .get_miniblock_storage_logs_from_table(miniblock_number, NOT_MIGRATED_TABLE)
+            .await;
+
+        for (hashed_key, _, _) in storage_logs {
+            let value_before_migration = connection
+                .storage_logs_dal()
+                .get_storage_value_from_table(hashed_key, miniblock_number, NOT_MIGRATED_TABLE)
+                .await;
+            let value_after_migration = connection
+                .storage_logs_dal()
+                .get_storage_value_from_table(hashed_key, miniblock_number, MIGRATED_TABLE)
+                .await;
+            assert_eq!(
+                value_before_migration, value_after_migration,
+                "Found divergency for hashed_key = {hashed_key:?}, miniblock {miniblock_number}"
+            );
+        }
+
+        println!("Processed miniblock {miniblock_number}");
+    }
+
+    println!("Finished");
+}
diff --git a/core/bin/storage_logs_dedup_migration/src/main.rs b/core/bin/storage_logs_dedup_migration/src/main.rs
new file mode 100644
index 000000000000..d58ef99bdc6b
--- /dev/null
+++ b/core/bin/storage_logs_dedup_migration/src/main.rs
@@ -0,0 +1,165 @@
+use std::collections::hash_map::{Entry, HashMap};
+
+use clap::Parser;
+
+use zksync_dal::connection::DbVariant;
+use zksync_dal::ConnectionPool;
+use zksync_types::{MiniblockNumber, H256};
+
+/// When the threshold is reached then the migration is blocked on vacuuming.
+const UNVACUUMED_ROWS_THRESHOLD: usize = 2_000_000;
+
+#[derive(Debug, Parser)]
+#[command(
+    author = "Matter Labs",
+    about = "Migration that deduplicates rows in storage_logs DB table"
+)]
+struct Cli {
+    /// Miniblock number to start migration from.
+    #[arg(long)]
+    start_from_miniblock: u32,
+}
+
+/// Blockchain state cache
+struct StateCache {
+    /// (hashed_key => value) mapping.
+    pub storage: HashMap<H256, H256>,
+    /// Miniblock number cache is valid for.
+    pub miniblock: Option<MiniblockNumber>,
+    /// Flag indicating if state is initially empty.
+    pub is_state_initially_empty: bool,
+}
+
+impl StateCache {
+    /// Loads value from state if present.
+    pub fn get_value(&mut self, hashed_key: H256) -> Option<H256> {
+        if let Entry::Vacant(e) = self.storage.entry(hashed_key) {
+            if self.is_state_initially_empty {
+                e.insert(H256::zero());
+            }
+        }
+
+        self.storage.get(&hashed_key).copied()
+    }
+}
+
+#[tokio::main]
+async fn main() {
+    let opt = Cli::parse();
+    let pool = ConnectionPool::singleton(DbVariant::Master)
+        .build()
+        .await
+        .unwrap();
+    let mut connection = pool.access_storage().await;
+
+    let sealed_miniblock = connection.blocks_dal().get_sealed_miniblock_number().await;
+    println!(
+        "Migration started for miniblock range {}..={}",
+        opt.start_from_miniblock, sealed_miniblock
+    );
+
+    let (previous_miniblock, is_state_initially_empty) = if opt.start_from_miniblock == 0 {
+        (None, true)
+    } else {
+        (Some((opt.start_from_miniblock - 1).into()), false)
+    };
+
+    let mut state_cache = StateCache {
+        storage: HashMap::new(),
+        miniblock: previous_miniblock,
+        is_state_initially_empty,
+    };
+
+    let mut number_of_unvacuum_rows = 0;
+
+    for miniblock_number in opt.start_from_miniblock..=sealed_miniblock.0 {
+        let miniblock_number = MiniblockNumber(miniblock_number);
+
+        // Load all storage logs of miniblock.
+        let storage_logs = connection
+            .storage_logs_dal()
+            .get_miniblock_storage_logs(miniblock_number)
+            .await;
+        let initial_storage_logs_count = storage_logs.len();
+
+        // Load previous values from memory.
+        let prev_values: HashMap<_, _> = storage_logs
+            .iter()
+            .map(|(hashed_key, _, _)| (*hashed_key, state_cache.get_value(*hashed_key)))
+            .collect();
+
+        // Load missing previous values from database.
+        let missing_keys: Vec<_> = prev_values
+            .iter()
+            .filter_map(|(key, value)| (value.is_none()).then_some(*key))
+            .collect();
+
+        let in_memory_prev_values_iter = prev_values.into_iter().filter_map(|(k, v)| Some((k, v?)));
+        let prev_values: HashMap<_, _> = if miniblock_number.0 == 0 || missing_keys.is_empty() {
+            assert!(missing_keys.is_empty());
+            in_memory_prev_values_iter.collect()
+        } else {
+            let values_for_missing_keys: HashMap<_, _> = connection
+                .storage_logs_dal()
+                .get_storage_values(&missing_keys, miniblock_number - 1)
+                .await;
+
+            in_memory_prev_values_iter
+                .chain(
+                    values_for_missing_keys
+                        .into_iter()
+                        .map(|(k, v)| (k, v.unwrap_or_else(H256::zero))),
+                )
+                .collect()
+        };
+
+        // Effective state for keys that were touched in the current miniblock.
+        let current_values: HashMap<_, _> = storage_logs
+            .into_iter()
+            .map(|(hashed_key, value, operation_number)| (hashed_key, (value, operation_number)))
+            .collect();
+
+        // Collect effective storage logs of the miniblock and their operation numbers.
+        let (effective_logs, op_numbers_to_retain): (Vec<_>, Vec<_>) = current_values
+            .into_iter()
+            .filter_map(|(hashed_key, (value, operation_number))| {
+                let prev_value = prev_values[&hashed_key];
+                (value != prev_value).then_some(((hashed_key, value), operation_number as i32))
+            })
+            .unzip();
+
+        // Remove others, i.e. non-effective logs from DB.
+        connection
+            .storage_logs_dal()
+            .retain_storage_logs(miniblock_number, &op_numbers_to_retain)
+            .await;
+        number_of_unvacuum_rows += initial_storage_logs_count - op_numbers_to_retain.len();
+
+        // Update state cache.
+        for (key, value) in effective_logs {
+            state_cache.storage.insert(key, value);
+        }
+        state_cache.miniblock = Some(miniblock_number);
+
+        if miniblock_number.0 < 100 || miniblock_number.0 % 100 == 0 {
+            println!("Deduplicated logs for miniblock {miniblock_number}, number of unvacuumed rows {number_of_unvacuum_rows}");
+        }
+
+        if number_of_unvacuum_rows > UNVACUUMED_ROWS_THRESHOLD {
+            let started_at = std::time::Instant::now();
+            println!("Starting vacuuming");
+            connection.storage_logs_dal().vacuum_storage_logs().await;
+            number_of_unvacuum_rows = 0;
+            println!("Vacuum finished in {:?}", started_at.elapsed());
+        }
+    }
+
+    if number_of_unvacuum_rows > 0 {
+        let started_at = std::time::Instant::now();
+        println!("Starting vacuuming");
+        connection.storage_logs_dal().vacuum_storage_logs().await;
+        println!("Vacuum finished in {:?}", started_at.elapsed());
+    }
+
+    println!("Finished");
+}
diff --git a/core/bin/system-constants-generator/Cargo.toml b/core/bin/system-constants-generator/Cargo.toml
index 4d4fea76b185..561ac5167385 100644
--- a/core/bin/system-constants-generator/Cargo.toml
+++ b/core/bin/system-constants-generator/Cargo.toml
@@ -11,11 +11,11 @@ description = "Tool for generating JSON files with the system constants for L1/L
 publish = false # We don't want to publish our binaries.
 
 [dependencies]
-zksync_state = { path = "../../lib/state", version = "1.0" }
-zksync_types = { path = "../../lib/types", version = "1.0" }
-zksync_utils = { path = "../../lib/utils", version = "1.0" }
-zksync_contracts = {path = "../../lib/contracts", version = "1.0" }
-vm = {path = "../../lib/vm", version="0.1.0" }
+zksync_state = { path = "../../lib/state" }
+zksync_types = { path = "../../lib/types" }
+zksync_utils = { path = "../../lib/utils" }
+zksync_contracts = { path = "../../lib/contracts" }
+vm = { path = "../../lib/vm" }
 
 codegen = "0.2.0"
 
diff --git a/core/bin/system-constants-generator/src/intrinsic_costs.rs b/core/bin/system-constants-generator/src/intrinsic_costs.rs
index ef8db44829f4..c663939db6ee 100644
--- a/core/bin/system-constants-generator/src/intrinsic_costs.rs
+++ b/core/bin/system-constants-generator/src/intrinsic_costs.rs
@@ -21,6 +21,7 @@ pub(crate) struct VmSpentResourcesResult {
     // The total amount of gas the users have paid for.
     pub(crate) total_gas_paid: u32,
     // The total amount of gas the users have paid for public data.
+    // TODO (SMA-1698): make it an option, since sometimes its calculation is skipped.
     pub(crate) total_pubdata_paid: u32,
 }
 
diff --git a/core/bin/system-constants-generator/src/main.rs b/core/bin/system-constants-generator/src/main.rs
index 741d8e0500d6..d101647134f8 100644
--- a/core/bin/system-constants-generator/src/main.rs
+++ b/core/bin/system-constants-generator/src/main.rs
@@ -129,8 +129,8 @@ fn generate_rust_fee_constants(intrinsic_gas_constants: &IntrinsicSystemGasConst
 
     scope.raw(
         vec![
-            "H",
-            "A",
+            "// TODO (SMA-1699): Use this method to ensure that the transactions provide enough",
+            "// intrinsic gas on the API level.",
         ]
         .join("\n"),
     );
diff --git a/core/bin/system-constants-generator/src/utils.rs b/core/bin/system-constants-generator/src/utils.rs
index 1f1d5e4abeb9..3af5df328f42 100644
--- a/core/bin/system-constants-generator/src/utils.rs
+++ b/core/bin/system-constants-generator/src/utils.rs
@@ -266,6 +266,7 @@ pub(super) fn execute_user_txs_in_test_gas_vm(
         &GAS_TEST_SYSTEM_CONTRACTS,
         TxExecutionMode::VerifyExecute,
     );
+    vm.start_next_l2_block(vm.get_current_l2_block_info().dummy_next_block_info());
 
     let mut total_gas_refunded = 0;
     for tx in txs {
@@ -305,6 +306,7 @@ pub(super) fn execute_user_txs_in_test_gas_vm(
         result.full_result.contracts_used,
         result.full_result.cycles_used,
         result.full_result.computational_gas_used,
+        result.full_result.total_log_queries,
     );
 
     VmSpentResourcesResult {
diff --git a/core/bin/verification_key_generator_and_server/Cargo.toml b/core/bin/verification_key_generator_and_server/Cargo.toml
index 837e52898765..c6ade8c3c05c 100644
--- a/core/bin/verification_key_generator_and_server/Cargo.toml
+++ b/core/bin/verification_key_generator_and_server/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "zksync_verification_key_generator_and_server"
-version = "1.0.0"
+version = "0.1.0"
 edition = "2018"
 
 [lib]
@@ -20,10 +20,10 @@ name = "zksync_commitment_generator"
 path = "src/commitment_generator.rs"
 
 [dependencies]
-zksync_types = {path = "../../lib/types", version = "1.0" }
-zksync_prover_utils = {path = "../../lib/prover_utils", version = "1.0" }
-vlog = { path = "../../lib/vlog", version = "1.0" }
-circuit_testing = {git = "https://github.com/matter-labs/era-circuit_testing.git", branch = "main"}
+zksync_types = { path = "../../lib/types" }
+zksync_prover_utils = { path = "../../lib/prover_utils" }
+vlog = { path = "../../lib/vlog" }
+circuit_testing = { git = "https://github.com/matter-labs/era-circuit_testing.git", branch = "main" }
 itertools = "0.10.5"
 bincode = "1.3.3"
 
@@ -32,3 +32,4 @@ hex = "0.4.3"
 structopt = "0.3.26"
 ff = { package = "ff_ce", version = "0.14.1" }
 once_cell = "1.8.0"
+tracing = "0.1"
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 d6435ac58dcc..efc3726eccd1 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": [
-        16132018988898810280,
-        14629326668513402207,
-        13927012963228438244,
-        438836257494388653
+        974750104498669965,
+        8834694375170731028,
+        17769568165179068263,
+        1849964290686413257
       ],
       "y": [
-        9208149293484976939,
-        6928926474381817269,
-        9049839661709678601,
-        3159086914561291422
+        2843958502709968021,
+        14935491193053445350,
+        17474331455917570677,
+        3480256926594645294
       ],
       "infinity": false
     },
     {
       "x": [
-        8167991757189792621,
-        12144200201207014477,
-        11734943669898586373,
-        2193141783069775476
+        12247266302470255326,
+        5464334033464606744,
+        14546720066962635103,
+        3390803970213094244
       ],
       "y": [
-        17360142870886900923,
-        13115961790852995117,
-        18410766760283752426,
-        58598073722965045
+        1712883459777313087,
+        8894684513803091578,
+        7336029034040207862,
+        1084942733964754038
       ],
       "infinity": false
     },
     {
       "x": [
-        6146007756603285924,
-        6323811950493532548,
-        13106922048360852624,
-        466032134849380491
+        11977576082511042092,
+        13911318721427630536,
+        319094179978428102,
+        953394664847088490
       ],
       "y": [
-        18129312257576062028,
-        1862682333985860999,
-        11375866511232479537,
-        1993295577101228431
+        5661602966428088380,
+        18066888770140331931,
+        10148625466830766086,
+        532999801462127665
       ],
       "infinity": false
     },
     {
       "x": [
-        2809427848829662407,
-        12284258556184215755,
-        7636306187033076241,
-        2114748180158946072
+        10638316621700142822,
+        6209825954391834011,
+        6018402549491433521,
+        2545954919587131385
       ],
       "y": [
-        14938290724462753010,
-        4469670089738748357,
-        4333038821107617112,
-        3325252483617185630
+        3871396302214628234,
+        10421121582832311901,
+        3487262368594849688,
+        47097530491220969
       ],
       "infinity": false
     },
     {
       "x": [
-        2811571661472266293,
-        10805076128876270563,
-        13466352093104839476,
-        2679418577316861424
+        5177078736350587057,
+        913561536392131154,
+        5845225668116211782,
+        1148177573394811202
       ],
       "y": [
-        6289932497598671988,
-        10287193347450766117,
-        1002213271037575380,
-        2919063136646142593
+        8211065483139055749,
+        11150796128594731149,
+        12060516803886544192,
+        1369115203017663219
       ],
       "infinity": false
     },
     {
       "x": [
-        18040905380309423259,
-        2992050369681309630,
-        7602002287396364748,
-        610279260467961564
+        13164869081104983842,
+        8055457852373227775,
+        14586708642322040767,
+        1635508642571745116
       ],
       "y": [
-        13064134520386336340,
-        16129927882519803745,
-        2367043478173028808,
-        756367716463615162
+        13200963466266892674,
+        5743120645853669652,
+        13845956436885115425,
+        190245686570654182
       ],
       "infinity": false
     },
     {
       "x": [
-        11205248788812451673,
-        12805888223872356565,
-        3192506617534475900,
-        1788055857068087500
+        14509622964666644543,
+        14326815147327339718,
+        14403865749203816615,
+        3250250446651605086
       ],
       "y": [
-        14249524255052314472,
-        2804915545701549755,
-        8453552885321586295,
-        1517275418947033059
+        16982880826411734238,
+        7223038929743846372,
+        13243677057981888895,
+        3343376109946605946
       ],
       "infinity": false
     },
     {
       "x": [
-        3370213179722093102,
-        15232829601741289326,
-        15264565963863545427,
-        3399686965437331565
+        2186705028467599783,
+        10754157155083578321,
+        9835223072941921904,
+        622934131449235283
       ],
       "y": [
-        695972907603137570,
-        1065210392506346562,
-        13377574163460762697,
-        1438903077274895969
+        18146384691082289702,
+        3710418457832183420,
+        9065618198278602094,
+        1385809660894704773
       ],
       "infinity": false
     }
@@ -128,31 +128,31 @@
   "gate_selectors_commitments": [
     {
       "x": [
-        2916037360975110368,
-        2115449174392144212,
-        14608640754181148556,
-        971169600851407725
+        17931943108498820694,
+        4676695383650659094,
+        9553383984112211657,
+        2582659305204352628
       ],
       "y": [
-        8394386574107401239,
-        11833730770085674615,
-        2274226308564527013,
-        757668483662158276
+        12954711565738560879,
+        8077826911980788091,
+        11395265968148743331,
+        2855607571527172113
       ],
       "infinity": false
     },
     {
       "x": [
-        15790049926918974381,
-        1498916798022404031,
-        7512683194829329777,
-        130629875891522412
+        1579731699170899555,
+        2930979681521170129,
+        14423227389748779725,
+        3843483067412713
       ],
       "y": [
-        10570165756172650947,
-        16024260722575267127,
-        10403393574807352915,
-        2193441270275759098
+        12757858203360676100,
+        11658617912640524507,
+        18404463112235833117,
+        216398038700598122
       ],
       "infinity": false
     }
@@ -160,78 +160,78 @@
   "permutation_commitments": [
     {
       "x": [
-        16937140281571163722,
-        8528685593141239391,
-        14604264781363495282,
-        137274269481496519
+        17803109611249396349,
+        11283859494780689211,
+        13999735262776985506,
+        1616317395767274315
       ],
       "y": [
-        12832201597709954736,
-        14731869942190515158,
-        6098275778634872340,
-        1894980855192645736
+        4702080082438660327,
+        10318021266807502248,
+        1343468927015043909,
+        1458947702127238817
       ],
       "infinity": false
     },
     {
       "x": [
-        9506243675355227355,
-        4921543690455935123,
-        4864521994209504368,
-        1194838968611913113
+        13991248091180946539,
+        9572452770464844385,
+        7281256466642465445,
+        1589821161594539260
       ],
       "y": [
-        3514343005912152815,
-        4590983463867380289,
-        4810604720730504186,
-        2370963330363647136
+        16330872592308522669,
+        11643961078499332590,
+        7621286777424912214,
+        1961788650881680195
       ],
       "infinity": false
     },
     {
       "x": [
-        17229604967143530892,
-        10436078466088746474,
-        8131435850212543426,
-        62279533258920234
+        14854997120241085994,
+        893859077870132655,
+        10853933192917459827,
+        2671373989840251193
       ],
       "y": [
-        13233331203150147346,
-        1683012122586045301,
-        12023735178019542936,
-        209604889173254535
+        11492939649862087988,
+        1925620351626108277,
+        12007636802682139817,
+        1315346956977275889
       ],
       "infinity": false
     },
     {
       "x": [
-        2317615578050559984,
-        3409863650741942555,
-        2800913349454859982,
-        1145393423472998888
+        13343929807426311972,
+        3234215523073799496,
+        4658804614957804350,
+        123243726695066707
       ],
       "y": [
-        3313805684145217681,
-        8698235642305641581,
-        9555080423733977624,
-        1868569776379940006
+        14958243475655956241,
+        4034118281425140294,
+        1019154098165161379,
+        2657524750158613958
       ],
       "infinity": false
     }
   ],
-  "total_lookup_entries_length": 15224202,
+  "total_lookup_entries_length": 15208907,
   "lookup_selector_commitment": {
     "x": [
-      8259805827727145280,
-      16824074282046227807,
-      3121477555564412954,
-      1865943569871175431
+      3869759959209659371,
+      17545310949245876386,
+      6597968549104995840,
+      1547642766729861753
     ],
     "y": [
-      16644549437179353127,
-      14517598437143192812,
-      10007139167811704538,
-      1155056757464351841
+      5629222579571396955,
+      16315207580711001852,
+      15947168783307514478,
+      2534006098464270073
     ],
     "infinity": false
   },
@@ -299,16 +299,16 @@
   ],
   "lookup_table_type_commitment": {
     "x": [
-      15847017871013531611,
-      15599972677346614519,
-      7829590182636204190,
-      1175429517043722092
+      6380759427317126685,
+      6672737265924091686,
+      14552369645196037262,
+      1668823783737500912
     ],
     "y": [
-      3566505229345713693,
-      2712054860970341853,
-      7992126959188622741,
-      416242544149800237
+      4951884449279236371,
+      16324193898368483526,
+      10792452284404778772,
+      929770155761471462
     ],
     "infinity": false
   },
diff --git a/core/bin/verification_key_generator_and_server/src/commitment_generator.rs b/core/bin/verification_key_generator_and_server/src/commitment_generator.rs
index e9a94a7566f2..9b8bd76a6268 100644
--- a/core/bin/verification_key_generator_and_server/src/commitment_generator.rs
+++ b/core/bin/verification_key_generator_and_server/src/commitment_generator.rs
@@ -4,7 +4,7 @@ use zksync_prover_utils::vk_commitment_helper::{
 use zksync_verification_key_server::generate_commitments;
 
 fn main() {
-    vlog::info!("Starting commitment generation!");
+    tracing::info!("Starting commitment generation!");
     read_and_update_contract_toml();
 }
 
@@ -21,7 +21,7 @@ fn read_and_update_contract_toml() {
         get_toml_formatted_value(leaf_aggregation_commitment_hex);
     contract_doc["contracts"]["RECURSION_NODE_LEVEL_VK_HASH"] =
         get_toml_formatted_value(node_aggregation_commitment_hex);
-    vlog::info!("Updated toml content: {:?}", contract_doc.to_string());
+    tracing::info!("Updated toml content: {:?}", contract_doc.to_string());
     write_contract_toml(contract_doc);
 }
 
diff --git a/core/bin/verification_key_generator_and_server/src/lib.rs b/core/bin/verification_key_generator_and_server/src/lib.rs
index 5ba186a422aa..2b05363595b6 100644
--- a/core/bin/verification_key_generator_and_server/src/lib.rs
+++ b/core/bin/verification_key_generator_and_server/src/lib.rs
@@ -44,7 +44,7 @@ pub fn get_vk_for_circuit_type(
     circuit_type: u8,
 ) -> VerificationKey<Bn256, ZkSyncCircuit<Bn256, VmWitnessOracle<Bn256>>> {
     let filepath = get_file_path(circuit_type);
-    vlog::info!("Fetching verification key from path: {}", filepath);
+    tracing::info!("Fetching verification key from path: {}", filepath);
     let text = std::fs::read_to_string(&filepath)
         .unwrap_or_else(|_| panic!("Failed reading verification key from path: {}", filepath));
     serde_json::from_str::<VerificationKey<Bn256, ZkSyncCircuit<Bn256, VmWitnessOracle<Bn256>>>>(
@@ -63,7 +63,7 @@ pub fn save_vk_for_circuit_type(
     vk: VerificationKey<Bn256, ZkSyncCircuit<Bn256, VmWitnessOracle<Bn256>>>,
 ) {
     let filepath = get_file_path(circuit_type);
-    vlog::info!("saving verification key to: {}", filepath);
+    tracing::info!("saving verification key to: {}", filepath);
     std::fs::write(filepath, serde_json::to_string_pretty(&vk).unwrap()).unwrap();
 }
 
@@ -150,15 +150,15 @@ pub fn generate_commitments() -> (String, String, String) {
     let basic_circuit_commitment_hex = format!("0x{}", to_hex(&basic_circuit_commitment));
     let leaf_aggregation_commitment_hex = format!("0x{}", to_hex(&leaf_aggregation_vk_commitment));
     let node_aggregation_commitment_hex = format!("0x{}", to_hex(&node_aggregation_vk_commitment));
-    vlog::info!(
+    tracing::info!(
         "basic circuit commitment {:?}",
         basic_circuit_commitment_hex
     );
-    vlog::info!(
+    tracing::info!(
         "leaf aggregation commitment {:?}",
         leaf_aggregation_commitment_hex
     );
-    vlog::info!(
+    tracing::info!(
         "node aggregation commitment {:?}",
         node_aggregation_commitment_hex
     );
diff --git a/core/bin/verification_key_generator_and_server/src/main.rs b/core/bin/verification_key_generator_and_server/src/main.rs
index e556bfd24f59..30ffb0574d4d 100644
--- a/core/bin/verification_key_generator_and_server/src/main.rs
+++ b/core/bin/verification_key_generator_and_server/src/main.rs
@@ -15,7 +15,7 @@ fn main() {
     } else {
         (3..17).collect()
     };
-    vlog::info!("Starting verification key generation!");
+    tracing::info!("Starting verification key generation!");
     get_circuits_for_vk()
         .into_iter()
         .filter(|c| circuit_types.contains(&c.numeric_circuit_type()))
@@ -23,7 +23,7 @@ fn main() {
 }
 
 fn get_and_ensure_valid_circuit_type(circuit_type: String) -> u8 {
-    vlog::info!("Received circuit_type: {:?}", circuit_type);
+    tracing::info!("Received circuit_type: {:?}", circuit_type);
     circuit_type
         .parse::<u8>()
         .expect("Please specify a circuit type in range [1, 17]")
@@ -37,7 +37,7 @@ fn generate_verification_key(circuit: ZkSyncCircuit<Bn256, VmWitnessOracle<Bn256
     >(circuit.clone(), 26)
     .unwrap();
     save_vk_for_circuit_type(circuit.numeric_circuit_type(), res);
-    vlog::info!(
+    tracing::info!(
         "Finished VK generation for circuit {:?} (id {:?})",
         circuit.short_description(),
         circuit.numeric_circuit_type()
diff --git a/core/bin/zksync_core/Cargo.toml b/core/bin/zksync_core/Cargo.toml
index 226a77035cc6..11db825e446e 100644
--- a/core/bin/zksync_core/Cargo.toml
+++ b/core/bin/zksync_core/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "zksync_core"
-version = "1.0.0"
+version = "0.1.0"
 edition = "2018"
 authors = ["The Matter Labs Team <hello@matterlabs.dev>"]
 homepage = "https://zksync.io/"
@@ -11,37 +11,38 @@ categories = ["cryptography"]
 publish = false # We don't want to publish our binaries.
 
 [dependencies]
-zksync_state = { path = "../../lib/state", version = "1.0" }
-zksync_types = { path = "../../lib/types", version = "1.0" }
-zksync_dal = { path = "../../lib/dal", version = "1.0" }
-zksync_config = { path = "../../lib/config", version = "1.0" }
-zksync_utils = { path = "../../lib/utils", version = "1.0" }
-zksync_contracts = { path = "../../lib/contracts", version = "1.0" }
-zksync_eth_client = { path = "../../lib/eth_client", version = "1.0" }
-zksync_eth_signer = { path = "../../lib/eth_signer", version = "1.0" }
-zksync_mempool = { path = "../../lib/mempool", version = "1.0" }
-zksync_prover_utils = { path = "../../lib/prover_utils", version = "1.0" }
-zksync_queued_job_processor = { path = "../../lib/queued_job_processor", version = "1.0" }
-zksync_circuit_breaker = { path = "../../lib/circuit_breaker", version = "1.0" }
-vm = { path = "../../lib/vm", version = "0.1.0" }
-zksync_storage = { path = "../../lib/storage", version = "1.0" }
-zksync_merkle_tree = { path = "../../lib/merkle_tree", version = "1.0" }
-zksync_mini_merkle_tree = { path = "../../lib/mini_merkle_tree", version = "1.0" }
-zksync_verification_key_generator_and_server = { path = "../verification_key_generator_and_server", version = "1.0" }
-prometheus_exporter = { path = "../../lib/prometheus_exporter", version = "1.0" }
-zksync_web3_decl = { path = "../../lib/web3_decl", version = "1.0", default-features = false, features = [
-    "server", "client"
+zksync_state = { path = "../../lib/state" }
+zksync_types = { path = "../../lib/types" }
+zksync_dal = { path = "../../lib/dal" }
+zksync_config = { path = "../../lib/config" }
+zksync_utils = { path = "../../lib/utils" }
+zksync_contracts = { path = "../../lib/contracts" }
+zksync_eth_client = { path = "../../lib/eth_client" }
+zksync_eth_signer = { path = "../../lib/eth_signer" }
+zksync_mempool = { path = "../../lib/mempool" }
+zksync_prover_utils = { path = "../../lib/prover_utils" }
+zksync_queued_job_processor = { path = "../../lib/queued_job_processor" }
+zksync_circuit_breaker = { path = "../../lib/circuit_breaker" }
+vm = { path = "../../lib/vm" }
+zksync_storage = { path = "../../lib/storage" }
+zksync_merkle_tree = { path = "../../lib/merkle_tree" }
+zksync_mini_merkle_tree = { path = "../../lib/mini_merkle_tree" }
+zksync_verification_key_generator_and_server = { path = "../verification_key_generator_and_server" }
+prometheus_exporter = { path = "../../lib/prometheus_exporter" }
+zksync_web3_decl = { path = "../../lib/web3_decl", default-features = false, features = [
+    "server",
+    "client",
 ] }
-zksync_object_store = { path = "../../lib/object_store", version = "1.0" }
-zksync_health_check = { path = "../../lib/health_check", version = "0.1.0" }
-vlog = { path = "../../lib/vlog", version = "1.0" }
+zksync_object_store = { path = "../../lib/object_store" }
+zksync_health_check = { path = "../../lib/health_check" }
+vlog = { path = "../../lib/vlog" }
 
-multivm = { path = "../../lib/multivm", version = "0.1.0" }
+multivm = { path = "../../lib/multivm" }
 
 clap = { version = "4.2.4", features = ["derive"] }
 serde = { version = "1.0", features = ["derive"] }
 serde_json = "1.0"
-metrics = "0.20"
+metrics = "0.21"
 itertools = "0.10.3"
 ctrlc = { version = "3.1", features = ["termination"] }
 rand = "0.8"
@@ -68,7 +69,13 @@ hex = "0.4"
 governor = "0.4.2"
 tower-http = { version = "0.4.1", features = ["full"] }
 tower = { version = "0.4.13", features = ["full"] }
-axum = { version = "0.6.19", default-features = false, features = ["http1", "json", "tokio"] }
+axum = { version = "0.6.19", default-features = false, features = [
+    "http1",
+    "json",
+    "tokio",
+] }
+once_cell = "1.7"
+
 
 actix-rt = "2.2.0"
 actix-cors = "0.6.0-beta.2"
@@ -80,8 +87,9 @@ tracing = "0.1.26"
 tikv-jemallocator = "0.5"
 
 [dev-dependencies]
-db_test_macro = { path = "../../lib/db_test_macro", version = "0.1.0" }
+db_test_macro = { path = "../../lib/db_test_macro" }
 
 assert_matches = "1.5"
-once_cell = "1.7"
+zksync_test_account = { path = "../../lib/test_account" }
+
 tempfile = "3.0.2"
diff --git a/core/bin/zksync_core/src/api_server/contract_verification/mod.rs b/core/bin/zksync_core/src/api_server/contract_verification/mod.rs
index e49d56a695e2..f7d7be67a84c 100644
--- a/core/bin/zksync_core/src/api_server/contract_verification/mod.rs
+++ b/core/bin/zksync_core/src/api_server/contract_verification/mod.rs
@@ -51,7 +51,7 @@ pub fn start_server_thread_detached(
     replica_connection_pool: ConnectionPool,
     api_config: ContractVerificationApiConfig,
     mut stop_receiver: watch::Receiver<bool>,
-) -> JoinHandle<()> {
+) -> JoinHandle<anyhow::Result<()>> {
     let (handler, panic_sender) = spawn_panic_handler();
 
     std::thread::Builder::new()
@@ -69,7 +69,7 @@ pub fn start_server_thread_detached(
                 actix_rt::spawn(async move {
                     if stop_receiver.changed().await.is_ok() {
                         close_handle.stop(true).await;
-                        vlog::info!(
+                        tracing::info!(
                             "Stop signal received, contract verification API is shutting down"
                         );
                     }
diff --git a/core/bin/zksync_core/src/api_server/execution_sandbox/apply.rs b/core/bin/zksync_core/src/api_server/execution_sandbox/apply.rs
index b6a299eb46ca..f9c47c82ea58 100644
--- a/core/bin/zksync_core/src/api_server/execution_sandbox/apply.rs
+++ b/core/bin/zksync_core/src/api_server/execution_sandbox/apply.rs
@@ -6,26 +6,23 @@
 //!
 //! This module is intended to be blocking.
 
-use std::{
-    collections::HashMap,
-    time::{Duration, Instant},
-};
+use multivm::{VmInstance, VmInstanceData};
+use std::time::{Duration, Instant};
+use vm::{constants::BLOCK_GAS_LIMIT, HistoryDisabled, L1BatchEnv, L2BlockEnv, SystemEnv};
 
-use vm::{
-    vm_with_bootloader::{
-        derive_base_fee_and_gas_per_pubdata, init_vm, BlockContext, BlockContextMode,
-        DerivedBlockContext,
-    },
-    zk_evm::block_properties::BlockProperties,
-    HistoryDisabled, VmInstance,
+use zksync_config::constants::{
+    SYSTEM_CONTEXT_ADDRESS, SYSTEM_CONTEXT_CURRENT_L2_BLOCK_INFO_POSITION,
+    SYSTEM_CONTEXT_CURRENT_TX_ROLLING_HASH_POSITION, ZKPORTER_IS_AVAILABLE,
 };
-use zksync_config::constants::ZKPORTER_IS_AVAILABLE;
 use zksync_dal::{ConnectionPool, SqlxError, StorageProcessor};
 use zksync_state::{PostgresStorage, ReadStorage, StorageView, WriteStorage};
 use zksync_types::{
-    api, get_nonce_key,
+    api,
+    block::{legacy_miniblock_hash, pack_block_info, unpack_block_info},
+    get_nonce_key,
     utils::{decompose_full_nonce, nonces_to_full_nonce, storage_key_for_eth_balance},
-    L1BatchNumber, MiniblockNumber, Nonce, StorageKey, Transaction, H256, U256,
+    AccountTreeId, L1BatchNumber, MiniblockNumber, Nonce, ProtocolVersionId, StorageKey,
+    Transaction, H256, U256,
 };
 use zksync_utils::{h256_to_u256, time::seconds_since_epoch, u256_to_h256};
 
@@ -39,9 +36,8 @@ pub(super) fn apply_vm_in_sandbox<T>(
     connection_pool: &ConnectionPool,
     tx: Transaction,
     block_args: BlockArgs,
-    storage_read_cache: HashMap<StorageKey, H256>,
-    apply: impl FnOnce(&mut Box<VmInstance<'_, HistoryDisabled>>, Transaction) -> T,
-) -> (T, HashMap<StorageKey, H256>) {
+    apply: impl FnOnce(&mut VmInstance<'_, PostgresStorage<'_>, HistoryDisabled>, Transaction) -> T,
+) -> T {
     let stage_started_at = Instant::now();
     let span = tracing::debug_span!("initialization").entered();
 
@@ -50,20 +46,25 @@ pub(super) fn apply_vm_in_sandbox<T>(
     let connection_acquire_time = stage_started_at.elapsed();
     // We don't want to emit too many logs.
     if connection_acquire_time > Duration::from_millis(10) {
-        vlog::debug!(
+        tracing::debug!(
             "Obtained connection (took {:?})",
             stage_started_at.elapsed()
         );
     }
 
     let resolve_started_at = Instant::now();
-    let (state_block_number, vm_block_number) = rt_handle
-        .block_on(block_args.resolve_block_numbers(&mut connection))
+    let ResolvedBlockInfo {
+        state_l2_block_number,
+        vm_l1_batch_number,
+        l1_batch_timestamp,
+        protocol_version,
+    } = rt_handle
+        .block_on(block_args.resolve_block_info(&mut connection))
         .expect("Failed resolving block numbers");
     let resolve_time = resolve_started_at.elapsed();
     // We don't want to emit too many logs.
     if resolve_time > Duration::from_millis(10) {
-        vlog::debug!(
+        tracing::debug!(
             "Resolved block numbers (took {:?})",
             resolve_started_at.elapsed()
         );
@@ -72,14 +73,51 @@ pub(super) fn apply_vm_in_sandbox<T>(
     if block_args.resolves_to_latest_sealed_miniblock() {
         shared_args
             .caches
-            .schedule_values_update(state_block_number);
+            .schedule_values_update(state_l2_block_number);
     }
-    let block_timestamp = block_args.block_timestamp_seconds();
 
-    let storage = PostgresStorage::new(rt_handle.clone(), connection, state_block_number, false)
+    let mut l2_block_info_to_reset = None;
+    let current_l2_block_info =
+        rt_handle.block_on(read_l2_block_info(&mut connection, state_l2_block_number));
+    let next_l2_block_info = if block_args.is_pending_miniblock() {
+        L2BlockEnv {
+            number: current_l2_block_info.l2_block_number + 1,
+            timestamp: l1_batch_timestamp,
+            prev_block_hash: current_l2_block_info.l2_block_hash,
+            // For simplicity we assume each miniblock create one virtual block.
+            // This may be wrong only during transition period.
+            max_virtual_blocks_to_create: 1,
+        }
+    } else if current_l2_block_info.l2_block_number == 0 {
+        // Special case:
+        // - For environments, where genesis block was created before virtual block upgrade it doesn't matter what we put here.
+        // - Otherwise, we need to put actual values here. We cannot create next l2 block with block_number=0 and max_virtual_blocks_to_create=0
+        //   because of SystemContext requirements. But, due to intrinsics of SystemContext, block.number still will be resolved to 0.
+        L2BlockEnv {
+            number: 1,
+            timestamp: 0,
+            prev_block_hash: legacy_miniblock_hash(MiniblockNumber(0)),
+            max_virtual_blocks_to_create: 1,
+        }
+    } else {
+        // We need to reset L2 block info in storage to process transaction in the current block context.
+        // Actual resetting will be done after `storage_view` is created.
+        let prev_l2_block_info = rt_handle.block_on(read_l2_block_info(
+            &mut connection,
+            state_l2_block_number - 1,
+        ));
+        l2_block_info_to_reset = Some(prev_l2_block_info);
+        L2BlockEnv {
+            number: current_l2_block_info.l2_block_number,
+            timestamp: current_l2_block_info.l2_block_timestamp,
+            prev_block_hash: prev_l2_block_info.l2_block_hash,
+            max_virtual_blocks_to_create: 1,
+        }
+    };
+
+    let storage = PostgresStorage::new(rt_handle.clone(), connection, state_l2_block_number, false)
         .with_caches(shared_args.caches);
-    // Moving `storage_read_cache` to `storage_view`. It will be moved back once execution is finished and `storage_view` is not needed.
-    let mut storage_view = StorageView::new_with_read_keys(storage, storage_read_cache);
+    let mut storage_view = StorageView::new(storage);
 
     let storage_view_setup_started_at = Instant::now();
     if let Some(nonce) = execution_args.enforced_nonce {
@@ -95,47 +133,79 @@ pub(super) fn apply_vm_in_sandbox<T>(
     let mut current_balance = h256_to_u256(storage_view.read_value(&balance_key));
     current_balance += execution_args.added_balance;
     storage_view.set_value(balance_key, u256_to_h256(current_balance));
+
+    // Reset L2 block info.
+    if let Some(l2_block_info_to_reset) = l2_block_info_to_reset {
+        let l2_block_info_key = StorageKey::new(
+            AccountTreeId::new(SYSTEM_CONTEXT_ADDRESS),
+            SYSTEM_CONTEXT_CURRENT_L2_BLOCK_INFO_POSITION,
+        );
+        let l2_block_info = pack_block_info(
+            l2_block_info_to_reset.l2_block_number as u64,
+            l2_block_info_to_reset.l2_block_timestamp,
+        );
+        storage_view.set_value(l2_block_info_key, u256_to_h256(l2_block_info));
+
+        let l2_block_txs_rolling_hash_key = StorageKey::new(
+            AccountTreeId::new(SYSTEM_CONTEXT_ADDRESS),
+            SYSTEM_CONTEXT_CURRENT_TX_ROLLING_HASH_POSITION,
+        );
+        storage_view.set_value(
+            l2_block_txs_rolling_hash_key,
+            l2_block_info_to_reset.txs_rolling_hash,
+        );
+    }
+
     let storage_view_setup_time = storage_view_setup_started_at.elapsed();
     // We don't want to emit too many logs.
     if storage_view_setup_time > Duration::from_millis(10) {
-        vlog::debug!("Prepared the storage view (took {storage_view_setup_time:?})",);
+        tracing::debug!("Prepared the storage view (took {storage_view_setup_time:?})",);
     }
 
-    let mut oracle_tools = vm::OracleTools::new(&mut storage_view, HistoryDisabled);
-    let block_properties = BlockProperties {
-        default_aa_code_hash: h256_to_u256(shared_args.base_system_contracts.default_aa.hash),
-        zkporter_is_available: ZKPORTER_IS_AVAILABLE,
-    };
     let TxSharedArgs {
+        operator_account,
         l1_gas_price,
         fair_l2_gas_price,
+        base_system_contracts,
+        validation_computational_gas_limit,
+        chain_id,
         ..
     } = shared_args;
 
-    let block_context = DerivedBlockContext {
-        context: BlockContext {
-            block_number: vm_block_number.0,
-            block_timestamp,
-            l1_gas_price,
-            fair_l2_gas_price,
-            operator_address: *shared_args.operator_account.address(),
-        },
-        base_fee: execution_args.enforced_base_fee.unwrap_or_else(|| {
-            derive_base_fee_and_gas_per_pubdata(l1_gas_price, fair_l2_gas_price).0
-        }),
+    let system_env = SystemEnv {
+        zk_porter_available: ZKPORTER_IS_AVAILABLE,
+        version: protocol_version,
+        base_system_smart_contracts: base_system_contracts
+            .get_by_protocol_version(protocol_version),
+        gas_limit: BLOCK_GAS_LIMIT,
+        execution_mode: execution_args.execution_mode,
+        default_validation_computational_gas_limit: validation_computational_gas_limit,
+        chain_id,
     };
 
-    // Since this method assumes that the block vm_block_number-1 is present in the DB, it means that its hash
-    // has already been stored in the VM.
-    let block_context_properties = BlockContextMode::OverrideCurrent(block_context);
+    let l1_batch_env = L1BatchEnv {
+        previous_batch_hash: None,
+        number: vm_l1_batch_number,
+        timestamp: l1_batch_timestamp,
+        l1_gas_price,
+        fair_l2_gas_price,
+        fee_account: *operator_account.address(),
+        enforced_base_fee: execution_args.enforced_base_fee,
+        first_l2_block: next_l2_block_info,
+    };
 
-    let mut vm = init_vm(
-        &mut oracle_tools,
-        block_context_properties,
-        &block_properties,
-        execution_args.execution_mode,
-        &shared_args.base_system_contracts,
+    let storage_view = storage_view.to_rc_ptr();
+    let mut initial_version = VmInstanceData::new_for_specific_vm_version(
+        storage_view.clone(),
+        &system_env,
+        HistoryDisabled,
+        protocol_version.into_api_vm_version(),
     );
+    let mut vm = Box::new(VmInstance::new(
+        l1_batch_env,
+        system_env,
+        &mut initial_version,
+    ));
 
     metrics::histogram!("api.web3.sandbox", stage_started_at.elapsed(), "stage" => "initialization");
     span.exit();
@@ -150,70 +220,140 @@ pub(super) fn apply_vm_in_sandbox<T>(
     let vm_execution_took = stage_started_at.elapsed();
     metrics::histogram!("api.web3.sandbox", vm_execution_took, "stage" => "execution");
 
-    let oracles_sizes = vm_metrics::record_vm_memory_metrics(&vm);
-    vm_metrics::report_storage_view_metrics(
-        &tx_id,
-        oracles_sizes,
-        vm_execution_took,
-        storage_view.metrics(),
-    );
+    let memory_metrics = vm.record_vm_memory_metrics();
+    if let Some(memory_metrics) = memory_metrics {
+        vm_metrics::report_vm_memory_metrics(
+            &tx_id,
+            &memory_metrics,
+            vm_execution_took,
+            storage_view.as_ref().borrow_mut().metrics(),
+        );
+    }
     drop(vm_permit); // Ensure that the permit lives until this point
 
-    // Move `read_storage_keys` from `storage_view` back to cache.
-    (result, storage_view.into_read_storage_keys())
+    result
 }
 
-impl BlockArgs {
-    fn is_pending_miniblock(&self) -> bool {
-        matches!(
-            self.block_id,
-            api::BlockId::Number(api::BlockNumber::Pending)
-        )
+#[derive(Debug, Clone, Copy)]
+struct StoredL2BlockInfo {
+    pub l2_block_number: u32,
+    pub l2_block_timestamp: u64,
+    pub l2_block_hash: H256,
+    pub txs_rolling_hash: H256,
+}
+
+async fn read_l2_block_info(
+    connection: &mut StorageProcessor<'_>,
+    miniblock_number: MiniblockNumber,
+) -> StoredL2BlockInfo {
+    let l2_block_info_key = StorageKey::new(
+        AccountTreeId::new(SYSTEM_CONTEXT_ADDRESS),
+        SYSTEM_CONTEXT_CURRENT_L2_BLOCK_INFO_POSITION,
+    );
+    let l2_block_info = connection
+        .storage_web3_dal()
+        .get_historical_value_unchecked(&l2_block_info_key, miniblock_number)
+        .await
+        .unwrap();
+    let (l2_block_number, l2_block_timestamp) = unpack_block_info(h256_to_u256(l2_block_info));
+
+    let l2_block_txs_rolling_hash_key = StorageKey::new(
+        AccountTreeId::new(SYSTEM_CONTEXT_ADDRESS),
+        SYSTEM_CONTEXT_CURRENT_TX_ROLLING_HASH_POSITION,
+    );
+    let txs_rolling_hash = connection
+        .storage_web3_dal()
+        .get_historical_value_unchecked(&l2_block_txs_rolling_hash_key, miniblock_number)
+        .await
+        .unwrap();
+
+    let l2_block_hash = connection
+        .blocks_web3_dal()
+        .get_miniblock_hash(miniblock_number)
+        .await
+        .unwrap()
+        .unwrap();
+
+    StoredL2BlockInfo {
+        l2_block_number: l2_block_number as u32,
+        l2_block_timestamp,
+        l2_block_hash,
+        txs_rolling_hash,
     }
+}
+
+#[derive(Debug)]
+struct ResolvedBlockInfo {
+    pub state_l2_block_number: MiniblockNumber,
+    pub vm_l1_batch_number: L1BatchNumber,
+    pub l1_batch_timestamp: u64,
+    pub protocol_version: ProtocolVersionId,
+}
 
-    fn resolves_to_latest_sealed_miniblock(&self) -> bool {
+impl BlockArgs {
+    pub(crate) fn is_pending_miniblock(&self) -> bool {
         matches!(
             self.block_id,
-            api::BlockId::Number(
-                api::BlockNumber::Pending | api::BlockNumber::Latest | api::BlockNumber::Committed
-            )
+            api::BlockId::Number(api::BlockNumber::Pending)
         )
     }
 
-    async fn resolve_block_numbers(
+    async fn resolve_block_info(
         &self,
         connection: &mut StorageProcessor<'_>,
-    ) -> Result<(MiniblockNumber, L1BatchNumber), SqlxError> {
-        Ok(if self.is_pending_miniblock() {
-            let sealed_l1_batch_number = connection
-                .blocks_web3_dal()
-                .get_sealed_l1_batch_number()
-                .await?;
-            let sealed_miniblock_number = connection
-                .blocks_web3_dal()
-                .get_sealed_miniblock_number()
-                .await?;
-            (sealed_miniblock_number, sealed_l1_batch_number + 1)
-        } else {
-            let l1_batch_number = connection
-                .storage_web3_dal()
-                .resolve_l1_batch_number_of_miniblock(self.resolved_block_number)
-                .await?
-                .expected_l1_batch();
-            (self.resolved_block_number, l1_batch_number)
-        })
-    }
+    ) -> Result<ResolvedBlockInfo, SqlxError> {
+        let (state_l2_block_number, vm_l1_batch_number, l1_batch_timestamp) =
+            if self.is_pending_miniblock() {
+                let sealed_l1_batch_number = connection
+                    .blocks_web3_dal()
+                    .get_sealed_l1_batch_number()
+                    .await?;
+                let sealed_miniblock_header = connection
+                    .blocks_dal()
+                    .get_last_sealed_miniblock_header()
+                    .await
+                    .expect("At least one miniblock must exist");
 
-    fn block_timestamp_seconds(&self) -> u64 {
-        if self.is_pending_miniblock() {
-            seconds_since_epoch()
-        } else {
-            self.block_timestamp_s.unwrap_or_else(|| {
-                panic!(
-                    "Block timestamp is `None`, `block_id`: {:?}, `resolved_block_number`: {}",
+                // Timestamp of the next L1 batch must be greater than the timestamp of the last miniblock.
+                let l1_batch_timestamp =
+                    seconds_since_epoch().max(sealed_miniblock_header.timestamp + 1);
+                (
+                    sealed_miniblock_header.number,
+                    sealed_l1_batch_number + 1,
+                    l1_batch_timestamp,
+                )
+            } else {
+                let l1_batch_number = connection
+                    .storage_web3_dal()
+                    .resolve_l1_batch_number_of_miniblock(self.resolved_block_number)
+                    .await?
+                    .expected_l1_batch();
+                let l1_batch_timestamp = self.l1_batch_timestamp_s.unwrap_or_else(|| {
+                    panic!(
+                    "L1 batch timestamp is `None`, `block_id`: {:?}, `resolved_block_number`: {}",
                     self.block_id, self.resolved_block_number.0
                 );
-            })
-        }
+                });
+
+                (
+                    self.resolved_block_number,
+                    l1_batch_number,
+                    l1_batch_timestamp,
+                )
+            };
+
+        // Blocks without version specified are considered to be of `Version9`.
+        // TODO: remove `unwrap_or` when protocol version ID will be assigned for each block.
+        let protocol_version = connection
+            .blocks_dal()
+            .get_miniblock_protocol_version_id(state_l2_block_number)
+            .await
+            .unwrap_or(ProtocolVersionId::Version9);
+        Ok(ResolvedBlockInfo {
+            state_l2_block_number,
+            vm_l1_batch_number,
+            l1_batch_timestamp,
+            protocol_version,
+        })
     }
 }
diff --git a/core/bin/zksync_core/src/api_server/execution_sandbox/error.rs b/core/bin/zksync_core/src/api_server/execution_sandbox/error.rs
index 4b67d987ebcf..abc50af37a5f 100644
--- a/core/bin/zksync_core/src/api_server/execution_sandbox/error.rs
+++ b/core/bin/zksync_core/src/api_server/execution_sandbox/error.rs
@@ -1,6 +1,6 @@
 use thiserror::Error;
 
-use vm::TxRevertReason;
+use vm::{Halt, TxRevertReason};
 
 #[derive(Debug, Error)]
 pub(crate) enum SandboxExecutionError {
@@ -27,57 +27,52 @@ pub(crate) enum SandboxExecutionError {
         that caused this error. Error description: {0}"
     )]
     UnexpectedVMBehavior(String),
-    #[error("Transaction is unexecutable. Reason: {0}")]
-    Unexecutable(String),
 }
 
-impl From<TxRevertReason> for SandboxExecutionError {
-    fn from(reason: TxRevertReason) -> Self {
-        match reason {
-            TxRevertReason::EthCall(reason) => SandboxExecutionError::Revert(
-                reason.to_user_friendly_string(),
-                reason.encoded_data(),
-            ),
-            TxRevertReason::TxReverted(reason) => SandboxExecutionError::Revert(
-                reason.to_user_friendly_string(),
-                reason.encoded_data(),
-            ),
-            TxRevertReason::FailedToChargeFee(reason) => {
-                SandboxExecutionError::FailedToChargeFee(reason.to_string())
-            }
-            TxRevertReason::FromIsNotAnAccount => SandboxExecutionError::FromIsNotAnAccount,
-            TxRevertReason::InnerTxError => SandboxExecutionError::InnerTxError,
-            TxRevertReason::Unknown(reason) => {
-                SandboxExecutionError::BootloaderFailure(reason.to_string())
-            }
-            TxRevertReason::ValidationFailed(reason) => {
-                SandboxExecutionError::AccountValidationFailed(reason.to_string())
-            }
-            TxRevertReason::PaymasterValidationFailed(reason) => {
-                SandboxExecutionError::PaymasterValidationFailed(reason.to_string())
+impl From<Halt> for SandboxExecutionError {
+    fn from(value: Halt) -> Self {
+        match value {
+            Halt::FailedToChargeFee(reason) => Self::FailedToChargeFee(reason.to_string()),
+            Halt::FromIsNotAnAccount => Self::FromIsNotAnAccount,
+            Halt::InnerTxError => Self::InnerTxError,
+            Halt::Unknown(reason) => Self::BootloaderFailure(reason.to_string()),
+            Halt::ValidationFailed(reason) => Self::AccountValidationFailed(reason.to_string()),
+            Halt::PaymasterValidationFailed(reason) => {
+                Self::PaymasterValidationFailed(reason.to_string())
             }
-            TxRevertReason::PrePaymasterPreparationFailed(reason) => {
-                SandboxExecutionError::PrePaymasterPreparationFailed(reason.to_string())
+            Halt::PrePaymasterPreparationFailed(reason) => {
+                Self::PrePaymasterPreparationFailed(reason.to_string())
             }
-            TxRevertReason::UnexpectedVMBehavior(reason) => {
-                SandboxExecutionError::UnexpectedVMBehavior(reason)
+            Halt::UnexpectedVMBehavior(reason) => Self::UnexpectedVMBehavior(reason),
+            Halt::BootloaderOutOfGas => {
+                Self::UnexpectedVMBehavior("bootloader is out of gas".to_string())
             }
-            TxRevertReason::BootloaderOutOfGas => {
-                SandboxExecutionError::UnexpectedVMBehavior("bootloader is out of gas".to_string())
-            }
-            TxRevertReason::NotEnoughGasProvided => SandboxExecutionError::UnexpectedVMBehavior(
+            Halt::NotEnoughGasProvided => Self::UnexpectedVMBehavior(
                 "The bootloader did not contain enough gas to execute the transaction".to_string(),
             ),
-            revert_reason @ TxRevertReason::FailedToMarkFactoryDependencies(_) => {
-                SandboxExecutionError::Revert(revert_reason.to_string(), vec![])
-            }
-            TxRevertReason::PayForTxFailed(reason) => {
-                SandboxExecutionError::FailedToPayForTransaction(reason.to_string())
+            revert_reason @ Halt::FailedToMarkFactoryDependencies(_) => {
+                Self::Revert(revert_reason.to_string(), vec![])
             }
-            TxRevertReason::TooBigGasLimit => {
-                SandboxExecutionError::Revert(TxRevertReason::TooBigGasLimit.to_string(), vec![])
+            Halt::PayForTxFailed(reason) => Self::FailedToPayForTransaction(reason.to_string()),
+            Halt::TooBigGasLimit => Self::Revert(Halt::TooBigGasLimit.to_string(), vec![]),
+            Halt::MissingInvocationLimitReached => Self::InnerTxError,
+            Halt::VMPanic => Self::UnexpectedVMBehavior("VM panic".to_string()),
+            Halt::FailedToSetL2Block(reason) => SandboxExecutionError::Revert(reason, vec![]),
+            Halt::FailedToAppendTransactionToL2Block(reason) => {
+                SandboxExecutionError::Revert(reason, vec![])
             }
-            TxRevertReason::MissingInvocationLimitReached => SandboxExecutionError::InnerTxError,
+        }
+    }
+}
+
+impl From<TxRevertReason> for SandboxExecutionError {
+    fn from(reason: TxRevertReason) -> Self {
+        match reason {
+            TxRevertReason::TxReverted(reason) => SandboxExecutionError::Revert(
+                reason.to_user_friendly_string(),
+                reason.encoded_data(),
+            ),
+            TxRevertReason::Halt(halt) => SandboxExecutionError::from(halt),
         }
     }
 }
diff --git a/core/bin/zksync_core/src/api_server/execution_sandbox/execute.rs b/core/bin/zksync_core/src/api_server/execution_sandbox/execute.rs
index 8f083a0022c3..ec3079a06b3e 100644
--- a/core/bin/zksync_core/src/api_server/execution_sandbox/execute.rs
+++ b/core/bin/zksync_core/src/api_server/execution_sandbox/execute.rs
@@ -2,22 +2,18 @@
 
 use tracing::{span, Level};
 
-use std::{collections::HashMap, mem};
-
+use multivm::MultivmTracer;
 use vm::{
-    utils::ETH_CALL_GAS_LIMIT,
-    vm_with_bootloader::{
-        push_transaction_to_bootloader_memory, BootloaderJobType, TxExecutionMode,
-    },
-    VmExecutionResult,
+    constants::ETH_CALL_GAS_LIMIT, StorageInvocations, TxExecutionMode, VmExecutionResultAndLogs,
 };
 use zksync_dal::ConnectionPool;
+
 use zksync_types::{
-    fee::TransactionExecutionMetrics, l2::L2Tx, ExecuteTransactionCommon, Nonce, StorageKey,
-    Transaction, H256, U256,
+    fee::TransactionExecutionMetrics, l2::L2Tx, ExecuteTransactionCommon, Nonce,
+    PackedEthSignature, Transaction, U256,
 };
 
-use super::{apply, error::SandboxExecutionError, vm_metrics, BlockArgs, TxSharedArgs, VmPermit};
+use super::{apply, vm_metrics, ApiTracer, BlockArgs, TxSharedArgs, VmPermit};
 
 #[derive(Debug)]
 pub(crate) struct TxExecutionArgs {
@@ -25,6 +21,7 @@ pub(crate) struct TxExecutionArgs {
     pub enforced_nonce: Option<Nonce>,
     pub added_balance: U256,
     pub enforced_base_fee: Option<u64>,
+    pub missed_storage_invocation_limit: usize,
 }
 
 impl TxExecutionArgs {
@@ -34,6 +31,7 @@ impl TxExecutionArgs {
             enforced_nonce: Some(tx.nonce()),
             added_balance: U256::zero(),
             enforced_base_fee: Some(tx.common_data.fee.max_fee_per_gas.as_u64()),
+            missed_storage_invocation_limit: usize::MAX,
         }
     }
 
@@ -43,12 +41,11 @@ impl TxExecutionArgs {
     ) -> Self {
         let missed_storage_invocation_limit = vm_execution_cache_misses_limit.unwrap_or(usize::MAX);
         Self {
-            execution_mode: TxExecutionMode::EthCall {
-                missed_storage_invocation_limit,
-            },
+            execution_mode: TxExecutionMode::EthCall,
             enforced_nonce: None,
             added_balance: U256::zero(),
             enforced_base_fee: Some(enforced_base_fee),
+            missed_storage_invocation_limit,
         }
     }
 
@@ -67,9 +64,8 @@ impl TxExecutionArgs {
         };
 
         Self {
-            execution_mode: TxExecutionMode::EstimateFee {
-                missed_storage_invocation_limit,
-            },
+            execution_mode: TxExecutionMode::EstimateFee,
+            missed_storage_invocation_limit,
             enforced_nonce: tx.nonce(),
             added_balance,
             enforced_base_fee: Some(base_fee),
@@ -84,12 +80,16 @@ pub(crate) async fn execute_tx_eth_call(
     mut tx: L2Tx,
     block_args: BlockArgs,
     vm_execution_cache_misses_limit: Option<usize>,
-    trace_call: bool,
-) -> Result<VmExecutionResult, SandboxExecutionError> {
+    custom_tracers: Vec<ApiTracer>,
+) -> VmExecutionResultAndLogs {
     let enforced_base_fee = tx.common_data.fee.max_fee_per_gas.as_u64();
     let execution_args =
         TxExecutionArgs::for_eth_call(enforced_base_fee, vm_execution_cache_misses_limit);
 
+    if tx.common_data.signature.is_empty() {
+        tx.common_data.signature = PackedEthSignature::default().serialize_packed().into();
+    }
+
     // Protection against infinite-loop eth_calls and alike:
     // limiting the amount of gas the call can use.
     // We can't use BLOCK_ERGS_LIMIT here since the VM itself has some overhead.
@@ -101,9 +101,7 @@ pub(crate) async fn execute_tx_eth_call(
         connection_pool,
         tx.into(),
         block_args,
-        BootloaderJobType::TransactionExecution,
-        trace_call,
-        &mut HashMap::new(),
+        custom_tracers,
     )
     .await;
 
@@ -117,11 +115,7 @@ pub(crate) async fn execute_tx_with_pending_state(
     execution_args: TxExecutionArgs,
     connection_pool: ConnectionPool,
     tx: Transaction,
-    storage_read_cache: &mut HashMap<StorageKey, H256>,
-) -> (
-    Result<VmExecutionResult, SandboxExecutionError>,
-    TransactionExecutionMetrics,
-) {
+) -> (VmExecutionResultAndLogs, TransactionExecutionMetrics) {
     let mut connection = connection_pool.access_storage_tagged("api").await;
     let block_args = BlockArgs::pending(&mut connection).await;
     drop(connection);
@@ -136,9 +130,7 @@ pub(crate) async fn execute_tx_with_pending_state(
         connection_pool,
         tx,
         block_args,
-        BootloaderJobType::TransactionExecution,
-        false,
-        storage_read_cache,
+        vec![],
     )
     .await
 }
@@ -154,23 +146,16 @@ async fn execute_tx_in_sandbox(
     connection_pool: ConnectionPool,
     tx: Transaction,
     block_args: BlockArgs,
-    job_type: BootloaderJobType,
-    trace_call: bool,
-    storage_read_cache: &mut HashMap<StorageKey, H256>,
-) -> (
-    Result<VmExecutionResult, SandboxExecutionError>,
-    TransactionExecutionMetrics,
-) {
+    custom_tracers: Vec<ApiTracer>,
+) -> (VmExecutionResultAndLogs, TransactionExecutionMetrics) {
     let total_factory_deps = tx
         .execute
         .factory_deps
         .as_ref()
         .map_or(0, |deps| deps.len() as u16);
 
-    let moved_cache = mem::take(storage_read_cache);
-    let (execution_result, moved_cache) = tokio::task::spawn_blocking(move || {
+    let execution_result = tokio::task::spawn_blocking(move || {
         let span = span!(Level::DEBUG, "execute_in_sandbox").entered();
-        let execution_mode = execution_args.execution_mode;
         let result = apply::apply_vm_in_sandbox(
             vm_permit,
             shared_args,
@@ -178,15 +163,16 @@ async fn execute_tx_in_sandbox(
             &connection_pool,
             tx,
             block_args,
-            moved_cache,
             |vm, tx| {
-                push_transaction_to_bootloader_memory(vm, &tx, execution_mode, None);
-                let result = if trace_call {
-                    vm.execute_till_block_end_with_call_tracer(job_type)
-                } else {
-                    vm.execute_till_block_end(job_type)
-                };
-                result.full_result
+                vm.push_transaction(&tx);
+                let storage_invocation_tracer =
+                    StorageInvocations::new(execution_args.missed_storage_invocation_limit);
+                let custom_tracers: Vec<_> = custom_tracers
+                    .into_iter()
+                    .map(|tracer| tracer.into_boxed())
+                    .chain(vec![storage_invocation_tracer.into_boxed()])
+                    .collect();
+                vm.inspect_next_transaction(custom_tracers)
             },
         );
         span.exit();
@@ -195,13 +181,7 @@ async fn execute_tx_in_sandbox(
     .await
     .unwrap();
 
-    *storage_read_cache = moved_cache;
-
     let tx_execution_metrics =
         vm_metrics::collect_tx_execution_metrics(total_factory_deps, &execution_result);
-    let result = match execution_result.revert_reason {
-        None => Ok(execution_result),
-        Some(revert) => Err(revert.revert_reason.into()),
-    };
-    (result, tx_execution_metrics)
+    (execution_result, tx_execution_metrics)
 }
diff --git a/core/bin/zksync_core/src/api_server/execution_sandbox/mod.rs b/core/bin/zksync_core/src/api_server/execution_sandbox/mod.rs
index 2fe593c57e21..675512b5a167 100644
--- a/core/bin/zksync_core/src/api_server/execution_sandbox/mod.rs
+++ b/core/bin/zksync_core/src/api_server/execution_sandbox/mod.rs
@@ -1,28 +1,28 @@
+use std::sync::Arc;
+use std::time::{Duration, Instant};
 use tokio::runtime::Handle;
 
-use std::{
-    sync::Arc,
-    time::{Duration, Instant},
-};
-
-use vm::vm_with_bootloader::derive_base_fee_and_gas_per_pubdata;
+use vm::utils::fee::derive_base_fee_and_gas_per_pubdata;
 use zksync_config::constants::PUBLISH_BYTECODE_OVERHEAD;
-use zksync_contracts::BaseSystemContracts;
 use zksync_dal::{ConnectionPool, SqlxError, StorageProcessor};
 use zksync_state::{PostgresStorage, PostgresStorageCaches, ReadStorage, StorageView};
-use zksync_types::{api, AccountTreeId, MiniblockNumber, U256};
+use zksync_types::{api, AccountTreeId, L2ChainId, MiniblockNumber, U256};
 use zksync_utils::bytecode::{compress_bytecode, hash_bytecode};
 
+use super::tx_sender::MultiVMBaseSystemContracts;
+
 // Note: keep the modules private, and instead re-export functions that make public interface.
 mod apply;
 mod error;
 mod execute;
+mod tracers;
 mod validate;
 mod vm_metrics;
 
 pub(super) use self::{
     error::SandboxExecutionError,
     execute::{execute_tx_eth_call, execute_tx_with_pending_state, TxExecutionArgs},
+    tracers::ApiTracer,
 };
 
 /// Permit to invoke VM code.
@@ -54,7 +54,7 @@ impl VmConcurrencyBarrier {
     /// Shuts down the related VM concurrency limiter so that it won't issue new permits.
     pub fn close(&self) {
         self.limiter.close();
-        vlog::info!("VM concurrency limiter closed");
+        tracing::info!("VM concurrency limiter closed");
     }
 
     /// Waits until all permits issued by the VM concurrency limiter are dropped.
@@ -68,7 +68,7 @@ impl VmConcurrencyBarrier {
 
         loop {
             let current_permits = self.limiter.available_permits();
-            vlog::debug!(
+            tracing::debug!(
                 "Waiting until all VM permits are dropped; currently remaining: {} / {}",
                 self.max_concurrency - current_permits,
                 self.max_concurrency
@@ -100,7 +100,7 @@ pub struct VmConcurrencyLimiter {
 impl VmConcurrencyLimiter {
     /// Creates a limiter together with a barrier allowing to control its shutdown.
     pub fn new(max_concurrency: usize) -> (Self, VmConcurrencyBarrier) {
-        vlog::info!(
+        tracing::info!(
             "Initializing the VM concurrency limiter with max concurrency {max_concurrency}"
         );
         let limiter = Arc::new(tokio::sync::Semaphore::new(max_concurrency));
@@ -130,7 +130,7 @@ impl VmConcurrencyLimiter {
         let elapsed = start.elapsed();
         // We don't want to emit too many logs.
         if elapsed > Duration::from_millis(10) {
-            vlog::debug!(
+            tracing::debug!(
                 "Permit is obtained. Available permits: {available_permits}. Took {elapsed:?}"
             );
         }
@@ -225,8 +225,10 @@ pub(crate) struct TxSharedArgs {
     pub operator_account: AccountTreeId,
     pub l1_gas_price: u64,
     pub fair_l2_gas_price: u64,
-    pub base_system_contracts: BaseSystemContracts,
+    pub base_system_contracts: MultiVMBaseSystemContracts,
     pub caches: PostgresStorageCaches,
+    pub validation_computational_gas_limit: u32,
+    pub chain_id: L2ChainId,
 }
 
 /// Information about a block provided to VM.
@@ -234,7 +236,7 @@ pub(crate) struct TxSharedArgs {
 pub(crate) struct BlockArgs {
     block_id: api::BlockId,
     resolved_block_number: MiniblockNumber,
-    block_timestamp_s: Option<u64>,
+    l1_batch_timestamp_s: Option<u64>,
 }
 
 impl BlockArgs {
@@ -243,7 +245,7 @@ impl BlockArgs {
         Self {
             block_id,
             resolved_block_number,
-            block_timestamp_s: None,
+            l1_batch_timestamp_s: None,
         }
     }
 
@@ -252,6 +254,10 @@ impl BlockArgs {
         connection: &mut StorageProcessor<'_>,
         block_id: api::BlockId,
     ) -> Result<Option<Self>, SqlxError> {
+        if block_id == api::BlockId::Number(api::BlockNumber::Pending) {
+            return Ok(Some(BlockArgs::pending(connection).await));
+        }
+
         let resolved_block_number = connection
             .blocks_web3_dal()
             .resolve_block_id(block_id)
@@ -260,14 +266,36 @@ impl BlockArgs {
             return Ok(None);
         };
 
-        let block_timestamp_s = connection
+        let l1_batch_number = connection
+            .storage_web3_dal()
+            .resolve_l1_batch_number_of_miniblock(resolved_block_number)
+            .await?
+            .expected_l1_batch();
+        let l1_batch_timestamp_s = connection
             .blocks_web3_dal()
-            .get_block_timestamp(resolved_block_number)
+            .get_expected_l1_batch_timestamp(l1_batch_number)
             .await?;
+        assert!(
+            l1_batch_timestamp_s.is_some(),
+            "Missing batch timestamp for non-pending block"
+        );
         Ok(Some(Self {
             block_id,
             resolved_block_number,
-            block_timestamp_s,
+            l1_batch_timestamp_s,
         }))
     }
+
+    pub fn resolved_block_number(&self) -> MiniblockNumber {
+        self.resolved_block_number
+    }
+
+    pub fn resolves_to_latest_sealed_miniblock(&self) -> bool {
+        matches!(
+            self.block_id,
+            api::BlockId::Number(
+                api::BlockNumber::Pending | api::BlockNumber::Latest | api::BlockNumber::Committed
+            )
+        )
+    }
 }
diff --git a/core/bin/zksync_core/src/api_server/execution_sandbox/tracers.rs b/core/bin/zksync_core/src/api_server/execution_sandbox/tracers.rs
new file mode 100644
index 000000000000..ad6a65f1373f
--- /dev/null
+++ b/core/bin/zksync_core/src/api_server/execution_sandbox/tracers.rs
@@ -0,0 +1,22 @@
+use multivm::MultivmTracer;
+use once_cell::sync::OnceCell;
+use std::sync::Arc;
+use vm::{CallTracer, HistoryMode};
+use zksync_state::WriteStorage;
+use zksync_types::vm_trace::Call;
+
+/// Custom tracers supported by our api
+#[derive(Debug)]
+pub(crate) enum ApiTracer {
+    CallTracer(Arc<OnceCell<Vec<Call>>>),
+}
+
+impl ApiTracer {
+    pub fn into_boxed<S: WriteStorage, H: HistoryMode + 'static>(
+        self,
+    ) -> Box<dyn MultivmTracer<S, H>> {
+        match self {
+            ApiTracer::CallTracer(tracer) => CallTracer::new(tracer, H::default()).into_boxed(),
+        }
+    }
+}
diff --git a/core/bin/zksync_core/src/api_server/execution_sandbox/validate.rs b/core/bin/zksync_core/src/api_server/execution_sandbox/validate.rs
index 0b09d03cdbfe..8e4138b5e702 100644
--- a/core/bin/zksync_core/src/api_server/execution_sandbox/validate.rs
+++ b/core/bin/zksync_core/src/api_server/execution_sandbox/validate.rs
@@ -1,11 +1,12 @@
-use std::{
-    collections::{HashMap, HashSet},
-    time::Instant,
-};
+use std::{collections::HashSet, time::Instant};
 
-use vm::oracles::tracer::{ValidationError, ValidationTracerParams};
-use vm::vm_with_bootloader::push_transaction_to_bootloader_memory;
+use multivm::MultivmTracer;
+use vm::{
+    ExecutionResult, HistoryDisabled, StorageInvocations, ValidationError, ValidationTracer,
+    ValidationTracerParams,
+};
 use zksync_dal::{ConnectionPool, StorageProcessor};
+
 use zksync_types::{l2::L2Tx, Transaction, TRUSTED_ADDRESS_SLOTS, TRUSTED_TOKEN_SLOTS, U256};
 
 use super::{
@@ -59,9 +60,9 @@ impl TxSharedArgs {
         drop(connection);
 
         let execution_args = TxExecutionArgs::for_validation(&tx);
-        let execution_mode = execution_args.execution_mode;
         let tx: Transaction = tx.into();
-        let (validation_result, _) = tokio::task::spawn_blocking(move || {
+
+        let validation_result = tokio::task::spawn_blocking(move || {
             let span = tracing::debug_span!("validate_in_sandbox").entered();
             let result = apply::apply_vm_in_sandbox(
                 vm_permit,
@@ -70,12 +71,26 @@ impl TxSharedArgs {
                 &connection_pool,
                 tx,
                 block_args,
-                HashMap::new(),
                 |vm, tx| {
                     let stage_started_at = Instant::now();
                     let span = tracing::debug_span!("validation").entered();
-                    push_transaction_to_bootloader_memory(vm, &tx, execution_mode, None);
-                    let result = vm.execute_validation(validation_params);
+                    vm.push_transaction(&tx);
+
+                    let (tracer, validation_result) = ValidationTracer::<HistoryDisabled>::new(
+                        validation_params,
+                    );
+
+                    let result = vm.inspect_next_transaction(vec![
+                        tracer.into_boxed(),
+                        StorageInvocations::new(execution_args.missed_storage_invocation_limit).into_boxed()
+                    ]);
+
+                    let result = match (result.result, validation_result.get()) {
+                        (ExecutionResult::Halt { reason }, _) => Err(ValidationError::FailedTx(reason)),
+                        (_, Some(err)) => Err(ValidationError::ViolatedRule(err.clone())),
+                        (_, None) => Ok(()),
+                    };
+
 
                     metrics::histogram!("api.web3.sandbox", stage_started_at.elapsed(), "stage" => "validation");
                     span.exit();
diff --git a/core/bin/zksync_core/src/api_server/execution_sandbox/vm_metrics.rs b/core/bin/zksync_core/src/api_server/execution_sandbox/vm_metrics.rs
index fc7e06cf632f..e0d7d3ea7be9 100644
--- a/core/bin/zksync_core/src/api_server/execution_sandbox/vm_metrics.rs
+++ b/core/bin/zksync_core/src/api_server/execution_sandbox/vm_metrics.rs
@@ -1,50 +1,53 @@
-//! Module responsible for observing the VM behavior, i.e. calculating the statistics of the VM runs
-//! or reporting the VM memory usage.
-
 use std::time::Duration;
-
-use vm::{HistoryMode, VmExecutionResult, VmInstance};
+use vm::{VmExecutionResultAndLogs, VmMemoryMetrics};
 use zksync_state::StorageViewMetrics;
-use zksync_types::{
-    event::{extract_long_l2_to_l1_messages, extract_published_bytecodes},
-    fee::TransactionExecutionMetrics,
-    storage_writes_deduplicator::StorageWritesDeduplicator,
-};
+use zksync_types::event::{extract_long_l2_to_l1_messages, extract_published_bytecodes};
+use zksync_types::fee::TransactionExecutionMetrics;
+use zksync_types::storage_writes_deduplicator::StorageWritesDeduplicator;
 use zksync_utils::bytecode::bytecode_len_in_bytes;
 
-pub(super) fn report_storage_view_metrics(
+pub fn report_vm_memory_metrics(
     tx_id: &str,
-    oracles_sizes: usize,
+    memory_metrics: &VmMemoryMetrics,
     vm_execution_took: Duration,
-    metrics: StorageViewMetrics,
+    storage_metrics: StorageViewMetrics,
 ) {
+    metrics::histogram!("runtime_context.memory.event_sink_size", memory_metrics.event_sink_inner as f64, "type" => "inner");
+    metrics::histogram!("runtime_context.memory.event_sink_size", memory_metrics.event_sink_history as f64, "type" => "history");
+    metrics::histogram!("runtime_context.memory.memory_size", memory_metrics.memory_inner as f64, "type" => "inner");
+    metrics::histogram!("runtime_context.memory.memory_size", memory_metrics.memory_history as f64, "type" => "history");
+    metrics::histogram!("runtime_context.memory.decommitter_size", memory_metrics.decommittment_processor_inner as f64, "type" => "inner");
+    metrics::histogram!("runtime_context.memory.decommitter_size", memory_metrics.decommittment_processor_history as f64, "type" => "history");
+    metrics::histogram!("runtime_context.memory.storage_size", memory_metrics.storage_inner as f64, "type" => "inner");
+    metrics::histogram!("runtime_context.memory.storage_size", memory_metrics.storage_history as f64, "type" => "history");
+
     metrics::histogram!(
         "runtime_context.memory.storage_view_cache_size",
-        metrics.cache_size as f64
+        storage_metrics.cache_size as f64
     );
     metrics::histogram!(
         "runtime_context.memory",
-        (oracles_sizes + metrics.cache_size) as f64
+        (memory_metrics.full_size() + storage_metrics.cache_size) as f64
     );
 
-    let total_storage_invocations =
-        metrics.get_value_storage_invocations + metrics.set_value_storage_invocations;
+    let total_storage_invocations = storage_metrics.get_value_storage_invocations
+        + storage_metrics.set_value_storage_invocations;
     let total_time_spent_in_storage =
-        metrics.time_spent_on_get_value + metrics.time_spent_on_set_value;
+        storage_metrics.time_spent_on_get_value + storage_metrics.time_spent_on_set_value;
 
     metrics::histogram!(
         "runtime_context.storage_interaction.amount",
-        metrics.storage_invocations_missed as f64,
+        storage_metrics.storage_invocations_missed as f64,
         "interaction" => "missed"
     );
     metrics::histogram!(
         "runtime_context.storage_interaction.amount",
-        metrics.get_value_storage_invocations as f64,
+        storage_metrics.get_value_storage_invocations as f64,
         "interaction" => "get_value"
     );
     metrics::histogram!(
         "runtime_context.storage_interaction.amount",
-        metrics.set_value_storage_invocations as f64,
+        storage_metrics.set_value_storage_invocations as f64,
         "interaction" => "set_value"
     );
     metrics::histogram!(
@@ -55,17 +58,17 @@ pub(super) fn report_storage_view_metrics(
 
     metrics::histogram!(
         "runtime_context.storage_interaction.duration",
-        metrics.time_spent_on_storage_missed,
+        storage_metrics.time_spent_on_storage_missed,
         "interaction" => "missed"
     );
     metrics::histogram!(
         "runtime_context.storage_interaction.duration",
-        metrics.time_spent_on_get_value,
+        storage_metrics.time_spent_on_get_value,
         "interaction" => "get_value"
     );
     metrics::histogram!(
         "runtime_context.storage_interaction.duration",
-        metrics.time_spent_on_set_value,
+        storage_metrics.time_spent_on_set_value,
         "interaction" => "set_value"
     );
     metrics::histogram!(
@@ -81,10 +84,10 @@ pub(super) fn report_storage_view_metrics(
             "interaction" => "total"
         );
     }
-    if metrics.storage_invocations_missed > 0 {
-        let duration_per_unit = metrics
+    if storage_metrics.storage_invocations_missed > 0 {
+        let duration_per_unit = storage_metrics
             .time_spent_on_storage_missed
-            .div_f64(metrics.storage_invocations_missed as f64);
+            .div_f64(storage_metrics.storage_invocations_missed as f64);
         metrics::histogram!(
             "runtime_context.storage_interaction.duration_per_unit",
             duration_per_unit,
@@ -100,92 +103,55 @@ pub(super) fn report_storage_view_metrics(
     const STORAGE_INVOCATIONS_DEBUG_THRESHOLD: usize = 1_000;
 
     if total_storage_invocations > STORAGE_INVOCATIONS_DEBUG_THRESHOLD {
-        vlog::info!(
+        tracing::info!(
             "Tx {tx_id} resulted in {total_storage_invocations} storage_invocations, {} new_storage_invocations, \
              {} get_value_storage_invocations, {} set_value_storage_invocations, \
              vm execution took {vm_execution_took:?}, storage interaction took {total_time_spent_in_storage:?} \
              (missed: {:?} get: {:?} set: {:?})",
-            metrics.storage_invocations_missed,
-            metrics.get_value_storage_invocations,
-            metrics.set_value_storage_invocations,
-            metrics.time_spent_on_storage_missed,
-            metrics.time_spent_on_get_value,
-            metrics.time_spent_on_set_value,
+            storage_metrics.storage_invocations_missed,
+            storage_metrics.get_value_storage_invocations,
+            storage_metrics.set_value_storage_invocations,
+            storage_metrics.time_spent_on_storage_missed,
+            storage_metrics.time_spent_on_get_value,
+            storage_metrics.time_spent_on_set_value,
         );
     }
 }
 
 pub(super) fn collect_tx_execution_metrics(
     contracts_deployed: u16,
-    result: &VmExecutionResult,
+    result: &VmExecutionResultAndLogs,
 ) -> TransactionExecutionMetrics {
+    let writes_metrics = StorageWritesDeduplicator::apply_on_empty_state(&result.logs.storage_logs);
     let event_topics = result
+        .logs
         .events
         .iter()
         .map(|event| event.indexed_topics.len() as u16)
         .sum();
-
-    let l2_l1_long_messages = extract_long_l2_to_l1_messages(&result.events)
+    let l2_l1_long_messages = extract_long_l2_to_l1_messages(&result.logs.events)
         .iter()
         .map(|event| event.len())
         .sum();
-
-    let published_bytecode_bytes = extract_published_bytecodes(&result.events)
+    let published_bytecode_bytes = extract_published_bytecodes(&result.logs.events)
         .iter()
         .map(|bytecode_hash| bytecode_len_in_bytes(*bytecode_hash))
         .sum();
 
-    let writes_metrics =
-        StorageWritesDeduplicator::apply_on_empty_state(&result.storage_log_queries);
-
     TransactionExecutionMetrics {
         initial_storage_writes: writes_metrics.initial_storage_writes,
         repeated_storage_writes: writes_metrics.repeated_storage_writes,
-        gas_used: result.gas_used as usize,
+        gas_used: result.statistics.gas_used as usize,
         event_topics,
         published_bytecode_bytes,
         l2_l1_long_messages,
-        l2_l1_logs: result.l2_to_l1_logs.len(),
-        contracts_used: result.contracts_used,
+        l2_l1_logs: result.logs.l2_to_l1_logs.len(),
+        contracts_used: result.statistics.contracts_used,
         contracts_deployed,
-        vm_events: result.events.len(),
-        storage_logs: result.storage_log_queries.len(),
-        total_log_queries: result.total_log_queries,
-        cycles_used: result.cycles_used,
-        computational_gas_used: result.computational_gas_used,
+        vm_events: result.logs.events.len(),
+        storage_logs: result.logs.storage_logs.len(),
+        total_log_queries: result.statistics.total_log_queries,
+        cycles_used: result.statistics.cycles_used,
+        computational_gas_used: result.statistics.computational_gas_used,
     }
 }
-
-/// Returns the sum of all oracles' sizes.
-pub(super) fn record_vm_memory_metrics<H: HistoryMode>(vm: &VmInstance<'_, H>) -> usize {
-    let event_sink_inner = vm.state.event_sink.get_size();
-    let event_sink_history = vm.state.event_sink.get_history_size();
-    let memory_inner = vm.state.memory.get_size();
-    let memory_history = vm.state.memory.get_history_size();
-    let decommittment_processor_inner = vm.state.decommittment_processor.get_size();
-    let decommittment_processor_history = vm.state.decommittment_processor.get_history_size();
-    let storage_inner = vm.state.storage.get_size();
-    let storage_history = vm.state.storage.get_history_size();
-
-    metrics::histogram!("runtime_context.memory.event_sink_size", event_sink_inner as f64, "type" => "inner");
-    metrics::histogram!("runtime_context.memory.event_sink_size", event_sink_history as f64, "type" => "history");
-    metrics::histogram!("runtime_context.memory.memory_size", memory_inner as f64, "type" => "inner");
-    metrics::histogram!("runtime_context.memory.memory_size", memory_history as f64, "type" => "history");
-    metrics::histogram!("runtime_context.memory.decommitter_size", decommittment_processor_inner as f64, "type" => "inner");
-    metrics::histogram!("runtime_context.memory.decommitter_size", decommittment_processor_history as f64, "type" => "history");
-    metrics::histogram!("runtime_context.memory.storage_size", storage_inner as f64, "type" => "inner");
-    metrics::histogram!("runtime_context.memory.storage_size", storage_history as f64, "type" => "history");
-
-    [
-        event_sink_inner,
-        event_sink_history,
-        memory_inner,
-        memory_history,
-        decommittment_processor_inner,
-        decommittment_processor_history,
-        storage_inner,
-        storage_history,
-    ]
-    .iter()
-    .sum::<usize>()
-}
diff --git a/core/bin/zksync_core/src/api_server/healthcheck.rs b/core/bin/zksync_core/src/api_server/healthcheck.rs
index af3409f9f4e1..74495f3439cb 100644
--- a/core/bin/zksync_core/src/api_server/healthcheck.rs
+++ b/core/bin/zksync_core/src/api_server/healthcheck.rs
@@ -26,13 +26,13 @@ async fn run_server(
     for check in &health_checks {
         let health_check_name = check.name();
         if !health_check_names.insert(health_check_name) {
-            vlog::warn!(
+            tracing::warn!(
                 "Health check with name `{health_check_name}` is defined multiple times; only the last mention \
                  will be present in `/health` endpoint output"
             );
         }
     }
-    vlog::debug!(
+    tracing::debug!(
         "Starting healthcheck server with checks {health_check_names:?} on {bind_address}"
     );
 
@@ -45,13 +45,13 @@ async fn run_server(
         .serve(app.into_make_service())
         .with_graceful_shutdown(async move {
             if stop_receiver.changed().await.is_err() {
-                vlog::warn!("Stop signal sender for healthcheck server was dropped without sending a signal");
+                tracing::warn!("Stop signal sender for healthcheck server was dropped without sending a signal");
             }
-            vlog::info!("Stop signal received, healthcheck server is shutting down");
+            tracing::info!("Stop signal received, healthcheck server is shutting down");
         })
         .await
         .expect("Healthcheck server failed");
-    vlog::info!("Healthcheck server shut down");
+    tracing::info!("Healthcheck server shut down");
 }
 
 #[derive(Debug)]
@@ -84,7 +84,7 @@ impl HealthCheckHandle {
             // Propagate potential panics from the server task.
             server_result.unwrap();
         } else {
-            vlog::debug!("Timed out {GRACEFUL_SHUTDOWN_WAIT:?} waiting for healthcheck server to gracefully shut down");
+            tracing::debug!("Timed out {GRACEFUL_SHUTDOWN_WAIT:?} waiting for healthcheck server to gracefully shut down");
         }
     }
 }
diff --git a/core/bin/zksync_core/src/api_server/tx_sender/mod.rs b/core/bin/zksync_core/src/api_server/tx_sender/mod.rs
index c462f0cf8423..3fa349b304d8 100644
--- a/core/bin/zksync_core/src/api_server/tx_sender/mod.rs
+++ b/core/bin/zksync_core/src/api_server/tx_sender/mod.rs
@@ -9,15 +9,19 @@ use governor::{
 };
 
 // Built-in uses
-use std::{cmp, collections::HashMap, num::NonZeroU32, sync::Arc, time::Instant};
+use std::{cmp, num::NonZeroU32, sync::Arc, time::Instant};
 
 // Workspace uses
+
 use vm::{
-    transaction_data::{derive_overhead, OverheadCoeficients},
-    vm_with_bootloader::derive_base_fee_and_gas_per_pubdata,
-    zk_evm::zkevm_opcode_defs::system_params::MAX_PUBDATA_PER_BLOCK,
-    VmExecutionResult,
+    constants::{BLOCK_GAS_LIMIT, MAX_PUBDATA_PER_BLOCK},
+    utils::{
+        fee::derive_base_fee_and_gas_per_pubdata,
+        overhead::{derive_overhead, OverheadCoeficients},
+    },
+    VmExecutionResultAndLogs,
 };
+
 use zksync_config::configs::{api::Web3JsonRpcConfig, chain::StateKeeperConfig};
 use zksync_contracts::BaseSystemContracts;
 use zksync_dal::{transactions_dal::L2TxSubmissionResult, ConnectionPool};
@@ -28,29 +32,69 @@ use zksync_types::{
     l2::error::TxCheckError::TxDuplication,
     l2::L2Tx,
     utils::storage_key_for_eth_balance,
-    AccountTreeId, Address, ExecuteTransactionCommon, Nonce, StorageKey, Transaction, H160, H256,
-    MAX_GAS_PER_PUBDATA_BYTE, MAX_L2_TX_GAS_LIMIT, MAX_NEW_FACTORY_DEPS, U256,
+    AccountTreeId, Address, ExecuteTransactionCommon, L2ChainId, Nonce, PackedEthSignature,
+    ProtocolVersionId, Transaction, H160, H256, MAX_GAS_PER_PUBDATA_BYTE, MAX_L2_TX_GAS_LIMIT,
+    MAX_NEW_FACTORY_DEPS, U256,
 };
+
 use zksync_utils::h256_to_u256;
 
 // Local uses
-use crate::api_server::execution_sandbox::{
-    adjust_l1_gas_price_for_tx, execute_tx_eth_call, execute_tx_with_pending_state,
-    get_pubdata_for_factory_deps, BlockArgs, SandboxExecutionError, TxExecutionArgs, TxSharedArgs,
-    VmConcurrencyLimiter, VmPermit,
+use crate::api_server::{
+    execution_sandbox::{
+        adjust_l1_gas_price_for_tx, execute_tx_eth_call, execute_tx_with_pending_state,
+        get_pubdata_for_factory_deps, BlockArgs, TxExecutionArgs, TxSharedArgs,
+        VmConcurrencyLimiter, VmPermit,
+    },
+    tx_sender::result::ApiCallResult,
 };
+
 use crate::l1_gas_price::L1GasPriceProvider;
 use crate::state_keeper::seal_criteria::{ConditionalSealer, SealData};
 
-mod error;
 mod proxy;
+mod result;
 
-pub(super) use self::{error::SubmitTxError, proxy::TxProxy};
+pub(super) use self::{proxy::TxProxy, result::SubmitTxError};
 
 /// Type alias for the rate limiter implementation.
 type TxSenderRateLimiter =
     RateLimiter<NotKeyed, InMemoryState, MonotonicClock, NoOpMiddleware<Instant>>;
 
+#[derive(Debug, Clone)]
+pub struct MultiVMBaseSystemContracts {
+    /// Contracts to be used for pre-virtual-blocks protocol versions.
+    pub(crate) pre_virtual_blocks: BaseSystemContracts,
+    /// Contracts to be used for post-virtual-blocks protocol versions.
+    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,
+}
+
+impl MultiVMBaseSystemContracts {
+    pub fn get_by_protocol_version(self, version: ProtocolVersionId) -> BaseSystemContracts {
+        match version {
+            ProtocolVersionId::Version0
+            | ProtocolVersionId::Version1
+            | ProtocolVersionId::Version2
+            | ProtocolVersionId::Version3
+            | ProtocolVersionId::Version4
+            | ProtocolVersionId::Version5
+            | ProtocolVersionId::Version6
+            | ProtocolVersionId::Version7
+            | ProtocolVersionId::Version8
+            | ProtocolVersionId::Version9
+            | ProtocolVersionId::Version10
+            | ProtocolVersionId::Version11
+            | ProtocolVersionId::Version12 => self.pre_virtual_blocks,
+            ProtocolVersionId::Version13 => self.post_virtual_blocks,
+            ProtocolVersionId::Version14
+            | ProtocolVersionId::Version15
+            | ProtocolVersionId::Version16 => self.post_virtual_blocks_finish_upgrade_fix,
+        }
+    }
+}
+
 /// Smart contracts to be used in the API sandbox requests, e.g. for estimating gas and
 /// performing `eth_call` requests.
 #[derive(Debug, Clone)]
@@ -58,11 +102,11 @@ pub struct ApiContracts {
     /// Contracts to be used when estimating gas.
     /// These contracts (mainly, bootloader) normally should be tuned to provide accurate
     /// execution metrics.
-    estimate_gas: BaseSystemContracts,
+    pub(crate) estimate_gas: MultiVMBaseSystemContracts,
     /// Contracts to be used when performing `eth_call` requests.
     /// These contracts (mainly, bootloader) normally should be tuned to provide better UX
     /// exeprience (e.g. revert messages).
-    eth_call: BaseSystemContracts,
+    pub(crate) eth_call: MultiVMBaseSystemContracts,
 }
 
 impl ApiContracts {
@@ -71,8 +115,18 @@ impl ApiContracts {
     /// given that there is no way to fetch "playground" contracts from the main node.
     pub fn load_from_disk() -> Self {
         Self {
-            estimate_gas: BaseSystemContracts::estimate_gas(),
-            eth_call: BaseSystemContracts::playground(),
+            estimate_gas: MultiVMBaseSystemContracts {
+                pre_virtual_blocks: BaseSystemContracts::estimate_gas_pre_virtual_blocks(),
+                post_virtual_blocks: BaseSystemContracts::estimate_gas_post_virtual_blocks(),
+                post_virtual_blocks_finish_upgrade_fix:
+                    BaseSystemContracts::estimate_gas_post_virtual_blocks_finish_upgrade_fix(),
+            },
+            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(),
+            },
         }
     }
 }
@@ -175,12 +229,14 @@ pub struct TxSenderConfig {
     pub validation_computational_gas_limit: u32,
     pub default_aa: H256,
     pub bootloader: H256,
+    pub chain_id: L2ChainId,
 }
 
 impl TxSenderConfig {
     pub fn new(
         state_keeper_config: &StateKeeperConfig,
         web3_json_config: &Web3JsonRpcConfig,
+        chain_id: L2ChainId,
     ) -> Self {
         Self {
             fee_account_addr: state_keeper_config.fee_account_addr,
@@ -193,6 +249,7 @@ impl TxSenderConfig {
                 .validation_computational_gas_limit,
             default_aa: state_keeper_config.default_aa_hash,
             bootloader: state_keeper_config.bootloader_hash,
+            chain_id,
         }
     }
 }
@@ -223,7 +280,7 @@ pub struct TxSender<G>(pub(super) Arc<TxSenderInner<G>>);
 // Custom implementation is required due to generic param:
 // Even though it's under `Arc`, compiler doesn't generate the `Clone` implementation unless
 // an unnecessary bound is added.
-impl<E> Clone for TxSender<E> {
+impl<G> Clone for TxSender<G> {
     fn clone(&self) -> Self {
         Self(self.0.clone())
     }
@@ -267,11 +324,10 @@ impl<G: L1GasPriceProvider> TxSender<G> {
             TxExecutionArgs::for_validation(&tx),
             self.0.replica_connection_pool.clone(),
             tx.clone().into(),
-            &mut HashMap::new(),
         )
         .await;
 
-        vlog::info!(
+        tracing::info!(
             "Submit tx {:?} with execution metrics {:?}",
             tx.hash(),
             tx_metrics
@@ -372,6 +428,11 @@ impl<G: L1GasPriceProvider> TxSender<G> {
             fair_l2_gas_price: self.0.sender_config.fair_l2_gas_price,
             base_system_contracts: self.0.api_contracts.eth_call.clone(),
             caches: self.storage_caches(),
+            validation_computational_gas_limit: self
+                .0
+                .sender_config
+                .validation_computational_gas_limit,
+            chain_id: self.0.sender_config.chain_id,
         }
     }
 
@@ -383,8 +444,10 @@ impl<G: L1GasPriceProvider> TxSender<G> {
             return Err(SubmitTxError::GasLimitIsTooBig);
         }
 
+        // TODO (SMA-1715): do not subsidize the overhead for the transaction
+
         if tx.common_data.fee.gas_limit > self.0.sender_config.max_allowed_l2_tx_gas_limit.into() {
-            vlog::info!(
+            tracing::info!(
                 "Submitted Tx is Unexecutable {:?} because of GasLimitIsTooBig {}",
                 tx.hash(),
                 tx.common_data.fee.gas_limit,
@@ -392,7 +455,7 @@ impl<G: L1GasPriceProvider> TxSender<G> {
             return Err(SubmitTxError::GasLimitIsTooBig);
         }
         if tx.common_data.fee.max_fee_per_gas < self.0.sender_config.fair_l2_gas_price.into() {
-            vlog::info!(
+            tracing::info!(
                 "Submitted Tx is Unexecutable {:?} because of MaxFeePerGasTooLow {}",
                 tx.hash(),
                 tx.common_data.fee.max_fee_per_gas
@@ -400,7 +463,7 @@ impl<G: L1GasPriceProvider> TxSender<G> {
             return Err(SubmitTxError::MaxFeePerGasTooLow);
         }
         if tx.common_data.fee.max_fee_per_gas < tx.common_data.fee.max_priority_fee_per_gas {
-            vlog::info!(
+            tracing::info!(
                 "Submitted Tx is Unexecutable {:?} because of MaxPriorityFeeGreaterThanMaxFee {}",
                 tx.hash(),
                 tx.common_data.fee.max_fee_per_gas
@@ -541,8 +604,7 @@ impl<G: L1GasPriceProvider> TxSender<G> {
         tx_gas_limit: u32,
         l1_gas_price: u64,
         base_fee: u64,
-        storage_read_cache: &mut HashMap<StorageKey, H256>,
-    ) -> Result<VmExecutionResult, SandboxExecutionError> {
+    ) -> (VmExecutionResultAndLogs, TransactionExecutionMetrics) {
         let gas_limit_with_overhead = tx_gas_limit
             + derive_overhead(
                 tx_gas_limit,
@@ -581,26 +643,23 @@ impl<G: L1GasPriceProvider> TxSender<G> {
             execution_args,
             self.0.replica_connection_pool.clone(),
             tx.clone(),
-            storage_read_cache,
         )
         .await;
 
-        if let Err(err) = self.ensure_tx_executable(tx, &tx_metrics, false) {
-            let SubmitTxError::Unexecutable(message) = err else {
-                unreachable!()
-            };
-            return Err(SandboxExecutionError::Unexecutable(message));
-        }
-        exec_result
+        (exec_result, tx_metrics)
     }
 
     fn shared_args_for_gas_estimate(&self, l1_gas_price: u64) -> TxSharedArgs {
+        let config = &self.0.sender_config;
         TxSharedArgs {
-            operator_account: AccountTreeId::new(self.0.sender_config.fee_account_addr),
+            operator_account: AccountTreeId::new(config.fee_account_addr),
             l1_gas_price,
-            fair_l2_gas_price: self.0.sender_config.fair_l2_gas_price,
+            fair_l2_gas_price: config.fair_l2_gas_price,
+            // We want to bypass the computation gas limit check for gas estimation
+            validation_computational_gas_limit: BLOCK_GAS_LIMIT,
             base_system_contracts: self.0.api_contracts.estimate_gas.clone(),
             caches: self.storage_caches(),
+            chain_id: config.chain_id,
         }
     }
 
@@ -660,7 +719,7 @@ impl<G: L1GasPriceProvider> TxSender<G> {
             && account_code_hash == H256::zero()
             && tx.execute.value > self.get_balance(&tx.initiator_account()).await
         {
-            vlog::info!(
+            tracing::info!(
                 "fee estimation failed on validation step.
                 account: {} does not have enough funds for for transferring tx.value: {}.",
                 &tx.initiator_account(),
@@ -672,8 +731,7 @@ impl<G: L1GasPriceProvider> TxSender<G> {
         // For L2 transactions we need a properly formatted signature
         if let ExecuteTransactionCommon::L2(l2_common_data) = &mut tx.common_data {
             if l2_common_data.signature.is_empty() {
-                l2_common_data.signature = vec![0u8; 65];
-                l2_common_data.signature[64] = 27;
+                l2_common_data.signature = PackedEthSignature::default().serialize_packed().into();
             }
 
             l2_common_data.fee.gas_per_pubdata_limit = MAX_GAS_PER_PUBDATA_BYTE.into();
@@ -705,9 +763,6 @@ impl<G: L1GasPriceProvider> TxSender<G> {
             pubdata_for_factory_deps * (gas_per_pubdata_byte as u32)
         };
 
-        // Rolling cache with storage values that were read from the DB.
-        let mut storage_read_cache = HashMap::new();
-
         // We are using binary search to find the minimal values of gas_limit under which
         // the transaction succeedes
         let mut lower_bound = 0;
@@ -717,7 +772,7 @@ impl<G: L1GasPriceProvider> TxSender<G> {
             tx.initiator_account(),
             tx.nonce().unwrap_or(Nonce(0))
         );
-        vlog::trace!(
+        tracing::trace!(
             "fee estimation tx {:?}: preparation took {:?}, starting binary search",
             tx_id,
             estimation_started_at.elapsed(),
@@ -731,7 +786,7 @@ impl<G: L1GasPriceProvider> TxSender<G> {
             // gas limit will make the transaction successful
             let iteration_started_at = Instant::now();
             let try_gas_limit = gas_for_bytecodes_pubdata + mid;
-            let result = self
+            let (result, _execution_metrics) = self
                 .estimate_gas_step(
                     vm_permit.clone(),
                     tx.clone(),
@@ -739,16 +794,16 @@ impl<G: L1GasPriceProvider> TxSender<G> {
                     try_gas_limit,
                     l1_gas_price,
                     base_fee,
-                    &mut storage_read_cache,
                 )
                 .await;
-            if result.is_err() {
+
+            if result.result.is_failed() {
                 lower_bound = mid + 1;
             } else {
                 upper_bound = mid;
             }
 
-            vlog::trace!(
+            tracing::trace!(
                 "fee estimation tx {:?}: iteration {} took {:?}. lower_bound: {}, upper_bound: {}",
                 tx_id,
                 number_of_iterations,
@@ -769,7 +824,7 @@ impl<G: L1GasPriceProvider> TxSender<G> {
         );
 
         let suggested_gas_limit = tx_body_gas_limit + gas_for_bytecodes_pubdata;
-        let result = self
+        let (result, tx_metrics) = self
             .estimate_gas_step(
                 vm_permit,
                 tx.clone(),
@@ -777,39 +832,36 @@ impl<G: L1GasPriceProvider> TxSender<G> {
                 suggested_gas_limit,
                 l1_gas_price,
                 base_fee,
-                &mut storage_read_cache,
             )
             .await;
 
-        match result {
-            Err(err) => Err(err.into()),
-            Ok(_) => {
-                let overhead = derive_overhead(
-                    suggested_gas_limit,
-                    gas_per_pubdata_byte as u32,
-                    tx.encoding_len(),
-                    OverheadCoeficients::from_tx_type(tx.tx_format() as u8),
-                );
+        result.into_api_call_result()?;
+        self.ensure_tx_executable(tx.clone(), &tx_metrics, false)?;
 
-                let full_gas_limit =
-                    match tx_body_gas_limit.overflowing_add(gas_for_bytecodes_pubdata + overhead) {
-                        (value, false) => value,
-                        (_, true) => {
-                            return Err(SubmitTxError::ExecutionReverted(
-                                "exceeds block gas limit".to_string(),
-                                vec![],
-                            ));
-                        }
-                    };
-
-                Ok(Fee {
-                    max_fee_per_gas: base_fee.into(),
-                    max_priority_fee_per_gas: 0u32.into(),
-                    gas_limit: full_gas_limit.into(),
-                    gas_per_pubdata_limit: gas_per_pubdata_byte.into(),
-                })
-            }
-        }
+        let overhead = derive_overhead(
+            suggested_gas_limit,
+            gas_per_pubdata_byte as u32,
+            tx.encoding_len(),
+            OverheadCoeficients::from_tx_type(tx.tx_format() as u8),
+        );
+
+        let full_gas_limit =
+            match tx_body_gas_limit.overflowing_add(gas_for_bytecodes_pubdata + overhead) {
+                (value, false) => value,
+                (_, true) => {
+                    return Err(SubmitTxError::ExecutionReverted(
+                        "exceeds block gas limit".to_string(),
+                        vec![],
+                    ));
+                }
+            };
+
+        Ok(Fee {
+            max_fee_per_gas: base_fee.into(),
+            max_priority_fee_per_gas: 0u32.into(),
+            gas_limit: full_gas_limit.into(),
+            gas_per_pubdata_limit: gas_per_pubdata_byte.into(),
+        })
     }
 
     pub(super) async fn eth_call(
@@ -821,25 +873,17 @@ impl<G: L1GasPriceProvider> TxSender<G> {
         let vm_permit = vm_permit.ok_or(SubmitTxError::ServerShuttingDown)?;
 
         let vm_execution_cache_misses_limit = self.0.sender_config.vm_execution_cache_misses_limit;
-        let result = execute_tx_eth_call(
+        execute_tx_eth_call(
             vm_permit,
             self.shared_args(),
             self.0.replica_connection_pool.clone(),
             tx,
             block_args,
             vm_execution_cache_misses_limit,
-            false,
+            vec![],
         )
-        .await?;
-
-        Ok(match result.revert_reason {
-            Some(result) => result.original_data,
-            None => result
-                .return_data
-                .into_iter()
-                .flat_map(<[u8; 32]>::from)
-                .collect(),
-        })
+        .await
+        .into_api_call_result()
     }
 
     pub fn gas_price(&self) -> u64 {
@@ -879,7 +923,7 @@ impl<G: L1GasPriceProvider> TxSender<G> {
                 "Tx is Unexecutable because of {reason}; inputs for decision: {seal_data:?}"
             );
             if log_message {
-                vlog::info!("{tx_hash:#?} {message}");
+                tracing::info!("{tx_hash:#?} {message}");
             }
             return Err(SubmitTxError::Unexecutable(message));
         }
diff --git a/core/bin/zksync_core/src/api_server/tx_sender/proxy.rs b/core/bin/zksync_core/src/api_server/tx_sender/proxy.rs
index 1f1a4b63993d..4f70b1d5e503 100644
--- a/core/bin/zksync_core/src/api_server/tx_sender/proxy.rs
+++ b/core/bin/zksync_core/src/api_server/tx_sender/proxy.rs
@@ -44,7 +44,7 @@ impl TxProxy {
     pub async fn submit_tx(&self, tx: &L2Tx) -> RpcResult<H256> {
         let input_data = tx.common_data.input_data().expect("raw tx is absent");
         let raw_tx = zksync_types::Bytes(input_data.to_vec());
-        vlog::info!("Proxying tx {}", tx.hash());
+        tracing::info!("Proxying tx {}", tx.hash());
         self.client.send_raw_transaction(raw_tx).await
     }
 
diff --git a/core/bin/zksync_core/src/api_server/tx_sender/error.rs b/core/bin/zksync_core/src/api_server/tx_sender/result.rs
similarity index 89%
rename from core/bin/zksync_core/src/api_server/tx_sender/error.rs
rename to core/bin/zksync_core/src/api_server/tx_sender/result.rs
index 847a8206807c..ea57bcb975e7 100644
--- a/core/bin/zksync_core/src/api_server/tx_sender/error.rs
+++ b/core/bin/zksync_core/src/api_server/tx_sender/result.rs
@@ -1,6 +1,7 @@
 use crate::api_server::execution_sandbox::SandboxExecutionError;
 use thiserror::Error;
-use vm::oracles::tracer::ValidationError;
+
+use vm::{ExecutionResult, ValidationError, VmExecutionResultAndLogs};
 use zksync_types::l2::error::TxCheckError;
 use zksync_types::U256;
 
@@ -133,7 +134,6 @@ impl From<SandboxExecutionError> for SubmitTxError {
             SandboxExecutionError::FailedToPayForTransaction(reason) => {
                 Self::FailedToChargeFee(reason)
             }
-            SandboxExecutionError::Unexecutable(reason) => Self::Unexecutable(reason),
         }
     }
 }
@@ -143,3 +143,23 @@ impl From<ValidationError> for SubmitTxError {
         Self::ValidationFailed(err.to_string())
     }
 }
+
+pub(crate) trait ApiCallResult {
+    fn into_api_call_result(self) -> Result<Vec<u8>, SubmitTxError>;
+}
+
+impl ApiCallResult for VmExecutionResultAndLogs {
+    fn into_api_call_result(self) -> Result<Vec<u8>, SubmitTxError> {
+        match self.result {
+            ExecutionResult::Success { output } => Ok(output),
+            ExecutionResult::Revert { output } => Err(SubmitTxError::ExecutionReverted(
+                output.to_user_friendly_string(),
+                output.encoded_data(),
+            )),
+            ExecutionResult::Halt { reason } => {
+                let output: SandboxExecutionError = reason.into();
+                Err(output.into())
+            }
+        }
+    }
+}
diff --git a/core/bin/zksync_core/src/api_server/web3/backend_jsonrpc/batch_limiter_middleware.rs b/core/bin/zksync_core/src/api_server/web3/backend_jsonrpc/batch_limiter_middleware.rs
new file mode 100644
index 000000000000..492eb32a33ba
--- /dev/null
+++ b/core/bin/zksync_core/src/api_server/web3/backend_jsonrpc/batch_limiter_middleware.rs
@@ -0,0 +1,135 @@
+use std::num::NonZeroU32;
+use std::sync::Arc;
+
+use governor::clock::DefaultClock;
+use governor::middleware::NoOpMiddleware;
+use governor::state::{InMemoryState, NotKeyed};
+use governor::{Quota, RateLimiter};
+
+use jsonrpc_core::middleware::Middleware;
+use jsonrpc_core::*;
+use jsonrpc_pubsub::Session;
+
+/// Configures the rate limiting for the WebSocket API.
+/// Rate limiting is applied per active connection, e.g. a single connected user may not send more than X requests
+/// per minute.
+#[derive(Debug, Clone)]
+pub struct RateLimitMetadata<T> {
+    meta: T,
+    rate_limiter: Option<Arc<RateLimiter<NotKeyed, InMemoryState, DefaultClock, NoOpMiddleware>>>,
+}
+
+impl<T> RateLimitMetadata<T> {
+    pub(crate) fn new(requests_per_minute: Option<u32>, meta: T) -> Self {
+        let rate_limiter = if let Some(requests_per_minute) = requests_per_minute {
+            assert!(requests_per_minute > 0, "requests_per_minute must be > 0");
+
+            Some(Arc::new(RateLimiter::direct(Quota::per_minute(
+                NonZeroU32::new(requests_per_minute).unwrap(),
+            ))))
+        } else {
+            None
+        };
+
+        Self { meta, rate_limiter }
+    }
+}
+
+impl<T: jsonrpc_core::Metadata> jsonrpc_core::Metadata for RateLimitMetadata<T> {}
+
+impl<T: jsonrpc_pubsub::PubSubMetadata> jsonrpc_pubsub::PubSubMetadata for RateLimitMetadata<T> {
+    fn session(&self) -> Option<Arc<Session>> {
+        self.meta.session()
+    }
+}
+
+#[derive(Debug, Clone, Copy)]
+pub(crate) enum Transport {
+    Ws,
+}
+
+impl Transport {
+    pub fn as_str(&self) -> &'static str {
+        match self {
+            Transport::Ws => "ws",
+        }
+    }
+}
+
+/// Middleware that implements limiting for WebSocket connections:
+/// - Limits the number of requests per minute for a single connection.
+/// - Limits the maximum size of the batch requests.
+///
+/// Rate limiting data is stored in the metadata of the connection, while the maximum batch size is stored in the
+/// middleware itself.
+#[derive(Debug)]
+pub(crate) struct LimitMiddleware {
+    transport: Transport,
+    max_batch_size: Option<usize>,
+}
+
+impl LimitMiddleware {
+    pub fn new(transport: Transport, max_batch_size: Option<usize>) -> Self {
+        Self {
+            transport,
+            max_batch_size,
+        }
+    }
+}
+
+impl<T: jsonrpc_core::Metadata> Middleware<RateLimitMetadata<T>> for LimitMiddleware {
+    type Future = FutureResponse;
+
+    type CallFuture = middleware::NoopCallFuture;
+
+    fn on_request<F, X>(
+        &self,
+        request: jsonrpc_core::Request,
+        meta: RateLimitMetadata<T>,
+        next: F,
+    ) -> futures::future::Either<Self::Future, X>
+    where
+        F: Fn(jsonrpc_core::Request, RateLimitMetadata<T>) -> X + Send + Sync,
+        X: futures::Future<Output = Option<jsonrpc_core::Response>> + Send + 'static,
+    {
+        // Check whether rate limiting is enabled, and if so, whether we should discard the request.
+        // Note that RPC batch requests are stil counted as a single request.
+        if let Some(rate_limiter) = &meta.rate_limiter {
+            // Check number of actual RPC requests.
+            let num_requests: usize = match &request {
+                jsonrpc_core::Request::Single(_) => 1,
+                jsonrpc_core::Request::Batch(batch) => batch.len(),
+            };
+            let num_requests = NonZeroU32::new(num_requests.max(1) as u32).unwrap();
+
+            // Note: if required, we can extract data on rate limiting from the error.
+            if rate_limiter.check_n(num_requests).is_err() {
+                metrics::increment_counter!("api.jsonrpc_backend.batch.rate_limited", "transport" => self.transport.as_str());
+                let err = jsonrpc_core::error::Error {
+                    code: jsonrpc_core::error::ErrorCode::ServerError(429),
+                    message: "Too many requests".to_string(),
+                    data: None,
+                };
+
+                return futures::future::Either::Left(Box::pin(futures::future::ready(Some(
+                    jsonrpc_core::Response::from(err, Some(Version::V2)),
+                ))));
+            }
+        }
+
+        // Check whether the batch size is within the allowed limits.
+        if let jsonrpc_core::Request::Batch(batch) = &request {
+            metrics::histogram!("api.jsonrpc_backend.batch.size", batch.len() as f64, "transport" => self.transport.as_str());
+
+            if Some(batch.len()) > self.max_batch_size {
+                metrics::increment_counter!("api.jsonrpc_backend.batch.rejected", "transport" => self.transport.as_str());
+                return futures::future::Either::Left(Box::pin(futures::future::ready(Some(
+                    jsonrpc_core::Response::from(Error::invalid_request(), Some(Version::V2)),
+                ))));
+            }
+        }
+
+        // Proceed with the request.
+        futures::future::Either::Right(next(request, meta))
+    }
+}
diff --git a/core/bin/zksync_core/src/api_server/web3/backend_jsonrpc/error.rs b/core/bin/zksync_core/src/api_server/web3/backend_jsonrpc/error.rs
index 2f26728d07c7..1be080d114bc 100644
--- a/core/bin/zksync_core/src/api_server/web3/backend_jsonrpc/error.rs
+++ b/core/bin/zksync_core/src/api_server/web3/backend_jsonrpc/error.rs
@@ -13,6 +13,7 @@ pub fn into_jsrpc_error(err: Web3Error) -> Error {
             | Web3Error::FilterNotFound
             | Web3Error::InvalidFeeParams(_)
             | Web3Error::LogsLimitExceeded(_, _, _)
+            | Web3Error::TooManyLogs(_)
             | Web3Error::InvalidFilterBlockHash => ErrorCode::InvalidParams,
             Web3Error::SubmitTransactionError(_, _) | Web3Error::SerializationError(_) => 3.into(),
             Web3Error::PubSubTimeout => 4.into(),
@@ -32,7 +33,7 @@ pub fn into_jsrpc_error(err: Web3Error) -> Error {
 }
 
 pub fn internal_error(method_name: &str, error: impl ToString) -> Web3Error {
-    vlog::error!(
+    tracing::error!(
         "Internal error in method {}: {}",
         method_name,
         error.to_string(),
diff --git a/core/bin/zksync_core/src/api_server/web3/backend_jsonrpc/mod.rs b/core/bin/zksync_core/src/api_server/web3/backend_jsonrpc/mod.rs
index ea957a5df6fb..d1d83a37d401 100644
--- a/core/bin/zksync_core/src/api_server/web3/backend_jsonrpc/mod.rs
+++ b/core/bin/zksync_core/src/api_server/web3/backend_jsonrpc/mod.rs
@@ -1,3 +1,4 @@
+pub(crate) mod batch_limiter_middleware;
 pub mod error;
 pub mod namespaces;
 pub mod pub_sub;
diff --git a/core/bin/zksync_core/src/api_server/web3/backend_jsonrpc/namespaces/zks.rs b/core/bin/zksync_core/src/api_server/web3/backend_jsonrpc/namespaces/zks.rs
index 765a85bea2d7..5cfb76af62b9 100644
--- a/core/bin/zksync_core/src/api_server/web3/backend_jsonrpc/namespaces/zks.rs
+++ b/core/bin/zksync_core/src/api_server/web3/backend_jsonrpc/namespaces/zks.rs
@@ -16,7 +16,7 @@ use zksync_types::{
     transaction_request::CallRequest,
     Address, L1BatchNumber, MiniblockNumber, H256, U256, U64,
 };
-use zksync_web3_decl::types::Token;
+use zksync_web3_decl::types::{Filter, Log, Token};
 
 // Local uses
 use crate::web3::namespaces::ZksNamespace;
@@ -108,6 +108,9 @@ pub trait ZksNamespaceT {
         &self,
         version_id: Option<u16>,
     ) -> BoxFuture<Result<Option<ProtocolVersion>>>;
+
+    #[rpc(name = "zks_getLogsWithVirtualBlocks")]
+    fn get_logs_with_virtual_blocks(&self, filter: Filter) -> BoxFuture<Result<Vec<Log>>>;
 }
 
 impl<G: L1GasPriceProvider + Send + Sync + 'static> ZksNamespaceT for ZksNamespace<G> {
@@ -295,4 +298,14 @@ impl<G: L1GasPriceProvider + Send + Sync + 'static> ZksNamespaceT for ZksNamespa
         let self_ = self.clone();
         Box::pin(async move { Ok(self_.get_protocol_version_impl(version_id).await) })
     }
+
+    fn get_logs_with_virtual_blocks(&self, filter: Filter) -> BoxFuture<Result<Vec<Log>>> {
+        let self_ = self.clone();
+        Box::pin(async move {
+            self_
+                .get_logs_with_virtual_blocks_impl(filter)
+                .await
+                .map_err(into_jsrpc_error)
+        })
+    }
 }
diff --git a/core/bin/zksync_core/src/api_server/web3/backend_jsonrpc/pub_sub.rs b/core/bin/zksync_core/src/api_server/web3/backend_jsonrpc/pub_sub.rs
index 2306544cd5dc..4a28a17b4e36 100644
--- a/core/bin/zksync_core/src/api_server/web3/backend_jsonrpc/pub_sub.rs
+++ b/core/bin/zksync_core/src/api_server/web3/backend_jsonrpc/pub_sub.rs
@@ -8,6 +8,7 @@ use jsonrpc_pubsub::{Session, SubscriptionId};
 use zksync_web3_decl::types::PubSubResult;
 
 use super::super::namespaces::EthSubscribe;
+use super::batch_limiter_middleware::RateLimitMetadata;
 
 #[rpc]
 pub trait Web3PubSub {
@@ -35,7 +36,7 @@ pub trait Web3PubSub {
 }
 
 impl Web3PubSub for EthSubscribe {
-    type Metadata = Arc<Session>;
+    type Metadata = RateLimitMetadata<Arc<Session>>;
 
     fn subscribe(
         &self,
diff --git a/core/bin/zksync_core/src/api_server/web3/backend_jsonrpsee/mod.rs b/core/bin/zksync_core/src/api_server/web3/backend_jsonrpsee/mod.rs
index 3ead6304d7e0..815f92b70f26 100644
--- a/core/bin/zksync_core/src/api_server/web3/backend_jsonrpsee/mod.rs
+++ b/core/bin/zksync_core/src/api_server/web3/backend_jsonrpsee/mod.rs
@@ -24,7 +24,8 @@ pub fn into_jsrpc_error(err: Web3Error) -> ErrorObjectOwned {
             | Web3Error::FilterNotFound
             | Web3Error::InvalidFeeParams(_)
             | Web3Error::InvalidFilterBlockHash
-            | Web3Error::LogsLimitExceeded(_, _, _) => ErrorCode::InvalidParams.code(),
+            | Web3Error::LogsLimitExceeded(_, _, _)
+            | Web3Error::TooManyLogs(_) => ErrorCode::InvalidParams.code(),
             Web3Error::SubmitTransactionError(_, _) | Web3Error::SerializationError(_) => 3,
             Web3Error::PubSubTimeout => 4,
             Web3Error::RequestTimeout => 5,
diff --git a/core/bin/zksync_core/src/api_server/web3/backend_jsonrpsee/namespaces/zks.rs b/core/bin/zksync_core/src/api_server/web3/backend_jsonrpsee/namespaces/zks.rs
index 61b95d723ea3..ee675cc9e2ca 100644
--- a/core/bin/zksync_core/src/api_server/web3/backend_jsonrpsee/namespaces/zks.rs
+++ b/core/bin/zksync_core/src/api_server/web3/backend_jsonrpsee/namespaces/zks.rs
@@ -14,7 +14,7 @@ use zksync_types::{
 use zksync_web3_decl::{
     jsonrpsee::core::{async_trait, RpcResult},
     namespaces::zks::ZksNamespaceServer,
-    types::Token,
+    types::{Filter, Log, Token},
 };
 
 use crate::{
@@ -152,4 +152,10 @@ impl<G: L1GasPriceProvider + Send + Sync + 'static> ZksNamespaceServer for ZksNa
     ) -> RpcResult<Option<ProtocolVersion>> {
         Ok(self.get_protocol_version_impl(version_id).await)
     }
+
+    async fn get_logs_with_virtual_blocks(&self, filter: Filter) -> RpcResult<Vec<Log>> {
+        self.get_logs_with_virtual_blocks_impl(filter)
+            .await
+            .map_err(into_jsrpc_error)
+    }
 }
diff --git a/core/bin/zksync_core/src/api_server/web3/mod.rs b/core/bin/zksync_core/src/api_server/web3/mod.rs
index 8cf1c69c8041..1267e2b67ccd 100644
--- a/core/bin/zksync_core/src/api_server/web3/mod.rs
+++ b/core/bin/zksync_core/src/api_server/web3/mod.rs
@@ -1,7 +1,9 @@
 // External uses
+use anyhow::Context as _;
 use futures::future;
-use jsonrpc_core::{IoHandler, MetaIoHandler};
+use jsonrpc_core::MetaIoHandler;
 use jsonrpc_http_server::hyper;
+
 use jsonrpc_pubsub::PubSubHandler;
 use serde::Deserialize;
 use tokio::sync::{watch, RwLock};
@@ -11,7 +13,6 @@ use tower_http::{cors::CorsLayer, metrics::InFlightRequestsLayer};
 use std::{net::SocketAddr, sync::Arc, time::Duration};
 
 // Workspace uses
-use zksync_contracts::BaseSystemContractsHashes;
 use zksync_dal::{ConnectionPool, StorageProcessor};
 use zksync_health_check::{HealthStatus, HealthUpdater, ReactiveHealthCheck};
 use zksync_types::{api, MiniblockNumber};
@@ -29,7 +30,10 @@ use zksync_web3_decl::{
 
 // Local uses
 use crate::{
-    api_server::{execution_sandbox::VmConcurrencyBarrier, tx_sender::TxSender},
+    api_server::{
+        execution_sandbox::VmConcurrencyBarrier, tx_sender::TxSender,
+        web3::backend_jsonrpc::batch_limiter_middleware::RateLimitMetadata,
+    },
     l1_gas_price::L1GasPriceProvider,
     sync_layer::SyncState,
 };
@@ -42,6 +46,7 @@ pub mod state;
 
 // Uses from submodules.
 use self::backend_jsonrpc::{
+    batch_limiter_middleware::{LimitMiddleware, Transport},
     error::internal_error,
     namespaces::{
         debug::DebugNamespaceT, en::EnNamespaceT, eth::EthNamespaceT, net::NetNamespaceT,
@@ -54,7 +59,7 @@ use self::namespaces::{
     ZksNamespace,
 };
 use self::pubsub_notifier::{notify_blocks, notify_logs, notify_txs};
-use self::state::{Filters, InternalApiConfig, RpcState};
+use self::state::{Filters, InternalApiConfig, RpcState, SealedMiniblockNumber};
 
 /// Timeout for graceful shutdown logic within API servers.
 const GRACEFUL_SHUTDOWN_TIMEOUT: Duration = Duration::from_secs(5);
@@ -108,6 +113,7 @@ impl Namespace {
 pub struct ApiBuilder<G> {
     backend: ApiBackend,
     pool: ConnectionPool,
+    last_miniblock_pool: ConnectionPool,
     config: InternalApiConfig,
     transport: Option<ApiTransport>,
     tx_sender: Option<TxSender<G>>,
@@ -116,11 +122,13 @@ pub struct ApiBuilder<G> {
     subscriptions_limit: Option<usize>,
     batch_request_size_limit: Option<usize>,
     response_body_size_limit: Option<usize>,
+    websocket_requests_per_minute_limit: Option<u32>,
     sync_state: Option<SyncState>,
     threads: Option<usize>,
     vm_concurrency_limit: Option<usize>,
     polling_interval: Option<Duration>,
     namespaces: Option<Vec<Namespace>>,
+    logs_translator_enabled: bool,
 }
 
 impl<G> ApiBuilder<G> {
@@ -128,6 +136,7 @@ impl<G> ApiBuilder<G> {
         Self {
             backend: ApiBackend::Jsonrpsee,
             transport: None,
+            last_miniblock_pool: pool.clone(),
             pool,
             sync_state: None,
             tx_sender: None,
@@ -136,31 +145,20 @@ impl<G> ApiBuilder<G> {
             subscriptions_limit: None,
             batch_request_size_limit: None,
             response_body_size_limit: None,
+            websocket_requests_per_minute_limit: None,
             threads: None,
             vm_concurrency_limit: None,
             polling_interval: None,
             namespaces: None,
             config,
+            logs_translator_enabled: false,
         }
     }
 
     pub fn jsonrpc_backend(config: InternalApiConfig, pool: ConnectionPool) -> Self {
         Self {
             backend: ApiBackend::Jsonrpc,
-            transport: None,
-            pool,
-            sync_state: None,
-            tx_sender: None,
-            vm_barrier: None,
-            filters_limit: None,
-            subscriptions_limit: None,
-            batch_request_size_limit: None,
-            response_body_size_limit: None,
-            threads: None,
-            vm_concurrency_limit: None,
-            polling_interval: None,
-            namespaces: None,
-            config,
+            ..Self::jsonrpsee_backend(config, pool)
         }
     }
 
@@ -174,6 +172,14 @@ impl<G> ApiBuilder<G> {
         self
     }
 
+    /// Configures a dedicated DB pool to be used for updating the latest miniblock information
+    /// in a background task. If not called, the main pool will be used. If the API server is under high load,
+    /// it may make sense to supply a single-connection pool to reduce pool contention with the API methods.
+    pub fn with_last_miniblock_pool(mut self, pool: ConnectionPool) -> Self {
+        self.last_miniblock_pool = pool;
+        self
+    }
+
     pub fn with_tx_sender(
         mut self,
         tx_sender: TxSender<G>,
@@ -204,6 +210,14 @@ impl<G> ApiBuilder<G> {
         self
     }
 
+    pub fn with_websocket_requests_per_minute_limit(
+        mut self,
+        websocket_requests_per_minute_limit: u32,
+    ) -> Self {
+        self.websocket_requests_per_minute_limit = Some(websocket_requests_per_minute_limit);
+        self
+    }
+
     pub fn with_sync_state(mut self, sync_state: SyncState) -> Self {
         self.sync_state = Some(sync_state);
         self
@@ -228,30 +242,49 @@ impl<G> ApiBuilder<G> {
         self.namespaces = Some(namespaces);
         self
     }
+
+    pub fn enable_request_translator(mut self) -> Self {
+        tracing::info!("Logs request translator enabled");
+        self.logs_translator_enabled = true;
+        self
+    }
 }
 
 impl<G: 'static + Send + Sync + L1GasPriceProvider> ApiBuilder<G> {
-    fn build_rpc_state(&self) -> RpcState<G> {
+    fn build_rpc_state(self) -> RpcState<G> {
+        // Chosen to be significantly smaller than the interval between miniblocks, but larger than
+        // the latency of getting the latest sealed miniblock number from Postgres. If the API server
+        // processes enough requests, information about the latest sealed miniblock will be updated
+        // by reporting block difference metrics, so the actual update lag would be much smaller than this value.
+        const SEALED_MINIBLOCK_UPDATE_INTERVAL: Duration = Duration::from_millis(25);
+
+        let (last_sealed_miniblock, update_task) =
+            SealedMiniblockNumber::new(self.last_miniblock_pool, SEALED_MINIBLOCK_UPDATE_INTERVAL);
+        // The update tasks takes care of its termination, so we don't need to retain its handle.
+        tokio::spawn(update_task);
+
         RpcState {
             installed_filters: Arc::new(RwLock::new(Filters::new(
                 self.filters_limit.unwrap_or(usize::MAX),
             ))),
-            connection_pool: self.pool.clone(),
-            tx_sender: self.tx_sender.clone().expect("TxSender is not provided"),
-            sync_state: self.sync_state.clone(),
-            api_config: self.config.clone(),
+            connection_pool: self.pool,
+            tx_sender: self.tx_sender.expect("TxSender is not provided"),
+            sync_state: self.sync_state,
+            api_config: self.config,
+            last_sealed_miniblock,
+            logs_translator_enabled: self.logs_translator_enabled,
         }
     }
 
-    async fn build_rpc_module(&self) -> RpcModule<()> {
+    async fn build_rpc_module(mut self) -> RpcModule<()> {
+        let namespaces = self.namespaces.take().unwrap();
         let zksync_network_id = self.config.l2_chain_id;
-        let rpc_app = self.build_rpc_state();
+        let rpc_state = self.build_rpc_state();
 
         // Collect all the methods into a single RPC module.
-        let namespaces = self.namespaces.as_ref().unwrap();
         let mut rpc = RpcModule::new(());
         if namespaces.contains(&Namespace::Eth) {
-            rpc.merge(EthNamespace::new(rpc_app.clone()).into_rpc())
+            rpc.merge(EthNamespace::new(rpc_state.clone()).into_rpc())
                 .expect("Can't merge eth namespace");
         }
         if namespaces.contains(&Namespace::Net) {
@@ -263,35 +296,16 @@ impl<G: 'static + Send + Sync + L1GasPriceProvider> ApiBuilder<G> {
                 .expect("Can't merge web3 namespace");
         }
         if namespaces.contains(&Namespace::Zks) {
-            rpc.merge(ZksNamespace::new(rpc_app.clone()).into_rpc())
+            rpc.merge(ZksNamespace::new(rpc_state.clone()).into_rpc())
                 .expect("Can't merge zks namespace");
         }
         if namespaces.contains(&Namespace::En) {
-            rpc.merge(EnNamespace::new(rpc_app.clone()).into_rpc())
+            rpc.merge(EnNamespace::new(rpc_state.clone()).into_rpc())
                 .expect("Can't merge en namespace");
         }
         if namespaces.contains(&Namespace::Debug) {
-            let hashes = BaseSystemContractsHashes {
-                default_aa: rpc_app.tx_sender.0.sender_config.default_aa,
-                bootloader: rpc_app.tx_sender.0.sender_config.bootloader,
-            };
-            rpc.merge(
-                DebugNamespace::new(
-                    rpc_app.connection_pool,
-                    hashes,
-                    rpc_app.tx_sender.0.sender_config.fair_l2_gas_price,
-                    rpc_app
-                        .tx_sender
-                        .0
-                        .sender_config
-                        .vm_execution_cache_misses_limit,
-                    rpc_app.tx_sender.vm_concurrency_limiter(),
-                    rpc_app.tx_sender.storage_caches(),
-                )
-                .await
-                .into_rpc(),
-            )
-            .expect("Can't merge debug namespace");
+            rpc.merge(DebugNamespace::new(rpc_state).await.into_rpc())
+                .expect("Can't merge debug namespace");
         }
         rpc
     }
@@ -299,13 +313,16 @@ impl<G: 'static + Send + Sync + L1GasPriceProvider> ApiBuilder<G> {
     pub async fn build(
         mut self,
         stop_receiver: watch::Receiver<bool>,
-    ) -> (Vec<tokio::task::JoinHandle<()>>, ReactiveHealthCheck) {
+    ) -> (
+        Vec<tokio::task::JoinHandle<anyhow::Result<()>>>,
+        ReactiveHealthCheck,
+    ) {
         if self.filters_limit.is_none() {
-            vlog::warn!("Filters limit is not set - unlimited filters are allowed");
+            tracing::warn!("Filters limit is not set - unlimited filters are allowed");
         }
 
         if self.namespaces.is_none() {
-            vlog::warn!("debug_ API namespace will be disabled by default in ApiBuilder");
+            tracing::warn!("debug_ API namespace will be disabled by default in ApiBuilder");
             self.namespaces = Some(Namespace::NON_DEBUG.to_vec());
         }
 
@@ -316,23 +333,25 @@ impl<G: 'static + Send + Sync + L1GasPriceProvider> ApiBuilder<G> {
             .contains(&Namespace::Pubsub)
             && matches!(&self.transport, Some(ApiTransport::Http(_)))
         {
-            vlog::debug!("pubsub API is not supported for HTTP transport, ignoring");
+            tracing::debug!("pubsub API is not supported for HTTP transport, ignoring");
         }
 
         match (&self.transport, self.subscriptions_limit) {
             (Some(ApiTransport::WebSocket(_)), None) => {
-                vlog::warn!(
+                tracing::warn!(
                     "`subscriptions_limit` is not set - unlimited subscriptions are allowed"
                 );
             }
             (Some(ApiTransport::Http(_)), Some(_)) => {
-                vlog::warn!(
+                tracing::warn!(
                     "`subscriptions_limit` is ignored for HTTP transport, use WebSocket instead"
                 );
             }
             _ => {}
         }
 
+        // TODO (PLA-284): Pass `stop_receiver` into every implementation to properly
+        // handle shutdown signals.
         match (self.backend, self.transport.take()) {
             (ApiBackend::Jsonrpc, Some(ApiTransport::Http(addr))) => {
                 let (api_health_check, health_updater) = ReactiveHealthCheck::new("http_api");
@@ -352,21 +371,16 @@ impl<G: 'static + Send + Sync + L1GasPriceProvider> ApiBuilder<G> {
                     api_health_check,
                 )
             }
-            (ApiBackend::Jsonrpsee, Some(ApiTransport::Http(addr))) => {
-                let (api_health_check, health_updater) = ReactiveHealthCheck::new("http_api");
-                (
-                    vec![
-                        self.build_jsonrpsee_http(addr, stop_receiver, health_updater)
-                            .await,
-                    ],
-                    api_health_check,
-                )
-            }
-            (ApiBackend::Jsonrpsee, Some(ApiTransport::WebSocket(addr))) => {
-                let (api_health_check, health_updater) = ReactiveHealthCheck::new("ws_api");
+            (ApiBackend::Jsonrpsee, Some(transport)) => {
+                let name = match &transport {
+                    ApiTransport::Http(_) => "http_api",
+                    ApiTransport::WebSocket(_) => "ws_api",
+                };
+                let (api_health_check, health_updater) = ReactiveHealthCheck::new(name);
+
                 (
                     vec![
-                        self.build_jsonrpsee_ws(addr, stop_receiver, health_updater)
+                        self.build_jsonrpsee(transport, stop_receiver, health_updater)
                             .await,
                     ],
                     api_health_check,
@@ -377,41 +391,40 @@ impl<G: 'static + Send + Sync + L1GasPriceProvider> ApiBuilder<G> {
     }
 
     async fn build_jsonrpc_http(
-        self,
+        mut self,
         addr: SocketAddr,
         mut stop_receiver: watch::Receiver<bool>,
         health_updater: HealthUpdater,
-    ) -> tokio::task::JoinHandle<()> {
+    ) -> tokio::task::JoinHandle<anyhow::Result<()>> {
         if self.batch_request_size_limit.is_some() {
-            vlog::info!("`batch_request_size_limit` is not supported for `jsonrpc` backend, this value is ignored");
+            tracing::info!("`batch_request_size_limit` is not supported for HTTP `jsonrpc` backend, this value is ignored");
         }
         if self.response_body_size_limit.is_some() {
-            vlog::info!("`response_body_size_limit` is not supported for `jsonrpc` backend, this value is ignored");
+            tracing::info!("`response_body_size_limit` is not supported for `jsonrpc` backend, this value is ignored");
         }
 
-        let mut io_handler = IoHandler::new();
-        self.extend_jsonrpc_methods(&mut io_handler).await;
-        let vm_barrier = self.vm_barrier.unwrap();
-
+        let vm_barrier = self.vm_barrier.take().unwrap();
         let runtime = tokio::runtime::Builder::new_multi_thread()
             .enable_all()
             .thread_name("jsonrpc-http-worker")
             .worker_threads(self.threads.unwrap())
             .build()
             .unwrap();
+        let mut io_handler: MetaIoHandler<()> = MetaIoHandler::default();
+        self.extend_jsonrpc_methods(&mut io_handler).await;
 
         tokio::task::spawn_blocking(move || {
             let server = jsonrpc_http_server::ServerBuilder::new(io_handler)
                 .threads(1)
                 .event_loop_executor(runtime.handle().clone())
                 .start_http(&addr)
-                .unwrap();
+                .context("jsonrpc_http::Server::start_http")?;
 
             let close_handle = server.close_handle();
             let closing_vm_barrier = vm_barrier.clone();
             runtime.handle().spawn(async move {
                 if stop_receiver.changed().await.is_ok() {
-                    vlog::info!("Stop signal received, HTTP JSON-RPC server is shutting down");
+                    tracing::info!("Stop signal received, HTTP JSON-RPC server is shutting down");
                     closing_vm_barrier.close();
                     close_handle.close();
                 }
@@ -420,9 +433,10 @@ impl<G: 'static + Send + Sync + L1GasPriceProvider> ApiBuilder<G> {
             health_updater.update(HealthStatus::Ready.into());
             server.wait();
             drop(health_updater);
-            vlog::info!("HTTP JSON-RPC server stopped");
+            tracing::info!("HTTP JSON-RPC server stopped");
             runtime.block_on(Self::wait_for_vm(vm_barrier, "HTTP"));
             runtime.shutdown_timeout(GRACEFUL_SHUTDOWN_TIMEOUT);
+            Ok(())
         })
     }
 
@@ -430,22 +444,23 @@ impl<G: 'static + Send + Sync + L1GasPriceProvider> ApiBuilder<G> {
         let wait_for_vm =
             tokio::time::timeout(GRACEFUL_SHUTDOWN_TIMEOUT, vm_barrier.wait_until_stopped());
         if wait_for_vm.await.is_err() {
-            vlog::warn!(
+            tracing::warn!(
                 "VM execution on {transport} JSON-RPC server didn't stop after {GRACEFUL_SHUTDOWN_TIMEOUT:?}; \
                  forcing shutdown anyway"
             );
         } else {
-            vlog::info!("VM execution on {transport} JSON-RPC server stopped");
+            tracing::info!("VM execution on {transport} JSON-RPC server stopped");
         }
     }
 
-    async fn extend_jsonrpc_methods<T>(&self, io: &mut MetaIoHandler<T>)
+    async fn extend_jsonrpc_methods<T, S>(mut self, io: &mut MetaIoHandler<T, S>)
     where
         T: jsonrpc_core::Metadata,
+        S: jsonrpc_core::Middleware<T>,
     {
         let zksync_network_id = self.config.l2_chain_id;
+        let namespaces = self.namespaces.take().unwrap();
         let rpc_state = self.build_rpc_state();
-        let namespaces = self.namespaces.as_ref().unwrap();
         if namespaces.contains(&Namespace::Eth) {
             io.extend_with(EthNamespace::new(rpc_state.clone()).to_delegate());
         }
@@ -462,48 +477,37 @@ impl<G: 'static + Send + Sync + L1GasPriceProvider> ApiBuilder<G> {
             io.extend_with(NetNamespace::new(zksync_network_id).to_delegate());
         }
         if namespaces.contains(&Namespace::Debug) {
-            let hashes = BaseSystemContractsHashes {
-                default_aa: rpc_state.tx_sender.0.sender_config.default_aa,
-                bootloader: rpc_state.tx_sender.0.sender_config.bootloader,
-            };
-            let debug_ns = DebugNamespace::new(
-                rpc_state.connection_pool,
-                hashes,
-                rpc_state.tx_sender.0.sender_config.fair_l2_gas_price,
-                rpc_state
-                    .tx_sender
-                    .0
-                    .sender_config
-                    .vm_execution_cache_misses_limit,
-                rpc_state.tx_sender.vm_concurrency_limiter(),
-                rpc_state.tx_sender.storage_caches(),
-            )
-            .await;
+            let debug_ns = DebugNamespace::new(rpc_state).await;
             io.extend_with(debug_ns.to_delegate());
         }
     }
 
     async fn build_jsonrpc_ws(
-        self,
+        mut self,
         addr: SocketAddr,
         mut stop_receiver: watch::Receiver<bool>,
         health_updater: HealthUpdater,
-    ) -> Vec<tokio::task::JoinHandle<()>> {
-        if self.batch_request_size_limit.is_some() {
-            vlog::info!("`batch_request_size_limit` is not supported for `jsonrpc` backend, this value is ignored");
-        }
+    ) -> Vec<tokio::task::JoinHandle<anyhow::Result<()>>> {
         if self.response_body_size_limit.is_some() {
-            vlog::info!("`response_body_size_limit` is not supported for `jsonrpc` backend, this value is ignored");
+            tracing::info!("`response_body_size_limit` is not supported for `jsonrpc` backend, this value is ignored");
         }
+        let websocket_requests_per_second_limit = self.websocket_requests_per_minute_limit;
+
+        let batch_limiter_middleware =
+            LimitMiddleware::new(Transport::Ws, self.batch_request_size_limit);
 
         let runtime = tokio::runtime::Builder::new_multi_thread()
             .enable_all()
             .thread_name("jsonrpc-ws-worker")
             .worker_threads(self.threads.unwrap())
             .build()
-            .unwrap();
+            .unwrap(); // Constructing a runtime should always succeed.
+        let max_connections = self.subscriptions_limit.unwrap_or(usize::MAX);
+        let vm_barrier = self.vm_barrier.take().unwrap();
 
-        let mut io_handler = PubSubHandler::default();
+        let io_handler: MetaIoHandler<RateLimitMetadata<Arc<jsonrpc_pubsub::Session>>, _> =
+            MetaIoHandler::with_middleware(batch_limiter_middleware);
+        let mut io_handler = PubSubHandler::new(io_handler);
         let mut notify_handles = Vec::new();
 
         if self
@@ -536,29 +540,27 @@ impl<G: 'static + Send + Sync + L1GasPriceProvider> ApiBuilder<G> {
             ]);
             io_handler.extend_with(pub_sub.to_delegate());
         }
-
         self.extend_jsonrpc_methods(&mut io_handler).await;
 
-        let max_connections = self.subscriptions_limit.unwrap_or(usize::MAX);
-        let vm_barrier = self.vm_barrier.unwrap();
         let server_handle = tokio::task::spawn_blocking(move || {
             let server = jsonrpc_ws_server::ServerBuilder::with_meta_extractor(
                 io_handler,
-                |context: &jsonrpc_ws_server::RequestContext| {
-                    Arc::new(jsonrpc_pubsub::Session::new(context.sender()))
+                move |context: &jsonrpc_ws_server::RequestContext| {
+                    let session = Arc::new(jsonrpc_pubsub::Session::new(context.sender()));
+                    RateLimitMetadata::new(websocket_requests_per_second_limit, session)
                 },
             )
             .event_loop_executor(runtime.handle().clone())
             .max_connections(max_connections)
             .session_stats(TrackOpenWsConnections)
             .start(&addr)
-            .unwrap();
+            .context("jsonrpc_ws_server::Server::start()")?;
 
             let close_handle = server.close_handle();
             let closing_vm_barrier = vm_barrier.clone();
             runtime.handle().spawn(async move {
                 if stop_receiver.changed().await.is_ok() {
-                    vlog::info!("Stop signal received, WS JSON-RPC server is shutting down");
+                    tracing::info!("Stop signal received, WS JSON-RPC server is shutting down");
                     closing_vm_barrier.close();
                     close_handle.close();
                 }
@@ -567,29 +569,44 @@ impl<G: 'static + Send + Sync + L1GasPriceProvider> ApiBuilder<G> {
             health_updater.update(HealthStatus::Ready.into());
             server.wait().unwrap();
             drop(health_updater);
-            vlog::info!("WS JSON-RPC server stopped");
+            tracing::info!("WS JSON-RPC server stopped");
             runtime.block_on(Self::wait_for_vm(vm_barrier, "WS"));
             runtime.shutdown_timeout(GRACEFUL_SHUTDOWN_TIMEOUT);
+            Ok(())
         });
 
         notify_handles.push(server_handle);
         notify_handles
     }
 
-    async fn build_jsonrpsee_http(
-        self,
-        addr: SocketAddr,
+    async fn build_jsonrpsee(
+        mut self,
+        transport: ApiTransport,
         stop_receiver: watch::Receiver<bool>,
         health_updater: HealthUpdater,
-    ) -> tokio::task::JoinHandle<()> {
-        let rpc = self.build_rpc_module().await;
+    ) -> tokio::task::JoinHandle<anyhow::Result<()>> {
+        if matches!(transport, ApiTransport::WebSocket(_)) {
+            // TODO (SMA-1588): Implement `eth_subscribe` method for `jsonrpsee`.
+            tracing::warn!(
+                "`eth_subscribe` is not implemented for jsonrpsee backend, use jsonrpc instead"
+            );
+
+            if self.websocket_requests_per_minute_limit.is_some() {
+                tracing::info!("`websocket_requests_per_second_limit` is not supported for `jsonrpsee` backend, this value is ignored");
+            }
+        }
+
+        let runtime_thread_name = match transport {
+            ApiTransport::Http(_) => "jsonrpsee-http-worker",
+            ApiTransport::WebSocket(_) => "jsonrpsee-ws-worker",
+        };
         let runtime = tokio::runtime::Builder::new_multi_thread()
             .enable_all()
-            .thread_name("jsonrpsee-http-worker")
+            .thread_name(runtime_thread_name)
             .worker_threads(self.threads.unwrap())
             .build()
             .unwrap();
-        let vm_barrier = self.vm_barrier.unwrap();
+        let vm_barrier = self.vm_barrier.take().unwrap();
         let batch_request_config = if let Some(limit) = self.batch_request_size_limit {
             BatchRequestConfig::Limit(limit as u32)
         } else {
@@ -600,12 +617,13 @@ impl<G: 'static + Send + Sync + L1GasPriceProvider> ApiBuilder<G> {
             .map(|limit| limit as u32)
             .unwrap_or(u32::MAX);
 
+        let rpc = self.build_rpc_module().await;
+
         // Start the server in a separate tokio runtime from a dedicated thread.
         tokio::task::spawn_blocking(move || {
-            runtime.block_on(Self::run_jsonrpsee_server(
-                true,
+            let res = runtime.block_on(Self::run_jsonrpsee_server(
                 rpc,
-                addr,
+                transport,
                 stop_receiver,
                 health_updater,
                 vm_barrier,
@@ -613,21 +631,25 @@ impl<G: 'static + Send + Sync + L1GasPriceProvider> ApiBuilder<G> {
                 response_body_size_limit,
             ));
             runtime.shutdown_timeout(GRACEFUL_SHUTDOWN_TIMEOUT);
+            res
         })
     }
 
     #[allow(clippy::too_many_arguments)]
     async fn run_jsonrpsee_server(
-        is_http: bool,
         rpc: RpcModule<()>,
-        addr: SocketAddr,
+        transport: ApiTransport,
         mut stop_receiver: watch::Receiver<bool>,
         health_updater: HealthUpdater,
         vm_barrier: VmConcurrencyBarrier,
         batch_request_config: BatchRequestConfig,
         response_body_size_limit: u32,
-    ) {
-        let transport = if is_http { "HTTP" } else { "WS" };
+    ) -> anyhow::Result<()> {
+        let (transport_str, is_http, addr) = match transport {
+            ApiTransport::Http(addr) => ("HTTP", true, addr),
+            ApiTransport::WebSocket(addr) => ("WS", false, addr),
+        };
+
         // Setup CORS.
         let cors = is_http.then(|| {
             CorsLayer::new()
@@ -639,8 +661,8 @@ impl<G: 'static + Send + Sync + L1GasPriceProvider> ApiBuilder<G> {
         });
         // Setup metrics for the number of in-flight requests.
         let (in_flight_requests, counter) = InFlightRequestsLayer::pair();
-        tokio::spawn(counter.run_emitter(Duration::from_secs(10), move |count| {
-            metrics::histogram!("api.web3.in_flight_requests", count as f64, "scheme" => transport);
+        tokio::spawn(counter.run_emitter(Duration::from_millis(100), move |count| {
+            metrics::histogram!("api.web3.in_flight_requests", count as f64, "scheme" => transport_str);
             future::ready(())
         }));
         // Assemble server middleware.
@@ -660,16 +682,16 @@ impl<G: 'static + Send + Sync + L1GasPriceProvider> ApiBuilder<G> {
             .max_response_body_size(response_body_size_limit)
             .build(addr)
             .await
-            .unwrap_or_else(|err| {
-                panic!("Failed building {} JSON-RPC server: {}", transport, err);
-            });
+            .with_context(|| format!("Failed building {transport_str} JSON-RPC server"))?;
         let server_handle = server.start(rpc);
 
         let close_handle = server_handle.clone();
         let closing_vm_barrier = vm_barrier.clone();
         tokio::spawn(async move {
             if stop_receiver.changed().await.is_ok() {
-                vlog::info!("Stop signal received, {transport} JSON-RPC server is shutting down");
+                tracing::info!(
+                    "Stop signal received, {transport_str} JSON-RPC server is shutting down"
+                );
                 closing_vm_barrier.close();
                 close_handle.stop().ok();
             }
@@ -678,53 +700,9 @@ impl<G: 'static + Send + Sync + L1GasPriceProvider> ApiBuilder<G> {
 
         server_handle.stopped().await;
         drop(health_updater);
-        vlog::info!("{transport} JSON-RPC server stopped");
-        Self::wait_for_vm(vm_barrier, transport).await;
-    }
-
-    async fn build_jsonrpsee_ws(
-        self,
-        addr: SocketAddr,
-        stop_receiver: watch::Receiver<bool>,
-        health_updater: HealthUpdater,
-    ) -> tokio::task::JoinHandle<()> {
-        vlog::warn!(
-            "`eth_subscribe` is not implemented for jsonrpsee backend, use jsonrpc instead"
-        );
-
-        let rpc = self.build_rpc_module().await;
-        let runtime = tokio::runtime::Builder::new_multi_thread()
-            .enable_all()
-            .thread_name("jsonrpsee-ws-worker")
-            .worker_threads(self.threads.unwrap())
-            .build()
-            .unwrap();
-        let vm_barrier = self.vm_barrier.unwrap();
-
-        let batch_request_config = if let Some(limit) = self.batch_request_size_limit {
-            BatchRequestConfig::Limit(limit as u32)
-        } else {
-            BatchRequestConfig::Unlimited
-        };
-        let response_body_size_limit = self
-            .response_body_size_limit
-            .map(|limit| limit as u32)
-            .unwrap_or(u32::MAX);
-
-        // Start the server in a separate tokio runtime from a dedicated thread.
-        tokio::task::spawn_blocking(move || {
-            runtime.block_on(Self::run_jsonrpsee_server(
-                false,
-                rpc,
-                addr,
-                stop_receiver,
-                health_updater,
-                vm_barrier,
-                batch_request_config,
-                response_body_size_limit,
-            ));
-            runtime.shutdown_timeout(GRACEFUL_SHUTDOWN_TIMEOUT);
-        })
+        tracing::info!("{transport_str} JSON-RPC server stopped");
+        Self::wait_for_vm(vm_barrier, transport_str).await;
+        Ok(())
     }
 }
 
diff --git a/core/bin/zksync_core/src/api_server/web3/namespaces/debug.rs b/core/bin/zksync_core/src/api_server/web3/namespaces/debug.rs
index da1af8238315..9ca717f0dcf4 100644
--- a/core/bin/zksync_core/src/api_server/web3/namespaces/debug.rs
+++ b/core/bin/zksync_core/src/api_server/web3/namespaces/debug.rs
@@ -1,64 +1,60 @@
+use once_cell::sync::OnceCell;
 use std::{sync::Arc, time::Instant};
+use vm::constants::BLOCK_GAS_LIMIT;
+
+use vm::ExecutionResult;
 
-use zksync_contracts::{
-    BaseSystemContracts, BaseSystemContractsHashes, PLAYGROUND_BLOCK_BOOTLOADER_CODE,
-};
 use zksync_dal::ConnectionPool;
 use zksync_state::PostgresStorageCaches;
 use zksync_types::{
     api::{BlockId, BlockNumber, DebugCall, ResultDebugCall, TracerConfig},
     l2::L2Tx,
     transaction_request::CallRequest,
-    vm_trace::{Call, VmTrace},
-    AccountTreeId, H256, USED_BOOTLOADER_MEMORY_BYTES,
+    vm_trace::Call,
+    AccountTreeId, L2ChainId, H256, USED_BOOTLOADER_MEMORY_BYTES,
 };
 use zksync_web3_decl::error::Web3Error;
 
+use super::report_latency_with_block_id_and_diff;
 use crate::api_server::{
-    execution_sandbox::{execute_tx_eth_call, BlockArgs, TxSharedArgs, VmConcurrencyLimiter},
-    tx_sender::SubmitTxError,
-    web3::{backend_jsonrpc::error::internal_error, resolve_block},
+    execution_sandbox::{
+        execute_tx_eth_call, ApiTracer, BlockArgs, TxSharedArgs, VmConcurrencyLimiter,
+    },
+    tx_sender::ApiContracts,
+    web3::{
+        backend_jsonrpc::error::internal_error,
+        resolve_block,
+        state::{RpcState, SealedMiniblockNumber},
+    },
 };
+use crate::l1_gas_price::L1GasPriceProvider;
 
 #[derive(Debug, Clone)]
 pub struct DebugNamespace {
     connection_pool: ConnectionPool,
     fair_l2_gas_price: u64,
-    base_system_contracts: BaseSystemContracts,
+    api_contracts: ApiContracts,
     vm_execution_cache_misses_limit: Option<usize>,
     vm_concurrency_limiter: Arc<VmConcurrencyLimiter>,
     storage_caches: PostgresStorageCaches,
+    last_sealed_miniblock: SealedMiniblockNumber,
+    chain_id: L2ChainId,
 }
 
 impl DebugNamespace {
-    pub async fn new(
-        connection_pool: ConnectionPool,
-        base_system_contract_hashes: BaseSystemContractsHashes,
-        fair_l2_gas_price: u64,
-        vm_execution_cache_misses_limit: Option<usize>,
-        vm_concurrency_limiter: Arc<VmConcurrencyLimiter>,
-        storage_caches: PostgresStorageCaches,
-    ) -> Self {
-        let mut storage = connection_pool.access_storage_tagged("api").await;
-
-        let mut base_system_contracts = storage
-            .storage_dal()
-            .get_base_system_contracts(
-                base_system_contract_hashes.bootloader,
-                base_system_contract_hashes.default_aa,
-            )
-            .await;
-
-        drop(storage);
+    pub async fn new<G: L1GasPriceProvider>(state: RpcState<G>) -> Self {
+        let sender_config = &state.tx_sender.0.sender_config;
 
-        base_system_contracts.bootloader = PLAYGROUND_BLOCK_BOOTLOADER_CODE.clone();
+        let api_contracts = ApiContracts::load_from_disk();
         Self {
-            connection_pool,
-            fair_l2_gas_price,
-            base_system_contracts,
-            vm_execution_cache_misses_limit,
-            vm_concurrency_limiter,
-            storage_caches,
+            connection_pool: state.connection_pool,
+            fair_l2_gas_price: sender_config.fair_l2_gas_price,
+            api_contracts,
+            vm_execution_cache_misses_limit: sender_config.vm_execution_cache_misses_limit,
+            vm_concurrency_limiter: state.tx_sender.vm_concurrency_limiter(),
+            storage_caches: state.tx_sender.storage_caches(),
+            last_sealed_miniblock: state.last_sealed_miniblock,
+            chain_id: sender_config.chain_id,
         }
     }
 
@@ -80,10 +76,7 @@ impl DebugNamespace {
             .blocks_web3_dal()
             .get_trace_for_miniblock(block_number)
             .await;
-
-        metrics::histogram!("api.web3.call", start.elapsed(), "method" => METHOD_NAME, "block_id" => block_id.extract_block_tag());
-
-        Ok(call_trace
+        let call_trace = call_trace
             .into_iter()
             .map(|call_trace| {
                 let mut result: DebugCall = call_trace.into();
@@ -92,7 +85,11 @@ impl DebugNamespace {
                 }
                 ResultDebugCall { result }
             })
-            .collect())
+            .collect();
+
+        let block_diff = self.last_sealed_miniblock.diff(block_number);
+        report_latency_with_block_id_and_diff(METHOD_NAME, start, block_id, block_diff);
+        Ok(call_trace)
     }
 
     #[tracing::instrument(skip(self))]
@@ -133,9 +130,9 @@ impl DebugNamespace {
             .map(|options| options.tracer_config.only_top_call)
             .unwrap_or(false);
 
-        let block = block_id.unwrap_or(BlockId::Number(BlockNumber::Pending));
+        let block_id = block_id.unwrap_or(BlockId::Number(BlockNumber::Pending));
         let mut connection = self.connection_pool.access_storage_tagged("api").await;
-        let block_args = BlockArgs::new(&mut connection, block)
+        let block_args = BlockArgs::new(&mut connection, block_id)
             .await
             .map_err(|err| internal_error("debug_trace_call", err))?
             .ok_or(Web3Error::NoBlock)?;
@@ -148,6 +145,13 @@ impl DebugNamespace {
         let vm_permit = vm_permit.ok_or(Web3Error::InternalError)?;
 
         // We don't need properly trace if we only need top call
+        let call_tracer_result = Arc::new(OnceCell::default());
+        let custom_tracers = if only_top_call {
+            vec![]
+        } else {
+            vec![ApiTracer::CallTracer(call_tracer_result.clone())]
+        };
+
         let result = execute_tx_eth_call(
             vm_permit,
             shared_args,
@@ -155,32 +159,29 @@ impl DebugNamespace {
             tx.clone(),
             block_args,
             self.vm_execution_cache_misses_limit,
-            !only_top_call,
+            custom_tracers,
         )
-        .await
-        .map_err(|err| {
-            let submit_tx_error = SubmitTxError::from(err);
-            Web3Error::SubmitTransactionError(submit_tx_error.to_string(), submit_tx_error.data())
-        })?;
-
-        let (output, revert_reason) = match result.revert_reason {
-            Some(result) => (vec![], Some(result.revert_reason.to_string())),
-            None => (
-                result
-                    .return_data
-                    .into_iter()
-                    .flat_map(<[u8; 32]>::from)
-                    .collect(),
-                None,
-            ),
-        };
-        let trace = match result.trace {
-            VmTrace::CallTrace(trace) => trace,
-            VmTrace::ExecutionTrace(_) => vec![],
+        .await;
+
+        let (output, revert_reason) = match result.result {
+            ExecutionResult::Success { output, .. } => (output, None),
+            ExecutionResult::Revert { output } => (vec![], Some(output.to_string())),
+            ExecutionResult::Halt { reason } => {
+                return Err(Web3Error::SubmitTransactionError(
+                    reason.to_string(),
+                    vec![],
+                ))
+            }
         };
+
+        // We had only one copy of Arc this arc is already dropped it's safe to unwrap
+        let trace = Arc::try_unwrap(call_tracer_result)
+            .unwrap()
+            .take()
+            .unwrap_or_default();
         let call = Call::new_high_level(
-            u32::MAX,
-            result.gas_used,
+            tx.common_data.fee.gas_limit.as_u32(),
+            result.statistics.gas_used,
             tx.execute.value,
             tx.execute.calldata,
             output,
@@ -188,8 +189,8 @@ impl DebugNamespace {
             trace,
         );
 
-        metrics::histogram!("api.web3.call", start.elapsed(), "method" => METHOD_NAME, "block_id" => block.extract_block_tag());
-
+        let block_diff = self.last_sealed_miniblock.diff_with_block_args(&block_args);
+        report_latency_with_block_id_and_diff(METHOD_NAME, start, block_id, block_diff);
         Ok(call.into())
     }
 
@@ -198,8 +199,10 @@ impl DebugNamespace {
             operator_account: AccountTreeId::default(),
             l1_gas_price: 100_000,
             fair_l2_gas_price: self.fair_l2_gas_price,
-            base_system_contracts: self.base_system_contracts.clone(),
+            base_system_contracts: self.api_contracts.eth_call.clone(),
             caches: self.storage_caches.clone(),
+            validation_computational_gas_limit: BLOCK_GAS_LIMIT,
+            chain_id: self.chain_id,
         }
     }
 }
diff --git a/core/bin/zksync_core/src/api_server/web3/namespaces/eth.rs b/core/bin/zksync_core/src/api_server/web3/namespaces/eth.rs
index 16f9a57daad4..dfd96f9abad7 100644
--- a/core/bin/zksync_core/src/api_server/web3/namespaces/eth.rs
+++ b/core/bin/zksync_core/src/api_server/web3/namespaces/eth.rs
@@ -1,12 +1,5 @@
 use std::time::Instant;
 
-use crate::{
-    api_server::{
-        execution_sandbox::BlockArgs,
-        web3::{backend_jsonrpc::error::internal_error, resolve_block, state::RpcState},
-    },
-    l1_gas_price::L1GasPriceProvider,
-};
 use zksync_types::{
     api::{
         BlockId, BlockNumber, GetLogsFilter, Transaction, TransactionId, TransactionReceipt,
@@ -26,6 +19,15 @@ use zksync_web3_decl::{
     types::{Address, Block, Filter, FilterChanges, Log, TypedFilter, U64},
 };
 
+use super::report_latency_with_block_id_and_diff;
+use crate::{
+    api_server::{
+        execution_sandbox::BlockArgs,
+        web3::{backend_jsonrpc::error::internal_error, resolve_block, state::RpcState},
+    },
+    l1_gas_price::L1GasPriceProvider,
+};
+
 pub const EVENT_TOPIC_NUMBER_LIMIT: usize = 4;
 pub const PROTOCOL_VERSION: &str = "zks/1";
 
@@ -94,7 +96,11 @@ impl<G: L1GasPriceProvider> EthNamespace<G> {
         let res_bytes = call_result
             .map_err(|err| Web3Error::SubmitTransactionError(err.to_string(), err.data()))?;
 
-        metrics::histogram!("api.web3.call", start.elapsed(), "method" => METHOD_NAME, "block_id" => block.extract_block_tag());
+        let block_diff = self
+            .state
+            .last_sealed_miniblock
+            .diff_with_block_args(&block_args);
+        report_latency_with_block_id_and_diff(METHOD_NAME, start, block, block_diff);
 
         Ok(res_bytes.into())
     }
@@ -192,14 +198,28 @@ impl<G: L1GasPriceProvider> EthNamespace<G> {
             )
             .await
             .map_err(|err| internal_error(METHOD_NAME, err))?;
-
-        metrics::histogram!("api.web3.call", start.elapsed(), "method" => METHOD_NAME, "block_id" => block.extract_block_tag());
+        self.report_latency_with_block_id(METHOD_NAME, start, block, block_number);
 
         Ok(balance)
     }
 
+    fn report_latency_with_block_id(
+        &self,
+        method_name: &'static str,
+        start: Instant,
+        block: BlockId,
+        block_number: MiniblockNumber,
+    ) {
+        let block_diff = self.state.last_sealed_miniblock.diff(block_number);
+        report_latency_with_block_id_and_diff(method_name, start, block, block_diff);
+    }
+
     #[tracing::instrument(skip(self, filter))]
     pub async fn get_logs_impl(&self, mut filter: Filter) -> Result<Vec<Log>, Web3Error> {
+        if self.state.logs_translator_enabled {
+            return self.state.translate_get_logs(filter).await;
+        }
+
         let start = Instant::now();
 
         self.state.resolve_filter_block_hash(&mut filter).await?;
@@ -270,8 +290,17 @@ impl<G: L1GasPriceProvider> EthNamespace<G> {
             .await
             .map_err(|err| internal_error(method_name, err));
 
-        metrics::histogram!("api.web3.call", start.elapsed(), "method" => method_name, "block_id" => block_id.extract_block_tag());
-
+        if let Ok(Some(block)) = &block {
+            let block_number = MiniblockNumber(block.number.as_u32());
+            self.report_latency_with_block_id(method_name, start, block_id, block_number);
+        } else {
+            metrics::histogram!(
+                "api.web3.call",
+                start.elapsed(),
+                "method" => method_name,
+                "block_id" => block_id.extract_block_tag()
+            );
+        }
         block
     }
 
@@ -293,9 +322,17 @@ impl<G: L1GasPriceProvider> EthNamespace<G> {
             .await
             .map_err(|err| internal_error(METHOD_NAME, err));
 
-        metrics::histogram!("api.web3.call", start.elapsed(), "method" => METHOD_NAME, "block_id" => block_id.extract_block_tag());
-
-        tx_count
+        if let Ok(Some((block_number, _))) = &tx_count {
+            self.report_latency_with_block_id(METHOD_NAME, start, block_id, *block_number);
+        } else {
+            metrics::histogram!(
+                "api.web3.call",
+                start.elapsed(),
+                "method" => METHOD_NAME,
+                "block_id" => block_id.extract_block_tag(),
+            );
+        }
+        Ok(tx_count?.map(|(_, count)| count))
     }
 
     #[tracing::instrument(skip(self))]
@@ -320,8 +357,7 @@ impl<G: L1GasPriceProvider> EthNamespace<G> {
             .await
             .map_err(|err| internal_error(METHOD_NAME, err))?;
 
-        metrics::histogram!("api.web3.call", start.elapsed(), "method" => METHOD_NAME, "block_id" => block.extract_block_tag());
-
+        self.report_latency_with_block_id(METHOD_NAME, start, block, block_number);
         Ok(contract_code.unwrap_or_default().into())
     }
 
@@ -354,8 +390,7 @@ impl<G: L1GasPriceProvider> EthNamespace<G> {
             .await
             .map_err(|err| internal_error(METHOD_NAME, err))?;
 
-        metrics::histogram!("api.web3.call", start.elapsed(), "method" => METHOD_NAME, "block_id" => block.extract_block_tag());
-
+        self.report_latency_with_block_id(METHOD_NAME, start, block, block_number);
         Ok(value)
     }
 
@@ -380,26 +415,34 @@ impl<G: L1GasPriceProvider> EthNamespace<G> {
             .access_storage_tagged("api")
             .await;
 
-        let full_nonce = match block {
-            BlockId::Number(BlockNumber::Pending) => connection
-                .transactions_web3_dal()
-                .next_nonce_by_initiator_account(address)
-                .await
-                .map_err(|err| internal_error(method_name, err)),
+        let (full_nonce, block_number) = match block {
+            BlockId::Number(BlockNumber::Pending) => {
+                let nonce = connection
+                    .transactions_web3_dal()
+                    .next_nonce_by_initiator_account(address)
+                    .await
+                    .map_err(|err| internal_error(method_name, err));
+                (nonce, None)
+            }
             _ => {
                 let block_number = resolve_block(&mut connection, block, method_name).await?;
-                connection
+                let nonce = connection
                     .storage_web3_dal()
                     .get_address_historical_nonce(address, block_number)
                     .await
-                    .map_err(|err| internal_error(method_name, err))
+                    .map_err(|err| internal_error(method_name, err));
+                (nonce, Some(block_number))
             }
         };
 
+        // TODO (SMA-1612): currently account nonce is returning always, but later we will
+        //  return account nonce for account abstraction and deployment nonce for non account abstraction.
+        //  Strip off deployer nonce part.
         let account_nonce = full_nonce.map(|nonce| decompose_full_nonce(nonce).0);
 
-        metrics::histogram!("api.web3.call", start.elapsed(), "method" => method_name, "block_id" => block.extract_block_tag());
-
+        let block_diff =
+            block_number.map_or(0, |number| self.state.last_sealed_miniblock.diff(number));
+        report_latency_with_block_id_and_diff(method_name, start, block, block_diff);
         account_nonce
     }
 
@@ -606,6 +649,7 @@ impl<G: L1GasPriceProvider> EthNamespace<G> {
 
     #[tracing::instrument(skip(self))]
     pub fn protocol_version(&self) -> String {
+        // TODO (SMA-838): Versioning of our protocol
         PROTOCOL_VERSION.to_string()
     }
 
@@ -617,7 +661,7 @@ impl<G: L1GasPriceProvider> EthNamespace<G> {
 
         let submit_result = self.state.tx_sender.submit_tx(tx).await;
         let submit_result = submit_result.map(|_| hash).map_err(|err| {
-            vlog::debug!("Send raw transaction error: {err}");
+            tracing::debug!("Send raw transaction error: {err}");
             metrics::counter!(
                 "api.submit_tx_error",
                 1,
@@ -659,7 +703,7 @@ impl<G: L1GasPriceProvider> EthNamespace<G> {
         &self,
         block_count: U64,
         newest_block: BlockNumber,
-        _reward_percentiles: Vec<f32>,
+        reward_percentiles: Vec<f32>,
     ) -> Result<FeeHistory, Web3Error> {
         const METHOD_NAME: &str = "fee_history";
 
@@ -690,14 +734,21 @@ impl<G: L1GasPriceProvider> EthNamespace<G> {
         let oldest_block = newest_miniblock.0 + 1 - base_fee_per_gas.len() as u32;
         // We do not store gas used ratio for blocks, returns array of zeroes as a placeholder.
         let gas_used_ratio = vec![0.0; base_fee_per_gas.len()];
-        // Effective priority gas price is currently 0, returns `reward: null` as a placeholder.
-        let reward = None;
+        // Effective priority gas price is currently 0.
+        let reward = Some(vec![
+            vec![U256::zero(); reward_percentiles.len()];
+            base_fee_per_gas.len()
+        ]);
 
         // `base_fee_per_gas` for next miniblock cannot be calculated, appending last fee as a placeholder.
         base_fee_per_gas.push(*base_fee_per_gas.last().unwrap());
 
-        metrics::histogram!("api.web3.call", start.elapsed(), "method" => METHOD_NAME, "block_id" => newest_block.to_string());
-
+        self.report_latency_with_block_id(
+            METHOD_NAME,
+            start,
+            BlockId::Number(newest_block),
+            newest_miniblock,
+        );
         Ok(FeeHistory {
             oldest_block: web3::types::BlockNumber::Number(oldest_block.into()),
             base_fee_per_gas,
@@ -790,7 +841,7 @@ impl<G: L1GasPriceProvider> EthNamespace<G> {
                     if let Some(miniblock_number) = storage
                         .events_web3_dal()
                         .get_log_block_number(
-                            get_logs_filter.clone(),
+                            &get_logs_filter,
                             self.state.api_config.req_entities_limit,
                         )
                         .await
diff --git a/core/bin/zksync_core/src/api_server/web3/namespaces/mod.rs b/core/bin/zksync_core/src/api_server/web3/namespaces/mod.rs
index 08223a7d4cdd..5ece2f9eae9a 100644
--- a/core/bin/zksync_core/src/api_server/web3/namespaces/mod.rs
+++ b/core/bin/zksync_core/src/api_server/web3/namespaces/mod.rs
@@ -1,14 +1,13 @@
 //! Actual implementation of Web3 API namespaces logic, not tied to the backend
 //! used to create a JSON RPC server.
 
-use num::{rational::Ratio, BigUint};
+use std::time::Instant;
 
-use zksync_types::U256;
-use zksync_utils::{biguint_to_u256, u256_to_biguint};
+use zksync_types::api;
 
 mod debug;
 mod en;
-mod eth;
+pub(crate) mod eth;
 mod eth_subscribe;
 mod net;
 mod web3;
@@ -24,8 +23,30 @@ pub use self::{
     zks::ZksNamespace,
 };
 
-pub fn scale_u256(val: U256, scale_factor: &Ratio<BigUint>) -> U256 {
-    let val_as_ratio = &Ratio::from_integer(u256_to_biguint(val));
-    let result = (val_as_ratio * scale_factor).ceil();
-    biguint_to_u256(result.to_integer())
+/// Helper to report latency of an RPC method that takes `BlockId` as an argument. Used by `eth`
+/// and `debug` namespaces.
+fn report_latency_with_block_id_and_diff(
+    method_name: &'static str,
+    start: Instant,
+    block_id: api::BlockId,
+    block_diff: u32,
+) {
+    let block_diff_label = match block_diff {
+        0 => "0",
+        1 => "1",
+        2 => "2",
+        3..=9 => "<10",
+        10..=99 => "<100",
+        100..=999 => "<1000",
+        _ => ">=1000",
+    };
+    metrics::histogram!(
+        "api.web3.call",
+        start.elapsed(),
+        "method" => method_name,
+        "block_id" => block_id.extract_block_tag(),
+        "block_diff" => block_diff_label
+    );
+
+    metrics::histogram!("api.web3.call.block_diff", block_diff as f64, "method" => method_name);
 }
diff --git a/core/bin/zksync_core/src/api_server/web3/namespaces/zks.rs b/core/bin/zksync_core/src/api_server/web3/namespaces/zks.rs
index 0c8905489017..acf5e5848b1e 100644
--- a/core/bin/zksync_core/src/api_server/web3/namespaces/zks.rs
+++ b/core/bin/zksync_core/src/api_server/web3/namespaces/zks.rs
@@ -1,11 +1,8 @@
-use std::time::Instant;
-use std::{collections::HashMap, convert::TryInto};
+use std::{collections::HashMap, convert::TryInto, time::Instant};
 
 use bigdecimal::{BigDecimal, Zero};
 
 use zksync_mini_merkle_tree::MiniMerkleTree;
-
-use zksync_types::l2::L2Tx;
 use zksync_types::{
     api::{
         BlockDetails, BridgeAddresses, GetLogsFilter, L1BatchDetails, L2ToL1LogProof,
@@ -14,6 +11,7 @@ use zksync_types::{
     commitment::SerializeCommitment,
     fee::Fee,
     l1::L1Tx,
+    l2::L2Tx,
     l2_to_l1_log::L2ToL1Log,
     tokens::ETHEREUM_ADDRESS,
     transaction_request::CallRequest,
@@ -23,12 +21,11 @@ use zksync_types::{
 use zksync_utils::address_to_h256;
 use zksync_web3_decl::{
     error::Web3Error,
-    types::{Address, Token, H256},
+    types::{Address, Filter, Log, Token, H256},
 };
 
 use crate::api_server::web3::{backend_jsonrpc::error::internal_error, RpcState};
-use crate::fee_ticker::FeeTicker;
-use crate::fee_ticker::{error::TickerError, TokenPriceRequestType};
+use crate::fee_ticker::{error::TickerError, FeeTicker, TokenPriceRequestType};
 use crate::l1_gas_price::L1GasPriceProvider;
 
 #[derive(Debug)]
@@ -596,4 +593,12 @@ impl<G: L1GasPriceProvider> ZksNamespace<G> {
 
         protocol_version
     }
+
+    #[tracing::instrument(skip_all)]
+    pub async fn get_logs_with_virtual_blocks_impl(
+        &self,
+        filter: Filter,
+    ) -> Result<Vec<Log>, Web3Error> {
+        self.state.translate_get_logs(filter).await
+    }
 }
diff --git a/core/bin/zksync_core/src/api_server/web3/pubsub_notifier.rs b/core/bin/zksync_core/src/api_server/web3/pubsub_notifier.rs
index f0b7a29cf5e8..b4d268bfedff 100644
--- a/core/bin/zksync_core/src/api_server/web3/pubsub_notifier.rs
+++ b/core/bin/zksync_core/src/api_server/web3/pubsub_notifier.rs
@@ -1,3 +1,4 @@
+use anyhow::Context as _;
 use jsonrpc_pubsub::typed;
 use tokio::sync::watch;
 use tokio::time::{interval, Duration, Instant};
@@ -13,18 +14,18 @@ pub async fn notify_blocks(
     connection_pool: ConnectionPool,
     polling_interval: Duration,
     stop_receiver: watch::Receiver<bool>,
-) {
+) -> anyhow::Result<()> {
     let mut last_block_number = connection_pool
         .access_storage_tagged("api")
         .await
         .blocks_web3_dal()
         .get_sealed_miniblock_number()
         .await
-        .unwrap();
+        .context("get_sealed_miniblock_number()")?;
     let mut timer = interval(polling_interval);
     loop {
         if *stop_receiver.borrow() {
-            vlog::info!("Stop signal received, pubsub_block_notifier is shutting down");
+            tracing::info!("Stop signal received, pubsub_block_notifier is shutting down");
             break;
         }
 
@@ -37,7 +38,7 @@ pub async fn notify_blocks(
             .blocks_web3_dal()
             .get_block_headers_after(last_block_number)
             .await
-            .unwrap();
+            .with_context(|| format!("get_block_headers_after({last_block_number})"))?;
         metrics::histogram!("api.web3.pubsub.db_poll_latency", start.elapsed(), "subscription_type" => "blocks");
         if !new_blocks.is_empty() {
             last_block_number =
@@ -62,6 +63,7 @@ pub async fn notify_blocks(
             metrics::histogram!("api.web3.pubsub.notify_subscribers_latency", start.elapsed(), "subscription_type" => "blocks");
         }
     }
+    Ok(())
 }
 
 pub async fn notify_txs(
@@ -69,12 +71,12 @@ pub async fn notify_txs(
     connection_pool: ConnectionPool,
     polling_interval: Duration,
     stop_receiver: watch::Receiver<bool>,
-) {
+) -> anyhow::Result<()> {
     let mut last_time = chrono::Utc::now().naive_utc();
     let mut timer = interval(polling_interval);
     loop {
         if *stop_receiver.borrow() {
-            vlog::info!("Stop signal received, pubsub_tx_notifier is shutting down");
+            tracing::info!("Stop signal received, pubsub_tx_notifier is shutting down");
             break;
         }
 
@@ -87,7 +89,7 @@ pub async fn notify_txs(
             .transactions_web3_dal()
             .get_pending_txs_hashes_after(last_time, None)
             .await
-            .unwrap();
+            .context("get_pending_txs_hashes_after()")?;
         metrics::histogram!("api.web3.pubsub.db_poll_latency", start.elapsed(), "subscription_type" => "txs");
         if let Some(new_last_time) = new_last_time {
             last_time = new_last_time;
@@ -111,6 +113,7 @@ pub async fn notify_txs(
             metrics::histogram!("api.web3.pubsub.notify_subscribers_latency", start.elapsed(), "subscription_type" => "txs");
         }
     }
+    Ok(())
 }
 
 pub async fn notify_logs(
@@ -118,18 +121,18 @@ pub async fn notify_logs(
     connection_pool: ConnectionPool,
     polling_interval: Duration,
     stop_receiver: watch::Receiver<bool>,
-) {
+) -> anyhow::Result<()> {
     let mut last_block_number = connection_pool
         .access_storage_tagged("api")
         .await
         .blocks_web3_dal()
         .get_sealed_miniblock_number()
         .await
-        .unwrap();
+        .context("get_sealed_miniblock_number()")?;
     let mut timer = interval(polling_interval);
     loop {
         if *stop_receiver.borrow() {
-            vlog::info!("Stop signal received, pubsub_logs_notifier is shutting down");
+            tracing::info!("Stop signal received, pubsub_logs_notifier is shutting down");
             break;
         }
 
@@ -142,7 +145,7 @@ pub async fn notify_logs(
             .events_web3_dal()
             .get_all_logs(last_block_number)
             .await
-            .unwrap();
+            .context("events_web3_dal().get_all_logs()")?;
         metrics::histogram!("api.web3.pubsub.db_poll_latency", start.elapsed(), "subscription_type" => "logs");
         if !new_logs.is_empty() {
             last_block_number =
@@ -170,4 +173,5 @@ pub async fn notify_logs(
             metrics::histogram!("api.web3.pubsub.notify_subscribers_latency", start.elapsed(), "subscription_type" => "logs");
         }
     }
+    Ok(())
 }
diff --git a/core/bin/zksync_core/src/api_server/web3/state.rs b/core/bin/zksync_core/src/api_server/web3/state.rs
index 63d28621968f..28b67430eda1 100644
--- a/core/bin/zksync_core/src/api_server/web3/state.rs
+++ b/core/bin/zksync_core/src/api_server/web3/state.rs
@@ -1,22 +1,42 @@
-use std::collections::HashMap;
-use std::sync::Arc;
-
 use tokio::sync::RwLock;
-use zksync_config::configs::{api::Web3JsonRpcConfig, chain::NetworkConfig, ContractsConfig};
+use zksync_utils::h256_to_u256;
 
-use crate::api_server::tx_sender::TxSender;
-use crate::api_server::web3::{backend_jsonrpc::error::internal_error, resolve_block};
-use crate::sync_layer::SyncState;
+use std::{
+    collections::HashMap,
+    convert::TryFrom,
+    future::Future,
+    sync::{
+        atomic::{AtomicU32, Ordering},
+        Arc,
+    },
+    time::{Duration, Instant},
+};
 
+use zksync_config::configs::{api::Web3JsonRpcConfig, chain::NetworkConfig, ContractsConfig};
 use zksync_dal::ConnectionPool;
-
 use zksync_types::{
-    api, l2::L2Tx, transaction_request::CallRequest, Address, L1ChainId, L2ChainId,
-    MiniblockNumber, H256, U256, U64,
+    api::{self, BlockId, BlockNumber, GetLogsFilter},
+    block::unpack_block_upgrade_info,
+    l2::L2Tx,
+    transaction_request::CallRequest,
+    AccountTreeId, Address, L1BatchNumber, L1ChainId, L2ChainId, MiniblockNumber, StorageKey, H256,
+    SYSTEM_CONTEXT_ADDRESS, U256, U64, VIRTUIAL_BLOCK_UPGRADE_INFO_POSITION,
 };
 use zksync_web3_decl::{
     error::Web3Error,
-    types::{Filter, TypedFilter},
+    types::{Filter, Log, TypedFilter},
+};
+
+use crate::{
+    api_server::{
+        execution_sandbox::BlockArgs,
+        tx_sender::TxSender,
+        web3::{
+            backend_jsonrpc::error::internal_error, namespaces::eth::EVENT_TOPIC_NUMBER_LIMIT,
+            resolve_block,
+        },
+    },
+    sync_layer::SyncState,
 };
 
 /// Configuration values for the API.
@@ -64,6 +84,83 @@ impl InternalApiConfig {
     }
 }
 
+/// Thread-safe updatable information about the last sealed miniblock number.
+///
+/// The information may be temporarily outdated and thus should only be used where this is OK
+/// (e.g., for metrics reporting). The value is updated by [`Self::diff()`] and [`Self::diff_with_block_args()`]
+/// and on an interval specified when creating an instance.
+#[derive(Debug, Clone)]
+pub(crate) struct SealedMiniblockNumber(Arc<AtomicU32>);
+
+impl SealedMiniblockNumber {
+    /// Creates a handle to the last sealed miniblock number together with a task that will update
+    /// it on a schedule.
+    pub fn new(
+        connection_pool: ConnectionPool,
+        update_interval: Duration,
+    ) -> (Self, impl Future<Output = ()> + Send) {
+        let this = Self(Arc::default());
+        let number_updater = this.clone();
+        let update_task = async move {
+            loop {
+                if Arc::strong_count(&number_updater.0) == 1 {
+                    // The `sealed_miniblock_number` was dropped; there's no sense continuing updates.
+                    tracing::debug!("Stopping latest sealed miniblock updates");
+                    break;
+                }
+
+                let mut connection = connection_pool.access_storage_tagged("api").await;
+                let last_sealed_miniblock = connection
+                    .blocks_web3_dal()
+                    .get_sealed_miniblock_number()
+                    .await;
+                drop(connection);
+
+                match last_sealed_miniblock {
+                    Ok(number) => {
+                        number_updater.update(number);
+                    }
+                    Err(err) => tracing::warn!(
+                        "Failed fetching latest sealed miniblock to update the watch channel: {err}"
+                    ),
+                }
+                tokio::time::sleep(update_interval).await;
+            }
+        };
+
+        (this, update_task)
+    }
+
+    /// Potentially updates the last sealed miniblock number by comparing it to the provided
+    /// sealed miniblock number (not necessarily the last one).
+    ///
+    /// Returns the last sealed miniblock number after the update.
+    fn update(&self, maybe_newer_miniblock_number: MiniblockNumber) -> MiniblockNumber {
+        let prev_value = self
+            .0
+            .fetch_max(maybe_newer_miniblock_number.0, Ordering::Relaxed);
+        MiniblockNumber(prev_value).max(maybe_newer_miniblock_number)
+    }
+
+    pub fn diff(&self, miniblock_number: MiniblockNumber) -> u32 {
+        let sealed_miniblock_number = self.update(miniblock_number);
+        sealed_miniblock_number.0.saturating_sub(miniblock_number.0)
+    }
+
+    /// Returns the difference between the latest miniblock number and the resolved miniblock number
+    /// from `block_args`.
+    pub fn diff_with_block_args(&self, block_args: &BlockArgs) -> u32 {
+        // We compute the difference in any case, since it may update the stored value.
+        let diff = self.diff(block_args.resolved_block_number());
+
+        if block_args.resolves_to_latest_sealed_miniblock() {
+            0 // Overwrite potentially inaccurate value
+        } else {
+            diff
+        }
+    }
+}
+
 /// Holder for the data required for the API to be functional.
 #[derive(Debug)]
 pub struct RpcState<E> {
@@ -72,6 +169,10 @@ pub struct RpcState<E> {
     pub tx_sender: TxSender<E>,
     pub sync_state: Option<SyncState>,
     pub(super) api_config: InternalApiConfig,
+    pub(super) last_sealed_miniblock: SealedMiniblockNumber,
+    // The flag that enables redirect of eth get logs implementation to
+    // implementation with virtual block translation to miniblocks
+    pub logs_translator_enabled: bool,
 }
 
 // Custom implementation is required due to generic param:
@@ -85,6 +186,8 @@ impl<E> Clone for RpcState<E> {
             tx_sender: self.tx_sender.clone(),
             sync_state: self.sync_state.clone(),
             api_config: self.api_config.clone(),
+            last_sealed_miniblock: self.last_sealed_miniblock.clone(),
+            logs_translator_enabled: self.logs_translator_enabled,
         }
     }
 }
@@ -210,6 +313,206 @@ impl<E> RpcState<E> {
         }
         Ok(())
     }
+
+    /// Returns logs for the given filter, taking into account block.number migration with virtual blocks
+    pub async fn translate_get_logs(&self, filter: Filter) -> Result<Vec<Log>, Web3Error> {
+        let start = Instant::now();
+        const METHOD_NAME: &str = "translate_get_logs";
+
+        // no support for block hash filtering
+        if filter.block_hash.is_some() {
+            return Err(Web3Error::InvalidFilterBlockHash);
+        }
+
+        if let Some(topics) = &filter.topics {
+            if topics.len() > EVENT_TOPIC_NUMBER_LIMIT {
+                return Err(Web3Error::TooManyTopics);
+            }
+        }
+
+        let mut conn = self.connection_pool.access_storage_tagged("api").await;
+
+        // get virtual block upgrade info
+        let upgrade_info = conn
+            .storage_dal()
+            .get_by_key(&StorageKey::new(
+                AccountTreeId::new(SYSTEM_CONTEXT_ADDRESS),
+                VIRTUIAL_BLOCK_UPGRADE_INFO_POSITION,
+            ))
+            .await
+            .ok_or_else(|| {
+                internal_error(
+                    METHOD_NAME,
+                    "Failed to get virtual block upgrade info from DB".to_string(),
+                )
+            })?;
+        let (virtual_block_start_batch, virtual_block_finish_l2_block) =
+            unpack_block_upgrade_info(h256_to_u256(upgrade_info));
+        let from_miniblock_number =
+            if let Some(BlockNumber::Number(block_number)) = filter.from_block {
+                self.resolve_miniblock_from_block(
+                    block_number.as_u64(),
+                    true,
+                    virtual_block_start_batch,
+                    virtual_block_finish_l2_block,
+                )
+                .await?
+            } else {
+                let block_number = filter.from_block.unwrap_or(BlockNumber::Latest);
+                let block_id = BlockId::Number(block_number);
+                conn.blocks_web3_dal()
+                    .resolve_block_id(block_id)
+                    .await
+                    .map_err(|err| internal_error(METHOD_NAME, err))?
+                    .unwrap()
+                    .0
+            };
+
+        let to_miniblock_number = if let Some(BlockNumber::Number(block_number)) = filter.to_block {
+            self.resolve_miniblock_from_block(
+                block_number.as_u64(),
+                true,
+                virtual_block_start_batch,
+                virtual_block_finish_l2_block,
+            )
+            .await?
+        } else {
+            let block_number = filter.to_block.unwrap_or(BlockNumber::Latest);
+            let block_id = BlockId::Number(block_number);
+            conn.blocks_web3_dal()
+                .resolve_block_id(block_id)
+                .await
+                .map_err(|err| internal_error(METHOD_NAME, err))?
+                .unwrap()
+                .0
+        };
+
+        // It is considered that all logs of the miniblock where created in the last virtual block
+        // of this miniblock. In this case no logs are created.
+        // When the given virtual block range is a subrange of some miniblock virtual block range.
+        // e.g. given virtual block range is [11, 12] and the miniblock = 5 virtual block range is [10, 14].
+        // Then `to_miniblock_number` will be 4 and `from_miniblock_number` will be 5. 4 < 5.
+        if to_miniblock_number < from_miniblock_number {
+            return Ok(vec![]);
+        }
+
+        let block_filter = Filter {
+            from_block: Some(from_miniblock_number.into()),
+            to_block: Some(to_miniblock_number.into()),
+            ..filter.clone()
+        };
+
+        let result = self
+            .filter_events_changes(
+                block_filter,
+                MiniblockNumber(from_miniblock_number),
+                MiniblockNumber(to_miniblock_number),
+            )
+            .await;
+
+        metrics::histogram!("api.web3.call", start.elapsed(), "method" => METHOD_NAME);
+
+        result
+    }
+
+    async fn resolve_miniblock_from_block(
+        &self,
+        block_number: u64,
+        is_from: bool,
+        virtual_block_start_batch: u64,
+        virtual_block_finish_l2_block: u64,
+    ) -> Result<u32, Web3Error> {
+        const METHOD_NAME: &str = "resolve_miniblock_from_block";
+
+        let mut conn = self.connection_pool.access_storage_tagged("api").await;
+
+        if block_number < virtual_block_start_batch {
+            let l1_batch = L1BatchNumber(block_number as u32);
+            let miniblock_range = conn
+                .blocks_web3_dal()
+                .get_miniblock_range_of_l1_batch(l1_batch)
+                .await
+                .map(|minmax| minmax.map(|(min, max)| (U64::from(min.0), U64::from(max.0))))
+                .map_err(|err| internal_error(METHOD_NAME, err))?;
+
+            match miniblock_range {
+                Some((batch_first_miniblock, batch_last_miniblock)) => {
+                    if is_from {
+                        Ok(batch_first_miniblock.as_u32())
+                    } else {
+                        Ok(batch_last_miniblock.as_u32())
+                    }
+                }
+                _ => Err(Web3Error::NoBlock),
+            }
+        } else if virtual_block_finish_l2_block > 0 && block_number >= virtual_block_finish_l2_block
+        {
+            u32::try_from(block_number).map_err(|_| Web3Error::NoBlock)
+        } else {
+            // we have to deal with virtual blocks here
+            let virtual_block_miniblock = if is_from {
+                conn.blocks_web3_dal()
+                    .get_miniblock_for_virtual_block_from(virtual_block_start_batch, block_number)
+                    .await
+                    .map_err(|err| internal_error(METHOD_NAME, err))?
+            } else {
+                conn.blocks_web3_dal()
+                    .get_miniblock_for_virtual_block_to(virtual_block_start_batch, block_number)
+                    .await
+                    .map_err(|err| internal_error(METHOD_NAME, err))?
+            };
+            virtual_block_miniblock.ok_or(Web3Error::NoBlock)
+        }
+    }
+
+    async fn filter_events_changes(
+        &self,
+        filter: Filter,
+        from_block: MiniblockNumber,
+        to_block: MiniblockNumber,
+    ) -> Result<Vec<Log>, Web3Error> {
+        const METHOD_NAME: &str = "filter_events_changes";
+
+        let addresses: Vec<_> = filter
+            .address
+            .map_or_else(Vec::default, |address| address.0);
+        let topics: Vec<_> = filter
+            .topics
+            .into_iter()
+            .flatten()
+            .enumerate()
+            .filter_map(|(idx, topics)| topics.map(|topics| (idx as u32 + 1, topics.0)))
+            .collect();
+        let get_logs_filter = GetLogsFilter {
+            from_block,
+            to_block: filter.to_block,
+            addresses,
+            topics,
+        };
+
+        let mut storage = self.connection_pool.access_storage_tagged("api").await;
+
+        // Check if there is more than one block in range and there are more than `req_entities_limit` logs that satisfies filter.
+        // In this case we should return error and suggest requesting logs with smaller block range.
+        if from_block != to_block
+            && storage
+                .events_web3_dal()
+                .get_log_block_number(&get_logs_filter, self.api_config.req_entities_limit)
+                .await
+                .map_err(|err| internal_error(METHOD_NAME, err))?
+                .is_some()
+        {
+            return Err(Web3Error::TooManyLogs(self.api_config.req_entities_limit));
+        }
+
+        let logs = storage
+            .events_web3_dal()
+            .get_logs(get_logs_filter, i32::MAX as usize)
+            .await
+            .map_err(|err| internal_error(METHOD_NAME, err))?;
+
+        Ok(logs)
+    }
 }
 
 /// Contains mapping from index to `Filter` with optional location.
diff --git a/core/bin/zksync_core/src/bin/block_reverter.rs b/core/bin/zksync_core/src/bin/block_reverter.rs
index fcfa5ec7e1ed..48ff9def1d0c 100644
--- a/core/bin/zksync_core/src/bin/block_reverter.rs
+++ b/core/bin/zksync_core/src/bin/block_reverter.rs
@@ -1,3 +1,4 @@
+use anyhow::Context as _;
 use clap::{Parser, Subcommand};
 use tokio::io::{self, AsyncReadExt};
 
@@ -56,6 +57,9 @@ enum Command {
         /// Flag that specifies if RocksDB with state keeper cache should be rolled back.
         #[arg(long)]
         rollback_sk_cache: bool,
+        /// Flag that allows to revert already executed blocks, it's ultra dangerous and required only for fixing external nodes
+        #[arg(long)]
+        allow_executed_block_reversion: bool,
     },
 
     /// Clears failed L1 transactions.
@@ -65,8 +69,22 @@ enum Command {
 
 #[tokio::main]
 async fn main() -> anyhow::Result<()> {
-    vlog::init();
-    let _sentry_guard = vlog::init_sentry();
+    #[allow(deprecated)] // TODO (QIT-21): Use centralized configuration approach.
+    let log_format = vlog::log_format_from_env();
+    #[allow(deprecated)] // TODO (QIT-21): Use centralized configuration approach.
+    let sentry_url = vlog::sentry_url_from_env();
+    #[allow(deprecated)] // TODO (QIT-21): Use centralized configuration approach.
+    let environment = vlog::environment_from_env();
+
+    let mut builder = vlog::ObservabilityBuilder::new().with_log_format(log_format);
+    if let Some(sentry_url) = sentry_url {
+        builder = builder
+            .with_sentry_url(&sentry_url)
+            .expect("Invalid Sentry URL")
+            .with_sentry_environment(environment);
+    }
+    let _guard = builder.build();
+
     let eth_sender = ETHSenderConfig::from_env();
     let db_config = DBConfig::from_env();
     let eth_client = ETHClientConfig::from_env();
@@ -75,8 +93,11 @@ async fn main() -> anyhow::Result<()> {
     let contracts = ContractsConfig::from_env();
     let config = BlockReverterEthConfig::new(eth_sender, contracts, eth_client.web3_url.clone());
 
-    let connection_pool = ConnectionPool::builder(DbVariant::Master).build().await;
-    let block_reverter = BlockReverter::new(
+    let connection_pool = ConnectionPool::builder(DbVariant::Master)
+        .build()
+        .await
+        .context("failed to build a connection pool")?;
+    let mut block_reverter = BlockReverter::new(
         db_config.state_keeper_db_path,
         db_config.merkle_tree.path,
         Some(config),
@@ -113,6 +134,7 @@ async fn main() -> anyhow::Result<()> {
             rollback_postgres,
             rollback_tree,
             rollback_sk_cache,
+            allow_executed_block_reversion,
         } => {
             if !rollback_tree && rollback_postgres {
                 println!("You want to rollback Postgres DB without rolling back tree.");
@@ -129,6 +151,21 @@ async fn main() -> anyhow::Result<()> {
                 }
             }
 
+            if allow_executed_block_reversion {
+                println!("You want to revert already executed blocks. It's impossible to restore them for the main node");
+                println!("Make sure you are doing it ONLY for external node");
+                println!("Are you sure? Print y/n");
+
+                let mut input = [0u8];
+                io::stdin().read_exact(&mut input).await.unwrap();
+                if input[0] != b'y' && input[0] != b'Y' {
+                    std::process::exit(0);
+                }
+                block_reverter.change_rollback_executed_l1_batches_allowance(
+                    L1ExecutedBatchesRevert::Allowed,
+                );
+            }
+
             let mut flags = BlockReverterFlags::empty();
             if rollback_postgres {
                 flags |= BlockReverterFlags::POSTGRES;
diff --git a/core/bin/zksync_core/src/bin/merkle_tree_consistency_checker.rs b/core/bin/zksync_core/src/bin/merkle_tree_consistency_checker.rs
index 97a7a417fe5c..d8955ffd01b6 100644
--- a/core/bin/zksync_core/src/bin/merkle_tree_consistency_checker.rs
+++ b/core/bin/zksync_core/src/bin/merkle_tree_consistency_checker.rs
@@ -24,7 +24,7 @@ struct Cli {
 impl Cli {
     fn run(self, config: &DBConfig) {
         let db_path = &config.merkle_tree.path;
-        vlog::info!("Verifying consistency of Merkle tree at {db_path}");
+        tracing::info!("Verifying consistency of Merkle tree at {db_path}");
         let start = Instant::now();
         let db = RocksDB::new(db_path, true);
         let tree = ZkSyncTree::new_lightweight(db);
@@ -34,21 +34,35 @@ impl Cli {
         } else {
             let next_number = tree.next_l1_batch_number();
             if next_number == L1BatchNumber(0) {
-                vlog::info!("Merkle tree is empty, skipping");
+                tracing::info!("Merkle tree is empty, skipping");
                 return;
             }
             next_number - 1
         };
 
-        vlog::info!("L1 batch number to check: {l1_batch_number}");
+        tracing::info!("L1 batch number to check: {l1_batch_number}");
         tree.verify_consistency(l1_batch_number);
-        vlog::info!("Merkle tree verified in {:?}", start.elapsed());
+        tracing::info!("Merkle tree verified in {:?}", start.elapsed());
     }
 }
 
 fn main() {
-    vlog::init();
-    let _sentry_guard = vlog::init_sentry();
+    #[allow(deprecated)] // TODO (QIT-21): Use centralized configuration approach.
+    let log_format = vlog::log_format_from_env();
+    #[allow(deprecated)] // TODO (QIT-21): Use centralized configuration approach.
+    let sentry_url = vlog::sentry_url_from_env();
+    #[allow(deprecated)] // TODO (QIT-21): Use centralized configuration approach.
+    let environment = vlog::environment_from_env();
+
+    let mut builder = vlog::ObservabilityBuilder::new().with_log_format(log_format);
+    if let Some(sentry_url) = sentry_url {
+        builder = builder
+            .with_sentry_url(&sentry_url)
+            .expect("Invalid Sentry URL")
+            .with_sentry_environment(environment);
+    }
+    let _guard = builder.build();
+
     let db_config = DBConfig::from_env();
     Cli::parse().run(&db_config);
 }
diff --git a/core/bin/zksync_core/src/bin/slot_index_consistency_checker.rs b/core/bin/zksync_core/src/bin/slot_index_consistency_checker.rs
deleted file mode 100644
index 2a771f1bcbf5..000000000000
--- a/core/bin/zksync_core/src/bin/slot_index_consistency_checker.rs
+++ /dev/null
@@ -1,64 +0,0 @@
-use zksync_config::DBConfig;
-use zksync_dal::{connection::DbVariant, ConnectionPool};
-use zksync_merkle_tree::domain::ZkSyncTree;
-use zksync_storage::RocksDB;
-use zksync_types::{L1BatchNumber, H256, U256};
-
-pub fn u256_to_h256_rev(num: U256) -> H256 {
-    let mut bytes = [0u8; 32];
-    num.to_little_endian(&mut bytes);
-    H256::from_slice(&bytes)
-}
-
-#[tokio::main]
-async fn main() {
-    vlog::init();
-    let db_path = DBConfig::from_env().merkle_tree.path;
-    vlog::info!("Verifying consistency of slot indices");
-
-    let pool = ConnectionPool::singleton(DbVariant::Replica).build().await;
-    let mut storage = pool.access_storage().await;
-
-    let db = RocksDB::new(db_path, true);
-    let tree = ZkSyncTree::new_lightweight(db);
-
-    let next_number = tree.next_l1_batch_number();
-    if next_number == L1BatchNumber(0) {
-        vlog::info!("Merkle tree is empty, skipping");
-        return;
-    }
-    let tree_l1_batch_number = next_number - 1;
-    let pg_l1_batch_number = storage.blocks_dal().get_sealed_l1_batch_number().await;
-
-    let check_up_to_l1_batch_number = tree_l1_batch_number.min(pg_l1_batch_number);
-
-    for l1_batch_number in 0..=check_up_to_l1_batch_number.0 {
-        vlog::info!("Checking indices for L1 batch {l1_batch_number}");
-        let pg_keys: Vec<_> = storage
-            .storage_logs_dedup_dal()
-            .initial_writes_for_batch(l1_batch_number.into())
-            .await
-            .into_iter()
-            .map(|(key, index)| {
-                (
-                    key,
-                    index.expect("Missing index in database, migration should be run beforehand"),
-                )
-            })
-            .collect();
-        let keys_u256: Vec<_> = pg_keys
-            .iter()
-            .map(|(key, _)| U256::from_little_endian(key.as_bytes()))
-            .collect();
-
-        let tree_keys: Vec<_> = tree
-            .read_leaves(l1_batch_number.into(), &keys_u256)
-            .into_iter()
-            .zip(keys_u256)
-            .map(|(leaf_data, key)| (u256_to_h256_rev(key), leaf_data.unwrap().leaf_index))
-            .collect();
-        assert_eq!(pg_keys, tree_keys);
-
-        vlog::info!("Indices are consistent for L1 batch {l1_batch_number}");
-    }
-}
diff --git a/core/bin/zksync_core/src/bin/verified_sources_fetcher.rs b/core/bin/zksync_core/src/bin/verified_sources_fetcher.rs
index 4c31eac7a59a..5dc1528b6a3c 100644
--- a/core/bin/zksync_core/src/bin/verified_sources_fetcher.rs
+++ b/core/bin/zksync_core/src/bin/verified_sources_fetcher.rs
@@ -4,7 +4,10 @@ use zksync_types::contract_verification_api::SourceCodeData;
 
 #[tokio::main]
 async fn main() {
-    let pool = ConnectionPool::singleton(DbVariant::Replica).build().await;
+    let pool = ConnectionPool::singleton(DbVariant::Replica)
+        .build()
+        .await
+        .unwrap();
     let mut storage = pool.access_storage().await;
     let reqs = storage
         .contract_verification_dal()
diff --git a/core/bin/zksync_core/src/bin/zksync_server.rs b/core/bin/zksync_core/src/bin/zksync_server.rs
index a160b398aebc..70ae9c425dbd 100644
--- a/core/bin/zksync_core/src/bin/zksync_server.rs
+++ b/core/bin/zksync_core/src/bin/zksync_server.rs
@@ -1,6 +1,7 @@
+use anyhow::Context as _;
 use clap::Parser;
 
-use std::{env, str::FromStr, time::Duration};
+use std::{str::FromStr, time::Duration};
 use zksync_config::configs::chain::NetworkConfig;
 
 use zksync_config::{ContractsConfig, ETHSenderConfig};
@@ -16,7 +17,7 @@ use zksync_utils::wait_for_tasks::wait_for_tasks;
 static GLOBAL: tikv_jemallocator::Jemalloc = tikv_jemallocator::Jemalloc;
 
 #[derive(Debug, Parser)]
-#[structopt(author = "Matter Labs", version, about = "zkSync operator node", long_about = None)]
+#[command(author = "Matter Labs", version, about = "zkSync operator node", long_about = None)]
 struct Cli {
     /// Generate genesis block for the first contract deployment using temporary DB.
     #[arg(long)]
@@ -51,30 +52,42 @@ impl FromStr for ComponentsToRun {
 #[tokio::main]
 async fn main() -> anyhow::Result<()> {
     let opt = Cli::parse();
-    vlog::init();
-    let sentry_guard = vlog::init_sentry();
+
+    #[allow(deprecated)] // TODO (QIT-21): Use centralized configuration approach.
+    let log_format = vlog::log_format_from_env();
+    #[allow(deprecated)] // TODO (QIT-21): Use centralized configuration approach.
+    let sentry_url = vlog::sentry_url_from_env();
+    #[allow(deprecated)] // TODO (QIT-21): Use centralized configuration approach.
+    let environment = vlog::environment_from_env();
+
+    let mut builder = vlog::ObservabilityBuilder::new().with_log_format(log_format);
+    if let Some(sentry_url) = &sentry_url {
+        builder = builder
+            .with_sentry_url(sentry_url)
+            .expect("Invalid Sentry URL")
+            .with_sentry_environment(environment);
+    }
+    let _guard = builder.build();
+
+    // Report whether sentry is running after the logging subsystem was initialized.
+    if let Some(sentry_url) = sentry_url {
+        tracing::info!("Sentry configured with URL: {sentry_url}");
+    } else {
+        tracing::info!("No sentry URL was provided");
+    }
 
     if opt.genesis || is_genesis_needed().await {
         let network = NetworkConfig::from_env();
         let eth_sender = ETHSenderConfig::from_env();
         let contracts = ContractsConfig::from_env();
-        genesis_init(&eth_sender, &network, &contracts).await;
+        genesis_init(&eth_sender, &network, &contracts)
+            .await
+            .context("genesis_init")?;
         if opt.genesis {
             return Ok(());
         }
     }
 
-    if sentry_guard.is_some() {
-        vlog::info!(
-            "Starting Sentry url: {}, l1_network: {}, l2_network {}",
-            env::var("MISC_SENTRY_URL").unwrap(),
-            env::var("CHAIN_ETH_NETWORK").unwrap(),
-            env::var("CHAIN_ETH_ZKSYNC_NETWORK").unwrap(),
-        );
-    } else {
-        vlog::info!("No sentry url configured");
-    }
-
     let components = if opt.rebuild_tree {
         vec![Component::Tree]
     } else {
@@ -92,9 +105,9 @@ async fn main() -> anyhow::Result<()> {
     let (core_task_handles, stop_sender, cb_receiver, health_check_handle) =
         initialize_components(components, is_only_oneshot_witness_generator_task)
             .await
-            .expect("Unable to start Core actors");
+            .context("Unable to start Core actors")?;
 
-    vlog::info!("Running {} core task handlers", core_task_handles.len());
+    tracing::info!("Running {} core task handlers", core_task_handles.len());
     let sigint_receiver = setup_sigint_handler();
 
     let particular_crypto_alerts = None::<Vec<String>>;
@@ -103,11 +116,13 @@ async fn main() -> anyhow::Result<()> {
     tokio::select! {
         _ = wait_for_tasks(core_task_handles, particular_crypto_alerts, graceful_shutdown, tasks_allowed_to_finish) => {},
         _ = sigint_receiver => {
-            vlog::info!("Stop signal received, shutting down");
+            tracing::info!("Stop signal received, shutting down");
         },
         error = cb_receiver => {
             if let Ok(error_msg) = error {
-                vlog::warn!("Circuit breaker received, shutting down. Reason: {}", error_msg);
+                let err = format!("Circuit breaker received, shutting down. Reason: {}", error_msg);
+                tracing::warn!("{err}");
+                vlog::capture_message(&err, vlog::AlertLevel::Warning);
             }
         },
     }
@@ -119,6 +134,6 @@ async fn main() -> anyhow::Result<()> {
     // Sleep for some time to let some components gracefully stop.
     tokio::time::sleep(Duration::from_secs(5)).await;
     health_check_handle.stop().await;
-    vlog::info!("Stopped");
+    tracing::info!("Stopped");
     Ok(())
 }
diff --git a/core/bin/zksync_core/src/block_reverter/mod.rs b/core/bin/zksync_core/src/block_reverter/mod.rs
index 283254bafac1..31c47d3a31c4 100644
--- a/core/bin/zksync_core/src/block_reverter/mod.rs
+++ b/core/bin/zksync_core/src/block_reverter/mod.rs
@@ -164,14 +164,14 @@ impl BlockReverter {
 
             // Rolling back Merkle tree
             if Path::new(&self.merkle_tree_path).exists() {
-                vlog::info!("Rolling back Merkle tree...");
+                tracing::info!("Rolling back Merkle tree...");
                 Self::rollback_new_tree(
                     last_l1_batch_to_keep,
                     &self.merkle_tree_path,
                     storage_root_hash,
                 );
             } else {
-                vlog::info!("Merkle tree not found; skipping");
+                tracing::info!("Merkle tree not found; skipping");
             }
         }
 
@@ -194,34 +194,34 @@ impl BlockReverter {
         let mut tree = ZkSyncTree::new_lightweight(db);
 
         if tree.next_l1_batch_number() <= last_l1_batch_to_keep {
-            vlog::info!("Tree is behind the L1 batch to revert to; skipping");
+            tracing::info!("Tree is behind the L1 batch to revert to; skipping");
             return;
         }
         tree.revert_logs(last_l1_batch_to_keep);
 
-        vlog::info!("checking match of the tree root hash and root hash from Postgres...");
+        tracing::info!("checking match of the tree root hash and root hash from Postgres...");
         assert_eq!(tree.root_hash(), storage_root_hash);
-        vlog::info!("saving tree changes to disk...");
+        tracing::info!("saving tree changes to disk...");
         tree.save();
     }
 
     /// Reverts blocks in the state keeper cache.
     async fn rollback_state_keeper_cache(&self, last_l1_batch_to_keep: L1BatchNumber) {
-        vlog::info!("opening DB with state keeper cache...");
+        tracing::info!("opening DB with state keeper cache...");
         let mut sk_cache = RocksdbStorage::new(self.state_keeper_cache_path.as_ref());
 
         if sk_cache.l1_batch_number() > last_l1_batch_to_keep + 1 {
             let mut storage = self.connection_pool.access_storage().await;
-            vlog::info!("rolling back state keeper cache...");
+            tracing::info!("rolling back state keeper cache...");
             sk_cache.rollback(&mut storage, last_l1_batch_to_keep).await;
         } else {
-            vlog::info!("nothing to revert in state keeper cache");
+            tracing::info!("nothing to revert in state keeper cache");
         }
     }
 
     /// Reverts data in the Postgres database.
     async fn rollback_postgres(&self, last_l1_batch_to_keep: L1BatchNumber) {
-        vlog::info!("rolling back postgres data...");
+        tracing::info!("rolling back postgres data...");
         let mut storage = self.connection_pool.access_storage().await;
         let mut transaction = storage.start_transaction().await;
 
@@ -231,47 +231,47 @@ impl BlockReverter {
             .await
             .expect("L1 batch should contain at least one miniblock");
 
-        vlog::info!("rolling back transactions state...");
+        tracing::info!("rolling back transactions state...");
         transaction
             .transactions_dal()
             .reset_transactions_state(last_miniblock_to_keep)
             .await;
-        vlog::info!("rolling back events...");
+        tracing::info!("rolling back events...");
         transaction
             .events_dal()
             .rollback_events(last_miniblock_to_keep)
             .await;
-        vlog::info!("rolling back l2 to l1 logs...");
+        tracing::info!("rolling back l2 to l1 logs...");
         transaction
             .events_dal()
             .rollback_l2_to_l1_logs(last_miniblock_to_keep)
             .await;
-        vlog::info!("rolling back created tokens...");
+        tracing::info!("rolling back created tokens...");
         transaction
             .tokens_dal()
             .rollback_tokens(last_miniblock_to_keep)
             .await;
-        vlog::info!("rolling back factory deps....");
+        tracing::info!("rolling back factory deps....");
         transaction
             .storage_dal()
             .rollback_factory_deps(last_miniblock_to_keep)
             .await;
-        vlog::info!("rolling back storage...");
+        tracing::info!("rolling back storage...");
         transaction
             .storage_logs_dal()
             .rollback_storage(last_miniblock_to_keep)
             .await;
-        vlog::info!("rolling back storage logs...");
+        tracing::info!("rolling back storage logs...");
         transaction
             .storage_logs_dal()
             .rollback_storage_logs(last_miniblock_to_keep)
             .await;
-        vlog::info!("rolling back l1 batches...");
+        tracing::info!("rolling back l1 batches...");
         transaction
             .blocks_dal()
             .delete_l1_batches(last_l1_batch_to_keep)
             .await;
-        vlog::info!("rolling back miniblocks...");
+        tracing::info!("rolling back miniblocks...");
         transaction
             .blocks_dal()
             .delete_miniblocks(last_miniblock_to_keep)
@@ -333,10 +333,10 @@ impl BlockReverter {
         loop {
             if let Some(receipt) = web3.eth().transaction_receipt(hash).await.unwrap() {
                 assert_eq!(receipt.status, Some(1.into()), "revert transaction failed");
-                vlog::info!("revert transaction has completed");
+                tracing::info!("revert transaction has completed");
                 return;
             } else {
-                vlog::info!("waiting for L1 transaction confirmation...");
+                tracing::info!("waiting for L1 transaction confirmation...");
                 sleep(Duration::from_secs(5)).await;
             }
         }
@@ -379,7 +379,7 @@ impl BlockReverter {
         let last_executed_l1_batch_number = self
             .get_l1_batch_number_from_contract(AggregatedActionType::Execute)
             .await;
-        vlog::info!(
+        tracing::info!(
             "Last L1 batch numbers on contract: committed {last_committed_l1_batch_number}, \
              verified {last_verified_l1_batch_number}, executed {last_executed_l1_batch_number}"
         );
@@ -408,7 +408,7 @@ impl BlockReverter {
 
     /// Clears failed L1 transactions
     pub async fn clear_failed_l1_transactions(&self) {
-        vlog::info!("clearing failed L1 transactions...");
+        tracing::info!("clearing failed L1 transactions...");
         self.connection_pool
             .access_storage()
             .await
@@ -416,6 +416,13 @@ impl BlockReverter {
             .clear_failed_transactions()
             .await;
     }
+
+    pub fn change_rollback_executed_l1_batches_allowance(
+        &mut self,
+        revert_executed_batches: L1ExecutedBatchesRevert,
+    ) {
+        self.executed_batches_revert_mode = revert_executed_batches
+    }
 }
 
 #[derive(Debug, Serialize)]
diff --git a/core/bin/zksync_core/src/consistency_checker/mod.rs b/core/bin/zksync_core/src/consistency_checker/mod.rs
index 2949596ba362..4283eb26761d 100644
--- a/core/bin/zksync_core/src/consistency_checker/mod.rs
+++ b/core/bin/zksync_core/src/consistency_checker/mod.rs
@@ -63,7 +63,7 @@ impl ConsistencyChecker {
                 )
             });
 
-        vlog::info!(
+        tracing::info!(
             "Checking commit tx {} for batch {}",
             commit_tx_hash,
             batch_number.0
@@ -123,7 +123,10 @@ impl ConsistencyChecker {
             .unwrap_or(L1BatchNumber(0))
     }
 
-    pub async fn run(self, stop_receiver: tokio::sync::watch::Receiver<bool>) {
+    pub async fn run(
+        self,
+        stop_receiver: tokio::sync::watch::Receiver<bool>,
+    ) -> anyhow::Result<()> {
         let mut batch_number: L1BatchNumber = self
             .last_committed_batch()
             .await
@@ -132,11 +135,11 @@ impl ConsistencyChecker {
             .max(1)
             .into();
 
-        vlog::info!("Starting consistency checker from batch {}", batch_number.0);
+        tracing::info!("Starting consistency checker from batch {}", batch_number.0);
 
         loop {
             if *stop_receiver.borrow() {
-                vlog::info!("Stop signal received, consistency_checker is shutting down");
+                tracing::info!("Stop signal received, consistency_checker is shutting down");
                 break;
             }
 
@@ -159,7 +162,7 @@ impl ConsistencyChecker {
 
             match self.check_commitments(batch_number).await {
                 Ok(true) => {
-                    vlog::info!("Batch {} is consistent with L1", batch_number.0);
+                    tracing::info!("Batch {} is consistent with L1", batch_number.0);
                     metrics::gauge!(
                         "external_node.last_correct_batch",
                         batch_number.0 as f64,
@@ -168,13 +171,14 @@ impl ConsistencyChecker {
                     batch_number.0 += 1;
                 }
                 Ok(false) => {
-                    panic!("Batch {} is inconsistent with L1", batch_number.0);
+                    anyhow::bail!("Batch {} is inconsistent with L1", batch_number.0);
                 }
                 Err(e) => {
-                    vlog::warn!("Consistency checker error: {}", e);
+                    tracing::warn!("Consistency checker error: {}", e);
                     tokio::time::sleep(SLEEP_DELAY).await;
                 }
             }
         }
+        Ok(())
     }
 }
diff --git a/core/bin/zksync_core/src/data_fetchers/error.rs b/core/bin/zksync_core/src/data_fetchers/error.rs
index 13febd297d3f..bdee49210082 100644
--- a/core/bin/zksync_core/src/data_fetchers/error.rs
+++ b/core/bin/zksync_core/src/data_fetchers/error.rs
@@ -42,7 +42,7 @@ impl ErrorAnalyzer {
 
     pub async fn update(&mut self) {
         if self.error_counter >= self.min_errors_to_report {
-            vlog::error!(
+            tracing::error!(
                 "[{}] A lot of requests to the remote API failed in a row. Current error count: {}",
                 &self.fetcher,
                 self.error_counter
@@ -59,7 +59,7 @@ impl ErrorAnalyzer {
         self.error_counter += 1;
         match error {
             ApiFetchError::RateLimit(time) => {
-                vlog::warn!(
+                tracing::warn!(
                         "[{}] Remote API notified us about rate limiting. Going to wait {} seconds before next loop iteration",
                         fetcher,
                         time.as_secs()
@@ -67,16 +67,16 @@ impl ErrorAnalyzer {
                 self.requested_delay = Some(time);
             }
             ApiFetchError::UnexpectedJsonFormat(err) => {
-                vlog::warn!("[{}] Parse data error: {}", fetcher, err);
+                tracing::warn!("[{}] Parse data error: {}", fetcher, err);
             }
             ApiFetchError::ApiUnavailable(err) => {
-                vlog::warn!("[{}] Remote API is unavailable: {}", fetcher, err);
+                tracing::warn!("[{}] Remote API is unavailable: {}", fetcher, err);
             }
             ApiFetchError::RequestTimeout => {
-                vlog::warn!("[{}] Request for data timed out", fetcher);
+                tracing::warn!("[{}] Request for data timed out", fetcher);
             }
             ApiFetchError::Other(err) => {
-                vlog::warn!("[{}] Unspecified API error: {}", fetcher, err);
+                tracing::warn!("[{}] Unspecified API error: {}", fetcher, err);
             }
         }
     }
diff --git a/core/bin/zksync_core/src/data_fetchers/mod.rs b/core/bin/zksync_core/src/data_fetchers/mod.rs
index 6ab0453eb09d..ce62a657d970 100644
--- a/core/bin/zksync_core/src/data_fetchers/mod.rs
+++ b/core/bin/zksync_core/src/data_fetchers/mod.rs
@@ -24,7 +24,7 @@ pub fn run_data_fetchers(
     network: zksync_types::network::Network,
     pool: ConnectionPool,
     stop_receiver: watch::Receiver<bool>,
-) -> Vec<JoinHandle<()>> {
+) -> Vec<JoinHandle<anyhow::Result<()>>> {
     let list_fetcher = token_list::TokenListFetcher::new(config.clone(), network);
     let price_fetcher = token_price::TokenPriceFetcher::new(config.clone());
     let volume_fetcher = token_trading_volume::TradingVolumeFetcher::new(config.clone());
diff --git a/core/bin/zksync_core/src/data_fetchers/token_list/mod.rs b/core/bin/zksync_core/src/data_fetchers/token_list/mod.rs
index e96d01b97931..cb7a631e5d2f 100644
--- a/core/bin/zksync_core/src/data_fetchers/token_list/mod.rs
+++ b/core/bin/zksync_core/src/data_fetchers/token_list/mod.rs
@@ -62,13 +62,17 @@ impl TokenListFetcher {
         }
     }
 
-    pub async fn run(mut self, pool: ConnectionPool, stop_receiver: watch::Receiver<bool>) {
+    pub async fn run(
+        mut self,
+        pool: ConnectionPool,
+        stop_receiver: watch::Receiver<bool>,
+    ) -> anyhow::Result<()> {
         let mut fetching_interval =
             tokio::time::interval(self.config.token_list.fetching_interval());
 
         loop {
             if *stop_receiver.borrow() {
-                vlog::info!("Stop signal received, token_list_fetcher is shutting down");
+                tracing::info!("Stop signal received, token_list_fetcher is shutting down");
                 break;
             }
 
@@ -93,6 +97,7 @@ impl TokenListFetcher {
 
             self.update_tokens(&mut storage, token_list).await;
         }
+        Ok(())
     }
 
     async fn fetch_token_list(&self) -> Result<HashMap<Address, TokenMetadata>, ApiFetchError> {
diff --git a/core/bin/zksync_core/src/data_fetchers/token_price/mod.rs b/core/bin/zksync_core/src/data_fetchers/token_price/mod.rs
index 0f2868090f34..e25ce2f11b2e 100644
--- a/core/bin/zksync_core/src/data_fetchers/token_price/mod.rs
+++ b/core/bin/zksync_core/src/data_fetchers/token_price/mod.rs
@@ -62,13 +62,17 @@ impl TokenPriceFetcher {
         }
     }
 
-    pub async fn run(mut self, pool: ConnectionPool, stop_receiver: watch::Receiver<bool>) {
+    pub async fn run(
+        mut self,
+        pool: ConnectionPool,
+        stop_receiver: watch::Receiver<bool>,
+    ) -> anyhow::Result<()> {
         let mut fetching_interval =
             tokio::time::interval(self.config.token_price.fetching_interval());
 
         loop {
             if *stop_receiver.borrow() {
-                vlog::info!("Stop signal received, token_price_fetcher is shutting down");
+                tracing::info!("Stop signal received, token_price_fetcher is shutting down");
                 break;
             }
 
@@ -92,6 +96,7 @@ impl TokenPriceFetcher {
             };
             self.store_token_prices(&mut storage, token_prices).await;
         }
+        Ok(())
     }
 
     async fn fetch_token_price(
diff --git a/core/bin/zksync_core/src/data_fetchers/token_trading_volume/mod.rs b/core/bin/zksync_core/src/data_fetchers/token_trading_volume/mod.rs
index 396128afbc6c..1713e8b30dbf 100644
--- a/core/bin/zksync_core/src/data_fetchers/token_trading_volume/mod.rs
+++ b/core/bin/zksync_core/src/data_fetchers/token_trading_volume/mod.rs
@@ -55,12 +55,16 @@ impl TradingVolumeFetcher {
         }
     }
 
-    pub async fn run(mut self, pool: ConnectionPool, stop_receiver: watch::Receiver<bool>) {
+    pub async fn run(
+        mut self,
+        pool: ConnectionPool,
+        stop_receiver: watch::Receiver<bool>,
+    ) -> anyhow::Result<()> {
         let mut fetching_interval =
             tokio::time::interval(self.config.token_trading_volume.fetching_interval());
         loop {
             if *stop_receiver.borrow() {
-                vlog::info!("Stop signal received, trading_volume_fetcher is shutting down");
+                tracing::info!("Stop signal received, trading_volume_fetcher is shutting down");
                 break;
             }
 
@@ -84,6 +88,7 @@ impl TradingVolumeFetcher {
             self.store_market_volumes(&mut storage, trading_volumes)
                 .await;
         }
+        Ok(())
     }
 
     async fn fetch_trading_volumes(
diff --git a/core/bin/zksync_core/src/eth_sender/aggregator.rs b/core/bin/zksync_core/src/eth_sender/aggregator.rs
index c19a8885f680..6a99a5f596b3 100644
--- a/core/bin/zksync_core/src/eth_sender/aggregator.rs
+++ b/core/bin/zksync_core/src/eth_sender/aggregator.rs
@@ -1,6 +1,8 @@
-use zksync_config::configs::eth_sender::{ProofSendingMode, SenderConfig};
+use zksync_config::configs::eth_sender::{ProofLoadingMode, ProofSendingMode, SenderConfig};
 use zksync_contracts::BaseSystemContractsHashes;
 use zksync_dal::StorageProcessor;
+use zksync_object_store::ObjectStore;
+use zksync_prover_utils::gcs_proof_fetcher::load_wrapped_fri_proofs_for_range;
 use zksync_types::{
     aggregated_operations::{
         AggregatedActionType, AggregatedOperation, L1BatchCommitOperation, L1BatchExecuteOperation,
@@ -23,10 +25,11 @@ pub struct Aggregator {
     proof_criteria: Vec<Box<dyn L1BatchPublishCriterion>>,
     execute_criteria: Vec<Box<dyn L1BatchPublishCriterion>>,
     config: SenderConfig,
+    blob_store: Box<dyn ObjectStore>,
 }
 
 impl Aggregator {
-    pub fn new(config: SenderConfig) -> Self {
+    pub fn new(config: SenderConfig, blob_store: Box<dyn ObjectStore>) -> Self {
         Self {
             commit_criteria: vec![
                 Box::from(NumberCriterion {
@@ -81,6 +84,7 @@ impl Aggregator {
                 }),
             ],
             config,
+            blob_store,
         }
     }
 
@@ -199,12 +203,15 @@ impl Aggregator {
         storage: &mut StorageProcessor<'_>,
         prover_storage: &mut StorageProcessor<'_>,
         l1_verifier_config: L1VerifierConfig,
+        proof_loading_mode: &ProofLoadingMode,
+        blob_store: &dyn ObjectStore,
     ) -> Option<L1BatchProofOperation> {
         let previous_proven_batch_number =
             storage.blocks_dal().get_last_l1_batch_with_prove_tx().await;
+        let batch_to_prove = previous_proven_batch_number + 1;
         if let Some(version_id) = storage
             .blocks_dal()
-            .get_batch_protocol_version_id(previous_proven_batch_number + 1)
+            .get_batch_protocol_version_id(batch_to_prove)
             .await
         {
             let verifier_config_for_next_batch = storage
@@ -216,13 +223,17 @@ impl Aggregator {
                 return None;
             }
         }
-        let proofs = prover_storage
-            .prover_dal()
-            .get_final_proofs_for_blocks(
-                previous_proven_batch_number + 1,
-                previous_proven_batch_number + 1,
-            )
-            .await;
+        let proofs = match proof_loading_mode {
+            ProofLoadingMode::OldProofFromDb => {
+                prover_storage
+                    .prover_dal()
+                    .get_final_proofs_for_blocks(batch_to_prove, batch_to_prove)
+                    .await
+            }
+            ProofLoadingMode::FriProofFromGcs => {
+                load_wrapped_fri_proofs_for_range(batch_to_prove, batch_to_prove, blob_store).await
+            }
+        };
         if proofs.is_empty() {
             // The proof for the next L1 batch is not generated yet
             return None;
@@ -297,7 +308,14 @@ impl Aggregator {
     ) -> Option<L1BatchProofOperation> {
         match self.config.proof_sending_mode {
             ProofSendingMode::OnlyRealProofs => {
-                Self::load_real_proof_operation(storage, prover_storage, l1_verifier_config).await
+                Self::load_real_proof_operation(
+                    storage,
+                    prover_storage,
+                    l1_verifier_config,
+                    &self.config.proof_loading_mode,
+                    &*self.blob_store,
+                )
+                .await
             }
 
             ProofSendingMode::SkipEveryProof => {
@@ -315,9 +333,14 @@ impl Aggregator {
 
             ProofSendingMode::OnlySampledProofs => {
                 // if there is a sampled proof then send it, otherwise check for skipped ones.
-                if let Some(op) =
-                    Self::load_real_proof_operation(storage, prover_storage, l1_verifier_config)
-                        .await
+                if let Some(op) = Self::load_real_proof_operation(
+                    storage,
+                    prover_storage,
+                    l1_verifier_config,
+                    &self.config.proof_loading_mode,
+                    &*self.blob_store,
+                )
+                .await
                 {
                     Some(op)
                 } else {
diff --git a/core/bin/zksync_core/src/eth_sender/eth_tx_aggregator.rs b/core/bin/zksync_core/src/eth_sender/eth_tx_aggregator.rs
index 13d565d29773..5df03c15f766 100644
--- a/core/bin/zksync_core/src/eth_sender/eth_tx_aggregator.rs
+++ b/core/bin/zksync_core/src/eth_sender/eth_tx_aggregator.rs
@@ -73,13 +73,13 @@ impl EthTxAggregator {
         prover_pool: ConnectionPool,
         eth_client: E,
         stop_receiver: watch::Receiver<bool>,
-    ) {
+    ) -> anyhow::Result<()> {
         loop {
             let mut storage = pool.access_storage_tagged("eth_sender").await;
             let mut prover_storage = prover_pool.access_storage_tagged("eth_sender").await;
 
             if *stop_receiver.borrow() {
-                vlog::info!("Stop signal received, eth_tx_aggregator is shutting down");
+                tracing::info!("Stop signal received, eth_tx_aggregator is shutting down");
                 break;
             }
 
@@ -89,11 +89,12 @@ impl EthTxAggregator {
             {
                 // Web3 API request failures can cause this,
                 // and anything more important is already properly reported.
-                vlog::warn!("eth_sender error {err:?}");
+                tracing::warn!("eth_sender error {err:?}");
             }
 
             tokio::time::sleep(self.config.aggregate_tx_poll_period()).await;
         }
+        Ok(())
     }
 
     pub(super) async fn get_multicall_data<E: BoundEthInterface>(
@@ -359,7 +360,7 @@ impl EthTxAggregator {
         tx: &EthTx,
     ) {
         let l1_batch_number_range = aggregated_op.l1_batch_range();
-        vlog::info!(
+        tracing::info!(
             "eth_tx with ID {} for op {} was saved for L1 batches {l1_batch_number_range:?}",
             tx.id,
             aggregated_op.get_action_caption()
diff --git a/core/bin/zksync_core/src/eth_sender/eth_tx_manager.rs b/core/bin/zksync_core/src/eth_sender/eth_tx_manager.rs
index de3703e8b37f..1469e17612f1 100644
--- a/core/bin/zksync_core/src/eth_sender/eth_tx_manager.rs
+++ b/core/bin/zksync_core/src/eth_sender/eth_tx_manager.rs
@@ -1,3 +1,4 @@
+use anyhow::Context as _;
 use std::sync::Arc;
 use tokio::sync::watch;
 
@@ -89,7 +90,7 @@ where
             match self.get_tx_status(history_item.tx_hash).await {
                 Ok(Some(s)) => return Some(s),
                 Ok(_) => continue,
-                Err(err) => vlog::warn!(
+                Err(err) => tracing::warn!(
                     "Can't check transaction {:?}: {:?}",
                     history_item.tx_hash,
                     err
@@ -112,7 +113,7 @@ where
             let priority_fee_per_gas = self
                 .increase_priority_fee(storage, tx.id, base_fee_per_gas)
                 .await?;
-            vlog::info!(
+            tracing::info!(
                 "Resending operation {} with base fee {:?} and priority fee {:?}",
                 tx.id,
                 base_fee_per_gas,
@@ -157,7 +158,7 @@ where
         if base_fee_per_gas <= next_block_minimal_base_fee.min(previous_base_fee) {
             // If the base fee is lower than the previous used one
             // or is lower than the minimal possible value for the next block, sending is skipped.
-            vlog::info!(
+            tracing::info!(
                 "Skipping gas adjustment for operation {}, \
                  base_fee_per_gas: suggested for resending {:?}, previously sent {:?}, next block minimum {:?}",
                 eth_tx_id,
@@ -214,7 +215,7 @@ where
                 .send_raw_transaction(storage, tx_history_id, signed_tx.raw_tx, current_block)
                 .await
             {
-                vlog::warn!(
+                tracing::warn!(
                     "Error when sending new signed tx for tx {}, base_fee_per_gas {}, priority_fee_per_gas: {}: {}",
                     tx.id,
                     base_fee_per_gas,
@@ -319,7 +320,7 @@ where
             inflight_txs.len() as f64,
         );
 
-        vlog::trace!(
+        tracing::trace!(
             "Going through not confirmed txs. \
              Block numbers: latest {}, finalized {}, \
              operator's nonce: latest {}, finalized {}",
@@ -331,7 +332,7 @@ where
 
         // Not confirmed transactions, ordered by nonce
         for tx in inflight_txs {
-            vlog::trace!("Checking tx id: {}", tx.id,);
+            tracing::trace!("Checking tx id: {}", tx.id,);
 
             // If the `operator_nonce.latest` <= `tx.nonce`, this means
             // that `tx` is not mined and we should resend it.
@@ -354,7 +355,7 @@ where
                 continue;
             }
 
-            vlog::trace!(
+            tracing::trace!(
                 "Sender's nonce on finalized block is greater than current tx's nonce. \
                  Checking transaction with id {}. Tx nonce is equal to {}",
                 tx.id,
@@ -371,7 +372,7 @@ where
                     // This is an error because such a big reorg may cause transactions that were
                     // previously recorded as confirmed to become pending again and we have to
                     // make sure it's not the case - otherwise eth_sender may not work properly.
-                    vlog::error!(
+                    tracing::error!(
                         "Possible block reorgs: finalized nonce increase detected, but no tx receipt found for tx {:?}",
                         &tx
                     );
@@ -392,6 +393,7 @@ where
                 tx.raw_tx.clone(),
                 tx.contract_address,
                 Options::with(|opt| {
+                    // TODO Calculate gas for every operation SMA-1436
                     opt.gas = Some(self.config.max_aggregated_tx_gas.into());
                     opt.max_fee_per_gas = Some(U256::from(base_fee_per_gas + priority_fee_per_gas));
                     opt.max_priority_fee_per_gas = Some(U256::from(priority_fee_per_gas));
@@ -415,7 +417,7 @@ where
             let tx_status = self.get_tx_status(tx.tx_hash).await;
 
             if let Ok(Some(tx_status)) = tx_status {
-                vlog::info!("The tx {:?} has been already sent", tx.tx_hash);
+                tracing::info!("The tx {:?} has been already sent", tx.tx_hash);
                 storage
                     .eth_sender_dal()
                     .set_sent_at_block(tx.id, tx_status.receipt.block_number.unwrap().as_u32())
@@ -438,7 +440,7 @@ where
                 )
                 .await
             {
-                vlog::warn!("Error {:?} in sending tx {:?}", error, &tx);
+                tracing::warn!("Error {:?} in sending tx {:?}", error, &tx);
             }
         }
     }
@@ -458,7 +460,7 @@ where
                 self.fail_tx(storage, tx, tx_status).await;
             }
         } else {
-            vlog::debug!(
+            tracing::debug!(
                 "Transaction {} with id {} is not yet finalized: block in receipt {receipt_block_number}, finalized block {finalized_block}",
                 tx_status.tx_hash,
                 tx.id,
@@ -484,7 +486,7 @@ where
                 "Tx is already failed, it's safe to fail here and apply the status on the next run",
             );
 
-        vlog::error!(
+        tracing::error!(
             "Eth tx failed {:?}, {:?}, failure reason {:?}",
             tx,
             tx_status.receipt,
@@ -513,7 +515,7 @@ where
         track_eth_tx_metrics(storage, "mined", tx).await;
 
         if gas_used > U256::from(tx.predicted_gas_cost) {
-            vlog::error!(
+            tracing::error!(
                 "Predicted gas {} lower than used gas {} for tx {:?} {}",
                 tx.predicted_gas_cost,
                 gas_used,
@@ -521,7 +523,7 @@ where
                 tx.id
             );
         }
-        vlog::info!(
+        tracing::info!(
             "eth_tx {} with hash {:?} for {} is confirmed. Gas spent: {:?}",
             tx.id,
             tx_hash,
@@ -551,9 +553,16 @@ where
         );
     }
 
-    pub async fn run(mut self, pool: ConnectionPool, stop_receiver: watch::Receiver<bool>) {
+    pub async fn run(
+        mut self,
+        pool: ConnectionPool,
+        stop_receiver: watch::Receiver<bool>,
+    ) -> anyhow::Result<()> {
         {
-            let l1_block_numbers = self.get_l1_block_numbers().await.unwrap();
+            let l1_block_numbers = self
+                .get_l1_block_numbers()
+                .await
+                .context("get_l1_block_numbers()")?;
             let mut storage = pool.access_storage_tagged("eth_sender").await;
             self.send_unsent_txs(&mut storage, l1_block_numbers).await;
         }
@@ -565,7 +574,7 @@ where
             let mut storage = pool.access_storage_tagged("eth_sender").await;
 
             if *stop_receiver.borrow() {
-                vlog::info!("Stop signal received, eth_tx_manager is shutting down");
+                tracing::info!("Stop signal received, eth_tx_manager is shutting down");
                 break;
             }
 
@@ -574,12 +583,13 @@ where
                 Err(e) => {
                     // Web3 API request failures can cause this,
                     // and anything more important is already properly reported.
-                    vlog::warn!("eth_sender error {:?}", e);
+                    tracing::warn!("eth_sender error {:?}", e);
                 }
             }
 
             tokio::time::sleep(self.config.tx_poll_period()).await;
         }
+        Ok(())
     }
 
     async fn send_new_eth_txs(
diff --git a/core/bin/zksync_core/src/eth_sender/grafana_metrics.rs b/core/bin/zksync_core/src/eth_sender/grafana_metrics.rs
index 2f9e1c706c48..d96b94a56e88 100644
--- a/core/bin/zksync_core/src/eth_sender/grafana_metrics.rs
+++ b/core/bin/zksync_core/src/eth_sender/grafana_metrics.rs
@@ -19,7 +19,7 @@ pub async fn track_eth_tx_metrics(
 
     // This should be only the case when some blocks were reverted.
     if l1_batch_headers.is_empty() {
-        vlog::warn!("No L1 batches were found for eth_tx with id = {}", tx.id);
+        tracing::warn!("No L1 batches were found for eth_tx with id = {}", tx.id);
         return;
     }
 
diff --git a/core/bin/zksync_core/src/eth_sender/publish_criterion.rs b/core/bin/zksync_core/src/eth_sender/publish_criterion.rs
index 1046496c4295..1870ecd05bda 100644
--- a/core/bin/zksync_core/src/eth_sender/publish_criterion.rs
+++ b/core/bin/zksync_core/src/eth_sender/publish_criterion.rs
@@ -52,7 +52,7 @@ impl L1BatchPublishCriterion for NumberCriterion {
         let batch_count = last_batch_number - first + 1;
         if batch_count >= self.limit {
             let result = L1BatchNumber(first + self.limit - 1);
-            vlog::debug!(
+            tracing::debug!(
                 "`l1_batch_number` publish criterion (limit={}) triggered for op {} with L1 batch range {:?}",
                 self.limit,
                 self.op,
@@ -109,7 +109,7 @@ impl L1BatchPublishCriterion for TimestampDeadlineCriterion {
                 .unwrap_or(first_l1_batch)
                 .header
                 .number;
-            vlog::debug!(
+            tracing::debug!(
                 "`timestamp` publish criterion triggered for op {} with L1 batch range {:?}",
                 self.op,
                 first_l1_batch.header.number.0..=result.0
@@ -189,7 +189,7 @@ impl L1BatchPublishCriterion for GasCriterion {
 
         if let Some(last_l1_batch) = last_l1_batch {
             let first_l1_batch_number = consecutive_l1_batches.first().unwrap().header.number.0;
-            vlog::debug!(
+            tracing::debug!(
                 "`gas_limit` publish criterion (gas={}) triggered for op {} with L1 batch range {:?}",
                 self.gas_limit - gas_left,
                 self.op,
@@ -240,7 +240,7 @@ impl L1BatchPublishCriterion for DataSizeCriterion {
 
                 let first_l1_batch_number = consecutive_l1_batches.first().unwrap().header.number.0;
                 let output = l1_batch.header.number - 1;
-                vlog::debug!(
+                tracing::debug!(
                     "`data_size` publish criterion (data={}) triggered for op {} with L1 batch range {:?}",
                     self.data_limit - data_size_left,
                     self.op,
diff --git a/core/bin/zksync_core/src/eth_sender/tests.rs b/core/bin/zksync_core/src/eth_sender/tests.rs
index ee9f739b2125..ff60034d8ad4 100644
--- a/core/bin/zksync_core/src/eth_sender/tests.rs
+++ b/core/bin/zksync_core/src/eth_sender/tests.rs
@@ -9,6 +9,7 @@ use zksync_config::{
 use zksync_contracts::BaseSystemContractsHashes;
 use zksync_dal::{ConnectionPool, StorageProcessor};
 use zksync_eth_client::{clients::mock::MockEthereum, EthInterface};
+use zksync_object_store::ObjectStoreFactory;
 use zksync_types::{
     aggregated_operations::{
         AggregatedOperation, L1BatchCommitOperation, L1BatchExecuteOperation, L1BatchProofOperation,
@@ -85,6 +86,7 @@ impl EthSenderTester {
             .await
             .unwrap(),
         );
+        let store_factory = ObjectStoreFactory::from_env();
 
         let aggregator = EthTxAggregator::new(
             SenderConfig {
@@ -92,7 +94,10 @@ impl EthSenderTester {
                 ..eth_sender_config.sender.clone()
             },
             // Aggregator - unused
-            Aggregator::new(aggregator_config.clone()),
+            Aggregator::new(
+                aggregator_config.clone(),
+                store_factory.create_store().await,
+            ),
             // zkSync contract address
             Address::random(),
             contracts_config.l1_multicall3_addr,
@@ -794,7 +799,7 @@ async fn insert_genesis_protocol_version(tester: &EthSenderTester) {
         .storage()
         .await
         .protocol_versions_dal()
-        .save_protocol_version(Default::default())
+        .save_protocol_version_with_tx(Default::default())
         .await;
 }
 
diff --git a/core/bin/zksync_core/src/eth_watch/client.rs b/core/bin/zksync_core/src/eth_watch/client.rs
index e3b4c3a3ecc5..e14ffc09a623 100644
--- a/core/bin/zksync_core/src/eth_watch/client.rs
+++ b/core/bin/zksync_core/src/eth_watch/client.rs
@@ -61,7 +61,7 @@ impl<E: EthInterface> EthHttpQueryClient<E> {
         zksync_contract_addr: Address,
         confirmations_for_eth_event: Option<u64>,
     ) -> Self {
-        vlog::debug!("New eth client, contract addr: {:x}", zksync_contract_addr);
+        tracing::debug!("New eth client, contract addr: {:x}", zksync_contract_addr);
         Self {
             client,
             topics: Vec::new(),
@@ -119,7 +119,7 @@ impl<E: EthInterface + Send + Sync + 'static> EthClient for EthHttpQueryClient<E
         // This code is compatible with both Infura and Alchemy API providers.
         // Note: we don't handle rate-limits here - assumption is that we're never going to hit them.
         if let Err(Error::EthClient(EthClientError::EthereumGateway(err))) = &result {
-            vlog::warn!("Provider returned error message: {:?}", err);
+            tracing::warn!("Provider returned error message: {:?}", err);
             let err_message = err.to_string();
             let err_code = if let web3::Error::Rpc(err) = err {
                 Some(err.code.code())
@@ -162,7 +162,7 @@ impl<E: EthInterface + Send + Sync + 'static> EthClient for EthHttpQueryClient<E
                 if from_number >= mid {
                     return Err(Error::InfiniteRecursion);
                 }
-                vlog::warn!(
+                tracing::warn!(
                     "Splitting block range in half: {:?} - {:?} - {:?}",
                     from,
                     mid,
@@ -178,7 +178,7 @@ impl<E: EthInterface + Send + Sync + 'static> EthClient for EthHttpQueryClient<E
                 first_half.append(&mut second_half);
                 result = Ok(first_half);
             } else if should_retry(err_code, err_message) && retries_left > 0 {
-                vlog::warn!("Retrying. Retries left: {:?}", retries_left);
+                tracing::warn!("Retrying. Retries left: {:?}", retries_left);
                 result = self.get_events(from, to, retries_left - 1).await;
             }
         }
diff --git a/core/bin/zksync_core/src/eth_watch/event_processors/priority_ops.rs b/core/bin/zksync_core/src/eth_watch/event_processors/priority_ops.rs
index d10b5893091d..729f217419dd 100644
--- a/core/bin/zksync_core/src/eth_watch/event_processors/priority_ops.rs
+++ b/core/bin/zksync_core/src/eth_watch/event_processors/priority_ops.rs
@@ -50,7 +50,7 @@ impl<W: EthClient + Sync> EventProcessor<W> for PriorityOpsEventProcessor {
 
         let first = &priority_ops[0];
         let last = &priority_ops[priority_ops.len() - 1];
-        vlog::debug!(
+        tracing::debug!(
             "Received priority requests with serial ids: {} (block {}) - {} (block {})",
             first.serial_id(),
             first.eth_block(),
diff --git a/core/bin/zksync_core/src/eth_watch/event_processors/upgrades.rs b/core/bin/zksync_core/src/eth_watch/event_processors/upgrades.rs
index a77daed6736d..acf66b7514fb 100644
--- a/core/bin/zksync_core/src/eth_watch/event_processors/upgrades.rs
+++ b/core/bin/zksync_core/src/eth_watch/event_processors/upgrades.rs
@@ -59,7 +59,7 @@ impl<W: EthClient + Sync> EventProcessor<W> for UpgradesEventProcessor {
             .iter()
             .map(|(u, _)| format!("{}", u.id as u16))
             .collect();
-        vlog::debug!("Received upgrades with ids: {}", ids_str.join(", "));
+        tracing::debug!("Received upgrades with ids: {}", ids_str.join(", "));
 
         let new_upgrades: Vec<_> = upgrades
             .into_iter()
@@ -80,7 +80,7 @@ impl<W: EthClient + Sync> EventProcessor<W> for UpgradesEventProcessor {
             let new_version = previous_version.apply_upgrade(upgrade, scheduler_vk_hash);
             storage
                 .protocol_versions_dal()
-                .save_protocol_version(new_version)
+                .save_protocol_version_with_tx(new_version)
                 .await;
         }
         metrics::histogram!("eth_watcher.poll_eth_node", stage_start.elapsed(), "stage" => "persist_upgrades");
diff --git a/core/bin/zksync_core/src/eth_watch/mod.rs b/core/bin/zksync_core/src/eth_watch/mod.rs
index 2d2d7276257f..8a756baddd61 100644
--- a/core/bin/zksync_core/src/eth_watch/mod.rs
+++ b/core/bin/zksync_core/src/eth_watch/mod.rs
@@ -54,7 +54,7 @@ impl<W: EthClient + Sync> EthWatch<W> {
 
         let state = Self::initialize_state(&client, &mut storage).await;
 
-        vlog::info!("initialized state: {:?}", state);
+        tracing::info!("initialized state: {:?}", state);
 
         let priority_ops_processor =
             PriorityOpsEventProcessor::new(state.next_expected_priority_id);
@@ -114,11 +114,15 @@ impl<W: EthClient + Sync> EthWatch<W> {
         }
     }
 
-    pub async fn run(&mut self, pool: ConnectionPool, stop_receiver: watch::Receiver<bool>) {
+    pub async fn run(
+        &mut self,
+        pool: ConnectionPool,
+        stop_receiver: watch::Receiver<bool>,
+    ) -> anyhow::Result<()> {
         let mut timer = tokio::time::interval(self.poll_interval);
         loop {
             if *stop_receiver.borrow() {
-                vlog::info!("Stop signal received, eth_watch is shutting down");
+                tracing::info!("Stop signal received, eth_watch is shutting down");
                 break;
             }
 
@@ -130,13 +134,14 @@ impl<W: EthClient + Sync> EthWatch<W> {
             if let Err(error) = self.loop_iteration(&mut storage).await {
                 // This is an error because otherwise we could potentially miss a priority operation
                 // thus entering priority mode, which is not desired.
-                vlog::error!("Failed to process new blocks {}", error);
+                tracing::error!("Failed to process new blocks {}", error);
                 self.last_processed_ethereum_block =
                     Self::initialize_state(&self.client, &mut storage)
                         .await
                         .last_processed_ethereum_block;
             }
         }
+        Ok(())
     }
 
     #[tracing::instrument(skip(self, storage))]
@@ -174,7 +179,7 @@ pub async fn start_eth_watch<E: EthInterface + Send + Sync + 'static>(
     eth_gateway: E,
     diamond_proxy_addr: Address,
     stop_receiver: watch::Receiver<bool>,
-) -> JoinHandle<()> {
+) -> JoinHandle<anyhow::Result<()>> {
     let eth_watch = ETHWatchConfig::from_env();
     let eth_client = EthHttpQueryClient::new(
         eth_gateway,
@@ -184,7 +189,5 @@ pub async fn start_eth_watch<E: EthInterface + Send + Sync + 'static>(
 
     let mut eth_watch = EthWatch::new(eth_client, &pool, eth_watch.poll_interval()).await;
 
-    tokio::spawn(async move {
-        eth_watch.run(pool, stop_receiver).await;
-    })
+    tokio::spawn(async move { eth_watch.run(pool, stop_receiver).await })
 }
diff --git a/core/bin/zksync_core/src/eth_watch/tests.rs b/core/bin/zksync_core/src/eth_watch/tests.rs
index b94e85879964..32d3837fecc2 100644
--- a/core/bin/zksync_core/src/eth_watch/tests.rs
+++ b/core/bin/zksync_core/src/eth_watch/tests.rs
@@ -627,7 +627,7 @@ async fn setup_db(connection_pool: &ConnectionPool) {
         .access_test_storage()
         .await
         .protocol_versions_dal()
-        .save_protocol_version(ProtocolVersion {
+        .save_protocol_version_with_tx(ProtocolVersion {
             id: (ProtocolVersionId::latest() as u16 - 1).try_into().unwrap(),
             ..Default::default()
         })
diff --git a/core/bin/zksync_core/src/fee_ticker/mod.rs b/core/bin/zksync_core/src/fee_ticker/mod.rs
index 35facd0e4b35..ef8e6fa05470 100644
--- a/core/bin/zksync_core/src/fee_ticker/mod.rs
+++ b/core/bin/zksync_core/src/fee_ticker/mod.rs
@@ -4,7 +4,7 @@ use core::fmt::Debug;
 
 use bigdecimal::BigDecimal;
 use num::{rational::Ratio, BigUint};
-use vm::vm_with_bootloader::base_fee_to_gas_per_pubdata;
+use vm::utils::fee::base_fee_to_gas_per_pubdata;
 use zksync_types::Address;
 use zksync_utils::ratio_to_big_decimal_normalized;
 
@@ -73,7 +73,7 @@ impl FeeTicker {
                     .ok_or_else(|| {
                         // It's kinda not OK that we have a price for token, but no metadata.
                         // Not a reason for a panic, but surely highest possible report level.
-                        vlog::error!(
+                        tracing::error!(
                             "Token {:x} has price, but no stored metadata",
                             l2_token_addr
                         );
diff --git a/core/bin/zksync_core/src/genesis.rs b/core/bin/zksync_core/src/genesis.rs
index e47a6025282c..7073b652b70b 100644
--- a/core/bin/zksync_core/src/genesis.rs
+++ b/core/bin/zksync_core/src/genesis.rs
@@ -2,30 +2,32 @@
 //! It initializes the Merkle tree with the basic setup (such as fields of special service accounts),
 //! setups the required databases, and outputs the data required to initialize a smart contract.
 
-use vm::zk_evm::aux_structures::{LogQuery, Timestamp};
+use anyhow::Context as _;
+
 use zksync_contracts::BaseSystemContracts;
 use zksync_dal::StorageProcessor;
 use zksync_merkle_tree::domain::ZkSyncTree;
+
 use zksync_types::{
     block::DeployedContract,
-    block::{BlockGasCount, L1BatchHeader, MiniblockHeader},
+    block::{legacy_miniblock_hash, BlockGasCount, L1BatchHeader, MiniblockHeader},
     commitment::{L1BatchCommitment, L1BatchMetadata},
     get_code_key, get_system_context_init_logs,
     protocol_version::{L1VerifierConfig, ProtocolVersion},
     tokens::{TokenInfo, TokenMetadata, ETHEREUM_ADDRESS},
     zkevm_test_harness::witness::sort_storage_access::sort_storage_access_queries,
-    AccountTreeId, Address, L1BatchNumber, L2ChainId, MiniblockNumber, ProtocolVersionId,
-    StorageKey, StorageLog, StorageLogKind, H256,
-};
-use zksync_utils::{
-    be_words_to_bytes, bytecode::hash_bytecode, h256_to_u256, miniblock_hash, u256_to_h256,
+    AccountTreeId, Address, L1BatchNumber, L2ChainId, LogQuery, MiniblockNumber, ProtocolVersionId,
+    StorageKey, StorageLog, StorageLogKind, Timestamp, H256,
 };
+use zksync_utils::{be_words_to_bytes, h256_to_u256};
+use zksync_utils::{bytecode::hash_bytecode, u256_to_h256};
 
 use crate::metadata_calculator::L1BatchWithLogs;
 
 #[derive(Debug, Clone)]
 pub struct GenesisParams {
     pub first_validator: Address,
+    pub protocol_version: ProtocolVersionId,
     pub base_system_contracts: BaseSystemContracts,
     pub system_contracts: Vec<DeployedContract>,
     pub first_verifier_address: Address,
@@ -36,22 +38,23 @@ pub async fn ensure_genesis_state(
     storage: &mut StorageProcessor<'_>,
     zksync_chain_id: L2ChainId,
     genesis_params: &GenesisParams,
-) -> H256 {
+) -> anyhow::Result<H256> {
     let mut transaction = storage.start_transaction().await;
 
     // return if genesis block was already processed
     if !transaction.blocks_dal().is_genesis_needed().await {
-        vlog::debug!("genesis is not needed!");
+        tracing::debug!("genesis is not needed!");
         return transaction
             .blocks_dal()
             .get_l1_batch_state_root(L1BatchNumber(0))
             .await
-            .expect("genesis block hash is empty");
+            .context("genesis block hash is empty");
     }
 
-    vlog::info!("running regenesis");
+    tracing::info!("running regenesis");
     let GenesisParams {
         first_validator,
+        protocol_version,
         base_system_contracts,
         system_contracts,
         first_verifier_address,
@@ -64,13 +67,14 @@ pub async fn ensure_genesis_state(
         &mut transaction,
         *first_validator,
         zksync_chain_id,
+        *protocol_version,
         base_system_contracts,
         system_contracts,
         *first_l1_verifier_config,
         *first_verifier_address,
     )
     .await;
-    vlog::info!("chain_schema_genesis is complete");
+    tracing::info!("chain_schema_genesis is complete");
 
     let storage_logs = L1BatchWithLogs::new(&mut transaction, L1BatchNumber(0)).await;
     let storage_logs = storage_logs.unwrap().storage_logs;
@@ -95,7 +99,7 @@ pub async fn ensure_genesis_state(
         rollup_last_leaf_index,
     )
     .await;
-    vlog::info!("operations_schema_genesis is complete");
+    tracing::info!("operations_schema_genesis is complete");
 
     transaction.commit().await;
 
@@ -118,7 +122,7 @@ pub async fn ensure_genesis_state(
         base_system_contracts_hashes.default_aa
     );
 
-    genesis_root_hash
+    Ok(genesis_root_hash)
 }
 
 // Default account and bootloader are not a regular system contracts
@@ -236,17 +240,19 @@ async fn insert_system_contracts(
     transaction.commit().await;
 }
 
+#[allow(clippy::too_many_arguments)]
 pub(crate) async fn create_genesis_l1_batch(
     storage: &mut StorageProcessor<'_>,
     first_validator_address: Address,
     chain_id: L2ChainId,
+    protocol_version: ProtocolVersionId,
     base_system_contracts: &BaseSystemContracts,
     system_contracts: &[DeployedContract],
     l1_verifier_config: L1VerifierConfig,
     verifier_address: Address,
 ) {
     let version = ProtocolVersion {
-        id: ProtocolVersionId::latest(),
+        id: protocol_version,
         timestamp: 0,
         l1_verifier_config,
         base_system_contracts_hashes: base_system_contracts.hashes(),
@@ -266,7 +272,7 @@ pub(crate) async fn create_genesis_l1_batch(
     let genesis_miniblock_header = MiniblockHeader {
         number: MiniblockNumber(0),
         timestamp: 0,
-        hash: miniblock_hash(MiniblockNumber(0)),
+        hash: legacy_miniblock_hash(MiniblockNumber(0)),
         l1_tx_count: 0,
         l2_tx_count: 0,
         base_fee_per_gas: 0,
@@ -274,13 +280,14 @@ pub(crate) async fn create_genesis_l1_batch(
         l2_fair_gas_price: 0,
         base_system_contracts_hashes: base_system_contracts.hashes(),
         protocol_version: Some(ProtocolVersionId::latest()),
+        virtual_blocks: 0,
     };
 
     let mut transaction = storage.start_transaction().await;
 
     transaction
         .protocol_versions_dal()
-        .save_protocol_version(version)
+        .save_protocol_version_with_tx(version)
         .await;
     transaction
         .blocks_dal()
@@ -370,13 +377,16 @@ mod tests {
         conn.blocks_dal().delete_genesis().await;
 
         let params = GenesisParams {
+            protocol_version: ProtocolVersionId::latest(),
             first_validator: Address::random(),
             base_system_contracts: BaseSystemContracts::load_from_disk(),
             system_contracts: get_system_smart_contracts(),
             first_l1_verifier_config: L1VerifierConfig::default(),
             first_verifier_address: Address::random(),
         };
-        ensure_genesis_state(&mut conn, L2ChainId(270), &params).await;
+        ensure_genesis_state(&mut conn, L2ChainId(270), &params)
+            .await
+            .unwrap();
 
         assert!(!conn.blocks_dal().is_genesis_needed().await);
         let metadata = conn
@@ -387,6 +397,8 @@ mod tests {
         assert_ne!(root_hash, H256::zero());
 
         // Check that `ensure_genesis_state()` doesn't panic on repeated runs.
-        ensure_genesis_state(&mut conn, L2ChainId(270), &params).await;
+        ensure_genesis_state(&mut conn, L2ChainId(270), &params)
+            .await
+            .unwrap();
     }
 }
diff --git a/core/bin/zksync_core/src/house_keeper/blocks_state_reporter.rs b/core/bin/zksync_core/src/house_keeper/blocks_state_reporter.rs
index 43e713a51c12..94bf04dc1783 100644
--- a/core/bin/zksync_core/src/house_keeper/blocks_state_reporter.rs
+++ b/core/bin/zksync_core/src/house_keeper/blocks_state_reporter.rs
@@ -49,6 +49,26 @@ impl L1BatchMetricsReporter {
             block_metrics.push((l1_batch, format!("l1_mined_{}", tx_type.as_str())))
         }
 
+        // todo: PLA-335
+        // block_metrics.append(
+        //     &mut conn
+        //         .prover_dal()
+        //         .get_proven_l1_batches()
+        //         .into_iter()
+        //         .map(|(l1_batch_number, stage)| (l1_batch_number, format!("prove_{:?}", stage)))
+        //         .collect(),
+        // );
+
+        // todo: PLA-335
+        // block_metrics.append(
+        //     &mut conn
+        //         .witness_generator_dal()
+        //         .get_witness_generated_l1_batches()
+        //         .into_iter()
+        //         .map(|(l1_batch_number, stage)| (l1_batch_number, format!("wit_gen_{:?}", stage)))
+        //         .collect(),
+        // );
+
         for (l1_batch_number, stage) in block_metrics {
             metrics::gauge!(
                 "server.block_number",
diff --git a/core/bin/zksync_core/src/house_keeper/fri_proof_compressor_job_retry_manager.rs b/core/bin/zksync_core/src/house_keeper/fri_proof_compressor_job_retry_manager.rs
new file mode 100644
index 000000000000..16726f46f974
--- /dev/null
+++ b/core/bin/zksync_core/src/house_keeper/fri_proof_compressor_job_retry_manager.rs
@@ -0,0 +1,54 @@
+use std::time::Duration;
+
+use async_trait::async_trait;
+use zksync_dal::ConnectionPool;
+use zksync_prover_utils::periodic_job::PeriodicJob;
+
+#[derive(Debug)]
+pub struct FriProofCompressorJobRetryManager {
+    pool: ConnectionPool,
+    max_attempts: u32,
+    processing_timeout: Duration,
+    retry_interval_ms: u64,
+}
+
+impl FriProofCompressorJobRetryManager {
+    pub fn new(
+        max_attempts: u32,
+        processing_timeout: Duration,
+        retry_interval_ms: u64,
+        pool: ConnectionPool,
+    ) -> Self {
+        Self {
+            max_attempts,
+            processing_timeout,
+            retry_interval_ms,
+            pool,
+        }
+    }
+}
+
+/// Invoked periodically to re-queue stuck fri prover jobs.
+#[async_trait]
+impl PeriodicJob for FriProofCompressorJobRetryManager {
+    const SERVICE_NAME: &'static str = "FriProofCompressorJobRetryManager";
+
+    async fn run_routine_task(&mut self) {
+        let stuck_jobs = self
+            .pool
+            .access_storage()
+            .await
+            .fri_proof_compressor_dal()
+            .requeue_stuck_jobs(self.processing_timeout, self.max_attempts)
+            .await;
+        let job_len = stuck_jobs.len();
+        for stuck_job in stuck_jobs {
+            tracing::info!("re-queuing fri proof compressor job {:?}", stuck_job);
+        }
+        metrics::counter!("prover_fri.proof_compressor.requeued_jobs", job_len as u64);
+    }
+
+    fn polling_interval_ms(&self) -> u64 {
+        self.retry_interval_ms
+    }
+}
diff --git a/core/bin/zksync_core/src/house_keeper/fri_proof_compressor_queue_monitor.rs b/core/bin/zksync_core/src/house_keeper/fri_proof_compressor_queue_monitor.rs
new file mode 100644
index 000000000000..d2bc42739a95
--- /dev/null
+++ b/core/bin/zksync_core/src/house_keeper/fri_proof_compressor_queue_monitor.rs
@@ -0,0 +1,65 @@
+use async_trait::async_trait;
+use zksync_dal::ConnectionPool;
+use zksync_types::proofs::JobCountStatistics;
+
+use zksync_prover_utils::periodic_job::PeriodicJob;
+
+const PROOF_COMPRESSOR_SERVICE_NAME: &str = "proof_compressor";
+
+#[derive(Debug)]
+pub struct FriProofCompressorStatsReporter {
+    reporting_interval_ms: u64,
+    pool: ConnectionPool,
+}
+
+impl FriProofCompressorStatsReporter {
+    pub fn new(reporting_interval_ms: u64, pool: ConnectionPool) -> Self {
+        Self {
+            reporting_interval_ms,
+            pool,
+        }
+    }
+
+    async fn get_job_statistics(pool: &ConnectionPool) -> JobCountStatistics {
+        pool.access_storage()
+            .await
+            .fri_proof_compressor_dal()
+            .get_jobs_stats()
+            .await
+    }
+}
+
+/// Invoked periodically to push job statistics to Prometheus
+/// Note: these values will be used for auto-scaling proof compressor
+#[async_trait]
+impl PeriodicJob for FriProofCompressorStatsReporter {
+    const SERVICE_NAME: &'static str = "ProofCompressorStatsReporter";
+
+    async fn run_routine_task(&mut self) {
+        let stats = Self::get_job_statistics(&self.pool).await;
+
+        if stats.queued > 0 {
+            tracing::info!(
+                "Found {} free {} in progress proof compressor jobs",
+                stats.queued,
+                stats.in_progress
+            );
+        }
+
+        metrics::gauge!(
+            format!("prover_fri.{}.jobs", PROOF_COMPRESSOR_SERVICE_NAME),
+            stats.queued as f64,
+            "type" => "queued"
+        );
+
+        metrics::gauge!(
+            format!("prover_fri.{}.jobs", PROOF_COMPRESSOR_SERVICE_NAME),
+            stats.in_progress as f64,
+            "type" => "in_progress"
+        );
+    }
+
+    fn polling_interval_ms(&self) -> u64 {
+        self.reporting_interval_ms
+    }
+}
diff --git a/core/bin/zksync_core/src/house_keeper/fri_prover_job_retry_manager.rs b/core/bin/zksync_core/src/house_keeper/fri_prover_job_retry_manager.rs
index 493dc3294204..c56ffae7f4c2 100644
--- a/core/bin/zksync_core/src/house_keeper/fri_prover_job_retry_manager.rs
+++ b/core/bin/zksync_core/src/house_keeper/fri_prover_job_retry_manager.rs
@@ -43,7 +43,7 @@ impl PeriodicJob for FriProverJobRetryManager {
             .await;
         let job_len = stuck_jobs.len();
         for stuck_job in stuck_jobs {
-            vlog::info!("re-queuing fri prover job {:?}", stuck_job);
+            tracing::info!("re-queuing fri prover job {:?}", stuck_job);
         }
         metrics::counter!("server.prover_fri.requeued_jobs", job_len as u64);
     }
diff --git a/core/bin/zksync_core/src/house_keeper/fri_scheduler_circuit_queuer.rs b/core/bin/zksync_core/src/house_keeper/fri_scheduler_circuit_queuer.rs
index d037c9077d6d..47fefe524594 100644
--- a/core/bin/zksync_core/src/house_keeper/fri_scheduler_circuit_queuer.rs
+++ b/core/bin/zksync_core/src/house_keeper/fri_scheduler_circuit_queuer.rs
@@ -28,7 +28,7 @@ impl SchedulerCircuitQueuer {
             conn.fri_witness_generator_dal()
                 .mark_scheduler_jobs_as_queued(l1_batch_number)
                 .await;
-            vlog::info!(
+            tracing::info!(
                 "Marked fri scheduler aggregation job for l1_batch {} as queued",
                 l1_batch_number,
             );
diff --git a/core/bin/zksync_core/src/house_keeper/fri_witness_generator_jobs_retry_manager.rs b/core/bin/zksync_core/src/house_keeper/fri_witness_generator_jobs_retry_manager.rs
index 4e63b8e2506d..a839c19868de 100644
--- a/core/bin/zksync_core/src/house_keeper/fri_witness_generator_jobs_retry_manager.rs
+++ b/core/bin/zksync_core/src/house_keeper/fri_witness_generator_jobs_retry_manager.rs
@@ -37,7 +37,7 @@ impl FriWitnessGeneratorJobRetryManager {
             .await;
         let job_len = stuck_jobs.len();
         for stuck_job in stuck_jobs {
-            vlog::info!("re-queuing fri witness input job {:?}", stuck_job);
+            tracing::info!("re-queuing fri witness input job {:?}", stuck_job);
         }
         metrics::counter!("server.witness_inputs_fri.requeued_jobs", job_len as u64);
     }
@@ -52,7 +52,7 @@ impl FriWitnessGeneratorJobRetryManager {
             .await;
         let job_len = stuck_jobs.len();
         for stuck_job in stuck_jobs {
-            vlog::info!("re-queuing fri witness input job {:?}", stuck_job);
+            tracing::info!("re-queuing fri witness input job {:?}", stuck_job);
         }
         metrics::counter!(
             "server.leaf_aggregations_jobs_fri.requeued_jobs",
@@ -70,7 +70,7 @@ impl FriWitnessGeneratorJobRetryManager {
             .await;
         let job_len = stuck_jobs.len();
         for stuck_job in stuck_jobs {
-            vlog::info!("re-queuing fri witness input job {:?}", stuck_job);
+            tracing::info!("re-queuing fri witness input job {:?}", stuck_job);
         }
         metrics::counter!(
             "server.node_aggregations_jobs_fri.requeued_jobs",
@@ -88,7 +88,7 @@ impl FriWitnessGeneratorJobRetryManager {
             .await;
         let job_len = stuck_jobs.len();
         for stuck_job in stuck_jobs {
-            vlog::info!("re-queuing fri witness input job {:?}", stuck_job);
+            tracing::info!("re-queuing fri witness input job {:?}", stuck_job);
         }
         metrics::counter!("server.scheduler_jobs_fri.requeued_jobs", job_len as u64);
     }
diff --git a/core/bin/zksync_core/src/house_keeper/fri_witness_generator_queue_monitor.rs b/core/bin/zksync_core/src/house_keeper/fri_witness_generator_queue_monitor.rs
index 1fb145953464..36203d09c588 100644
--- a/core/bin/zksync_core/src/house_keeper/fri_witness_generator_queue_monitor.rs
+++ b/core/bin/zksync_core/src/house_keeper/fri_witness_generator_queue_monitor.rs
@@ -55,7 +55,7 @@ impl FriWitnessGeneratorStatsReporter {
 
 fn emit_metrics_for_round(round: AggregationRound, stats: JobCountStatistics) {
     if stats.queued > 0 || stats.in_progress > 0 {
-        vlog::trace!(
+        tracing::trace!(
             "Found {} free and {} in progress {:?} FRI witness generators jobs",
             stats.queued,
             stats.in_progress,
@@ -93,7 +93,7 @@ impl PeriodicJob for FriWitnessGeneratorStatsReporter {
         }
 
         if aggregated.queued > 0 {
-            vlog::trace!(
+            tracing::trace!(
                 "Found {} free {} in progress witness generators jobs",
                 aggregated.queued,
                 aggregated.in_progress
diff --git a/core/bin/zksync_core/src/house_keeper/gcs_blob_cleaner.rs b/core/bin/zksync_core/src/house_keeper/gcs_blob_cleaner.rs
index a575a5a50084..809b912199bf 100644
--- a/core/bin/zksync_core/src/house_keeper/gcs_blob_cleaner.rs
+++ b/core/bin/zksync_core/src/house_keeper/gcs_blob_cleaner.rs
@@ -78,7 +78,7 @@ impl GcsBlobCleaner {
         blob_urls: Vec<(i64, S)>,
     ) -> Vec<i64> {
         if !blob_urls.is_empty() {
-            vlog::info!("Found {} {bucket} for cleaning blobs", blob_urls.len());
+            tracing::info!("Found {} {bucket} for cleaning blobs", blob_urls.len());
         }
 
         for (_, url) in &blob_urls {
diff --git a/core/bin/zksync_core/src/house_keeper/gpu_prover_queue_monitor.rs b/core/bin/zksync_core/src/house_keeper/gpu_prover_queue_monitor.rs
index 7ffdb40b9577..315715221b7c 100644
--- a/core/bin/zksync_core/src/house_keeper/gpu_prover_queue_monitor.rs
+++ b/core/bin/zksync_core/src/house_keeper/gpu_prover_queue_monitor.rs
@@ -42,7 +42,7 @@ impl PeriodicJob for GpuProverQueueMonitor {
         for ((region, zone), num_gpu) in prover_gpu_count_per_region_zone {
             let synthesizers = self.synthesizer_per_gpu as u64 * num_gpu;
             if synthesizers > 0 {
-                vlog::info!(
+                tracing::info!(
                     "Would be spawning {} circuit synthesizers in region {} zone {}",
                     synthesizers,
                     region,
diff --git a/core/bin/zksync_core/src/house_keeper/mod.rs b/core/bin/zksync_core/src/house_keeper/mod.rs
index ae5c8a991eb2..d28618b0f01f 100644
--- a/core/bin/zksync_core/src/house_keeper/mod.rs
+++ b/core/bin/zksync_core/src/house_keeper/mod.rs
@@ -1,4 +1,6 @@
 pub mod blocks_state_reporter;
+pub mod fri_proof_compressor_job_retry_manager;
+pub mod fri_proof_compressor_queue_monitor;
 pub mod fri_prover_job_retry_manager;
 pub mod fri_prover_queue_monitor;
 pub mod fri_scheduler_circuit_queuer;
diff --git a/core/bin/zksync_core/src/house_keeper/prover_job_retry_manager.rs b/core/bin/zksync_core/src/house_keeper/prover_job_retry_manager.rs
index 7e1259aeea07..6179bc8deb7b 100644
--- a/core/bin/zksync_core/src/house_keeper/prover_job_retry_manager.rs
+++ b/core/bin/zksync_core/src/house_keeper/prover_job_retry_manager.rs
@@ -44,7 +44,7 @@ impl PeriodicJob for ProverJobRetryManager {
             .await;
         let job_len = stuck_jobs.len();
         for stuck_job in stuck_jobs {
-            vlog::info!("re-queuing prover job {:?}", stuck_job);
+            tracing::info!("re-queuing prover job {:?}", stuck_job);
         }
         metrics::counter!("server.prover.requeued_jobs", job_len as u64);
     }
diff --git a/core/bin/zksync_core/src/house_keeper/waiting_to_queued_fri_witness_job_mover.rs b/core/bin/zksync_core/src/house_keeper/waiting_to_queued_fri_witness_job_mover.rs
index 995942116bb6..794be9fcd6a4 100644
--- a/core/bin/zksync_core/src/house_keeper/waiting_to_queued_fri_witness_job_mover.rs
+++ b/core/bin/zksync_core/src/house_keeper/waiting_to_queued_fri_witness_job_mover.rs
@@ -25,7 +25,7 @@ impl WaitingToQueuedFriWitnessJobMover {
             .await;
         let len = l1_batch_numbers.len();
         for (l1_batch_number, circuit_id) in l1_batch_numbers {
-            vlog::info!(
+            tracing::info!(
                 "Marked fri leaf aggregation job for l1_batch {} and circuit_id {} as queued",
                 l1_batch_number,
                 circuit_id
@@ -59,7 +59,7 @@ impl WaitingToQueuedFriWitnessJobMover {
             .await;
         let len = l1_batch_numbers.len();
         for (l1_batch_number, circuit_id, depth) in l1_batch_numbers {
-            vlog::info!(
+            tracing::info!(
                 "Marked fri node aggregation job for l1_batch {} and circuit_id {} depth {} as queued",
                 l1_batch_number,
                 circuit_id,
diff --git a/core/bin/zksync_core/src/house_keeper/waiting_to_queued_witness_job_mover.rs b/core/bin/zksync_core/src/house_keeper/waiting_to_queued_witness_job_mover.rs
index 9d1bc60de953..8246722a994b 100644
--- a/core/bin/zksync_core/src/house_keeper/waiting_to_queued_witness_job_mover.rs
+++ b/core/bin/zksync_core/src/house_keeper/waiting_to_queued_witness_job_mover.rs
@@ -31,7 +31,7 @@ impl WaitingToQueuedWitnessJobMover {
             .await;
         let len = l1_batch_numbers.len();
         for l1_batch_number in l1_batch_numbers {
-            vlog::info!(
+            tracing::info!(
                 "Marked leaf aggregation job for l1_batch {} as queued",
                 l1_batch_number
             );
@@ -50,7 +50,7 @@ impl WaitingToQueuedWitnessJobMover {
             .await;
         let len = l1_batch_numbers.len();
         for l1_batch_number in l1_batch_numbers {
-            vlog::info!(
+            tracing::info!(
                 "Marking node aggregation job for l1_batch {} as queued",
                 l1_batch_number
             );
@@ -69,7 +69,7 @@ impl WaitingToQueuedWitnessJobMover {
             .await;
         let len = l1_batch_numbers.len();
         for l1_batch_number in l1_batch_numbers {
-            vlog::info!(
+            tracing::info!(
                 "Marking scheduler aggregation job for l1_batch {} as queued",
                 l1_batch_number
             );
diff --git a/core/bin/zksync_core/src/house_keeper/witness_generator_queue_monitor.rs b/core/bin/zksync_core/src/house_keeper/witness_generator_queue_monitor.rs
index c6d58d346d5d..d91802462bcd 100644
--- a/core/bin/zksync_core/src/house_keeper/witness_generator_queue_monitor.rs
+++ b/core/bin/zksync_core/src/house_keeper/witness_generator_queue_monitor.rs
@@ -57,7 +57,7 @@ impl WitnessGeneratorStatsReporter {
 
 fn emit_metrics_for_round(round: AggregationRound, stats: JobCountStatistics) {
     if stats.queued > 0 || stats.in_progress > 0 {
-        vlog::trace!(
+        tracing::trace!(
             "Found {} free and {} in progress {:?} witness generators jobs",
             stats.queued,
             stats.in_progress,
@@ -95,7 +95,7 @@ impl PeriodicJob for WitnessGeneratorStatsReporter {
         }
 
         if aggregated.queued > 0 {
-            vlog::trace!(
+            tracing::trace!(
                 "Found {} free {} in progress witness generators jobs",
                 aggregated.queued,
                 aggregated.in_progress
diff --git a/core/bin/zksync_core/src/l1_gas_price/gas_adjuster/bounded_gas_adjuster.rs b/core/bin/zksync_core/src/l1_gas_price/gas_adjuster/bounded_gas_adjuster.rs
index 07e8dcc8f014..0e9bb83aacaf 100644
--- a/core/bin/zksync_core/src/l1_gas_price/gas_adjuster/bounded_gas_adjuster.rs
+++ b/core/bin/zksync_core/src/l1_gas_price/gas_adjuster/bounded_gas_adjuster.rs
@@ -31,7 +31,7 @@ impl<G: L1GasPriceProvider> L1GasPriceProvider for BoundedGasAdjuster<G> {
     fn estimate_effective_gas_price(&self) -> u64 {
         let default_gas_price = self.default_gas_adjuster.estimate_effective_gas_price();
         if default_gas_price > self.max_gas_price {
-            vlog::warn!(
+            tracing::warn!(
                 "Effective gas price is too high: {}, using max allowed: {}",
                 default_gas_price,
                 self.max_gas_price
diff --git a/core/bin/zksync_core/src/l1_gas_price/gas_adjuster/mod.rs b/core/bin/zksync_core/src/l1_gas_price/gas_adjuster/mod.rs
index 8abeba5be7cb..e449197e0559 100644
--- a/core/bin/zksync_core/src/l1_gas_price/gas_adjuster/mod.rs
+++ b/core/bin/zksync_core/src/l1_gas_price/gas_adjuster/mod.rs
@@ -79,19 +79,20 @@ impl<E: EthInterface> GasAdjuster<E> {
         Ok(())
     }
 
-    pub async fn run(self: Arc<Self>, stop_receiver: Receiver<bool>) {
+    pub async fn run(self: Arc<Self>, stop_receiver: Receiver<bool>) -> anyhow::Result<()> {
         loop {
             if *stop_receiver.borrow() {
-                vlog::info!("Stop signal received, gas_adjuster is shutting down");
+                tracing::info!("Stop signal received, gas_adjuster is shutting down");
                 break;
             }
 
             if let Err(err) = self.keep_updated().await {
-                vlog::warn!("Cannot add the base fee to gas statistics: {}", err);
+                tracing::warn!("Cannot add the base fee to gas statistics: {}", err);
             }
 
             tokio::time::sleep(self.config.poll_period()).await;
         }
+        Ok(())
     }
 }
 
diff --git a/core/bin/zksync_core/src/l1_gas_price/main_node_fetcher.rs b/core/bin/zksync_core/src/l1_gas_price/main_node_fetcher.rs
index cdd40f5fa028..2244607a47e8 100644
--- a/core/bin/zksync_core/src/l1_gas_price/main_node_fetcher.rs
+++ b/core/bin/zksync_core/src/l1_gas_price/main_node_fetcher.rs
@@ -43,17 +43,17 @@ impl MainNodeGasPriceFetcher {
             .expect("Unable to create a main node client")
     }
 
-    pub async fn run(self: Arc<Self>, stop_receiver: Receiver<bool>) {
+    pub async fn run(self: Arc<Self>, stop_receiver: Receiver<bool>) -> anyhow::Result<()> {
         loop {
             if *stop_receiver.borrow() {
-                vlog::info!("Stop signal received, MainNodeGasPriceFetcher is shutting down");
+                tracing::info!("Stop signal received, MainNodeGasPriceFetcher is shutting down");
                 break;
             }
 
             let main_node_gas_price = match self.client.get_l1_gas_price().await {
                 Ok(price) => price,
                 Err(err) => {
-                    vlog::warn!("Unable to get the gas price: {}", err);
+                    tracing::warn!("Unable to get the gas price: {}", err);
                     // A delay to avoid spamming the main node with requests.
                     tokio::time::sleep(SLEEP_INTERVAL).await;
                     continue;
@@ -63,6 +63,7 @@ impl MainNodeGasPriceFetcher {
                 .store(main_node_gas_price.as_u64(), Ordering::Relaxed);
             tokio::time::sleep(SLEEP_INTERVAL).await;
         }
+        Ok(())
     }
 }
 
diff --git a/core/bin/zksync_core/src/l1_gas_price/singleton.rs b/core/bin/zksync_core/src/l1_gas_price/singleton.rs
index 83faa7c96ffa..6d7b4897b3be 100644
--- a/core/bin/zksync_core/src/l1_gas_price/singleton.rs
+++ b/core/bin/zksync_core/src/l1_gas_price/singleton.rs
@@ -39,9 +39,10 @@ impl GasAdjusterSingleton {
         Arc::new(BoundedGasAdjuster::new(config.max_l1_gas_price(), adjuster))
     }
 
-    pub fn run_if_initialized(self, stop_signal: watch::Receiver<bool>) -> Option<JoinHandle<()>> {
-        self.0
-            .get()
-            .map(|adjuster| tokio::spawn(adjuster.clone().run(stop_signal)))
+    pub fn run_if_initialized(
+        self,
+        stop_signal: watch::Receiver<bool>,
+    ) -> Option<JoinHandle<anyhow::Result<()>>> {
+        Some(tokio::spawn(self.0.get()?.clone().run(stop_signal)))
     }
 }
diff --git a/core/bin/zksync_core/src/lib.rs b/core/bin/zksync_core/src/lib.rs
index 25105507ce62..05b297a9b81e 100644
--- a/core/bin/zksync_core/src/lib.rs
+++ b/core/bin/zksync_core/src/lib.rs
@@ -2,10 +2,11 @@
 
 use std::{str::FromStr, sync::Arc, time::Instant};
 
+use anyhow::Context as _;
 use futures::channel::oneshot;
+use prometheus_exporter::PrometheusExporterConfig;
 use tokio::{sync::watch, task::JoinHandle};
 
-use prometheus_exporter::run_prometheus_exporter;
 use zksync_circuit_breaker::{
     facet_selectors::FacetSelectorsChecker, l1_txs::FailedL1TransactionChecker, CircuitBreaker,
     CircuitBreakerChecker, CircuitBreakerError,
@@ -18,8 +19,8 @@ use zksync_config::configs::{
     },
     database::MerkleTreeMode,
     house_keeper::HouseKeeperConfig,
-    FriProverConfig, FriWitnessGeneratorConfig, PrometheusConfig, ProofDataHandlerConfig,
-    ProverGroupConfig, WitnessGeneratorConfig,
+    FriProofCompressorConfig, FriProverConfig, FriWitnessGeneratorConfig, PrometheusConfig,
+    ProofDataHandlerConfig, ProverGroupConfig, WitnessGeneratorConfig,
 };
 use zksync_config::{
     ApiConfig, ContractsConfig, DBConfig, ETHClientConfig, ETHSenderConfig, FetcherConfig,
@@ -31,7 +32,7 @@ use zksync_dal::{
 };
 use zksync_eth_client::clients::http::QueryClient;
 use zksync_eth_client::{clients::http::PKSigningClient, BoundEthInterface};
-use zksync_health_check::{CheckHealth, ReactiveHealthCheck};
+use zksync_health_check::{CheckHealth, HealthStatus, ReactiveHealthCheck};
 use zksync_object_store::ObjectStoreFactory;
 use zksync_prover_utils::periodic_job::PeriodicJob;
 use zksync_queued_job_processor::JobProcessor;
@@ -40,7 +41,7 @@ use zksync_types::{
     proofs::AggregationRound,
     protocol_version::{L1VerifierConfig, VerifierParams},
     system_contracts::get_system_smart_contracts,
-    Address, L2ChainId, PackedEthSignature,
+    Address, L2ChainId, PackedEthSignature, ProtocolVersionId,
 };
 use zksync_verification_key_server::get_cached_commitments;
 
@@ -49,6 +50,8 @@ use crate::api_server::tx_sender::TxSenderConfig;
 use crate::api_server::tx_sender::{TxSender, TxSenderBuilder};
 use crate::api_server::web3::{state::InternalApiConfig, Namespace};
 use crate::eth_sender::{Aggregator, EthTxManager};
+use crate::house_keeper::fri_proof_compressor_job_retry_manager::FriProofCompressorJobRetryManager;
+use crate::house_keeper::fri_proof_compressor_queue_monitor::FriProofCompressorStatsReporter;
 use crate::house_keeper::fri_prover_job_retry_manager::FriProverJobRetryManager;
 use crate::house_keeper::fri_prover_queue_monitor::FriProverStatsReporter;
 use crate::house_keeper::fri_scheduler_circuit_queuer::SchedulerCircuitQueuer;
@@ -106,15 +109,17 @@ pub async fn genesis_init(
     eth_sender: &ETHSenderConfig,
     network_config: &NetworkConfig,
     contracts_config: &ContractsConfig,
-) {
-    let mut storage = StorageProcessor::establish_connection(true).await;
+) -> anyhow::Result<()> {
+    let mut storage = StorageProcessor::establish_connection(true)
+        .await
+        .context("establish_connection")?;
     let operator_address = PackedEthSignature::address_from_private_key(
         &eth_sender
             .sender
             .private_key()
-            .expect("Private key is required for genesis init"),
+            .context("Private key is required for genesis init")?,
     )
-    .expect("Failed to restore operator address from private key");
+    .context("Failed to restore operator address from private key")?;
 
     genesis::ensure_genesis_state(
         &mut storage,
@@ -122,6 +127,7 @@ pub async fn genesis_init(
         &genesis::GenesisParams {
             // We consider the operator to be the first validator for now.
             first_validator: operator_address,
+            protocol_version: ProtocolVersionId::latest(),
             base_system_contracts: BaseSystemContracts::load_from_disk(),
             system_contracts: get_system_smart_contracts(),
             first_verifier_address: contracts_config.verifier_addr,
@@ -137,11 +143,12 @@ pub async fn genesis_init(
             },
         },
     )
-    .await;
+    .await?;
+    Ok(())
 }
 
 pub async fn is_genesis_needed() -> bool {
-    let mut storage = StorageProcessor::establish_connection(true).await;
+    let mut storage = StorageProcessor::establish_connection(true).await.unwrap();
     storage.blocks_dal().is_genesis_needed().await
 }
 
@@ -167,12 +174,15 @@ pub fn setup_sigint_handler() -> oneshot::Receiver<()> {
 pub enum Component {
     // Public Web3 API running on HTTP server.
     HttpApi,
+    // Public Web3 API running on HTTP/WebSocket server and redirect eth_getLogs to another method.
+    ApiTranslator,
     // Public Web3 API (including PubSub) running on WebSocket server.
     WsApi,
     // REST API for contract verification.
     ContractVerificationApi,
     // Metadata Calculator.
     Tree,
+    // TODO(BFT-273): Remove `TreeLightweight` component as obsolete
     TreeLightweight,
     TreeBackup,
     EthWatcher,
@@ -207,6 +217,7 @@ impl FromStr for Components {
                 Component::ContractVerificationApi,
             ])),
             "http_api" => Ok(Components(vec![Component::HttpApi])),
+            "http_api_translator" => Ok(Components(vec![Component::ApiTranslator])),
             "ws_api" => Ok(Components(vec![Component::WsApi])),
             "contract_verification_api" => Ok(Components(vec![Component::ContractVerificationApi])),
             "tree" | "tree_new" => Ok(Components(vec![Component::Tree])),
@@ -265,22 +276,29 @@ impl FromStr for Components {
 
 pub async fn initialize_components(
     components: Vec<Component>,
-    use_prometheus_pushgateway: bool,
+    use_prometheus_push_gateway: bool,
 ) -> anyhow::Result<(
-    Vec<JoinHandle<()>>,
+    Vec<JoinHandle<anyhow::Result<()>>>,
     watch::Sender<bool>,
     oneshot::Receiver<CircuitBreakerError>,
     HealthCheckHandle,
 )> {
-    vlog::info!("Starting the components: {components:?}");
+    tracing::info!("Starting the components: {components:?}");
 
     let db_config = DBConfig::from_env();
-    let connection_pool = ConnectionPool::builder(DbVariant::Master).build().await;
-    let prover_connection_pool = ConnectionPool::builder(DbVariant::Prover).build().await;
+    let connection_pool = ConnectionPool::builder(DbVariant::Master)
+        .build()
+        .await
+        .context("failed to build connection_pool")?;
+    let prover_connection_pool = ConnectionPool::builder(DbVariant::Prover)
+        .build()
+        .await
+        .context("failed to build prover_connection_pool")?;
     let replica_connection_pool = ConnectionPool::builder(DbVariant::Replica)
         .set_statement_timeout(db_config.statement_timeout())
         .build()
-        .await;
+        .await
+        .context("failed to build replica_connection_pool")?;
 
     let mut healthchecks: Vec<Box<dyn CheckHealth>> = Vec::new();
     let contracts_config = ContractsConfig::from_env();
@@ -295,7 +313,8 @@ pub async fn initialize_components(
             &circuit_breaker_config,
             main_zksync_contract_address,
         )
-        .await,
+        .await
+        .context("circuit_breakers_for_components")?,
         &circuit_breaker_config,
     );
     circuit_breaker_checker.check().await.unwrap_or_else(|err| {
@@ -307,29 +326,45 @@ pub async fn initialize_components(
 
     let (stop_sender, stop_receiver) = watch::channel(false);
     let (cb_sender, cb_receiver) = oneshot::channel();
+
     // Prometheus exporter and circuit breaker checker should run for every component configuration.
     let prom_config = PrometheusConfig::from_env();
-    let mut task_futures: Vec<JoinHandle<()>> = vec![
-        run_prometheus_exporter(
-            prom_config.listener_port,
-            use_prometheus_pushgateway.then(|| {
-                (
-                    prom_config.pushgateway_url.clone(),
-                    prom_config.push_interval(),
-                )
-            }),
-        ),
+    let prom_config = if use_prometheus_push_gateway {
+        PrometheusExporterConfig::push(prom_config.gateway_endpoint(), prom_config.push_interval())
+    } else {
+        PrometheusExporterConfig::pull(prom_config.listener_port)
+    };
+    let prom_config = prom_config.with_new_facade();
+
+    let (prometheus_health_check, prometheus_health_updater) =
+        ReactiveHealthCheck::new("prometheus_exporter");
+    healthchecks.push(Box::new(prometheus_health_check));
+    let prometheus_task = prom_config.run(stop_receiver.clone());
+    let prometheus_task = tokio::spawn(async move {
+        prometheus_health_updater.update(HealthStatus::Ready.into());
+        let res = prometheus_task.await;
+        drop(prometheus_health_updater);
+        res
+    });
+
+    let mut task_futures: Vec<JoinHandle<anyhow::Result<()>>> = vec![
+        prometheus_task,
         tokio::spawn(circuit_breaker_checker.run(cb_sender, stop_receiver.clone())),
     ];
 
     if components.contains(&Component::WsApi)
         || components.contains(&Component::HttpApi)
         || components.contains(&Component::ContractVerificationApi)
+        || components.contains(&Component::ApiTranslator)
     {
         let api_config = ApiConfig::from_env();
         let state_keeper_config = StateKeeperConfig::from_env();
         let network_config = NetworkConfig::from_env();
-        let tx_sender_config = TxSenderConfig::new(&state_keeper_config, &api_config.web3_json_rpc);
+        let tx_sender_config = TxSenderConfig::new(
+            &state_keeper_config,
+            &api_config.web3_json_rpc,
+            L2ChainId(network_config.zksync_network_id),
+        );
         let internal_api_config = InternalApiConfig::new(
             &network_config,
             &api_config.web3_json_rpc,
@@ -349,7 +384,7 @@ pub async fn initialize_components(
             ));
 
             let started_at = Instant::now();
-            vlog::info!("initializing HTTP API");
+            tracing::info!("initializing HTTP API");
             let bounded_gas_adjuster = gas_adjuster.get_or_init_bounded().await;
             let (futures, health_check) = run_http_api(
                 &tx_sender_config,
@@ -361,12 +396,14 @@ pub async fn initialize_components(
                 stop_receiver.clone(),
                 bounded_gas_adjuster.clone(),
                 state_keeper_config.save_call_traces,
+                components.contains(&Component::ApiTranslator),
                 storage_caches.clone().unwrap(),
             )
-            .await;
+            .await
+            .context("run_http_api")?;
             task_futures.extend(futures);
             healthchecks.push(Box::new(health_check));
-            vlog::info!("initialized HTTP API in {:?}", started_at.elapsed());
+            tracing::info!("initialized HTTP API in {:?}", started_at.elapsed());
             metrics::gauge!("server.init.latency", started_at.elapsed(), "stage" => "http_api");
         }
 
@@ -376,7 +413,7 @@ pub async fn initialize_components(
             });
 
             let started_at = Instant::now();
-            vlog::info!("initializing WS API");
+            tracing::info!("initializing WS API");
             let bounded_gas_adjuster = gas_adjuster.get_or_init_bounded().await;
             let (futures, health_check) = run_ws_api(
                 &tx_sender_config,
@@ -388,24 +425,26 @@ pub async fn initialize_components(
                 replica_connection_pool.clone(),
                 stop_receiver.clone(),
                 storage_caches,
+                components.contains(&Component::ApiTranslator),
             )
-            .await;
+            .await
+            .context("run_ws_api")?;
             task_futures.extend(futures);
             healthchecks.push(Box::new(health_check));
-            vlog::info!("initialized WS API in {:?}", started_at.elapsed());
+            tracing::info!("initialized WS API in {:?}", started_at.elapsed());
             metrics::gauge!("server.init.latency", started_at.elapsed(), "stage" => "ws_api");
         }
 
         if components.contains(&Component::ContractVerificationApi) {
             let started_at = Instant::now();
-            vlog::info!("initializing contract verification REST API");
+            tracing::info!("initializing contract verification REST API");
             task_futures.push(contract_verification::start_server_thread_detached(
                 connection_pool.clone(),
                 replica_connection_pool.clone(),
                 api_config.contract_verification.clone(),
                 stop_receiver.clone(),
             ));
-            vlog::info!(
+            tracing::info!(
                 "initialized contract verification REST API in {:?}",
                 started_at.elapsed()
             );
@@ -415,26 +454,31 @@ pub async fn initialize_components(
 
     if components.contains(&Component::StateKeeper) {
         let started_at = Instant::now();
-        vlog::info!("initializing State Keeper");
+        tracing::info!("initializing State Keeper");
         let bounded_gas_adjuster = gas_adjuster.get_or_init_bounded().await;
         add_state_keeper_to_task_futures(
             &mut task_futures,
             &contracts_config,
             StateKeeperConfig::from_env(),
+            &NetworkConfig::from_env(),
             &db_config,
             &MempoolConfig::from_env(),
             bounded_gas_adjuster,
             stop_receiver.clone(),
         )
-        .await;
-        vlog::info!("initialized State Keeper in {:?}", started_at.elapsed());
+        .await
+        .context("add_state_keeper_to_task_futures()")?;
+        tracing::info!("initialized State Keeper in {:?}", started_at.elapsed());
         metrics::gauge!("server.init.latency", started_at.elapsed(), "stage" => "state_keeper");
     }
 
     if components.contains(&Component::EthWatcher) {
         let started_at = Instant::now();
-        vlog::info!("initializing ETH-Watcher");
-        let eth_watch_pool = ConnectionPool::singleton(DbVariant::Master).build().await;
+        tracing::info!("initializing ETH-Watcher");
+        let eth_watch_pool = ConnectionPool::singleton(DbVariant::Master)
+            .build()
+            .await
+            .context("failed to build eth_watch_pool")?;
         task_futures.push(
             start_eth_watch(
                 eth_watch_pool,
@@ -444,15 +488,23 @@ pub async fn initialize_components(
             )
             .await,
         );
-        vlog::info!("initialized ETH-Watcher in {:?}", started_at.elapsed());
+        tracing::info!("initialized ETH-Watcher in {:?}", started_at.elapsed());
         metrics::gauge!("server.init.latency", started_at.elapsed(), "stage" => "eth_watcher");
     }
 
+    let store_factory = ObjectStoreFactory::from_env();
+
     if components.contains(&Component::EthTxAggregator) {
         let started_at = Instant::now();
-        vlog::info!("initializing ETH-TxAggregator");
-        let eth_sender_pool = ConnectionPool::singleton(DbVariant::Master).build().await;
-        let eth_sender_prover_pool = ConnectionPool::singleton(DbVariant::Prover).build().await;
+        tracing::info!("initializing ETH-TxAggregator");
+        let eth_sender_pool = ConnectionPool::singleton(DbVariant::Master)
+            .build()
+            .await
+            .context("failed to build eth_sender_pool")?;
+        let eth_sender_prover_pool = ConnectionPool::singleton(DbVariant::Prover)
+            .build()
+            .await
+            .context("failed to build eth_sender_prover_pool")?;
 
         let eth_sender = ETHSenderConfig::from_env();
         let eth_client =
@@ -460,7 +512,10 @@ pub async fn initialize_components(
         let nonce = eth_client.pending_nonce("eth_sender").await.unwrap();
         let eth_tx_aggregator_actor = EthTxAggregator::new(
             eth_sender.sender.clone(),
-            Aggregator::new(eth_sender.sender.clone()),
+            Aggregator::new(
+                eth_sender.sender.clone(),
+                store_factory.create_store().await,
+            ),
             contracts_config.validator_timelock_addr,
             contracts_config.l1_multicall3_addr,
             main_zksync_contract_address,
@@ -472,14 +527,17 @@ pub async fn initialize_components(
             eth_client,
             stop_receiver.clone(),
         )));
-        vlog::info!("initialized ETH-TxAggregator in {:?}", started_at.elapsed());
+        tracing::info!("initialized ETH-TxAggregator in {:?}", started_at.elapsed());
         metrics::gauge!("server.init.latency", started_at.elapsed(), "stage" => "eth_tx_aggregator");
     }
 
     if components.contains(&Component::EthTxManager) {
         let started_at = Instant::now();
-        vlog::info!("initializing ETH-TxManager");
-        let eth_manager_pool = ConnectionPool::singleton(DbVariant::Master).build().await;
+        tracing::info!("initializing ETH-TxManager");
+        let eth_manager_pool = ConnectionPool::singleton(DbVariant::Master)
+            .build()
+            .await
+            .context("failed to build eth_manager_pool")?;
         let eth_sender = ETHSenderConfig::from_env();
         let eth_client =
             PKSigningClient::from_config(&eth_sender, &contracts_config, &eth_client_config);
@@ -491,7 +549,7 @@ pub async fn initialize_components(
         task_futures.extend([tokio::spawn(
             eth_tx_manager_actor.run(eth_manager_pool, stop_receiver.clone()),
         )]);
-        vlog::info!("initialized ETH-TxManager in {:?}", started_at.elapsed());
+        tracing::info!("initialized ETH-TxManager in {:?}", started_at.elapsed());
         metrics::gauge!("server.init.latency", started_at.elapsed(), "stage" => "eth_tx_aggregator");
     }
 
@@ -499,18 +557,17 @@ pub async fn initialize_components(
         let started_at = Instant::now();
         let fetcher_config = FetcherConfig::from_env();
         let eth_network = chain::NetworkConfig::from_env();
-        vlog::info!("initializing data fetchers");
+        tracing::info!("initializing data fetchers");
         task_futures.extend(run_data_fetchers(
             &fetcher_config,
             eth_network.network,
             connection_pool.clone(),
             stop_receiver.clone(),
         ));
-        vlog::info!("initialized data fetchers in {:?}", started_at.elapsed());
+        tracing::info!("initialized data fetchers in {:?}", started_at.elapsed());
         metrics::gauge!("server.init.latency", started_at.elapsed(), "stage" => "data_fetchers");
     }
 
-    let store_factory = ObjectStoreFactory::from_env();
     add_trees_to_task_futures(
         &mut task_futures,
         &mut healthchecks,
@@ -518,7 +575,8 @@ pub async fn initialize_components(
         &store_factory,
         stop_receiver.clone(),
     )
-    .await;
+    .await
+    .context("add_trees_to_task_futures()")?;
     add_witness_generator_to_task_futures(
         &mut task_futures,
         &components,
@@ -530,7 +588,9 @@ pub async fn initialize_components(
     .await;
 
     if components.contains(&Component::Housekeeper) {
-        add_house_keeper_to_task_futures(&mut task_futures, &store_factory).await;
+        add_house_keeper_to_task_futures(&mut task_futures, &store_factory)
+            .await
+            .context("add_house_keeper_to_task_futures()")?;
     }
 
     if components.contains(&Component::ProofDataHandler) {
@@ -557,18 +617,23 @@ pub async fn initialize_components(
     Ok((task_futures, stop_sender, cb_receiver, health_check_handle))
 }
 
+#[allow(clippy::too_many_arguments)]
 async fn add_state_keeper_to_task_futures<E: L1GasPriceProvider + Send + Sync + 'static>(
-    task_futures: &mut Vec<JoinHandle<()>>,
+    task_futures: &mut Vec<JoinHandle<anyhow::Result<()>>>,
     contracts_config: &ContractsConfig,
     state_keeper_config: StateKeeperConfig,
+    network_config: &NetworkConfig,
     db_config: &DBConfig,
     mempool_config: &MempoolConfig,
     gas_adjuster: Arc<E>,
     stop_receiver: watch::Receiver<bool>,
-) {
+) -> anyhow::Result<()> {
     let fair_l2_gas_price = state_keeper_config.fair_l2_gas_price;
     let pool_builder = ConnectionPool::singleton(DbVariant::Master);
-    let state_keeper_pool = pool_builder.build().await;
+    let state_keeper_pool = pool_builder
+        .build()
+        .await
+        .context("failed to build state_keeper_pool")?;
     let next_priority_id = state_keeper_pool
         .access_storage()
         .await
@@ -577,7 +642,10 @@ async fn add_state_keeper_to_task_futures<E: L1GasPriceProvider + Send + Sync +
         .await;
     let mempool = MempoolGuard::new(next_priority_id, mempool_config.capacity);
 
-    let miniblock_sealer_pool = pool_builder.build().await;
+    let miniblock_sealer_pool = pool_builder
+        .build()
+        .await
+        .context("failed to build miniblock_sealer_pool")?;
     let (miniblock_sealer, miniblock_sealer_handle) = MiniblockSealer::new(
         miniblock_sealer_pool,
         state_keeper_config.miniblock_seal_queue_capacity,
@@ -588,6 +656,7 @@ async fn add_state_keeper_to_task_futures<E: L1GasPriceProvider + Send + Sync +
         contracts_config,
         state_keeper_config,
         db_config,
+        network_config,
         mempool_config,
         state_keeper_pool,
         mempool.clone(),
@@ -598,7 +667,10 @@ async fn add_state_keeper_to_task_futures<E: L1GasPriceProvider + Send + Sync +
     .await;
     task_futures.push(tokio::spawn(state_keeper.run()));
 
-    let mempool_fetcher_pool = pool_builder.build().await;
+    let mempool_fetcher_pool = pool_builder
+        .build()
+        .await
+        .context("failed to build mempool_fetcher_pool")?;
     let mempool_fetcher = MempoolFetcher::new(mempool, gas_adjuster, mempool_config);
     let mempool_fetcher_handle = tokio::spawn(mempool_fetcher.run(
         mempool_fetcher_pool,
@@ -608,15 +680,16 @@ async fn add_state_keeper_to_task_futures<E: L1GasPriceProvider + Send + Sync +
         stop_receiver,
     ));
     task_futures.push(mempool_fetcher_handle);
+    Ok(())
 }
 
 async fn add_trees_to_task_futures(
-    task_futures: &mut Vec<JoinHandle<()>>,
+    task_futures: &mut Vec<JoinHandle<anyhow::Result<()>>>,
     healthchecks: &mut Vec<Box<dyn CheckHealth>>,
     components: &[Component],
     store_factory: &ObjectStoreFactory,
     stop_receiver: watch::Receiver<bool>,
-) {
+) -> anyhow::Result<()> {
     if components.contains(&Component::TreeBackup) {
         panic!("Tree backup mode is disabled");
     }
@@ -636,12 +709,14 @@ async fn add_trees_to_task_futures(
             MerkleTreeMode::Lightweight => MetadataCalculatorModeConfig::Lightweight,
             MerkleTreeMode::Full => MetadataCalculatorModeConfig::Full { store_factory },
         },
-        (false, false) => return,
+        (false, false) => return Ok(()),
     };
-    let (future, tree_health_check) =
-        run_tree(&db_config, &operation_config, mode, stop_receiver).await;
+    let (future, tree_health_check) = run_tree(&db_config, &operation_config, mode, stop_receiver)
+        .await
+        .context("run_tree()")?;
     task_futures.push(future);
     healthchecks.push(Box::new(tree_health_check));
+    Ok(())
 }
 
 async fn run_tree(
@@ -649,34 +724,40 @@ async fn run_tree(
     operation_manager: &OperationsManagerConfig,
     mode: MetadataCalculatorModeConfig<'_>,
     stop_receiver: watch::Receiver<bool>,
-) -> (JoinHandle<()>, ReactiveHealthCheck) {
+) -> anyhow::Result<(JoinHandle<anyhow::Result<()>>, ReactiveHealthCheck)> {
     let started_at = Instant::now();
     let mode_str = if matches!(mode, MetadataCalculatorModeConfig::Full { .. }) {
         "full"
     } else {
         "lightweight"
     };
-    vlog::info!("Initializing Merkle tree in {mode_str} mode");
+    tracing::info!("Initializing Merkle tree in {mode_str} mode");
 
     let config = MetadataCalculatorConfig::for_main_node(config, operation_manager, mode);
     let metadata_calculator = MetadataCalculator::new(&config).await;
     let tree_health_check = metadata_calculator.tree_health_check();
-    let pool = ConnectionPool::singleton(DbVariant::Master).build().await;
-    let prover_pool = ConnectionPool::singleton(DbVariant::Prover).build().await;
+    let pool = ConnectionPool::singleton(DbVariant::Master)
+        .build()
+        .await
+        .context("failed to build connection pool")?;
+    let prover_pool = ConnectionPool::singleton(DbVariant::Prover)
+        .build()
+        .await
+        .context("failed to build prover_pool")?;
     let future = tokio::spawn(metadata_calculator.run(pool, prover_pool, stop_receiver));
 
-    vlog::info!("Initialized {mode_str} tree in {:?}", started_at.elapsed());
+    tracing::info!("Initialized {mode_str} tree in {:?}", started_at.elapsed());
     metrics::gauge!(
         "server.init.latency",
         started_at.elapsed(),
         "stage" => "tree",
         "tree" => mode_str
     );
-    (future, tree_health_check)
+    Ok((future, tree_health_check))
 }
 
 async fn add_witness_generator_to_task_futures(
-    task_futures: &mut Vec<JoinHandle<()>>,
+    task_futures: &mut Vec<JoinHandle<anyhow::Result<()>>>,
     components: &[Component],
     connection_pool: &ConnectionPool,
     prover_connection_pool: &ConnectionPool,
@@ -696,20 +777,19 @@ async fn add_witness_generator_to_task_futures(
         }
     });
 
-    let vk_commitments = get_cached_commitments();
-    let protocol_versions = prover_connection_pool
-        .access_storage()
-        .await
-        .protocol_versions_dal()
-        .protocol_version_for(&vk_commitments)
-        .await;
-
     for (batch_size, component_type) in generator_params {
         let started_at = Instant::now();
-        vlog::info!(
+        tracing::info!(
             "initializing the {component_type:?} witness generator, batch size: {batch_size:?}"
         );
 
+        let vk_commitments = get_cached_commitments();
+        let protocol_versions = prover_connection_pool
+            .access_storage()
+            .await
+            .protocol_versions_dal()
+            .protocol_version_for(&vk_commitments)
+            .await;
         let config = WitnessGeneratorConfig::from_env();
         let task = match component_type {
             AggregationRound::BasicCircuits => {
@@ -759,7 +839,7 @@ async fn add_witness_generator_to_task_futures(
         };
         task_futures.push(task);
 
-        vlog::info!(
+        tracing::info!(
             "initialized {component_type:?} witness generator in {:?}",
             started_at.elapsed()
         );
@@ -772,11 +852,14 @@ async fn add_witness_generator_to_task_futures(
 }
 
 async fn add_house_keeper_to_task_futures(
-    task_futures: &mut Vec<JoinHandle<()>>,
+    task_futures: &mut Vec<JoinHandle<anyhow::Result<()>>>,
     store_factory: &ObjectStoreFactory,
-) {
+) -> anyhow::Result<()> {
     let house_keeper_config = HouseKeeperConfig::from_env();
-    let connection_pool = ConnectionPool::singleton(DbVariant::Replica).build().await;
+    let connection_pool = ConnectionPool::singleton(DbVariant::Replica)
+        .build()
+        .await
+        .context("failed to build a connection pool")?;
     let l1_batch_metrics_reporter = L1BatchMetricsReporter::new(
         house_keeper_config.l1_batch_metrics_reporting_interval_ms,
         connection_pool,
@@ -785,7 +868,8 @@ async fn add_house_keeper_to_task_futures(
     let prover_connection_pool = ConnectionPool::builder(DbVariant::Prover)
         .set_max_size(Some(house_keeper_config.prover_db_pool_size))
         .build()
-        .await;
+        .await
+        .context("failed to build a prover_connection_pool")?;
     let gpu_prover_queue = GpuProverQueueMonitor::new(
         ProverGroupConfig::from_env().synthesizer_per_gpu,
         house_keeper_config.gpu_prover_queue_reporting_interval_ms,
@@ -867,11 +951,27 @@ async fn add_house_keeper_to_task_futures(
         prover_connection_pool.clone(),
     );
     task_futures.push(tokio::spawn(fri_prover_stats_reporter.run()));
+
+    let proof_compressor_config = FriProofCompressorConfig::from_env();
+    let fri_proof_compressor_stats_reporter = FriProofCompressorStatsReporter::new(
+        house_keeper_config.fri_proof_compressor_stats_reporting_interval_ms,
+        prover_connection_pool.clone(),
+    );
+    task_futures.push(tokio::spawn(fri_proof_compressor_stats_reporter.run()));
+
+    let fri_proof_compressor_retry_manager = FriProofCompressorJobRetryManager::new(
+        proof_compressor_config.max_attempts,
+        proof_compressor_config.generation_timeout(),
+        house_keeper_config.fri_proof_compressor_job_retrying_interval_ms,
+        prover_connection_pool.clone(),
+    );
+    task_futures.push(tokio::spawn(fri_proof_compressor_retry_manager.run()));
+    Ok(())
 }
 
 fn build_storage_caches(
     replica_connection_pool: &ConnectionPool,
-    task_futures: &mut Vec<JoinHandle<()>>,
+    task_futures: &mut Vec<JoinHandle<anyhow::Result<()>>>,
 ) -> PostgresStorageCaches {
     let rpc_config = Web3JsonRpcConfig::from_env();
     let factory_deps_capacity = rpc_config.factory_deps_cache_size() as u64;
@@ -934,8 +1034,9 @@ async fn run_http_api<G: L1GasPriceProvider + Send + Sync + 'static>(
     stop_receiver: watch::Receiver<bool>,
     gas_adjuster: Arc<G>,
     with_debug_namespace: bool,
+    with_logs_request_translator_enabled: bool,
     storage_caches: PostgresStorageCaches,
-) -> (Vec<JoinHandle<()>>, ReactiveHealthCheck) {
+) -> anyhow::Result<(Vec<JoinHandle<anyhow::Result<()>>>, ReactiveHealthCheck)> {
     let (tx_sender, vm_barrier) = build_tx_sender(
         tx_sender_config,
         &api_config.web3_json_rpc,
@@ -952,17 +1053,25 @@ async fn run_http_api<G: L1GasPriceProvider + Send + Sync + 'static>(
     } else {
         Namespace::NON_DEBUG.to_vec()
     };
-
-    web3::ApiBuilder::jsonrpsee_backend(internal_api.clone(), replica_connection_pool)
-        .http(api_config.web3_json_rpc.http_port)
-        .with_filter_limit(api_config.web3_json_rpc.filters_limit())
-        .with_threads(api_config.web3_json_rpc.http_server_threads())
-        .with_batch_request_size_limit(api_config.web3_json_rpc.max_batch_request_size())
-        .with_response_body_size_limit(api_config.web3_json_rpc.max_response_body_size())
-        .with_tx_sender(tx_sender, vm_barrier)
-        .enable_api_namespaces(namespaces)
-        .build(stop_receiver.clone())
+    let last_miniblock_pool = ConnectionPool::singleton(DbVariant::Replica)
+        .build()
         .await
+        .context("failed to build last_miniblock_pool")?;
+
+    let mut api_builder =
+        web3::ApiBuilder::jsonrpsee_backend(internal_api.clone(), replica_connection_pool)
+            .http(api_config.web3_json_rpc.http_port)
+            .with_last_miniblock_pool(last_miniblock_pool)
+            .with_filter_limit(api_config.web3_json_rpc.filters_limit())
+            .with_threads(api_config.web3_json_rpc.http_server_threads())
+            .with_batch_request_size_limit(api_config.web3_json_rpc.max_batch_request_size())
+            .with_response_body_size_limit(api_config.web3_json_rpc.max_response_body_size())
+            .with_tx_sender(tx_sender, vm_barrier)
+            .enable_api_namespaces(namespaces);
+    if with_logs_request_translator_enabled {
+        api_builder = api_builder.enable_request_translator();
+    }
+    Ok(api_builder.build(stop_receiver.clone()).await)
 }
 
 #[allow(clippy::too_many_arguments)]
@@ -976,7 +1085,8 @@ async fn run_ws_api<G: L1GasPriceProvider + Send + Sync + 'static>(
     replica_connection_pool: ConnectionPool,
     stop_receiver: watch::Receiver<bool>,
     storage_caches: PostgresStorageCaches,
-) -> (Vec<JoinHandle<()>>, ReactiveHealthCheck) {
+    with_logs_request_translator_enabled: bool,
+) -> anyhow::Result<(Vec<JoinHandle<anyhow::Result<()>>>, ReactiveHealthCheck)> {
     let (tx_sender, vm_barrier) = build_tx_sender(
         tx_sender_config,
         &api_config.web3_json_rpc,
@@ -987,19 +1097,33 @@ async fn run_ws_api<G: L1GasPriceProvider + Send + Sync + 'static>(
         storage_caches,
     )
     .await;
-
-    web3::ApiBuilder::jsonrpc_backend(internal_api.clone(), replica_connection_pool)
-        .ws(api_config.web3_json_rpc.ws_port)
-        .with_filter_limit(api_config.web3_json_rpc.filters_limit())
-        .with_subscriptions_limit(api_config.web3_json_rpc.subscriptions_limit())
-        .with_batch_request_size_limit(api_config.web3_json_rpc.max_batch_request_size())
-        .with_response_body_size_limit(api_config.web3_json_rpc.max_response_body_size())
-        .with_polling_interval(api_config.web3_json_rpc.pubsub_interval())
-        .with_threads(api_config.web3_json_rpc.ws_server_threads())
-        .with_tx_sender(tx_sender, vm_barrier)
-        .enable_api_namespaces(Namespace::NON_DEBUG.to_vec())
-        .build(stop_receiver.clone())
+    let last_miniblock_pool = ConnectionPool::singleton(DbVariant::Replica)
+        .build()
         .await
+        .context("failed to build last_miniblock_pool")?;
+
+    let mut api_builder =
+        web3::ApiBuilder::jsonrpc_backend(internal_api.clone(), replica_connection_pool)
+            .ws(api_config.web3_json_rpc.ws_port)
+            .with_last_miniblock_pool(last_miniblock_pool)
+            .with_filter_limit(api_config.web3_json_rpc.filters_limit())
+            .with_subscriptions_limit(api_config.web3_json_rpc.subscriptions_limit())
+            .with_batch_request_size_limit(api_config.web3_json_rpc.max_batch_request_size())
+            .with_response_body_size_limit(api_config.web3_json_rpc.max_response_body_size())
+            .with_websocket_requests_per_minute_limit(
+                api_config
+                    .web3_json_rpc
+                    .websocket_requests_per_minute_limit(),
+            )
+            .with_polling_interval(api_config.web3_json_rpc.pubsub_interval())
+            .with_threads(api_config.web3_json_rpc.ws_server_threads())
+            .with_tx_sender(tx_sender, vm_barrier)
+            .enable_api_namespaces(Namespace::NON_DEBUG.to_vec());
+
+    if with_logs_request_translator_enabled {
+        api_builder = api_builder.enable_request_translator();
+    }
+    Ok(api_builder.build(stop_receiver.clone()).await)
 }
 
 async fn circuit_breakers_for_components(
@@ -1007,7 +1131,7 @@ async fn circuit_breakers_for_components(
     web3_url: &str,
     circuit_breaker_config: &CircuitBreakerConfig,
     main_contract: Address,
-) -> Vec<Box<dyn CircuitBreaker>> {
+) -> anyhow::Result<Vec<Box<dyn CircuitBreaker>>> {
     let mut circuit_breakers: Vec<Box<dyn CircuitBreaker>> = Vec::new();
 
     if components.iter().any(|c| {
@@ -1016,7 +1140,10 @@ async fn circuit_breakers_for_components(
             Component::EthTxAggregator | Component::EthTxManager | Component::StateKeeper
         )
     }) {
-        let pool = ConnectionPool::singleton(DbVariant::Replica).build().await;
+        let pool = ConnectionPool::singleton(DbVariant::Replica)
+            .build()
+            .await
+            .context("failed to build a connection pool")?;
         circuit_breakers.push(Box::new(FailedL1TransactionChecker { pool }));
     }
 
@@ -1032,7 +1159,7 @@ async fn circuit_breakers_for_components(
         )));
     }
 
-    circuit_breakers
+    Ok(circuit_breakers)
 }
 
 #[tokio::test]
@@ -1042,5 +1169,5 @@ async fn test_house_keeper_components_get_added() {
         .unwrap();
     // circuit-breaker, prometheus-exporter components are run, irrespective of other components.
     let always_running_component_count = 2;
-    assert_eq!(13, core_task_handles.len() - always_running_component_count);
+    assert_eq!(15, core_task_handles.len() - always_running_component_count);
 }
diff --git a/core/bin/zksync_core/src/metadata_calculator/helpers.rs b/core/bin/zksync_core/src/metadata_calculator/helpers.rs
index 925adbe50531..6269c6c3d25a 100644
--- a/core/bin/zksync_core/src/metadata_calculator/helpers.rs
+++ b/core/bin/zksync_core/src/metadata_calculator/helpers.rs
@@ -57,7 +57,7 @@ impl AsyncTree {
         multi_get_chunk_size: usize,
         block_cache_capacity: usize,
     ) -> Self {
-        vlog::info!(
+        tracing::info!(
             "Initializing Merkle tree at `{db_path}` with {multi_get_chunk_size} multi-get chunk size, \
              {block_cache_capacity}B block cache",
             db_path = db_path.display()
@@ -179,7 +179,7 @@ impl L1BatchWithLogs {
         storage: &mut StorageProcessor<'_>,
         l1_batch_number: L1BatchNumber,
     ) -> Option<Self> {
-        vlog::debug!("Loading storage logs data for L1 batch #{l1_batch_number}");
+        tracing::debug!("Loading storage logs data for L1 batch #{l1_batch_number}");
         let load_changes_latency = TreeUpdateStage::LoadChanges.start();
 
         let header_latency = LoadChangesStage::L1BatchHeader.start();
@@ -214,7 +214,7 @@ impl L1BatchWithLogs {
             // ^ The tree doesn't use the read value, so we set it to zero.
             storage_logs.insert(storage_key, log);
         }
-        vlog::debug!(
+        tracing::debug!(
             "Made touched slots disjoint with protective reads; remaining touched slots: {}",
             touched_slots.len()
         );
@@ -278,8 +278,8 @@ mod tests {
     use zksync_dal::ConnectionPool;
     use zksync_types::{
         proofs::PrepareBasicCircuitsJob, protocol_version::L1VerifierConfig,
-        system_contracts::get_system_smart_contracts, Address, L2ChainId, StorageKey,
-        StorageLogKind,
+        system_contracts::get_system_smart_contracts, Address, L2ChainId, ProtocolVersionId,
+        StorageKey, StorageLogKind,
     };
 
     use super::*;
@@ -352,6 +352,7 @@ mod tests {
     fn mock_genesis_params() -> GenesisParams {
         GenesisParams {
             first_validator: Address::repeat_byte(0x01),
+            protocol_version: ProtocolVersionId::latest(),
             base_system_contracts: BaseSystemContracts::load_from_disk(),
             system_contracts: get_system_smart_contracts(),
             first_l1_verifier_config: L1VerifierConfig::default(),
@@ -366,7 +367,8 @@ mod tests {
             L2ChainId(270),
             &mock_genesis_params(),
         )
-        .await;
+        .await
+        .unwrap();
         reset_db_state(&pool, 5).await;
 
         let mut storage = pool.access_storage().await;
@@ -385,7 +387,9 @@ mod tests {
     #[db_test]
     async fn loaded_logs_equivalence_with_zero_no_op_logs(pool: ConnectionPool) {
         let mut storage = pool.access_storage().await;
-        ensure_genesis_state(&mut storage, L2ChainId(270), &mock_genesis_params()).await;
+        ensure_genesis_state(&mut storage, L2ChainId(270), &mock_genesis_params())
+            .await
+            .unwrap();
 
         let mut logs = gen_storage_logs(100..200, 2);
         for log in &mut logs[0] {
@@ -461,7 +465,9 @@ mod tests {
     #[db_test]
     async fn loaded_logs_equivalence_with_non_zero_no_op_logs(pool: ConnectionPool) {
         let mut storage = pool.access_storage().await;
-        ensure_genesis_state(&mut storage, L2ChainId(270), &mock_genesis_params()).await;
+        ensure_genesis_state(&mut storage, L2ChainId(270), &mock_genesis_params())
+            .await
+            .unwrap();
 
         let mut logs = gen_storage_logs(100..120, 1);
         // Entire batch of no-op logs (writing previous values).
@@ -506,7 +512,9 @@ mod tests {
     #[db_test]
     async fn loaded_logs_equivalence_with_protective_reads(pool: ConnectionPool) {
         let mut storage = pool.access_storage().await;
-        ensure_genesis_state(&mut storage, L2ChainId(270), &mock_genesis_params()).await;
+        ensure_genesis_state(&mut storage, L2ChainId(270), &mock_genesis_params())
+            .await
+            .unwrap();
 
         let mut logs = gen_storage_logs(100..120, 1);
         let logs_copy = logs[0].clone();
diff --git a/core/bin/zksync_core/src/metadata_calculator/metrics.rs b/core/bin/zksync_core/src/metadata_calculator/metrics.rs
index 510edad786fc..8b7477472f54 100644
--- a/core/bin/zksync_core/src/metadata_calculator/metrics.rs
+++ b/core/bin/zksync_core/src/metadata_calculator/metrics.rs
@@ -99,11 +99,11 @@ impl<S: ReportStage> UpdateTreeLatency<S> {
         metrics::histogram!(S::HISTOGRAM_NAME, elapsed, "stage" => stage);
 
         if let Some(record_count) = record_count {
-            vlog::debug!(
+            tracing::debug!(
                 "Metadata calculator stage `{stage}` with {record_count} records completed in {elapsed:?}"
             );
         } else {
-            vlog::debug!("Metadata calculator stage `{stage}` completed in {elapsed:?}");
+            tracing::debug!("Metadata calculator stage `{stage}` completed in {elapsed:?}");
         }
     }
 }
@@ -154,7 +154,7 @@ impl MetadataCalculator {
 
         let first_batch_number = batch_headers.first().unwrap().number.0;
         let last_batch_number = batch_headers.last().unwrap().number.0;
-        vlog::info!(
+        tracing::info!(
             "L1 batches #{:?} processed in tree",
             first_batch_number..=last_batch_number
         );
diff --git a/core/bin/zksync_core/src/metadata_calculator/mod.rs b/core/bin/zksync_core/src/metadata_calculator/mod.rs
index ecfeb20dbe59..b642ba968c4c 100644
--- a/core/bin/zksync_core/src/metadata_calculator/mod.rs
+++ b/core/bin/zksync_core/src/metadata_calculator/mod.rs
@@ -100,6 +100,7 @@ pub struct MetadataCalculator {
 impl MetadataCalculator {
     /// Creates a calculator with the specified `config`.
     pub async fn new(config: &MetadataCalculatorConfig<'_>) -> Self {
+        // TODO (SMA-1726): restore the tree from backup if appropriate
 
         let mode = config.mode.to_mode();
         let object_store = match config.mode {
@@ -127,15 +128,16 @@ impl MetadataCalculator {
         pool: ConnectionPool,
         prover_pool: ConnectionPool,
         stop_receiver: watch::Receiver<bool>,
-    ) {
-        let update_task = self.updater.loop_updating_tree(
-            self.delayer,
-            &pool,
-            &prover_pool,
-            stop_receiver,
-            self.health_updater,
-        );
-        update_task.await;
+    ) -> anyhow::Result<()> {
+        self.updater
+            .loop_updating_tree(
+                self.delayer,
+                &pool,
+                &prover_pool,
+                stop_receiver,
+                self.health_updater,
+            )
+            .await
     }
 
     /// This is used to improve L1 gas estimation for the commit operation. The estimations are computed
@@ -176,7 +178,7 @@ impl MetadataCalculator {
             header.base_system_contracts_hashes.default_aa,
         );
         let commitment_hash = commitment.hash();
-        vlog::trace!("L1 batch commitment: {commitment:?}");
+        tracing::trace!("L1 batch commitment: {commitment:?}");
 
         let metadata = L1BatchMetadata {
             root_hash: merkle_root_hash,
@@ -193,7 +195,9 @@ impl MetadataCalculator {
             pass_through_data_hash: commitment_hash.pass_through_data,
         };
 
-        vlog::trace!("L1 batch metadata: {metadata:?}");
+        tracing::trace!("L1 batch metadata: {metadata:?}");
         metadata
     }
+
+    // TODO (SMA-1726): Integrate tree backup mode
 }
diff --git a/core/bin/zksync_core/src/metadata_calculator/tests.rs b/core/bin/zksync_core/src/metadata_calculator/tests.rs
index b216a81c8f23..42c182477a32 100644
--- a/core/bin/zksync_core/src/metadata_calculator/tests.rs
+++ b/core/bin/zksync_core/src/metadata_calculator/tests.rs
@@ -13,14 +13,14 @@ use zksync_health_check::{CheckHealth, HealthStatus};
 use zksync_merkle_tree::domain::ZkSyncTree;
 use zksync_object_store::{ObjectStore, ObjectStoreFactory};
 use zksync_types::{
-    block::{BlockGasCount, L1BatchHeader, MiniblockHeader},
+    block::{miniblock_hash, BlockGasCount, L1BatchHeader, MiniblockHeader},
     proofs::PrepareBasicCircuitsJob,
     protocol_version::L1VerifierConfig,
     system_contracts::get_system_smart_contracts,
-    AccountTreeId, Address, L1BatchNumber, L2ChainId, MiniblockNumber, StorageKey, StorageLog,
-    H256,
+    AccountTreeId, Address, L1BatchNumber, L2ChainId, MiniblockNumber, ProtocolVersionId,
+    StorageKey, StorageLog, H256,
 };
-use zksync_utils::{miniblock_hash, u32_to_h256};
+use zksync_utils::u32_to_h256;
 
 use super::{
     L1BatchWithLogs, MetadataCalculator, MetadataCalculatorConfig, MetadataCalculatorModeConfig,
@@ -53,6 +53,7 @@ async fn genesis_creation(pool: ConnectionPool, prover_pool: ConnectionPool) {
     );
 }
 
+// TODO (SMA-1726): Restore tests for tree backup mode
 
 #[db_test]
 async fn basic_workflow(pool: ConnectionPool, prover_pool: ConnectionPool) {
@@ -127,6 +128,7 @@ async fn status_receiver_has_correct_states(pool: ConnectionPool, prover_pool: C
     tokio::time::timeout(RUN_TIMEOUT, calculator_handle)
         .await
         .expect("timed out waiting for calculator")
+        .unwrap()
         .unwrap();
     assert_eq!(
         tree_health_check.check_health().await.status(),
@@ -215,6 +217,7 @@ async fn running_metadata_calculator_with_additional_blocks(
     tokio::time::timeout(RUN_TIMEOUT, calculator_handle)
         .await
         .expect("timed out waiting for calculator")
+        .unwrap()
         .unwrap();
 
     // Switch to the full tree. It should pick up from the same spot and result in the same tree root hash.
@@ -245,6 +248,7 @@ async fn shutting_down_calculator(pool: ConnectionPool, prover_pool: ConnectionP
     stop_sx.send_replace(true);
     run_with_timeout(RUN_TIMEOUT, calculator_task)
         .await
+        .unwrap()
         .unwrap();
 }
 
@@ -320,6 +324,7 @@ async fn test_postgres_backup_recovery(
     tokio::time::timeout(RUN_TIMEOUT, calculator_handle)
         .await
         .expect("timed out waiting for calculator")
+        .unwrap()
         .unwrap();
 }
 
@@ -386,6 +391,7 @@ async fn setup_calculator_with_options(
     let mut storage = pool.access_storage().await;
     if storage.blocks_dal().is_genesis_needed().await {
         let chain_id = L2ChainId(270);
+        let protocol_version = ProtocolVersionId::latest();
         let base_system_contracts = BaseSystemContracts::load_from_disk();
         let system_contracts = get_system_smart_contracts();
         let first_validator = Address::repeat_byte(0x01);
@@ -396,13 +402,15 @@ async fn setup_calculator_with_options(
             chain_id,
             &GenesisParams {
                 first_validator,
+                protocol_version,
                 base_system_contracts,
                 system_contracts,
                 first_l1_verifier_config,
                 first_verifier_address,
             },
         )
-        .await;
+        .await
+        .unwrap();
     }
     metadata_calculator
 }
@@ -430,7 +438,9 @@ async fn run_calculator(
         root_hash
     });
 
-    run_with_timeout(RUN_TIMEOUT, calculator.run(pool, prover_pool, stop_rx)).await;
+    run_with_timeout(RUN_TIMEOUT, calculator.run(pool, prover_pool, stop_rx))
+        .await
+        .unwrap();
     delayer_handle.await.unwrap()
 }
 
@@ -477,7 +487,12 @@ pub(super) async fn extend_db_state(
         let miniblock_header = MiniblockHeader {
             number: miniblock_number,
             timestamp: header.timestamp,
-            hash: miniblock_hash(miniblock_number),
+            hash: miniblock_hash(
+                miniblock_number,
+                header.timestamp,
+                H256::zero(),
+                H256::zero(),
+            ),
             l1_tx_count: header.l1_tx_count,
             l2_tx_count: header.l2_tx_count,
             base_fee_per_gas: header.base_fee_per_gas,
@@ -485,6 +500,7 @@ pub(super) async fn extend_db_state(
             l2_fair_gas_price: 0,
             base_system_contracts_hashes: base_system_contracts.hashes(),
             protocol_version: Some(Default::default()),
+            virtual_blocks: 0,
         };
 
         storage
@@ -603,6 +619,7 @@ async fn deduplication_works_as_expected(pool: ConnectionPool) {
     let mut storage = pool.access_storage().await;
 
     let first_validator = Address::repeat_byte(0x01);
+    let protocol_version = ProtocolVersionId::latest();
     let base_system_contracts = BaseSystemContracts::load_from_disk();
     let system_contracts = get_system_smart_contracts();
     let first_l1_verifier_config = L1VerifierConfig::default();
@@ -611,6 +628,7 @@ async fn deduplication_works_as_expected(pool: ConnectionPool) {
         &mut storage,
         L2ChainId(270),
         &GenesisParams {
+            protocol_version,
             first_validator,
             base_system_contracts,
             system_contracts,
@@ -618,7 +636,8 @@ async fn deduplication_works_as_expected(pool: ConnectionPool) {
             first_verifier_address,
         },
     )
-    .await;
+    .await
+    .unwrap();
 
     let logs = gen_storage_logs(100..120, 1).pop().unwrap();
     let hashed_keys: Vec<_> = logs.iter().map(|log| log.key.hashed_key()).collect();
diff --git a/core/bin/zksync_core/src/metadata_calculator/updater.rs b/core/bin/zksync_core/src/metadata_calculator/updater.rs
index 21d937f846e2..972e495c2ff9 100644
--- a/core/bin/zksync_core/src/metadata_calculator/updater.rs
+++ b/core/bin/zksync_core/src/metadata_calculator/updater.rs
@@ -1,5 +1,5 @@
 //! Tree updater trait and its implementations.
-
+use anyhow::Context as _;
 use futures::{future, FutureExt};
 use tokio::sync::watch;
 
@@ -78,7 +78,7 @@ impl TreeUpdater {
                 .unwrap();
             save_witnesses_latency.report();
 
-            vlog::info!(
+            tracing::info!(
                 "Saved witnesses for L1 batch #{l1_batch_number} to object storage at `{object_key}`"
             );
             Some(object_key)
@@ -107,7 +107,7 @@ impl TreeUpdater {
         l1_batch_numbers: ops::RangeInclusive<u32>,
     ) -> L1BatchNumber {
         let start = Instant::now();
-        vlog::info!("Processing L1 batches #{l1_batch_numbers:?}");
+        tracing::info!("Processing L1 batches #{l1_batch_numbers:?}");
         let first_l1_batch_number = L1BatchNumber(*l1_batch_numbers.start());
         let last_l1_batch_number = L1BatchNumber(*l1_batch_numbers.end());
         let mut l1_batch_data = L1BatchWithLogs::new(storage, first_l1_batch_number).await;
@@ -156,17 +156,38 @@ impl TreeUpdater {
             // right away without having to implement dedicated code.
 
             if let Some(object_key) = &object_key {
+                let protocol_version_id = storage
+                    .blocks_dal()
+                    .get_batch_protocol_version_id(l1_batch_number)
+                    .await;
+                if let Some(id) = protocol_version_id {
+                    if !prover_storage
+                        .protocol_versions_dal()
+                        .prover_protocol_version_exists(id)
+                        .await
+                    {
+                        let protocol_version = storage
+                            .protocol_versions_dal()
+                            .get_protocol_version(id)
+                            .await
+                            .unwrap();
+                        prover_storage
+                            .protocol_versions_dal()
+                            .save_prover_protocol_version(protocol_version)
+                            .await;
+                    }
+                }
                 prover_storage
                     .witness_generator_dal()
-                    .save_witness_inputs(l1_batch_number, object_key)
+                    .save_witness_inputs(l1_batch_number, object_key, protocol_version_id)
                     .await;
-                prover_storage
-                    .fri_witness_generator_dal()
-                    .save_witness_inputs(l1_batch_number, object_key)
+                storage
+                    .proof_generation_dal()
+                    .insert_proof_generation_details(l1_batch_number, object_key)
                     .await;
             }
             save_postgres_latency.report();
-            vlog::info!("Updated metadata for L1 batch #{l1_batch_number} in Postgres");
+            tracing::info!("Updated metadata for L1 batch #{l1_batch_number} in Postgres");
 
             previous_root_hash = metadata.merkle_root_hash;
             updated_headers.push(header);
@@ -193,11 +214,11 @@ impl TreeUpdater {
         let last_requested_l1_batch = last_requested_l1_batch.min(last_sealed_l1_batch.0);
         let l1_batch_numbers = next_l1_batch_to_seal.0..=last_requested_l1_batch;
         if l1_batch_numbers.is_empty() {
-            vlog::trace!(
+            tracing::trace!(
                 "No L1 batches to seal: batch numbers range to be loaded {l1_batch_numbers:?} is empty"
             );
         } else {
-            vlog::info!("Updating Merkle tree with L1 batches #{l1_batch_numbers:?}");
+            tracing::info!("Updating Merkle tree with L1 batches #{l1_batch_numbers:?}");
             *next_l1_batch_to_seal = self
                 .process_multiple_batches(&mut storage, &mut prover_storage, l1_batch_numbers)
                 .await;
@@ -212,15 +233,15 @@ impl TreeUpdater {
         prover_pool: &ConnectionPool,
         mut stop_receiver: watch::Receiver<bool>,
         health_updater: HealthUpdater,
-    ) {
+    ) -> anyhow::Result<()> {
         let mut storage = pool.access_storage_tagged("metadata_calculator").await;
 
         // Ensure genesis creation
         let tree = &mut self.tree;
         if tree.is_empty() {
-            let Some(logs) = L1BatchWithLogs::new(&mut storage, L1BatchNumber(0)).await else {
-                panic!("Missing storage logs for the genesis L1 batch");
-            };
+            let logs = L1BatchWithLogs::new(&mut storage, L1BatchNumber(0))
+                .await
+                .context("Missing storage logs for the genesis L1 batch")?;
             tree.process_l1_batch(logs.storage_logs).await;
             tree.save().await;
         }
@@ -233,7 +254,7 @@ impl TreeUpdater {
             .await;
         drop(storage);
 
-        vlog::info!(
+        tracing::info!(
             "Initialized metadata calculator with {max_batches_per_iter} max L1 batches per iteration. \
              Next L1 batch for Merkle tree: {next_l1_batch_to_seal}, current Postgres L1 batch: {current_db_batch}, \
              last L1 batch with metadata: {last_l1_batch_with_metadata}",
@@ -252,11 +273,11 @@ impl TreeUpdater {
         if next_l1_batch_to_seal > last_l1_batch_with_metadata + 1 {
             // Check stop signal before proceeding with a potentially time-consuming operation.
             if *stop_receiver.borrow_and_update() {
-                vlog::info!("Stop signal received, metadata_calculator is shutting down");
-                return;
+                tracing::info!("Stop signal received, metadata_calculator is shutting down");
+                return Ok(());
             }
 
-            vlog::warn!(
+            tracing::warn!(
                 "Next L1 batch of the tree ({next_l1_batch_to_seal}) is greater than last L1 batch with metadata in Postgres \
                  ({last_l1_batch_with_metadata}); this may be a result of restoring Postgres from a snapshot. \
                  Truncating Merkle tree versions so that this mismatch is fixed..."
@@ -264,7 +285,7 @@ impl TreeUpdater {
             tree.revert_logs(last_l1_batch_with_metadata);
             tree.save().await;
             next_l1_batch_to_seal = tree.next_l1_batch_number();
-            vlog::info!("Truncated Merkle tree to L1 batch #{next_l1_batch_to_seal}");
+            tracing::info!("Truncated Merkle tree to L1 batch #{next_l1_batch_to_seal}");
 
             let health = TreeHealthCheckDetails {
                 mode: self.mode,
@@ -275,7 +296,7 @@ impl TreeUpdater {
 
         loop {
             if *stop_receiver.borrow_and_update() {
-                vlog::info!("Stop signal received, metadata_calculator is shutting down");
+                tracing::info!("Stop signal received, metadata_calculator is shutting down");
                 break;
             }
             let storage = pool.access_storage_tagged("metadata_calculator").await;
@@ -287,7 +308,7 @@ impl TreeUpdater {
             self.step(storage, prover_storage, &mut next_l1_batch_to_seal)
                 .await;
             let delay = if snapshot == *next_l1_batch_to_seal {
-                vlog::trace!(
+                tracing::trace!(
                     "Metadata calculator (next L1 batch: #{next_l1_batch_to_seal}) \
                      didn't make any progress; delaying it using {delayer:?}"
                 );
@@ -299,7 +320,7 @@ impl TreeUpdater {
                 };
                 health_updater.update(health.into());
 
-                vlog::trace!(
+                tracing::trace!(
                     "Metadata calculator (next L1 batch: #{next_l1_batch_to_seal}) made progress from #{snapshot}"
                 );
                 future::ready(()).right_future()
@@ -309,13 +330,14 @@ impl TreeUpdater {
             // and the stop receiver still allows to be more responsive during shutdown.
             tokio::select! {
                 _ = stop_receiver.changed() => {
-                    vlog::info!("Stop signal received, metadata_calculator is shutting down");
+                    tracing::info!("Stop signal received, metadata_calculator is shutting down");
                     break;
                 }
                 () = delay => { /* The delay has passed */ }
             }
         }
         drop(health_updater); // Explicitly mark where the updater should be dropped
+        Ok(())
     }
 
     async fn check_initial_writes_consistency(
@@ -323,22 +345,18 @@ impl TreeUpdater {
         l1_batch_number: L1BatchNumber,
         tree_initial_writes: &[InitialStorageWrite],
     ) {
-        let pg_initial_writes: Vec<_> = connection
+        let pg_initial_writes = connection
             .storage_logs_dedup_dal()
             .initial_writes_for_batch(l1_batch_number)
             .await;
 
-        let pg_initial_writes: Option<Vec<_>> = pg_initial_writes
+        let pg_initial_writes: Vec<_> = pg_initial_writes
             .into_iter()
             .map(|(key, index)| {
                 let key = U256::from_little_endian(key.as_bytes());
-                Some((key, index?))
+                (key, index)
             })
             .collect();
-        let Some(pg_initial_writes) = pg_initial_writes else {
-            vlog::info!("Skipping indices consistency check as they are missing in Postgres for L1 batch {l1_batch_number}");
-            return;
-        };
 
         let tree_initial_writes: Vec<_> = tree_initial_writes
             .iter()
diff --git a/core/bin/zksync_core/src/proof_data_handler/mod.rs b/core/bin/zksync_core/src/proof_data_handler/mod.rs
index 7c9c02bbad4a..f74983eadc01 100644
--- a/core/bin/zksync_core/src/proof_data_handler/mod.rs
+++ b/core/bin/zksync_core/src/proof_data_handler/mod.rs
@@ -1,28 +1,50 @@
+use crate::proof_data_handler::request_processor::RequestProcessor;
+use anyhow::Context as _;
 use axum::extract::Path;
 use axum::{routing::post, Json, Router};
 use std::net::SocketAddr;
 use tokio::sync::watch;
-
-use zksync_config::configs::ProofDataHandlerConfig;
+use zksync_config::{
+    configs::{proof_data_handler::ProtocolVersionLoadingMode, ProofDataHandlerConfig},
+    ContractsConfig,
+};
 use zksync_dal::ConnectionPool;
 use zksync_object_store::ObjectStore;
-use zksync_types::prover_server_api::{ProofGenerationDataRequest, SubmitProofRequest};
-
-use crate::proof_data_handler::request_processor::RequestProcessor;
+use zksync_types::{
+    protocol_version::{L1VerifierConfig, VerifierParams},
+    prover_server_api::{ProofGenerationDataRequest, SubmitProofRequest},
+    H256,
+};
 
 mod request_processor;
 
+fn fri_l1_verifier_config_from_env() -> L1VerifierConfig {
+    let config = ContractsConfig::from_env();
+    L1VerifierConfig {
+        params: VerifierParams {
+            recursion_node_level_vk_hash: config.fri_recursion_node_level_vk_hash,
+            recursion_leaf_level_vk_hash: config.fri_recursion_leaf_level_vk_hash,
+            // The base layer commitment is not used in the FRI prover verification.
+            recursion_circuits_set_vks_hash: H256::zero(),
+        },
+        recursion_scheduler_level_vk_hash: config.fri_recursion_scheduler_level_vk_hash,
+    }
+}
+
 pub(crate) async fn run_server(
     config: ProofDataHandlerConfig,
     blob_store: Box<dyn ObjectStore>,
     pool: ConnectionPool,
     mut stop_receiver: watch::Receiver<bool>,
-) {
+) -> anyhow::Result<()> {
     let bind_address = SocketAddr::from(([0, 0, 0, 0], config.http_port));
-    vlog::debug!("Starting proof data handler server on {bind_address}");
-
+    tracing::debug!("Starting proof data handler server on {bind_address}");
+    let l1_verifier_config: Option<L1VerifierConfig> = match config.protocol_version_loading_mode {
+        ProtocolVersionLoadingMode::FromDb => None,
+        ProtocolVersionLoadingMode::FromEnvVar => Some(fri_l1_verifier_config_from_env()),
+    };
     let get_proof_gen_processor =
-        RequestProcessor::new(blob_store, pool, config.proof_generation_timeout());
+        RequestProcessor::new(blob_store, pool, config, l1_verifier_config);
     let submit_proof_processor = get_proof_gen_processor.clone();
     let app = Router::new()
         .route(
@@ -52,11 +74,12 @@ pub(crate) async fn run_server(
         .serve(app.into_make_service())
         .with_graceful_shutdown(async move {
             if stop_receiver.changed().await.is_err() {
-                vlog::warn!("Stop signal sender for proof data handler server was dropped without sending a signal");
+                tracing::warn!("Stop signal sender for proof data handler server was dropped without sending a signal");
             }
-            vlog::info!("Stop signal received, proof data handler server is shutting down");
+            tracing::info!("Stop signal received, proof data handler server is shutting down");
         })
         .await
-        .expect("Proof data handler server failed");
-    vlog::info!("Proof data handler server shut down");
+        .context("Proof data handler server failed")?;
+    tracing::info!("Proof data handler server shut down");
+    Ok(())
 }
diff --git a/core/bin/zksync_core/src/proof_data_handler/request_processor.rs b/core/bin/zksync_core/src/proof_data_handler/request_processor.rs
index a868dd6106b4..826317963763 100644
--- a/core/bin/zksync_core/src/proof_data_handler/request_processor.rs
+++ b/core/bin/zksync_core/src/proof_data_handler/request_processor.rs
@@ -1,23 +1,30 @@
-use std::sync::Arc;
-use std::time::Duration;
-
 use axum::extract::Path;
 use axum::response::Response;
 use axum::{http::StatusCode, response::IntoResponse, Json};
+use std::convert::TryFrom;
+use std::sync::Arc;
+use zksync_config::configs::{
+    proof_data_handler::ProtocolVersionLoadingMode, ProofDataHandlerConfig,
+};
 
 use zksync_dal::{ConnectionPool, SqlxError};
 use zksync_object_store::{ObjectStore, ObjectStoreError};
-use zksync_types::prover_server_api::{
-    ProofGenerationData, ProofGenerationDataRequest, ProofGenerationDataResponse,
-    SubmitProofRequest, SubmitProofResponse,
+use zksync_types::protocol_version::FriProtocolVersionId;
+use zksync_types::{
+    protocol_version::L1VerifierConfig,
+    prover_server_api::{
+        ProofGenerationData, ProofGenerationDataRequest, ProofGenerationDataResponse,
+        SubmitProofRequest, SubmitProofResponse,
+    },
+    L1BatchNumber,
 };
-use zksync_types::L1BatchNumber;
 
 #[derive(Clone)]
 pub(crate) struct RequestProcessor {
     blob_store: Arc<dyn ObjectStore>,
     pool: ConnectionPool,
-    proof_generation_timeout: Duration,
+    config: ProofDataHandlerConfig,
+    l1_verifier_config: Option<L1VerifierConfig>,
 }
 
 pub(crate) enum RequestProcessorError {
@@ -34,14 +41,14 @@ impl IntoResponse for RequestProcessorError {
                 "No pending batches to process".to_owned(),
             ),
             RequestProcessorError::ObjectStore(err) => {
-                vlog::error!("GCS error: {:?}", err);
+                tracing::error!("GCS error: {:?}", err);
                 (
                     StatusCode::BAD_GATEWAY,
                     "Failed fetching/saving from GCS".to_owned(),
                 )
             }
             RequestProcessorError::Sqlx(err) => {
-                vlog::error!("Sqlx error: {:?}", err);
+                tracing::error!("Sqlx error: {:?}", err);
                 match err {
                     SqlxError::RowNotFound => {
                         (StatusCode::NOT_FOUND, "Non existing L1 batch".to_owned())
@@ -61,12 +68,14 @@ impl RequestProcessor {
     pub(crate) fn new(
         blob_store: Box<dyn ObjectStore>,
         pool: ConnectionPool,
-        proof_generation_timeout: Duration,
+        config: ProofDataHandlerConfig,
+        l1_verifier_config: Option<L1VerifierConfig>,
     ) -> Self {
         Self {
             blob_store: Arc::from(blob_store),
             pool,
-            proof_generation_timeout,
+            config,
+            l1_verifier_config,
         }
     }
 
@@ -74,14 +83,14 @@ impl RequestProcessor {
         &self,
         request: Json<ProofGenerationDataRequest>,
     ) -> Result<Json<ProofGenerationDataResponse>, RequestProcessorError> {
-        vlog::info!("Received request for proof generation data: {:?}", request);
+        tracing::info!("Received request for proof generation data: {:?}", request);
 
         let l1_batch_number = self
             .pool
             .access_storage()
             .await
             .proof_generation_dal()
-            .get_next_block_to_be_proven(self.proof_generation_timeout)
+            .get_next_block_to_be_proven(self.config.proof_generation_timeout())
             .await
             .ok_or(RequestProcessorError::NoPendingBatches)?;
 
@@ -91,9 +100,25 @@ impl RequestProcessor {
             .await
             .map_err(RequestProcessorError::ObjectStore)?;
 
+        let fri_protocol_version_id =
+            FriProtocolVersionId::try_from(self.config.fri_protocol_version_id)
+                .expect("Invalid FRI protocol version id");
+
+        let l1_verifier_config= match self.config.protocol_version_loading_mode {
+            ProtocolVersionLoadingMode::FromDb => {
+                panic!("Loading protocol version from db is not implemented yet")
+            }
+            ProtocolVersionLoadingMode::FromEnvVar => {
+                self.l1_verifier_config
+                    .expect("l1_verifier_config must be set while running ProtocolVersionLoadingMode::FromEnvVar mode")
+            }
+        };
+
         let proof_gen_data = ProofGenerationData {
             l1_batch_number,
             data: blob,
+            fri_protocol_version_id,
+            l1_verifier_config,
         };
 
         Ok(Json(ProofGenerationDataResponse::Success(proof_gen_data)))
@@ -104,21 +129,33 @@ impl RequestProcessor {
         Path(l1_batch_number): Path<u32>,
         Json(payload): Json<SubmitProofRequest>,
     ) -> Result<Json<SubmitProofResponse>, RequestProcessorError> {
-        vlog::info!("Received proof for block number: {:?}", l1_batch_number);
+        tracing::info!("Received proof for block number: {:?}", l1_batch_number);
         let l1_batch_number = L1BatchNumber(l1_batch_number);
+        match payload {
+            SubmitProofRequest::Proof(proof) => {
+                let blob_url = self
+                    .blob_store
+                    .put(l1_batch_number, &*proof)
+                    .await
+                    .map_err(RequestProcessorError::ObjectStore)?;
 
-        let blob_url = self
-            .blob_store
-            .put(l1_batch_number, &payload.proof)
-            .await
-            .map_err(RequestProcessorError::ObjectStore)?;
-
-        let mut storage = self.pool.access_storage().await;
-        storage
-            .proof_generation_dal()
-            .save_proof_artifacts_metadata(l1_batch_number, &blob_url)
-            .await
-            .map_err(RequestProcessorError::Sqlx)?;
+                let mut storage = self.pool.access_storage().await;
+                storage
+                    .proof_generation_dal()
+                    .save_proof_artifacts_metadata(l1_batch_number, &blob_url)
+                    .await
+                    .map_err(RequestProcessorError::Sqlx)?;
+            }
+            SubmitProofRequest::SkippedProofGeneration => {
+                self.pool
+                    .access_storage()
+                    .await
+                    .proof_generation_dal()
+                    .mark_proof_generation_job_as_skipped(l1_batch_number)
+                    .await
+                    .map_err(RequestProcessorError::Sqlx)?;
+            }
+        }
 
         Ok(Json(SubmitProofResponse::Success))
     }
diff --git a/core/bin/zksync_core/src/reorg_detector/mod.rs b/core/bin/zksync_core/src/reorg_detector/mod.rs
index 78d5a842efc9..3695ef3553f3 100644
--- a/core/bin/zksync_core/src/reorg_detector/mod.rs
+++ b/core/bin/zksync_core/src/reorg_detector/mod.rs
@@ -71,6 +71,8 @@ impl ReorgDetector {
 
     /// Localizes a reorg: performs binary search to determine the last non-diverged block.
     async fn detect_reorg(&self, diverged_l1_batch: L1BatchNumber) -> RpcResult<L1BatchNumber> {
+        // TODO (BFT-176, BFT-181): We have to look through the whole history, since batch status updater may mark
+        // a block as executed even if the state diverges for it.
         binary_search_with(1, diverged_l1_batch.0, |number| {
             self.root_hashes_match(L1BatchNumber(number))
         })
@@ -83,8 +85,8 @@ impl ReorgDetector {
             match self.run_inner().await {
                 Ok(l1_batch_number) => return l1_batch_number,
                 Err(err @ RpcError::Transport(_) | err @ RpcError::RequestTimeout) => {
-                    vlog::warn!("Following transport error occurred: {err}");
-                    vlog::info!("Trying again after a delay");
+                    tracing::warn!("Following transport error occurred: {err}");
+                    tracing::info!("Trying again after a delay");
                     tokio::time::sleep(SLEEP_INTERVAL).await;
                 }
                 Err(err) => {
@@ -139,7 +141,7 @@ impl ReorgDetector {
                 .is_legally_ahead_of_main_node(sealed_l1_batch_number)
                 .await?
             {
-                vlog::trace!(
+                tracing::trace!(
                     "Local state was updated ahead of the main node. Waiting for the main node to seal the batch"
                 );
                 tokio::time::sleep(SLEEP_INTERVAL).await;
@@ -147,7 +149,7 @@ impl ReorgDetector {
             }
 
             // At this point we're certain that if we detect a reorg, it's real.
-            vlog::trace!("Checking for reorgs - L1 batch #{sealed_l1_batch_number}");
+            tracing::trace!("Checking for reorgs - L1 batch #{sealed_l1_batch_number}");
             if self.root_hashes_match(sealed_l1_batch_number).await? {
                 metrics::gauge!(
                     "external_node.last_correct_batch",
@@ -156,13 +158,15 @@ impl ReorgDetector {
                 );
                 tokio::time::sleep(SLEEP_INTERVAL).await;
             } else {
-                vlog::warn!(
+                tracing::warn!(
                     "Reorg detected: last state hash doesn't match the state hash from main node \
                      (L1 batch #{sealed_l1_batch_number})"
                 );
-                vlog::info!("Searching for the first diverged batch");
+                tracing::info!("Searching for the first diverged batch");
                 let last_correct_l1_batch = self.detect_reorg(sealed_l1_batch_number).await?;
-                vlog::info!("Reorg localized: last correct L1 batch is #{last_correct_l1_batch}");
+                tracing::info!(
+                    "Reorg localized: last correct L1 batch is #{last_correct_l1_batch}"
+                );
                 return Ok(last_correct_l1_batch);
             }
         }
diff --git a/core/bin/zksync_core/src/state_keeper/batch_executor/mod.rs b/core/bin/zksync_core/src/state_keeper/batch_executor/mod.rs
index fce87a613338..7d768f7cde20 100644
--- a/core/bin/zksync_core/src/state_keeper/batch_executor/mod.rs
+++ b/core/bin/zksync_core/src/state_keeper/batch_executor/mod.rs
@@ -1,30 +1,31 @@
+use std::fmt;
+use std::sync::Arc;
+use std::time::Instant;
+
 use async_trait::async_trait;
+use once_cell::sync::OnceCell;
 use tokio::{
     sync::{mpsc, oneshot},
     task::JoinHandle,
 };
 
-use std::{collections::HashSet, fmt, time::Instant};
-
-use multivm::{
-    init_vm, init_vm_with_gas_limit, BlockProperties, OracleTools, VmInstance, VmVersion,
-};
+use multivm::{MultivmTracer, VmInstance, VmInstanceData};
 use vm::{
-    vm::{VmPartialExecutionResult, VmTxExecutionResult},
-    vm_with_bootloader::{BootloaderJobType, TxExecutionMode},
-    TxRevertReason, VmBlockResult,
+    CallTracer, ExecutionResult, FinishedL1Batch, Halt, HistoryEnabled, L1BatchEnv, L2BlockEnv,
+    SystemEnv, VmExecutionResultAndLogs,
 };
 use zksync_dal::ConnectionPool;
-use zksync_state::{RocksdbStorage, StorageView};
-use zksync_types::{tx::ExecutionMetrics, L1BatchNumber, Transaction, U256};
-use zksync_utils::bytecode::{hash_bytecode, CompressedBytecodeInfo};
+use zksync_state::{ReadStorage, RocksdbStorage, StorageView};
+use zksync_types::{vm_trace::Call, witness_block_state::WitnessBlockState, Transaction, U256};
+
+use zksync_utils::bytecode::CompressedBytecodeInfo;
 
 #[cfg(test)]
 mod tests;
 
 use crate::{
     gas_tracker::{gas_count_from_metrics, gas_count_from_tx_and_metrics},
-    state_keeper::{io::L1BatchParams, types::ExecutionMetricsForCriteria},
+    state_keeper::types::ExecutionMetricsForCriteria,
 };
 
 /// Representation of a transaction executed in the virtual machine.
@@ -32,14 +33,15 @@ use crate::{
 pub(crate) enum TxExecutionResult {
     /// Successful execution of the tx and the block tip dry run.
     Success {
-        tx_result: Box<VmTxExecutionResult>,
+        tx_result: Box<VmExecutionResultAndLogs>,
         tx_metrics: ExecutionMetricsForCriteria,
         bootloader_dry_run_metrics: ExecutionMetricsForCriteria,
-        bootloader_dry_run_result: Box<VmPartialExecutionResult>,
+        bootloader_dry_run_result: Box<VmExecutionResultAndLogs>,
         compressed_bytecodes: Vec<CompressedBytecodeInfo>,
+        call_tracer_result: Vec<Call>,
     },
     /// The VM rejected the tx for some reason.
-    RejectedByVm { rejection_reason: TxRevertReason },
+    RejectedByVm { reason: Halt },
     /// Bootloader gas limit is not enough to execute the tx.
     BootloaderOutOfGasForTx,
     /// Bootloader gas limit is enough to run the tx but not enough to execute block tip.
@@ -48,82 +50,29 @@ pub(crate) enum TxExecutionResult {
 
 impl TxExecutionResult {
     /// Returns a revert reason if either transaction was rejected or bootloader ran out of gas.
-    pub(super) fn err(&self) -> Option<&TxRevertReason> {
+    pub(super) fn err(&self) -> Option<&Halt> {
         match self {
             Self::Success { .. } => None,
-            Self::RejectedByVm { rejection_reason } => Some(rejection_reason),
+            Self::RejectedByVm {
+                reason: rejection_reason,
+            } => Some(rejection_reason),
             Self::BootloaderOutOfGasForTx | Self::BootloaderOutOfGasForBlockTip { .. } => {
-                Some(&TxRevertReason::BootloaderOutOfGas)
+                Some(&Halt::BootloaderOutOfGas)
             }
         }
     }
 }
 
-/// Configuration for the MultiVM.
-/// Currently, represents an ordered sequence of (min_batch_number, vm_version) entries,
-/// which will be scanned by the MultiVM on each batch.
-#[derive(Debug, Clone)]
-pub struct MultiVMConfig {
-    versions: Vec<(L1BatchNumber, VmVersion)>,
-}
-
-impl MultiVMConfig {
-    /// Creates a new MultiVM config from the provided sequence of (min_batch_number, vm_version) entries.
-    ///
-    /// ## Panics
-    ///
-    /// Panics if the provided sequence is not ordered by the batch number, if it's empty or if the first entry
-    /// doesn't correspond to the batch #1.
-    pub fn new(versions: Vec<(L1BatchNumber, VmVersion)>) -> Self {
-        // Must-haves: config is not empty, we start from the first batch, config is ordered.
-        assert!(!versions.is_empty());
-        assert_eq!(versions[0].0 .0, 1);
-        assert!(versions.windows(2).all(|w| w[0].0 < w[1].0));
-
-        Self { versions }
-    }
-
-    /// Finds the appropriate VM version for the provided batch number.
-    pub fn version_for(&self, batch_number: L1BatchNumber) -> VmVersion {
-        debug_assert!(
-            batch_number != L1BatchNumber(0),
-            "Genesis block doesn't need to be actually executed"
-        );
-        // Find the latest version which is not greater than the provided batch number.
-        let (_, version) = *self
-            .versions
-            .iter()
-            .rev()
-            .find(|(version_start, _)| batch_number >= *version_start)
-            .expect("At least one version must match");
-        version
-    }
-
-    /// Returns the config for mainnet.
-    /// This method is WIP, and returned config is not guaranteed to be full or correct.
-    pub fn mainnet_config_wip() -> Self {
-        Self::new(vec![
-            (L1BatchNumber(1), VmVersion::M5WithoutRefunds),
-            (L1BatchNumber(292), VmVersion::M5WithRefunds),
-            (L1BatchNumber(360), VmVersion::M6Initial),
-            (L1BatchNumber(390), VmVersion::M6BugWithCompressionFixed),
-            (L1BatchNumber(49508), VmVersion::Vm1_3_2),
-        ])
-    }
-
-    /// Returns the config for testnet.
-    /// This method is WIP, and returned config is not guaranteed to be full or correct.
-    pub fn testnet_config_wip() -> Self {
-        Self::new(vec![(L1BatchNumber(1), VmVersion::M5WithoutRefunds)])
-    }
-}
-
 /// An abstraction that allows us to create different kinds of batch executors.
 /// The only requirement is to return a [`BatchExecutorHandle`], which does its work
 /// by communicating with the externally initialized thread.
 #[async_trait]
 pub trait L1BatchExecutorBuilder: 'static + Send + Sync + fmt::Debug {
-    async fn init_batch(&self, l1_batch_params: L1BatchParams) -> BatchExecutorHandle;
+    async fn init_batch(
+        &self,
+        l1_batch_params: L1BatchEnv,
+        system_env: SystemEnv,
+    ) -> BatchExecutorHandle;
 }
 
 /// The default implementation of [`L1BatchExecutorBuilder`].
@@ -134,8 +83,7 @@ pub struct MainBatchExecutorBuilder {
     pool: ConnectionPool,
     save_call_traces: bool,
     max_allowed_tx_gas_limit: U256,
-    validation_computational_gas_limit: u32,
-    multivm_config: Option<MultiVMConfig>,
+    upload_witness_inputs_to_gcs: bool,
 }
 
 impl MainBatchExecutorBuilder {
@@ -144,40 +92,32 @@ impl MainBatchExecutorBuilder {
         pool: ConnectionPool,
         max_allowed_tx_gas_limit: U256,
         save_call_traces: bool,
-        validation_computational_gas_limit: u32,
-        multivm_config: Option<MultiVMConfig>,
+        upload_witness_inputs_to_gcs: bool,
     ) -> Self {
         Self {
             state_keeper_db_path,
             pool,
             save_call_traces,
             max_allowed_tx_gas_limit,
-            validation_computational_gas_limit,
-            multivm_config,
+            upload_witness_inputs_to_gcs,
         }
     }
 }
 
 #[async_trait]
 impl L1BatchExecutorBuilder for MainBatchExecutorBuilder {
-    async fn init_batch(&self, l1_batch_params: L1BatchParams) -> BatchExecutorHandle {
+    async fn init_batch(
+        &self,
+        l1_batch_params: L1BatchEnv,
+        system_env: SystemEnv,
+    ) -> BatchExecutorHandle {
         let mut secondary_storage = RocksdbStorage::new(self.state_keeper_db_path.as_ref());
         let mut conn = self.pool.access_storage_tagged("state_keeper").await;
         secondary_storage.update_from_postgres(&mut conn).await;
         drop(conn);
 
-        let batch_number = l1_batch_params
-            .context_mode
-            .inner_block_context()
-            .context
-            .block_number;
-        let vm_version = self
-            .multivm_config
-            .as_ref()
-            .map(|config| config.version_for(L1BatchNumber(batch_number)))
-            .unwrap_or(VmVersion::latest());
-
-        vlog::info!(
+        let batch_number = l1_batch_params.number;
+        tracing::info!(
             "Secondary storage for batch {batch_number} initialized, size is {}",
             secondary_storage.estimated_map_size()
         );
@@ -186,13 +126,12 @@ impl L1BatchExecutorBuilder for MainBatchExecutorBuilder {
             secondary_storage.estimated_map_size() as f64,
         );
         BatchExecutorHandle::new(
-            vm_version,
             self.save_call_traces,
             self.max_allowed_tx_gas_limit,
-            self.validation_computational_gas_limit,
             secondary_storage,
             l1_batch_params,
-            None,
+            system_env,
+            self.upload_witness_inputs_to_gcs,
         )
     }
 }
@@ -207,29 +146,33 @@ pub struct BatchExecutorHandle {
 }
 
 impl BatchExecutorHandle {
+    // TODO: to be removed once testing in stage2 is done
+    #[allow(clippy::too_many_arguments)]
     pub(super) fn new(
-        vm_version: VmVersion,
         save_call_traces: bool,
         max_allowed_tx_gas_limit: U256,
-        validation_computational_gas_limit: u32,
         secondary_storage: RocksdbStorage,
-        l1_batch_params: L1BatchParams,
-        vm_gas_limit: Option<u32>,
+        l1_batch_env: L1BatchEnv,
+        system_env: SystemEnv,
+        upload_witness_inputs_to_gcs: bool,
     ) -> Self {
         // Since we process `BatchExecutor` commands one-by-one (the next command is never enqueued
         // until a previous command is processed), capacity 1 is enough for the commands channel.
         let (commands_sender, commands_receiver) = mpsc::channel(1);
         let executor = BatchExecutor {
-            vm_version,
             save_call_traces,
             max_allowed_tx_gas_limit,
-            validation_computational_gas_limit,
             commands: commands_receiver,
-            vm_gas_limit,
         };
 
-        let handle =
-            tokio::task::spawn_blocking(move || executor.run(secondary_storage, l1_batch_params));
+        let handle = tokio::task::spawn_blocking(move || {
+            executor.run(
+                secondary_storage,
+                l1_batch_env,
+                system_env,
+                upload_witness_inputs_to_gcs,
+            )
+        });
         Self {
             handle,
             commands: commands_sender,
@@ -277,6 +220,19 @@ impl BatchExecutorHandle {
         res
     }
 
+    pub(super) async fn start_next_miniblock(&self, miniblock_info: L2BlockEnv) {
+        // While we don't get anything from the channel, it's useful to have it as a confirmation that the operation
+        // indeed has been processed.
+        let (response_sender, response_receiver) = oneshot::channel();
+        self.commands
+            .send(Command::StartNextMiniblock(miniblock_info, response_sender))
+            .await
+            .unwrap();
+        let start = Instant::now();
+        response_receiver.await.unwrap();
+        metrics::histogram!("state_keeper.batch_executor.command_response_time", start.elapsed(), "command" => "start_next_miniblock");
+    }
+
     pub(super) async fn rollback_last_tx(&self) {
         // While we don't get anything from the channel, it's useful to have it as a confirmation that the operation
         // indeed has been processed.
@@ -290,7 +246,7 @@ impl BatchExecutorHandle {
         metrics::histogram!("state_keeper.batch_executor.command_response_time", start.elapsed(), "command" => "rollback_last_tx");
     }
 
-    pub(super) async fn finish_batch(self) -> VmBlockResult {
+    pub(super) async fn finish_batch(self) -> (FinishedL1Batch, Option<WitnessBlockState>) {
         let (response_sender, response_receiver) = oneshot::channel();
         self.commands
             .send(Command::FinishBatch(response_sender))
@@ -307,8 +263,9 @@ impl BatchExecutorHandle {
 #[derive(Debug)]
 pub(super) enum Command {
     ExecuteTx(Box<Transaction>, oneshot::Sender<TxExecutionResult>),
+    StartNextMiniblock(L2BlockEnv, oneshot::Sender<()>),
     RollbackLastTx(oneshot::Sender<()>),
-    FinishBatch(oneshot::Sender<VmBlockResult>),
+    FinishBatch(oneshot::Sender<(FinishedL1Batch, Option<WitnessBlockState>)>),
 }
 
 /// Implementation of the "primary" (non-test) batch executor.
@@ -319,50 +276,26 @@ pub(super) enum Command {
 /// be constructed.
 #[derive(Debug)]
 pub(super) struct BatchExecutor {
-    vm_version: VmVersion,
     save_call_traces: bool,
     max_allowed_tx_gas_limit: U256,
-    validation_computational_gas_limit: u32,
     commands: mpsc::Receiver<Command>,
-    vm_gas_limit: Option<u32>,
 }
 
 impl BatchExecutor {
-    pub(super) fn run(mut self, secondary_storage: RocksdbStorage, l1_batch_params: L1BatchParams) {
-        vlog::info!(
-            "Starting executing batch #{}",
-            l1_batch_params
-                .context_mode
-                .inner_block_context()
-                .context
-                .block_number
-        );
+    pub(super) fn run(
+        mut self,
+        secondary_storage: RocksdbStorage,
+        l1_batch_params: L1BatchEnv,
+        system_env: SystemEnv,
+        upload_witness_inputs_to_gcs: bool,
+    ) {
+        tracing::info!("Starting executing batch #{:?}", &l1_batch_params.number);
 
-        let mut storage_view = StorageView::new(&secondary_storage);
-        let mut oracle_tools = OracleTools::new(self.vm_version, &mut storage_view);
-        let block_properties = BlockProperties::new(
-            self.vm_version,
-            l1_batch_params.properties.default_aa_code_hash,
-        );
-        let mut vm = match self.vm_gas_limit {
-            Some(vm_gas_limit) => init_vm_with_gas_limit(
-                self.vm_version,
-                &mut oracle_tools,
-                l1_batch_params.context_mode,
-                &block_properties,
-                TxExecutionMode::VerifyExecute,
-                &l1_batch_params.base_system_contracts,
-                vm_gas_limit,
-            ),
-            None => init_vm(
-                self.vm_version,
-                &mut oracle_tools,
-                l1_batch_params.context_mode,
-                &block_properties,
-                TxExecutionMode::VerifyExecute,
-                &l1_batch_params.base_system_contracts,
-            ),
-        };
+        let storage_view = StorageView::new(secondary_storage).to_rc_ptr();
+
+        let mut instance_data =
+            VmInstanceData::new(storage_view.clone(), &system_env, HistoryEnabled);
+        let mut vm = VmInstance::new(l1_batch_params, system_env, &mut instance_data);
 
         while let Some(cmd) = self.commands.blocking_recv() {
             match cmd {
@@ -374,12 +307,22 @@ impl BatchExecutor {
                     self.rollback_last_tx(&mut vm);
                     resp.send(()).unwrap();
                 }
+                Command::StartNextMiniblock(l2_block_env, resp) => {
+                    self.start_next_miniblock(l2_block_env, &mut vm);
+                    resp.send(()).unwrap();
+                }
                 Command::FinishBatch(resp) => {
-                    resp.send(self.finish_batch(&mut vm)).unwrap();
+                    let vm_block_result = self.finish_batch(&mut vm);
+                    let witness_block_state = if upload_witness_inputs_to_gcs {
+                        Some(storage_view.borrow_mut().witness_block_state())
+                    } else {
+                        None
+                    };
+                    resp.send((vm_block_result, witness_block_state)).unwrap();
 
                     // storage_view cannot be accessed while borrowed by the VM,
                     // so this is the only point at which storage metrics can be obtained
-                    let metrics = storage_view.metrics();
+                    let metrics = storage_view.as_ref().borrow_mut().metrics();
                     metrics::histogram!(
                         "state_keeper.batch_storage_interaction_duration",
                         metrics.time_spent_on_get_value,
@@ -396,32 +339,34 @@ impl BatchExecutor {
             }
         }
         // State keeper can exit because of stop signal, so it's OK to exit mid-batch.
-        vlog::info!("State keeper exited with an unfinished batch");
+        tracing::info!("State keeper exited with an unfinished batch");
     }
 
-    fn execute_tx(&self, tx: &Transaction, vm: &mut VmInstance<'_>) -> TxExecutionResult {
-        let gas_consumed_before_tx = vm.gas_consumed();
-
+    fn execute_tx<S: ReadStorage>(
+        &self,
+        tx: &Transaction,
+        vm: &mut VmInstance<'_, S, HistoryEnabled>,
+    ) -> TxExecutionResult {
         // Save pre-`execute_next_tx` VM snapshot.
-        vm.save_current_vm_as_snapshot();
+        vm.make_snapshot();
 
         // Reject transactions with too big gas limit.
         // They are also rejected on the API level, but
         // we need to secure ourselves in case some tx will somehow get into mempool.
         if tx.gas_limit() > self.max_allowed_tx_gas_limit {
-            vlog::warn!(
+            tracing::warn!(
                 "Found tx with too big gas limit in state keeper, hash: {:?}, gas_limit: {}",
                 tx.hash(),
                 tx.gas_limit()
             );
             return TxExecutionResult::RejectedByVm {
-                rejection_reason: TxRevertReason::TooBigGasLimit,
+                reason: Halt::TooBigGasLimit,
             };
         }
 
         // Execute the transaction.
         let stage_started_at = Instant::now();
-        let tx_result = self.execute_tx_in_vm(tx, vm);
+        let (tx_result, compressed_bytecodes, call_tracer_result) = self.execute_tx_in_vm(tx, vm);
         metrics::histogram!(
             "server.state_keeper.tx_execution_time",
             stage_started_at.elapsed(),
@@ -437,37 +382,42 @@ impl BatchExecutor {
             "stage" => "state_keeper"
         );
 
-        let (exec_result, compressed_bytecodes) = match tx_result {
-            Err(TxRevertReason::BootloaderOutOfGas) => {
-                return TxExecutionResult::BootloaderOutOfGasForTx
-            }
-            Err(rejection_reason) => return TxExecutionResult::RejectedByVm { rejection_reason },
-            Ok((exec_result, compressed_bytecodes)) => (exec_result, compressed_bytecodes),
-        };
+        if let ExecutionResult::Halt { reason } = tx_result.result {
+            return match reason {
+                Halt::BootloaderOutOfGas => TxExecutionResult::BootloaderOutOfGasForTx,
+                _ => TxExecutionResult::RejectedByVm { reason },
+            };
+        }
 
-        let tx_metrics =
-            Self::get_execution_metrics(vm, Some(tx), &exec_result.result, gas_consumed_before_tx);
-
-        match self.dryrun_block_tip(vm) {
-            Ok((bootloader_dry_run_result, bootloader_dry_run_metrics)) => {
-                TxExecutionResult::Success {
-                    tx_result: Box::new(exec_result),
-                    tx_metrics,
-                    bootloader_dry_run_metrics,
-                    bootloader_dry_run_result: Box::new(bootloader_dry_run_result),
-                    compressed_bytecodes,
-                }
-            }
-            Err(err) => {
-                vlog::warn!("VM reverted while executing block tip: {}", err);
-                TxExecutionResult::BootloaderOutOfGasForBlockTip
+        let tx_metrics = Self::get_execution_metrics(Some(tx), &tx_result);
+
+        let (bootloader_dry_run_result, bootloader_dry_run_metrics) = self.dryrun_block_tip(vm);
+        match &bootloader_dry_run_result.result {
+            ExecutionResult::Success { .. } => TxExecutionResult::Success {
+                tx_result: Box::new(tx_result),
+                tx_metrics,
+                bootloader_dry_run_metrics,
+                bootloader_dry_run_result: Box::new(bootloader_dry_run_result),
+                compressed_bytecodes,
+                call_tracer_result,
+            },
+            ExecutionResult::Revert { .. } => {
+                unreachable!(
+                    "VM must not revert when finalizing block (except `BootloaderOutOfGas`)"
+                );
             }
+            ExecutionResult::Halt { reason } => match reason {
+                Halt::BootloaderOutOfGas => TxExecutionResult::BootloaderOutOfGasForBlockTip,
+                _ => {
+                    panic!("VM must not revert when finalizing block (except `BootloaderOutOfGas`)")
+                }
+            },
         }
     }
 
-    fn rollback_last_tx(&self, vm: &mut VmInstance<'_>) {
+    fn rollback_last_tx<S: ReadStorage>(&self, vm: &mut VmInstance<'_, S, HistoryEnabled>) {
         let stage_started_at = Instant::now();
-        vm.rollback_to_snapshot_popping();
+        vm.rollback_to_the_latest_snapshot();
         metrics::histogram!(
             "server.state_keeper.tx_execution_time",
             stage_started_at.elapsed(),
@@ -475,19 +425,40 @@ impl BatchExecutor {
         );
     }
 
-    fn finish_batch(&self, vm: &mut VmInstance<'_>) -> VmBlockResult {
-        vm.execute_till_block_end(BootloaderJobType::BlockPostprocessing)
+    fn start_next_miniblock<S: ReadStorage>(
+        &self,
+        l2_block_env: L2BlockEnv,
+        vm: &mut VmInstance<'_, S, HistoryEnabled>,
+    ) {
+        vm.start_new_l2_block(l2_block_env);
+    }
+
+    fn finish_batch<S: ReadStorage>(
+        &self,
+        vm: &mut VmInstance<'_, S, HistoryEnabled>,
+    ) -> FinishedL1Batch {
+        // The vm execution was paused right after the last transaction was executed.
+        // 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");
+        }
+        result
     }
 
     // Err when transaction is rejected.
     // Ok(TxExecutionStatus::Success) when the transaction succeeded
     // Ok(TxExecutionStatus::Failure) when the transaction failed.
     // Note that failed transactions are considered properly processed and are included in blocks
-    fn execute_tx_in_vm(
+    fn execute_tx_in_vm<S: ReadStorage>(
         &self,
         tx: &Transaction,
-        vm: &mut VmInstance<'_>,
-    ) -> Result<(VmTxExecutionResult, Vec<CompressedBytecodeInfo>), TxRevertReason> {
+        vm: &mut VmInstance<'_, S, HistoryEnabled>,
+    ) -> (
+        VmExecutionResultAndLogs,
+        Vec<CompressedBytecodeInfo>,
+        Vec<Call>,
+    ) {
         // Note, that the space where we can put the calldata for compressing transactions
         // is limited and the transactions do not pay for taking it.
         // In order to not let the accounts spam the space of compressed bytecodes with bytecodes
@@ -498,130 +469,106 @@ impl BatchExecutor {
         // and so we reexecute the transaction, but without compressions.
 
         // Saving the snapshot before executing
-        vm.save_current_vm_as_snapshot();
+        vm.make_snapshot();
 
-        let compressed_bytecodes = if tx.is_l1() {
-            // For L1 transactions there are no compressed bytecodes
-            vec![]
+        let call_tracer_result = Arc::new(OnceCell::default());
+        let custom_tracers = if self.save_call_traces {
+            vec![CallTracer::new(call_tracer_result.clone(), HistoryEnabled).into_boxed()]
         } else {
-            // Deduplicate and filter factory deps preserving original order.
-            let deps = tx.execute.factory_deps.as_deref().unwrap_or_default();
-            let mut deps_hashes = HashSet::with_capacity(deps.len());
-            let filtered_deps = deps.iter().filter_map(|bytecode| {
-                let bytecode_hash = hash_bytecode(bytecode);
-                let is_known =
-                    !deps_hashes.insert(bytecode_hash) || vm.is_bytecode_known(&bytecode_hash);
-                if is_known {
-                    None
-                } else {
-                    CompressedBytecodeInfo::from_original(bytecode.clone()).ok()
-                }
-            });
-            filtered_deps.collect()
-        };
-
-        vm.push_transaction_to_bootloader_memory(
-            tx,
-            TxExecutionMode::VerifyExecute,
-            Some(compressed_bytecodes.clone()),
-        );
-        let result_with_compression = vm.execute_next_tx(
-            self.validation_computational_gas_limit,
-            self.save_call_traces,
-        )?;
-
-        let at_least_one_unpublished = {
-            compressed_bytecodes
-                .iter()
-                .any(|info| !vm.is_bytecode_known(&hash_bytecode(&info.original)))
+            vec![]
         };
+        if let Ok(result) =
+            vm.inspect_transaction_with_bytecode_compression(custom_tracers, tx.clone(), true)
+        {
+            let compressed_bytecodes = vm.get_last_tx_compressed_bytecodes();
+            vm.pop_snapshot_no_rollback();
 
-        if at_least_one_unpublished {
-            // Rolling back and trying to execute one more time.
-            vm.rollback_to_snapshot_popping();
-            vm.push_transaction_to_bootloader_memory(
-                tx,
-                TxExecutionMode::VerifyExecute,
-                Some(vec![]),
-            );
+            let trace = Arc::try_unwrap(call_tracer_result)
+                .unwrap()
+                .take()
+                .unwrap_or_default();
+            return (result, compressed_bytecodes, trace);
+        }
 
-            vm.execute_next_tx(
-                self.validation_computational_gas_limit,
-                self.save_call_traces,
-            )
-            .map(|val| (val, vec![]))
+        let call_tracer_result = Arc::new(OnceCell::default());
+        let custom_tracers = if self.save_call_traces {
+            vec![CallTracer::new(call_tracer_result.clone(), HistoryEnabled).into_boxed()]
         } else {
-            // Remove the snapshot taken at the start of this function as it is not needed anymore.
-            vm.pop_snapshot_no_rollback();
-            Ok((result_with_compression, compressed_bytecodes))
-        }
+            vec![]
+        };
+        vm.rollback_to_the_latest_snapshot();
+        let result = vm
+            .inspect_transaction_with_bytecode_compression(custom_tracers, tx.clone(), false)
+            .expect("Compression can't fail if we don't apply it");
+        let compressed_bytecodes = vm.get_last_tx_compressed_bytecodes();
+
+        // TODO implement tracer manager which will be responsible
+        // for collecting result from all tracers and save it to the database
+        let trace = Arc::try_unwrap(call_tracer_result)
+            .unwrap()
+            .take()
+            .unwrap_or_default();
+        (result, compressed_bytecodes, trace)
     }
 
-    fn dryrun_block_tip(
+    fn dryrun_block_tip<S: ReadStorage>(
         &self,
-        vm: &mut VmInstance<'_>,
-    ) -> Result<(VmPartialExecutionResult, ExecutionMetricsForCriteria), TxRevertReason> {
-        let stage_started_at = Instant::now();
-        let gas_consumed_before = vm.gas_consumed();
+        vm: &mut VmInstance<'_, S, HistoryEnabled>,
+    ) -> (VmExecutionResultAndLogs, ExecutionMetricsForCriteria) {
+        let started_at = Instant::now();
+        let mut stage_started_at = Instant::now();
 
         // Save pre-`execute_till_block_end` VM snapshot.
-        vm.save_current_vm_as_snapshot();
+        vm.make_snapshot();
+
+        metrics::histogram!(
+            "server.state_keeper.tx_execution_time",
+            stage_started_at.elapsed(),
+            "stage" => "dryrun_make_snapshot",
+        );
+        stage_started_at = Instant::now();
+
         let block_tip_result = vm.execute_block_tip();
-        let result = match &block_tip_result.revert_reason {
-            None => {
-                let metrics =
-                    Self::get_execution_metrics(vm, None, &block_tip_result, gas_consumed_before);
-                Ok((block_tip_result, metrics))
-            }
-            Some(TxRevertReason::BootloaderOutOfGas) => Err(TxRevertReason::BootloaderOutOfGas),
-            Some(other_reason) => {
-                panic!("VM must not revert when finalizing block (except `BootloaderOutOfGas`). Revert reason: {:?}", other_reason);
-            }
-        };
+
+        metrics::histogram!(
+            "server.state_keeper.tx_execution_time",
+            stage_started_at.elapsed(),
+            "stage" => "dryrun_execute_block_tip",
+        );
+        stage_started_at = Instant::now();
+
+        let metrics = Self::get_execution_metrics(None, &block_tip_result);
+
+        metrics::histogram!(
+            "server.state_keeper.tx_execution_time",
+            stage_started_at.elapsed(),
+            "stage" => "dryrun_get_execution_metrics",
+        );
+        stage_started_at = Instant::now();
 
         // Rollback to the pre-`execute_till_block_end` state.
-        vm.rollback_to_snapshot_popping();
+        vm.rollback_to_the_latest_snapshot();
 
         metrics::histogram!(
             "server.state_keeper.tx_execution_time",
             stage_started_at.elapsed(),
-            "stage" => "dryrun_block_tip"
+            "stage" => "dryrun_rollback_to_the_latest_snapshot"
         );
 
-        result
+        metrics::histogram!(
+            "server.state_keeper.tx_execution_time",
+            started_at.elapsed(),
+            "stage" => "dryrun_rollback"
+        );
+
+        (block_tip_result, metrics)
     }
 
     fn get_execution_metrics(
-        vm: &VmInstance<'_>,
         tx: Option<&Transaction>,
-        execution_result: &VmPartialExecutionResult,
-        gas_consumed_before: u32,
+        execution_result: &VmExecutionResultAndLogs,
     ) -> ExecutionMetricsForCriteria {
-        let gas_consumed_after = vm.gas_consumed();
-        assert!(
-            gas_consumed_after >= gas_consumed_before,
-            "Invalid consumed gas value, possible underflow. Tx: {:?}",
-            tx
-        );
-        let gas_used = gas_consumed_after - gas_consumed_before;
-        let total_factory_deps = tx
-            .map(|tx| {
-                tx.execute
-                    .factory_deps
-                    .as_ref()
-                    .map_or(0, |deps| deps.len() as u16)
-            })
-            .unwrap_or(0);
-
-        let execution_metrics = ExecutionMetrics::new(
-            &execution_result.logs,
-            gas_used as usize,
-            total_factory_deps,
-            execution_result.contracts_used,
-            execution_result.cycles_used,
-            execution_result.computational_gas_used,
-        );
-
+        let execution_metrics = execution_result.get_execution_metrics(tx);
         let l1_gas = match tx {
             Some(tx) => gas_count_from_tx_and_metrics(tx, &execution_metrics),
             None => gas_count_from_metrics(&execution_metrics),
diff --git a/core/bin/zksync_core/src/state_keeper/batch_executor/tests/mod.rs b/core/bin/zksync_core/src/state_keeper/batch_executor/tests/mod.rs
index 6c4199d3e170..bae8b81fc134 100644
--- a/core/bin/zksync_core/src/state_keeper/batch_executor/tests/mod.rs
+++ b/core/bin/zksync_core/src/state_keeper/batch_executor/tests/mod.rs
@@ -2,13 +2,15 @@ use assert_matches::assert_matches;
 use db_test_macro::db_test;
 
 use zksync_dal::ConnectionPool;
-use zksync_types::{tx::tx_execution_info::TxExecutionStatus, PriorityOpId};
+use zksync_types::PriorityOpId;
 
 mod tester;
 
-use self::tester::{Account, Tester};
+use self::tester::Tester;
 use super::TxExecutionResult;
-use crate::state_keeper::batch_executor::tests::tester::TestConfig;
+use crate::state_keeper::batch_executor::tests::tester::{AccountLoadNextExecutable, TestConfig};
+
+use zksync_test_account::Account;
 
 /// Ensures that the transaction was executed successfully.
 fn assert_executed(execution_result: &TxExecutionResult) {
@@ -24,7 +26,7 @@ fn assert_rejected(execution_result: &TxExecutionResult) {
 fn assert_reverted(execution_result: &TxExecutionResult) {
     assert_executed(execution_result);
     if let TxExecutionResult::Success { tx_result, .. } = execution_result {
-        assert_matches!(tx_result.status, TxExecutionStatus::Failure);
+        assert!(tx_result.result.is_failed());
     } else {
         unreachable!();
     }
@@ -36,6 +38,7 @@ async fn execute_l2_tx(connection_pool: ConnectionPool) {
     let mut alice = Account::random();
 
     let tester = Tester::new(connection_pool);
+
     tester.genesis().await;
     tester.fund(&[alice.address()]).await;
     let executor = tester.create_batch_executor().await;
@@ -51,6 +54,7 @@ async fn execute_l1_tx(connection_pool: ConnectionPool) {
     let mut alice = Account::random();
 
     let tester = Tester::new(connection_pool);
+
     tester.genesis().await;
     tester.fund(&[alice.address()]).await;
     let executor = tester.create_batch_executor().await;
@@ -85,6 +89,7 @@ async fn rollback(connection_pool: ConnectionPool) {
     let mut alice = Account::random();
 
     let tester = Tester::new(connection_pool);
+
     tester.genesis().await;
     tester.fund(&[alice.address()]).await;
     let executor = tester.create_batch_executor().await;
@@ -117,6 +122,7 @@ async fn rollback(connection_pool: ConnectionPool) {
         tx_metrics_old, tx_metrics_new,
         "Execution results must be the same"
     );
+
     executor.finish_batch().await;
 }
 
@@ -126,13 +132,13 @@ async fn reject_tx(connection_pool: ConnectionPool) {
     let mut alice = Account::random();
 
     let tester = Tester::new(connection_pool);
+
     tester.genesis().await;
     let executor = tester.create_batch_executor().await;
 
     // Wallet is not funded, it can't pay for fees.
     let res = executor.execute_tx(alice.execute()).await;
     assert_rejected(&res);
-    executor.finish_batch().await;
 }
 
 /// Checks that tx with too big gas limit is correctly rejected.
@@ -146,20 +152,22 @@ async fn too_big_gas_limit(connection_pool: ConnectionPool) {
     let executor = tester.create_batch_executor().await;
 
     let bad_tx = alice.execute_with_gas_limit(u32::MAX);
+
     let res_old = executor.execute_tx(bad_tx.clone()).await;
     assert_rejected(&res_old);
 
     executor.rollback_last_tx().await;
     let res_new = executor.execute_tx(bad_tx).await;
     assert_rejected(&res_new);
+    executor.rollback_last_tx().await;
 
     let (
         TxExecutionResult::RejectedByVm {
-            rejection_reason: rejection_reason_old,
+            reason: rejection_reason_old,
             ..
         },
         TxExecutionResult::RejectedByVm {
-            rejection_reason: rejection_reason_new,
+            reason: rejection_reason_new,
             ..
         },
     ) = (res_old, res_new)
@@ -173,6 +181,7 @@ async fn too_big_gas_limit(connection_pool: ConnectionPool) {
 
     // Ensure that now we can execute a valid tx.
     alice.nonce -= 1; // Reset the nonce.
+
     let res = executor.execute_tx(alice.execute()).await;
     assert_executed(&res);
     executor.finish_batch().await;
@@ -195,7 +204,6 @@ async fn tx_cant_be_reexecuted(connection_pool: ConnectionPool) {
     // Nonce is used for the second tx.
     let res2 = executor.execute_tx(tx).await;
     assert_rejected(&res2);
-    executor.finish_batch().await;
 }
 
 /// Checks that we can deploy and call the loadnext contract.
@@ -208,12 +216,18 @@ async fn deploy_and_call_loadtest(connection_pool: ConnectionPool) {
     tester.fund(&[alice.address()]).await;
     let executor = tester.create_batch_executor().await;
 
-    let (deploy_tx, loadtest_address) = alice.deploy_loadnext_tx();
-    assert_executed(&executor.execute_tx(deploy_tx).await);
-    let custom_gas_tx = alice.loadnext_custom_gas_call(loadtest_address, 10, 10_000_000);
-    assert_executed(&executor.execute_tx(custom_gas_tx).await);
-    let custom_writes_tx = alice.loadnext_custom_writes_call(loadtest_address, 1, 500_000_000);
-    assert_executed(&executor.execute_tx(custom_writes_tx).await);
+    let tx = alice.deploy_loadnext_tx();
+    assert_executed(&executor.execute_tx(tx.tx).await);
+    assert_executed(
+        &executor
+            .execute_tx(alice.loadnext_custom_gas_call(tx.address, 10, 10_000_000))
+            .await,
+    );
+    assert_executed(
+        &executor
+            .execute_tx(alice.loadnext_custom_writes_call(tx.address, 1, 500_000_000))
+            .await,
+    );
     executor.finish_batch().await;
 }
 
@@ -223,19 +237,22 @@ async fn execute_reverted_tx(connection_pool: ConnectionPool) {
     let mut alice = Account::random();
 
     let tester = Tester::new(connection_pool);
+
     tester.genesis().await;
     tester.fund(&[alice.address()]).await;
     let executor = tester.create_batch_executor().await;
 
-    let (deploy_tx, loadtest_address) = alice.deploy_loadnext_tx();
-    assert_executed(&executor.execute_tx(deploy_tx).await);
+    let tx = alice.deploy_loadnext_tx();
+    assert_executed(&executor.execute_tx(tx.tx).await);
 
-    let custom_writes_tx = alice.loadnext_custom_writes_call(
-        loadtest_address,
-        1,
-        1_000_000, // We provide enough gas for tx to be executed, but not enough for the call to be successful.
+    assert_reverted(
+        &executor
+            .execute_tx(alice.loadnext_custom_writes_call(
+                tx.address, 1,
+                1_000_000, // We provide enough gas for tx to be executed, but not enough for the call to be successful.
+            ))
+            .await,
     );
-    assert_reverted(&executor.execute_tx(custom_writes_tx).await);
     executor.finish_batch().await;
 }
 
@@ -247,6 +264,7 @@ async fn execute_realistic_scenario(connection_pool: ConnectionPool) {
     let mut bob = Account::random();
 
     let tester = Tester::new(connection_pool);
+
     tester.genesis().await;
     tester.fund(&[alice.address()]).await;
     tester.fund(&[bob.address()]).await;
@@ -300,6 +318,7 @@ async fn bootloader_out_of_gas_for_any_tx(connection_pool: ConnectionPool) {
             vm_gas_limit: Some(10),
             max_allowed_tx_gas_limit: u32::MAX,
             validation_computational_gas_limit: u32::MAX,
+            upload_witness_inputs_to_gcs: false,
         },
     );
 
@@ -309,8 +328,6 @@ async fn bootloader_out_of_gas_for_any_tx(connection_pool: ConnectionPool) {
 
     let res = executor.execute_tx(alice.execute()).await;
     assert_matches!(res, TxExecutionResult::BootloaderOutOfGasForTx);
-
-    executor.finish_batch().await;
 }
 
 /// Checks that we can handle the bootloader out of gas error on tip phase.
@@ -328,21 +345,20 @@ async fn bootloader_tip_out_of_gas(connection_pool: ConnectionPool) {
     let res = executor.execute_tx(alice.execute()).await;
     assert_executed(&res);
 
-    let vm_block_res = executor.finish_batch().await;
+    let (vm_block_res, _witness_block_state) = executor.finish_batch().await;
 
     // Just a bit below the gas used for the previous batch execution should be fine to execute the tx
     // but not enough to execute the block tip.
     tester.set_config(TestConfig {
         save_call_traces: false,
-        vm_gas_limit: Some(vm_block_res.full_result.gas_used - 10),
+        vm_gas_limit: Some(vm_block_res.block_tip_execution_result.statistics.gas_used - 10),
         max_allowed_tx_gas_limit: u32::MAX,
         validation_computational_gas_limit: u32::MAX,
+        upload_witness_inputs_to_gcs: false,
     });
 
     let second_executor = tester.create_batch_executor().await;
 
     let res = second_executor.execute_tx(alice.execute()).await;
-    assert_matches!(res, TxExecutionResult::BootloaderOutOfGasForBlockTip);
-
-    second_executor.finish_batch().await;
+    assert_matches!(res, TxExecutionResult::BootloaderOutOfGasForTx);
 }
diff --git a/core/bin/zksync_core/src/state_keeper/batch_executor/tests/tester.rs b/core/bin/zksync_core/src/state_keeper/batch_executor/tests/tester.rs
index c9af99c71bbe..9afca00f463a 100644
--- a/core/bin/zksync_core/src/state_keeper/batch_executor/tests/tester.rs
+++ b/core/bin/zksync_core/src/state_keeper/batch_executor/tests/tester.rs
@@ -1,43 +1,30 @@
 //! Testing harness for the batch executor.
 //! Contains helper functionality to initialize test context and perform tests without too much boilerplate.
 
-use multivm::VmVersion;
 use tempfile::TempDir;
 
 use vm::{
-    test_utils::{
-        get_create_zksync_address, get_deploy_tx, mock_loadnext_gas_burn_call,
-        mock_loadnext_test_call,
-    },
-    vm_with_bootloader::{BlockContext, BlockContextMode, DerivedBlockContext},
-    zk_evm::{
-        block_properties::BlockProperties,
-        zkevm_opcode_defs::system_params::INITIAL_STORAGE_WRITE_PUBDATA_BYTES,
-    },
+    constants::INITIAL_STORAGE_WRITE_PUBDATA_BYTES,
+    {L1BatchEnv, SystemEnv},
 };
-use zksync_config::configs::chain::StateKeeperConfig;
 
-use zksync_contracts::{get_loadnext_contract, TestContract};
+use zksync_config::configs::chain::StateKeeperConfig;
+use zksync_contracts::{get_loadnext_contract, test_contracts::LoadnextContractExecutionParams};
 use zksync_dal::ConnectionPool;
 use zksync_state::RocksdbStorage;
+use zksync_test_account::{Account, DeployContractsTx, TxType};
 use zksync_types::{
-    ethabi::{encode, Token},
-    fee::Fee,
-    l1::{L1Tx, OpProcessingType, PriorityQueueType},
-    l2::L2Tx,
-    system_contracts::get_system_smart_contracts,
-    utils::storage_key_for_standard_token_balance,
-    AccountTreeId, Address, Execute, L1BatchNumber, L1TxCommonData, L2ChainId, MiniblockNumber,
-    Nonce, PackedEthSignature, PriorityOpId, ProtocolVersionId, StorageLog, Transaction, H256,
+    ethabi::Token, fee::Fee, system_contracts::get_system_smart_contracts,
+    utils::storage_key_for_standard_token_balance, AccountTreeId, Address, Execute, L1BatchNumber,
+    L2ChainId, MiniblockNumber, PriorityOpId, ProtocolVersionId, StorageLog, Transaction, H256,
     L2_ETH_TOKEN_ADDRESS, SYSTEM_CONTEXT_MINIMAL_BASE_FEE, U256,
 };
-use zksync_utils::{test_utils::LoadnextContractExecutionParams, u256_to_h256};
+use zksync_utils::u256_to_h256;
 
 use crate::genesis::create_genesis_l1_batch;
 use crate::state_keeper::{
     batch_executor::BatchExecutorHandle,
-    io::L1BatchParams,
-    tests::{default_block_properties, BASE_SYSTEM_CONTRACTS},
+    tests::{default_l1_batch_env, default_system_env, BASE_SYSTEM_CONTRACTS},
 };
 
 const DEFAULT_GAS_PER_PUBDATA: u32 = 100;
@@ -51,6 +38,7 @@ pub(super) struct TestConfig {
     pub(super) vm_gas_limit: Option<u32>,
     pub(super) max_allowed_tx_gas_limit: u32,
     pub(super) validation_computational_gas_limit: u32,
+    pub(super) upload_witness_inputs_to_gcs: bool,
 }
 
 impl TestConfig {
@@ -63,6 +51,7 @@ impl TestConfig {
             save_call_traces: false,
             max_allowed_tx_gas_limit: config.max_allowed_l2_tx_gas_limit,
             validation_computational_gas_limit: config.validation_computational_gas_limit,
+            upload_witness_inputs_to_gcs: false,
         }
     }
 }
@@ -99,7 +88,11 @@ impl Tester {
     /// This function intentionally uses sensible defaults to not introduce boilerplate.
     pub(super) async fn create_batch_executor(&self) -> BatchExecutorHandle {
         // Not really important for the batch executor - it operates over a single batch.
-        let (block_context, block_properties) = self.batch_params(L1BatchNumber(1), 100);
+        let (l1_batch, system_env) = self.batch_params(
+            L1BatchNumber(1),
+            100,
+            self.config.validation_computational_gas_limit,
+        );
 
         let mut secondary_storage = RocksdbStorage::new(self.db_dir.path());
         let mut conn = self.pool.access_storage_tagged("state_keeper").await;
@@ -109,18 +102,12 @@ impl Tester {
         // We don't use the builder because it would require us to clone the `ConnectionPool`, which is forbidden
         // for the test pool (see the doc-comment on `TestPool` for details).
         BatchExecutorHandle::new(
-            VmVersion::latest(),
             self.config.save_call_traces,
             self.config.max_allowed_tx_gas_limit.into(),
-            self.config.validation_computational_gas_limit,
             secondary_storage,
-            L1BatchParams {
-                context_mode: block_context,
-                properties: block_properties,
-                base_system_contracts: BASE_SYSTEM_CONTRACTS.clone(),
-                protocol_version: ProtocolVersionId::latest(),
-            },
-            self.config.vm_gas_limit,
+            l1_batch,
+            system_env,
+            self.config.upload_witness_inputs_to_gcs,
         )
     }
 
@@ -129,26 +116,17 @@ impl Tester {
         &self,
         l1_batch_number: L1BatchNumber,
         timestamp: u64,
-    ) -> (BlockContextMode, BlockProperties) {
-        let block_properties = default_block_properties();
-
-        let context = BlockContext {
-            block_number: l1_batch_number.0,
-            block_timestamp: timestamp,
-            l1_gas_price: 1,
-            fair_l2_gas_price: 1,
-            operator_address: self.fee_account,
-        };
-        let derived_context = DerivedBlockContext {
-            context,
-            base_fee: 1,
-        };
-
-        let previous_block_hash = U256::zero(); // Not important in this context.
-        (
-            BlockContextMode::NewBlock(derived_context, previous_block_hash),
-            block_properties,
-        )
+        validation_computational_gas_limit: u32,
+    ) -> (L1BatchEnv, SystemEnv) {
+        let mut system_params = default_system_env();
+        if let Some(vm_gas_limit) = self.config.vm_gas_limit {
+            system_params.gas_limit = vm_gas_limit;
+        }
+        system_params.default_validation_computational_gas_limit =
+            validation_computational_gas_limit;
+        let mut batch_params = default_l1_batch_env(l1_batch_number.0, timestamp, self.fee_account);
+        batch_params.previous_batch_hash = Some(H256::zero()); // Not important in this context.
+        (batch_params, system_params)
     }
 
     /// Performs the genesis in the storage.
@@ -159,6 +137,7 @@ impl Tester {
                 &mut storage,
                 self.fee_account,
                 CHAIN_ID,
+                ProtocolVersionId::latest(),
                 &BASE_SYSTEM_CONTRACTS,
                 &get_system_smart_contracts(),
                 Default::default(),
@@ -195,123 +174,64 @@ impl Tester {
     }
 }
 
-/// Test account that maintains its own nonce and is able to encode common transaction types useful for tests.
-#[derive(Debug)]
-pub(super) struct Account {
-    pub pk: H256,
-    pub nonce: Nonce,
-}
-
-impl Account {
-    pub(super) fn random() -> Self {
-        Self {
-            pk: H256::random(),
-            nonce: Nonce(0),
-        }
-    }
-
-    /// Returns the address of the account.
-    pub(super) fn address(&self) -> Address {
-        PackedEthSignature::address_from_private_key(&self.pk).unwrap()
-    }
+pub trait AccountLoadNextExecutable {
+    fn deploy_loadnext_tx(&mut self) -> DeployContractsTx;
 
+    fn l1_execute(&mut self, serial_id: PriorityOpId) -> Transaction;
     /// Returns a valid `execute` transaction.
     /// Automatically increments nonce of the account.
-    pub(super) fn execute(&mut self) -> Transaction {
-        self.execute_with_gas_limit(1_000_000)
-    }
-
+    fn execute(&mut self) -> Transaction;
+    fn loadnext_custom_writes_call(
+        &mut self,
+        address: Address,
+        writes: u32,
+        gas_limit: u32,
+    ) -> Transaction;
     /// Returns a valid `execute` transaction.
     /// Automatically increments nonce of the account.
-    pub(super) fn execute_with_gas_limit(&mut self, gas_limit: u32) -> Transaction {
-        let fee = fee(gas_limit);
-        let mut l2_tx = L2Tx::new_signed(
-            Address::random(),
-            vec![],
-            self.nonce,
-            fee,
-            Default::default(),
-            CHAIN_ID,
-            &self.pk,
-            None,
-            Default::default(),
-        )
-        .unwrap();
-        // Input means all transaction data (NOT calldata, but all tx fields) that came from the API.
-        // This input will be used for the derivation of the tx hash, so put some random to it to be sure
-        // that the transaction hash is unique.
-        l2_tx.set_input(H256::random().0.to_vec(), H256::random());
-
-        // Increment the account nonce.
-        self.nonce += 1;
+    fn execute_with_gas_limit(&mut self, gas_limit: u32) -> Transaction;
+    /// Returns a transaction to the loadnext contract with custom gas limit and expected burned gas amount.
+    /// Increments the account nonce.
+    fn loadnext_custom_gas_call(
+        &mut self,
+        address: Address,
+        gas_to_burn: u32,
+        gas_limit: u32,
+    ) -> Transaction;
+}
 
-        l2_tx.into()
+impl AccountLoadNextExecutable for Account {
+    fn deploy_loadnext_tx(&mut self) -> DeployContractsTx {
+        let loadnext_contract = get_loadnext_contract();
+        let loadnext_constructor_data = &[Token::Uint(U256::from(100))];
+        self.get_deploy_tx_with_factory_deps(
+            &loadnext_contract.bytecode,
+            Some(loadnext_constructor_data),
+            loadnext_contract.factory_deps.clone(),
+            TxType::L2,
+        )
     }
-
-    /// Returns a valid `execute` transaction initiated from L1.
-    /// Does not increment nonce.
-    pub(super) fn l1_execute(&mut self, serial_id: PriorityOpId) -> Transaction {
-        let execute = Execute {
-            contract_address: Address::random(),
-            value: Default::default(),
-            calldata: vec![],
-            factory_deps: None,
-        };
-
-        let max_fee_per_gas = U256::from(1u32);
-        let gas_limit = U256::from(100_100);
-        let priority_op_data = L1TxCommonData {
-            sender: self.address(),
-            canonical_tx_hash: H256::from_low_u64_be(serial_id.0),
-            serial_id,
-            deadline_block: 100000,
-            layer_2_tip_fee: U256::zero(),
-            full_fee: U256::zero(),
-            gas_limit,
-            max_fee_per_gas,
-            op_processing_type: OpProcessingType::Common,
-            priority_queue_type: PriorityQueueType::Deque,
-            eth_hash: H256::random(),
-            eth_block: 1,
-            gas_per_pubdata_limit: U256::from(800),
-            to_mint: gas_limit * max_fee_per_gas + execute.value,
-            refund_recipient: self.address(),
-        };
-
-        let tx = L1Tx {
-            common_data: priority_op_data,
-            execute,
-            received_timestamp_ms: 0,
-        };
-        tx.into()
+    fn l1_execute(&mut self, serial_id: PriorityOpId) -> Transaction {
+        self.get_l1_tx(
+            Execute {
+                contract_address: Address::random(),
+                value: Default::default(),
+                calldata: vec![],
+                factory_deps: None,
+            },
+            serial_id.0,
+        )
     }
 
-    /// Returns the transaction to deploy the loadnext contract and address of this contract (after deployment).
-    /// Increments the account nonce.
-    pub(super) fn deploy_loadnext_tx(&mut self) -> (Transaction, Address) {
-        let TestContract {
-            bytecode,
-            factory_deps,
-            ..
-        } = get_loadnext_contract();
-        let loadnext_deploy_tx = get_deploy_tx(
-            self.pk,
-            self.nonce,
-            &bytecode,
-            factory_deps,
-            &encode(&[Token::Uint(U256::from(1000))]),
-            fee(500_000_000),
-        );
-        let test_contract_address =
-            get_create_zksync_address(loadnext_deploy_tx.initiator_account(), self.nonce);
-        self.nonce += 1;
-
-        (loadnext_deploy_tx.into(), test_contract_address)
+    /// Returns a valid `execute` transaction.
+    /// Automatically increments nonce of the account.
+    fn execute(&mut self) -> Transaction {
+        self.execute_with_gas_limit(1_000_000)
     }
 
     /// Returns a transaction to the loadnext contract with custom amount of write requests.
     /// Increments the account nonce.
-    pub(super) fn loadnext_custom_writes_call(
+    fn loadnext_custom_writes_call(
         &mut self,
         address: Address,
         writes: u32,
@@ -324,36 +244,60 @@ impl Account {
 
         let fee = fee(minimal_fee + gas_limit);
 
-        let tx = mock_loadnext_test_call(
-            self.pk,
-            self.nonce,
-            address,
-            fee,
-            LoadnextContractExecutionParams {
-                reads: 100,
-                writes: writes as usize,
-                events: 100,
-                hashes: 100,
-                recursive_calls: 0,
-                deploys: 100,
+        self.get_l2_tx_for_execute(
+            Execute {
+                contract_address: address,
+                calldata: LoadnextContractExecutionParams {
+                    reads: 100,
+                    writes: writes as usize,
+                    events: 100,
+                    hashes: 100,
+                    recursive_calls: 0,
+                    deploys: 100,
+                }
+                .to_bytes(),
+                value: Default::default(),
+                factory_deps: None,
             },
-        );
-        self.nonce += 1;
-        tx.into()
+            Some(fee),
+        )
+    }
+
+    /// Returns a valid `execute` transaction.
+    /// Automatically increments nonce of the account.
+    fn execute_with_gas_limit(&mut self, gas_limit: u32) -> Transaction {
+        let fee = fee(gas_limit);
+        self.get_l2_tx_for_execute(
+            Execute {
+                contract_address: Address::random(),
+                calldata: vec![],
+                value: Default::default(),
+                factory_deps: None,
+            },
+            Some(fee),
+        )
     }
 
     /// Returns a transaction to the loadnext contract with custom gas limit and expected burned gas amount.
     /// Increments the account nonce.
-    pub(super) fn loadnext_custom_gas_call(
+    fn loadnext_custom_gas_call(
         &mut self,
         address: Address,
         gas_to_burn: u32,
         gas_limit: u32,
     ) -> Transaction {
         let fee = fee(gas_limit);
-        let tx = mock_loadnext_gas_burn_call(self.pk, self.nonce, address, fee, gas_to_burn);
-        self.nonce += 1;
-        tx.into()
+        let calldata = mock_loadnext_gas_burn_calldata(gas_to_burn);
+
+        self.get_l2_tx_for_execute(
+            Execute {
+                contract_address: address,
+                calldata,
+                value: Default::default(),
+                factory_deps: None,
+            },
+            Some(fee),
+        )
     }
 }
 
@@ -365,3 +309,14 @@ fn fee(gas_limit: u32) -> Fee {
         gas_per_pubdata_limit: U256::from(DEFAULT_GAS_PER_PUBDATA),
     }
 }
+
+pub fn mock_loadnext_gas_burn_calldata(gas: u32) -> Vec<u8> {
+    let loadnext_contract = get_loadnext_contract();
+
+    let contract_function = loadnext_contract.contract.function("burnGas").unwrap();
+
+    let params = vec![Token::Uint(U256::from(gas))];
+    contract_function
+        .encode_input(&params)
+        .expect("failed to encode parameters")
+}
diff --git a/core/bin/zksync_core/src/state_keeper/extractors.rs b/core/bin/zksync_core/src/state_keeper/extractors.rs
index 5da6836ad2d2..f4fc397911aa 100644
--- a/core/bin/zksync_core/src/state_keeper/extractors.rs
+++ b/core/bin/zksync_core/src/state_keeper/extractors.rs
@@ -8,9 +8,8 @@ use std::{
     time::{Duration, Instant},
 };
 
-use vm::transaction_data::TransactionData;
 use zksync_dal::StorageProcessor;
-use zksync_types::{L1BatchNumber, Transaction, U256};
+use zksync_types::{L1BatchNumber, U256};
 use zksync_utils::h256_to_u256;
 
 /// Displays a Unix timestamp (seconds since epoch) in human-readable form. Useful for logging.
@@ -64,7 +63,7 @@ async fn wait_for_l1_batch_params_unchecked(
             .get_l1_batch_state_root_and_timestamp(number)
             .await;
         if let Some((root_hash, timestamp)) = data {
-            vlog::trace!(
+            tracing::trace!(
                 "Waiting for hash of L1 batch #{number} took {:?}",
                 stage_started_at.elapsed()
             );
@@ -74,9 +73,3 @@ async fn wait_for_l1_batch_params_unchecked(
         tokio::time::sleep(SAFE_STATE_ROOT_INTERVAL).await;
     }
 }
-
-/// Returns size in VM words of an encoded transaction.
-pub(super) fn encoded_transaction_size(tx: Transaction) -> usize {
-    let tx_data: TransactionData = tx.into();
-    tx_data.into_tokens().len()
-}
diff --git a/core/bin/zksync_core/src/state_keeper/io/common.rs b/core/bin/zksync_core/src/state_keeper/io/common.rs
index 8547f8481c38..e527bd159462 100644
--- a/core/bin/zksync_core/src/state_keeper/io/common.rs
+++ b/core/bin/zksync_core/src/state_keeper/io/common.rs
@@ -1,50 +1,60 @@
 use std::time::Duration;
 
-use vm::{
-    vm_with_bootloader::{BlockContext, BlockContextMode},
-    zk_evm::block_properties::BlockProperties,
-};
+use vm::{constants::BLOCK_GAS_LIMIT, L1BatchEnv, L2BlockEnv, SystemEnv, TxExecutionMode};
 use zksync_contracts::BaseSystemContracts;
 use zksync_dal::StorageProcessor;
-use zksync_types::{Address, L1BatchNumber, ProtocolVersionId, U256, ZKPORTER_IS_AVAILABLE};
-use zksync_utils::h256_to_u256;
-
-use itertools::Itertools;
+use zksync_types::{
+    Address, L1BatchNumber, L2ChainId, MiniblockNumber, ProtocolVersionId, H256, U256,
+    ZKPORTER_IS_AVAILABLE,
+};
+use zksync_utils::u256_to_h256;
 
-use super::{L1BatchParams, PendingBatchData};
+use super::PendingBatchData;
 use crate::state_keeper::extractors;
 
 /// Returns the parameters required to initialize the VM for the next L1 batch.
 #[allow(clippy::too_many_arguments)]
 pub(crate) fn l1_batch_params(
     current_l1_batch_number: L1BatchNumber,
-    operator_address: Address,
+    fee_account: Address,
     l1_batch_timestamp: u64,
-    previous_block_hash: U256,
+    previous_batch_hash: U256,
     l1_gas_price: u64,
     fair_l2_gas_price: u64,
+    first_miniblock_number: MiniblockNumber,
+    prev_miniblock_hash: H256,
     base_system_contracts: BaseSystemContracts,
+    validation_computational_gas_limit: u32,
     protocol_version: ProtocolVersionId,
-) -> L1BatchParams {
-    let block_properties = BlockProperties {
-        default_aa_code_hash: h256_to_u256(base_system_contracts.default_aa.hash),
-        zkporter_is_available: ZKPORTER_IS_AVAILABLE,
-    };
-
-    let context = BlockContext {
-        block_number: current_l1_batch_number.0,
-        block_timestamp: l1_batch_timestamp,
-        l1_gas_price,
-        fair_l2_gas_price,
-        operator_address,
-    };
-
-    L1BatchParams {
-        context_mode: BlockContextMode::NewBlock(context.into(), previous_block_hash),
-        properties: block_properties,
-        base_system_contracts,
-        protocol_version,
-    }
+    virtual_blocks: u32,
+    chain_id: L2ChainId,
+) -> (SystemEnv, L1BatchEnv) {
+    (
+        SystemEnv {
+            zk_porter_available: ZKPORTER_IS_AVAILABLE,
+            version: protocol_version,
+            base_system_smart_contracts: base_system_contracts,
+            gas_limit: BLOCK_GAS_LIMIT,
+            execution_mode: TxExecutionMode::VerifyExecute,
+            default_validation_computational_gas_limit: validation_computational_gas_limit,
+            chain_id,
+        },
+        L1BatchEnv {
+            previous_batch_hash: Some(u256_to_h256(previous_batch_hash)),
+            number: current_l1_batch_number,
+            timestamp: l1_batch_timestamp,
+            l1_gas_price,
+            fair_l2_gas_price,
+            fee_account,
+            enforced_base_fee: None,
+            first_l2_block: L2BlockEnv {
+                number: first_miniblock_number.0,
+                timestamp: l1_batch_timestamp,
+                prev_block_hash: prev_miniblock_hash,
+                max_virtual_blocks_to_create: virtual_blocks,
+            },
+        },
+    )
 }
 
 /// Returns the amount of iterations `delay_interval` fits into `max_wait`, rounding up.
@@ -61,6 +71,8 @@ pub(crate) async fn load_pending_batch(
     storage: &mut StorageProcessor<'_>,
     current_l1_batch_number: L1BatchNumber,
     fee_account: Address,
+    validation_computational_gas_limit: u32,
+    chain_id: L2ChainId,
 ) -> Option<PendingBatchData> {
     // If pending miniblock doesn't exist, it means that there is no unsynced state (i.e. no transaction
     // were executed after the last sealed batch).
@@ -77,10 +89,18 @@ pub(crate) async fn load_pending_batch(
         .get_miniblock_header(pending_miniblock_number)
         .await?;
 
-    vlog::info!("Getting previous batch hash");
+    tracing::info!("Getting previous batch hash");
     let (previous_l1_batch_hash, _) =
         extractors::wait_for_prev_l1_batch_params(storage, current_l1_batch_number).await;
 
+    tracing::info!("Getting previous miniblock hash");
+    let prev_miniblock_hash = storage
+        .blocks_dal()
+        .get_miniblock_header(pending_miniblock_number - 1)
+        .await
+        .unwrap()
+        .hash;
+
     let base_system_contracts = storage
         .storage_dal()
         .get_base_system_contracts(
@@ -93,18 +113,23 @@ pub(crate) async fn load_pending_batch(
         )
         .await;
 
-    vlog::info!("Previous l1_batch_hash: {}", previous_l1_batch_hash);
-    let params = l1_batch_params(
+    tracing::info!("Previous l1_batch_hash: {}", previous_l1_batch_hash);
+    let (system_env, l1_batch_env) = l1_batch_params(
         current_l1_batch_number,
         fee_account,
         pending_miniblock_header.timestamp,
         previous_l1_batch_hash,
         pending_miniblock_header.l1_gas_price,
         pending_miniblock_header.l2_fair_gas_price,
+        pending_miniblock_number,
+        prev_miniblock_hash,
         base_system_contracts,
+        validation_computational_gas_limit,
         pending_miniblock_header
             .protocol_version
             .expect("`protocol_version` must be set for pending miniblock"),
+        pending_miniblock_header.virtual_blocks,
+        chain_id,
     );
 
     let pending_miniblocks = storage
@@ -113,71 +138,12 @@ pub(crate) async fn load_pending_batch(
         .await;
 
     Some(PendingBatchData {
-        params,
+        l1_batch_env,
+        system_env,
         pending_miniblocks,
     })
 }
 
-/// Sets missing initial writes indices.
-pub async fn set_missing_initial_writes_indices(storage: &mut StorageProcessor<'_>) {
-    // Indices should start from 1, that's why default is (1, 0).
-    let (mut next_index, start_from_batch) = storage
-        .storage_logs_dedup_dal()
-        .max_set_enumeration_index()
-        .await
-        .map(|(index, l1_batch_number)| (index + 1, l1_batch_number + 1))
-        .unwrap_or((1, L1BatchNumber(0)));
-
-    let sealed_batch = storage.blocks_dal().get_sealed_l1_batch_number().await;
-    if start_from_batch > sealed_batch {
-        vlog::info!("All indices for initial writes are already set, no action is needed");
-        return;
-    } else {
-        let batches_count = sealed_batch.0 - start_from_batch.0 + 1;
-        if batches_count > 100 {
-            vlog::warn!("There are {batches_count} batches to set indices for, it may take substantial time.");
-        }
-    }
-
-    vlog::info!(
-        "Last set index {}. Starting migration from batch {start_from_batch}",
-        next_index - 1
-    );
-    let mut current_l1_batch = start_from_batch;
-    loop {
-        if current_l1_batch > storage.blocks_dal().get_sealed_l1_batch_number().await {
-            break;
-        }
-        vlog::info!("Setting indices for batch {current_l1_batch}");
-
-        let (hashed_keys, _): (Vec<_>, Vec<_>) = storage
-            .storage_logs_dedup_dal()
-            .initial_writes_for_batch(current_l1_batch)
-            .await
-            .into_iter()
-            .unzip();
-        let storage_keys = storage
-            .storage_logs_dal()
-            .resolve_hashed_keys(&hashed_keys)
-            .await;
-
-        // Sort storage key alphanumerically and assign indices.
-        let indexed_keys: Vec<_> = storage_keys
-            .into_iter()
-            .sorted()
-            .enumerate()
-            .map(|(pos, key)| (key.hashed_key(), next_index + pos as u64))
-            .collect();
-        storage
-            .storage_logs_dedup_dal()
-            .set_indices_for_initial_writes(&indexed_keys)
-            .await;
-
-        next_index += indexed_keys.len() as u64;
-        current_l1_batch += 1;
-    }
-}
-
 #[cfg(test)]
 mod tests {
     use super::*;
diff --git a/core/bin/zksync_core/src/state_keeper/io/mempool.rs b/core/bin/zksync_core/src/state_keeper/io/mempool.rs
index 6c431dc6396f..32eb379b5f16 100644
--- a/core/bin/zksync_core/src/state_keeper/io/mempool.rs
+++ b/core/bin/zksync_core/src/state_keeper/io/mempool.rs
@@ -7,17 +7,18 @@ use std::{
     time::{Duration, Instant},
 };
 
-use vm::{
-    vm_with_bootloader::{derive_base_fee_and_gas_per_pubdata, DerivedBlockContext},
-    VmBlockResult,
-};
+use vm::{utils::fee::derive_base_fee_and_gas_per_pubdata, FinishedL1Batch, L1BatchEnv, SystemEnv};
+
 use zksync_config::configs::chain::StateKeeperConfig;
 use zksync_dal::ConnectionPool;
 use zksync_mempool::L2TxFilter;
+use zksync_object_store::ObjectStoreFactory;
 use zksync_types::{
-    protocol_version::ProtocolUpgradeTx, Address, L1BatchNumber, MiniblockNumber,
+    block::MiniblockHeader, protocol_version::ProtocolUpgradeTx,
+    witness_block_state::WitnessBlockState, Address, L1BatchNumber, L2ChainId, MiniblockNumber,
     ProtocolVersionId, Transaction, U256,
 };
+// TODO (SMA-1206): use seconds instead of milliseconds.
 use zksync_utils::time::millis_since_epoch;
 
 use crate::{
@@ -26,7 +27,7 @@ use crate::{
         extractors,
         io::{
             common::{l1_batch_params, load_pending_batch, poll_iters},
-            L1BatchParams, MiniblockSealerHandle, PendingBatchData, StateKeeperIO,
+            MiniblockSealerHandle, PendingBatchData, StateKeeperIO,
         },
         mempool_actor::l2_tx_filter,
         updates::UpdatesManager,
@@ -34,6 +35,8 @@ use crate::{
     },
 };
 
+use super::MiniblockParams;
+
 /// Mempool-based IO for the state keeper.
 /// Receives transactions from the database through the mempool filtering logic.
 /// Decides which batch parameters should be used for the new batch.
@@ -48,10 +51,15 @@ pub(crate) struct MempoolIO<G> {
     current_l1_batch_number: L1BatchNumber,
     fee_account: Address,
     fair_l2_gas_price: u64,
+    validation_computational_gas_limit: u32,
     delay_interval: Duration,
     // Used to keep track of gas prices to set accepted price per pubdata byte in blocks.
     l1_gas_price_provider: Arc<G>,
     l2_erc20_bridge_addr: Address,
+    chain_id: L2ChainId,
+
+    virtual_blocks_interval: u32,
+    virtual_blocks_per_miniblock: u32,
 }
 
 #[async_trait]
@@ -68,28 +76,40 @@ impl<G: L1GasPriceProvider + 'static + Send + Sync> StateKeeperIO for MempoolIO<
         let mut storage = self.pool.access_storage_tagged("state_keeper").await;
 
         let PendingBatchData {
-            params,
+            l1_batch_env,
+            system_env,
             pending_miniblocks,
-        } = load_pending_batch(&mut storage, self.current_l1_batch_number, self.fee_account)
-            .await?;
+        } = load_pending_batch(
+            &mut storage,
+            self.current_l1_batch_number,
+            self.fee_account,
+            self.validation_computational_gas_limit,
+            self.chain_id,
+        )
+        .await?;
         // Initialize the filter for the transactions that come after the pending batch.
         // We use values from the pending block to match the filter with one used before the restart.
-        let context = params.context_mode.inner_block_context().context;
-        let (base_fee, gas_per_pubdata) =
-            derive_base_fee_and_gas_per_pubdata(context.l1_gas_price, context.fair_l2_gas_price);
+        let (base_fee, gas_per_pubdata) = derive_base_fee_and_gas_per_pubdata(
+            l1_batch_env.l1_gas_price,
+            l1_batch_env.fair_l2_gas_price,
+        );
         self.filter = L2TxFilter {
-            l1_gas_price: context.l1_gas_price,
+            l1_gas_price: l1_batch_env.l1_gas_price,
             fee_per_gas: base_fee,
             gas_per_pubdata: gas_per_pubdata as u32,
         };
 
         Some(PendingBatchData {
-            params,
+            l1_batch_env,
+            system_env,
             pending_miniblocks,
         })
     }
 
-    async fn wait_for_new_batch_params(&mut self, max_wait: Duration) -> Option<L1BatchParams> {
+    async fn wait_for_new_batch_params(
+        &mut self,
+        max_wait: Duration,
+    ) -> Option<(SystemEnv, L1BatchEnv)> {
         let deadline = Instant::now() + max_wait;
 
         // Block until at least one transaction in the mempool can match the filter (or timeout happens).
@@ -105,7 +125,13 @@ impl<G: L1GasPriceProvider + 'static + Send + Sync> StateKeeperIO for MempoolIO<
             }
 
             let prev_l1_batch_hash = self.load_previous_l1_batch_hash().await;
-            let prev_miniblock_timestamp = self.load_previous_miniblock_timestamp().await;
+
+            let MiniblockHeader {
+                timestamp: prev_miniblock_timestamp,
+                hash: prev_miniblock_hash,
+                ..
+            } = self.load_previous_miniblock_header().await;
+
             // We cannot create two L1 batches or miniblocks with the same timestamp (forbidden by the bootloader).
             // Hence, we wait until the current timestamp is larger than the timestamp of the previous miniblock.
             // We can use `timeout_at` since `sleep_past` is cancel-safe; it only uses `sleep()` async calls.
@@ -115,7 +141,7 @@ impl<G: L1GasPriceProvider + 'static + Send + Sync> StateKeeperIO for MempoolIO<
             );
             let current_timestamp = current_timestamp.await.ok()?;
 
-            vlog::info!(
+            tracing::info!(
                 "(l1_gas_price, fair_l2_gas_price) for L1 batch #{} is ({}, {})",
                 self.current_l1_batch_number.0,
                 self.filter.l1_gas_price,
@@ -126,6 +152,7 @@ impl<G: L1GasPriceProvider + 'static + Send + Sync> StateKeeperIO for MempoolIO<
                 .protocol_versions_dal()
                 .base_system_contracts_by_timestamp(current_timestamp)
                 .await;
+
             return Some(l1_batch_params(
                 self.current_l1_batch_number,
                 self.fee_account,
@@ -133,25 +160,39 @@ impl<G: L1GasPriceProvider + 'static + Send + Sync> StateKeeperIO for MempoolIO<
                 prev_l1_batch_hash,
                 self.filter.l1_gas_price,
                 self.fair_l2_gas_price,
+                self.current_miniblock_number,
+                prev_miniblock_hash,
                 base_system_contracts,
+                self.validation_computational_gas_limit,
                 protocol_version,
+                self.get_virtual_blocks_count(true, self.current_miniblock_number.0),
+                self.chain_id,
             ));
         }
         None
     }
 
+    // Returns the pair of timestamp and the number of virtual blocks to be produced in this miniblock
     async fn wait_for_new_miniblock_params(
         &mut self,
         max_wait: Duration,
         prev_miniblock_timestamp: u64,
-    ) -> Option<u64> {
+    ) -> Option<MiniblockParams> {
         // We must provide different timestamps for each miniblock.
         // If miniblock sealing interval is greater than 1 second then `sleep_past` won't actually sleep.
-        let current_timestamp = tokio::time::timeout(
+        let timestamp = tokio::time::timeout(
             max_wait,
             sleep_past(prev_miniblock_timestamp, self.current_miniblock_number),
-        );
-        current_timestamp.await.ok()
+        )
+        .await
+        .ok()?;
+
+        let virtual_blocks = self.get_virtual_blocks_count(false, self.current_miniblock_number.0);
+
+        Some(MiniblockParams {
+            timestamp,
+            virtual_blocks,
+        })
     }
 
     async fn wait_for_next_tx(&mut self, max_wait: Duration) -> Option<Transaction> {
@@ -192,7 +233,7 @@ impl<G: L1GasPriceProvider + 'static + Send + Sync> StateKeeperIO for MempoolIO<
         // Mark tx as rejected in the storage.
         let mut storage = self.pool.access_storage_tagged("state_keeper").await;
         metrics::increment_counter!("server.state_keeper.rejected_transactions");
-        vlog::warn!(
+        tracing::warn!(
             "transaction {} is rejected with error {}",
             rejected.hash(),
             error
@@ -215,13 +256,14 @@ impl<G: L1GasPriceProvider + 'static + Send + Sync> StateKeeperIO for MempoolIO<
 
     async fn seal_l1_batch(
         &mut self,
-        block_result: VmBlockResult,
+        witness_block_state: Option<WitnessBlockState>,
         updates_manager: UpdatesManager,
-        block_context: DerivedBlockContext,
+        l1_batch_env: &L1BatchEnv,
+        finished_batch: FinishedL1Batch,
     ) {
         assert_eq!(
             updates_manager.batch_timestamp(),
-            block_context.context.block_timestamp,
+            l1_batch_env.timestamp,
             "Batch timestamps don't match, batch number {}",
             self.current_l1_batch_number()
         );
@@ -229,15 +271,38 @@ impl<G: L1GasPriceProvider + 'static + Send + Sync> StateKeeperIO for MempoolIO<
         // We cannot start sealing an L1 batch until we've sealed all miniblocks included in it.
         self.miniblock_sealer_handle.wait_for_all_commands().await;
 
+        if let Some(witness_witness_block_state) = witness_block_state {
+            let object_store = ObjectStoreFactory::from_env().create_store().await;
+            let mut upload_successful_metric = 1.0;
+            match object_store
+                .put(self.current_l1_batch_number(), &witness_witness_block_state)
+                .await
+            {
+                Ok(path) => {
+                    tracing::debug!("Successfully uploaded witness block start state to Object Store to path = '{path}'");
+                }
+                Err(e) => {
+                    upload_successful_metric = 0.0;
+                    tracing::error!(
+                        "Failed to upload witness block start state to Object Store: {e:?}"
+                    );
+                }
+            }
+            metrics::histogram!(
+                "mempool.witness_block_start_upload_success",
+                upload_successful_metric
+            );
+        }
+
         let pool = self.pool.clone();
         let mut storage = pool.access_storage_tagged("state_keeper").await;
+
         updates_manager
             .seal_l1_batch(
                 &mut storage,
                 self.current_miniblock_number,
-                self.current_l1_batch_number,
-                block_result,
-                block_context,
+                l1_batch_env,
+                finished_batch,
                 self.l2_erc20_bridge_addr,
             )
             .await;
@@ -274,7 +339,7 @@ async fn sleep_past(timestamp: u64, miniblock: MiniblockNumber) -> u64 {
     match timestamp.cmp(&current_timestamp) {
         cmp::Ordering::Less => return current_timestamp,
         cmp::Ordering::Equal => {
-            vlog::info!(
+            tracing::info!(
                 "Current timestamp {} for miniblock #{miniblock} is equal to previous miniblock timestamp; waiting until \
                  timestamp increases",
                 extractors::display_timestamp(current_timestamp)
@@ -284,7 +349,7 @@ async fn sleep_past(timestamp: u64, miniblock: MiniblockNumber) -> u64 {
             // This situation can be triggered if the system keeper is started on a pod with a different
             // system time, or if it is buggy. Thus, a one-time error could require no actions if L1 batches
             // are expected to be generated frequently.
-            vlog::error!(
+            tracing::error!(
                 "Previous miniblock timestamp {} is larger than the current timestamp {} for miniblock #{miniblock}",
                 extractors::display_timestamp(timestamp),
                 extractors::display_timestamp(current_timestamp)
@@ -313,6 +378,7 @@ async fn sleep_past(timestamp: u64, miniblock: MiniblockNumber) -> u64 {
 }
 
 impl<G: L1GasPriceProvider> MempoolIO<G> {
+    #[allow(clippy::too_many_arguments)]
     pub(in crate::state_keeper) async fn new(
         mempool: MempoolGuard,
         miniblock_sealer_handle: MiniblockSealerHandle,
@@ -321,10 +387,22 @@ impl<G: L1GasPriceProvider> MempoolIO<G> {
         config: &StateKeeperConfig,
         delay_interval: Duration,
         l2_erc20_bridge_addr: Address,
+        validation_computational_gas_limit: u32,
+        chain_id: L2ChainId,
     ) -> Self {
+        assert!(
+            config.virtual_blocks_interval > 0,
+            "Virtual blocks interval must be positive"
+        );
+        assert!(
+            config.virtual_blocks_per_miniblock > 0,
+            "Virtual blocks per miniblock must be positive"
+        );
+
         let mut storage = pool.access_storage_tagged("state_keeper").await;
         let last_sealed_l1_batch_header = storage.blocks_dal().get_newest_l1_batch_header().await;
         let last_miniblock_number = storage.blocks_dal().get_sealed_miniblock_number().await;
+
         drop(storage);
 
         Self {
@@ -337,14 +415,18 @@ impl<G: L1GasPriceProvider> MempoolIO<G> {
             current_miniblock_number: last_miniblock_number + 1,
             fee_account: config.fee_account_addr,
             fair_l2_gas_price: config.fair_l2_gas_price,
+            validation_computational_gas_limit,
             delay_interval,
             l1_gas_price_provider,
             l2_erc20_bridge_addr,
+            chain_id,
+            virtual_blocks_interval: config.virtual_blocks_interval,
+            virtual_blocks_per_miniblock: config.virtual_blocks_per_miniblock,
         }
     }
 
     async fn load_previous_l1_batch_hash(&self) -> U256 {
-        vlog::info!(
+        tracing::info!(
             "Getting previous L1 batch hash for L1 batch #{}",
             self.current_l1_batch_number
         );
@@ -359,28 +441,42 @@ impl<G: L1GasPriceProvider> MempoolIO<G> {
             "server.state_keeper.wait_for_prev_hash_time",
             stage_started_at.elapsed()
         );
-        vlog::info!(
+        tracing::info!(
             "Got previous L1 batch hash: {batch_hash:0>64x} for L1 batch #{}",
             self.current_l1_batch_number
         );
         batch_hash
     }
 
-    async fn load_previous_miniblock_timestamp(&self) -> u64 {
+    async fn load_previous_miniblock_header(&self) -> MiniblockHeader {
         let stage_started_at: Instant = Instant::now();
 
         let mut storage = self.pool.access_storage_tagged("state_keeper").await;
-        let miniblock_timestamp = storage
+        let miniblock_header = storage
             .blocks_dal()
-            .get_miniblock_timestamp(self.current_miniblock_number - 1)
+            .get_miniblock_header(self.current_miniblock_number - 1)
             .await
             .expect("Previous miniblock must be sealed and header saved to DB");
 
         metrics::histogram!(
-            "server.state_keeper.get_prev_miniblock_timestamp",
+            "server.state_keeper.load_previous_miniblock_header",
             stage_started_at.elapsed()
         );
-        miniblock_timestamp
+        miniblock_header
+    }
+
+    /// "virtual_blocks_per_miniblock" will be created either if the miniblock_number % virtual_blocks_interval == 0 or
+    /// the miniblock is the first one in the batch.
+    /// For instance:
+    /// 1) If we want to have virtual block speed the same as the batch speed, virtual_block_interval = 10^9 and virtual_blocks_per_miniblock = 1
+    /// 2) If we want to have roughly 1 virtual block per 2 miniblocks, we need to have virtual_block_interval = 2, and virtual_blocks_per_miniblock = 1
+    /// 3) If we want to have 4 virtual blocks per miniblock, we need to have virtual_block_interval = 1, and virtual_blocks_per_miniblock = 4.
+    fn get_virtual_blocks_count(&self, first_in_batch: bool, miniblock_number: u32) -> u32 {
+        if first_in_batch || miniblock_number % self.virtual_blocks_interval == 0 {
+            return self.virtual_blocks_per_miniblock;
+        }
+
+        0
     }
 }
 
diff --git a/core/bin/zksync_core/src/state_keeper/io/mod.rs b/core/bin/zksync_core/src/state_keeper/io/mod.rs
index 6cd6bdab6358..69bf61055afe 100644
--- a/core/bin/zksync_core/src/state_keeper/io/mod.rs
+++ b/core/bin/zksync_core/src/state_keeper/io/mod.rs
@@ -6,11 +6,11 @@ use std::{
     time::{Duration, Instant},
 };
 
-use vm::vm_with_bootloader::{BlockContextMode, DerivedBlockContext};
-use vm::zk_evm::block_properties::BlockProperties;
-use vm::VmBlockResult;
-use zksync_contracts::BaseSystemContracts;
+use vm::FinishedL1Batch;
+use vm::{L1BatchEnv, SystemEnv};
+
 use zksync_dal::ConnectionPool;
+use zksync_types::witness_block_state::WitnessBlockState;
 use zksync_types::{
     block::MiniblockReexecuteData, protocol_version::ProtocolUpgradeTx, L1BatchNumber,
     MiniblockNumber, ProtocolVersionId, Transaction,
@@ -27,17 +27,6 @@ use super::updates::{MiniblockSealCommand, UpdatesManager};
 #[cfg(test)]
 mod tests;
 
-/// System parameters for L1 batch.
-/// It includes system params such as Basic System Contracts and zkPorter configuration
-/// and l1batch-specific parameters like timestamp, number, etc.
-#[derive(Debug, Clone)]
-pub struct L1BatchParams {
-    pub context_mode: BlockContextMode,
-    pub properties: BlockProperties,
-    pub base_system_contracts: BaseSystemContracts,
-    pub protocol_version: ProtocolVersionId,
-}
-
 /// Contains information about the un-synced execution state:
 /// Batch data and transactions that were executed before and are marked as so in the DB,
 /// but aren't a part of a sealed batch.
@@ -50,11 +39,27 @@ pub struct L1BatchParams {
 pub struct PendingBatchData {
     /// Data used to initialize the pending batch. We have to make sure that all the parameters
     /// (e.g. timestamp) are the same, so transaction would have the same result after re-execution.
-    pub(crate) params: L1BatchParams,
+    pub(crate) l1_batch_env: L1BatchEnv,
+    pub(crate) system_env: SystemEnv,
     /// List of miniblocks and corresponding transactions that were executed within batch.
     pub(crate) pending_miniblocks: Vec<MiniblockReexecuteData>,
 }
 
+#[derive(Debug, Copy, Clone, Default)]
+pub struct MiniblockParams {
+    /// The timestamp of the miniblock
+    pub(crate) timestamp: u64,
+    /// The maximal number of virtual blocks that can be created within this miniblock.
+    /// During the migration from displaying users batch.number to L2 block (i.e. miniblock) number in Q3 2023
+    /// in order to make the process smoother for users, we temporarily display the virtual blocks for users.
+    ///
+    /// Virtual blocks start their number with batch number and will increase until they reach the miniblock number.
+    /// Note that it is the *maximal* number of virtual blocks that can be created within this miniblock since
+    /// once the virtual blocks' number reaches the miniblock number, they will never be allowed to exceed those, i.e.
+    /// any "excess" created blocks will be ignored.
+    pub(crate) virtual_blocks: u32,
+}
+
 /// `StateKeeperIO` provides the interactive layer for the state keeper:
 /// it's used to receive volatile parameters (such as batch parameters), and also it's used to perform
 /// mutable operations on the persistent state (e.g. persist executed batches).
@@ -69,14 +74,16 @@ pub trait StateKeeperIO: 'static + Send {
     async fn load_pending_batch(&mut self) -> Option<PendingBatchData>;
     /// Blocks for up to `max_wait` until the parameters for the next L1 batch are available.
     /// Returns the data required to initialize the VM for the next batch.
-    async fn wait_for_new_batch_params(&mut self, max_wait: Duration) -> Option<L1BatchParams>;
+    async fn wait_for_new_batch_params(
+        &mut self,
+        max_wait: Duration,
+    ) -> Option<(SystemEnv, L1BatchEnv)>;
     /// Blocks for up to `max_wait` until the parameters for the next miniblock are available.
-    /// Right now it's only a timestamp.
     async fn wait_for_new_miniblock_params(
         &mut self,
         max_wait: Duration,
         prev_miniblock_timestamp: u64,
-    ) -> Option<u64>;
+    ) -> Option<MiniblockParams>;
     /// Blocks for up to `max_wait` until the next transaction is available for execution.
     /// Returns `None` if no transaction became available until the timeout.
     async fn wait_for_next_tx(&mut self, max_wait: Duration) -> Option<Transaction>;
@@ -90,9 +97,10 @@ pub trait StateKeeperIO: 'static + Send {
     /// Marks the L1 batch as sealed.
     async fn seal_l1_batch(
         &mut self,
-        block_result: VmBlockResult,
+        witness_block_state: Option<WitnessBlockState>,
         updates_manager: UpdatesManager,
-        block_context: DerivedBlockContext,
+        l1_batch_env: &L1BatchEnv,
+        finished_batch: FinishedL1Batch,
     );
     /// Loads protocol version of the previous l1 batch.
     async fn load_previous_batch_version_id(&mut self) -> Option<ProtocolVersionId>;
@@ -136,7 +144,7 @@ impl MiniblockSealerHandle {
     /// enough of them are processed (i.e., there is backpressure).
     pub async fn submit(&mut self, command: MiniblockSealCommand) {
         let miniblock_number = command.miniblock_number;
-        vlog::debug!(
+        tracing::debug!(
             "Enqueuing sealing command for miniblock #{miniblock_number} with #{} txs (L1 batch #{})",
             command.miniblock.executed_transactions.len(),
             command.l1_batch_number
@@ -156,7 +164,7 @@ impl MiniblockSealerHandle {
 
         let elapsed = start.elapsed();
         let queue_capacity = self.commands_sender.capacity();
-        vlog::debug!(
+        tracing::debug!(
             "Enqueued sealing command for miniblock #{miniblock_number} (took {elapsed:?}; \
              available queue capacity: {queue_capacity})"
         );
@@ -178,7 +186,7 @@ impl MiniblockSealerHandle {
 
     /// Waits until all previously submitted commands are fully processed by the sealer.
     pub async fn wait_for_all_commands(&mut self) {
-        vlog::debug!(
+        tracing::debug!(
             "Requested waiting for miniblock seal queue to empty; current available capacity: {}",
             self.commands_sender.capacity()
         );
@@ -190,7 +198,7 @@ impl MiniblockSealerHandle {
         }
 
         let elapsed = start.elapsed();
-        vlog::debug!("Miniblock seal queue is emptied (took {elapsed:?})");
+        tracing::debug!("Miniblock seal queue is emptied (took {elapsed:?})");
 
         // Since this method called from outside is essentially a no-op if `self.is_sync`,
         // we don't report its metrics in this case.
@@ -245,16 +253,16 @@ impl MiniblockSealer {
 
     /// Seals miniblocks as they are received from the [`MiniblockSealerHandle`]. This should be run
     /// on a separate Tokio task.
-    pub async fn run(mut self) {
+    pub async fn run(mut self) -> anyhow::Result<()> {
         if self.is_sync {
-            vlog::info!("Starting synchronous miniblock sealer");
+            tracing::info!("Starting synchronous miniblock sealer");
         } else if let Some(sender) = self.commands_sender.upgrade() {
-            vlog::info!(
+            tracing::info!(
                 "Starting async miniblock sealer with queue capacity {}",
                 sender.max_capacity()
             );
         } else {
-            vlog::warn!("Miniblock sealer not started, since its handle is already dropped");
+            tracing::warn!("Miniblock sealer not started, since its handle is already dropped");
         }
 
         let mut miniblock_seal_delta: Option<Instant> = None;
@@ -271,16 +279,17 @@ impl MiniblockSealer {
             completable.completion_sender.send(()).ok();
             // ^ We don't care whether anyone listens to the processing progress
         }
+        Ok(())
     }
 
     async fn next_command(&mut self) -> Option<Completable<MiniblockSealCommand>> {
-        vlog::debug!("Polling miniblock seal queue for next command");
+        tracing::debug!("Polling miniblock seal queue for next command");
         let start = Instant::now();
         let command = self.commands_receiver.recv().await;
         let elapsed = start.elapsed();
 
         if let Some(completable) = &command {
-            vlog::debug!(
+            tracing::debug!(
                 "Received command to seal miniblock #{} (polling took {elapsed:?})",
                 completable.command.miniblock_number
             );
diff --git a/core/bin/zksync_core/src/state_keeper/io/seal_logic.rs b/core/bin/zksync_core/src/state_keeper/io/seal_logic.rs
index 8136581108fc..0c3933a0562b 100644
--- a/core/bin/zksync_core/src/state_keeper/io/seal_logic.rs
+++ b/core/bin/zksync_core/src/state_keeper/io/seal_logic.rs
@@ -8,34 +8,32 @@ use std::{
     time::{Duration, Instant},
 };
 
-use vm::{
-    vm_with_bootloader::{
-        get_bootloader_memory, BlockContextMode, DerivedBlockContext, TxExecutionMode,
-    },
-    VmBlockResult,
-};
+use vm::{FinishedL1Batch, L1BatchEnv};
+
 use zksync_config::constants::ACCOUNT_CODE_STORAGE_ADDRESS;
 use zksync_dal::StorageProcessor;
+
+use zksync_types::{
+    block::unpack_block_info, 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,
         TransactionExecutionResult,
     },
-    zk_evm::aux_structures::LogQuery,
     zkevm_test_harness::witness::sort_storage_access::sort_storage_access_queries,
-    AccountTreeId, Address, ExecuteTransactionCommon, L1BatchNumber, MiniblockNumber, StorageKey,
-    StorageLog, StorageLogQuery, StorageValue, Transaction, VmEvent, H256, U256,
+    AccountTreeId, Address, ExecuteTransactionCommon, L1BatchNumber, LogQuery, MiniblockNumber,
+    StorageKey, StorageLog, StorageLogQuery, StorageValue, Transaction, VmEvent, H256,
 };
-use zksync_utils::{miniblock_hash, time::millis_since_epoch, u256_to_h256};
+// TODO (SMA-1206): use seconds instead of milliseconds.
+use zksync_utils::{h256_to_u256, time::millis_since_epoch, u256_to_h256};
 
-use crate::state_keeper::{
-    extractors,
-    io::common::set_missing_initial_writes_indices,
-    updates::{L1BatchUpdates, MiniblockSealCommand, UpdatesManager},
-};
+use crate::state_keeper::extractors;
+use crate::state_keeper::updates::{MiniblockSealCommand, UpdatesManager};
 
 #[derive(Debug, Clone, Copy)]
 struct SealProgressMetricNames {
@@ -92,7 +90,9 @@ impl SealProgress {
         let elapsed = self.stage_start.elapsed();
         if elapsed > MIN_STAGE_DURATION_TO_REPORT {
             let target = self.metric_names.target;
-            vlog::debug!("{target} execution stage {stage} took {elapsed:?} with count {count:?}");
+            tracing::debug!(
+                "{target} execution stage {stage} took {elapsed:?} with count {count:?}"
+            );
         }
 
         let (l1_batch_labels, miniblock_labels);
@@ -128,32 +128,20 @@ impl UpdatesManager {
         mut self,
         storage: &mut StorageProcessor<'_>,
         current_miniblock_number: MiniblockNumber,
-        current_l1_batch_number: L1BatchNumber,
-        block_result: VmBlockResult,
-        block_context: DerivedBlockContext,
+        l1_batch_env: &L1BatchEnv,
+        finished_batch: FinishedL1Batch,
         l2_erc20_bridge_addr: Address,
     ) {
         let started_at = Instant::now();
         let mut progress = SealProgress::for_l1_batch();
         let mut transaction = storage.start_transaction().await;
 
-        // The vm execution was paused right after the last transaction was executed.
-        // There is some post-processing work that the VM needs to do before the block is fully processed.
-        let VmBlockResult {
-            full_result,
-            block_tip_result,
-        } = block_result;
-        assert!(
-            full_result.revert_reason.is_none(),
-            "VM must not revert when finalizing block. Revert reason: {:?}",
-            full_result.revert_reason
-        );
         progress.end_stage("vm_finalization", None);
 
-        self.extend_from_fictive_transaction(block_tip_result.logs);
+        self.extend_from_fictive_transaction(finished_batch.block_tip_execution_result);
         // Seal fictive miniblock with last events and storage logs.
         let miniblock_command = self.seal_miniblock_command(
-            current_l1_batch_number,
+            l1_batch_env.number,
             current_miniblock_number,
             l2_erc20_bridge_addr,
         );
@@ -161,7 +149,8 @@ impl UpdatesManager {
         progress.end_stage("fictive_miniblock", None);
 
         let (_, deduped_log_queries) = sort_storage_access_queries(
-            full_result
+            finished_batch
+                .final_execution_state
                 .storage_log_queries
                 .iter()
                 .map(|log| &log.log_query),
@@ -169,55 +158,57 @@ impl UpdatesManager {
         progress.end_stage("log_deduplication", Some(deduped_log_queries.len()));
 
         let (l1_tx_count, l2_tx_count) = l1_l2_tx_count(&self.l1_batch.executed_transactions);
-        let (writes_count, reads_count) =
-            storage_log_query_write_read_counts(&full_result.storage_log_queries);
+        let (writes_count, reads_count) = storage_log_query_write_read_counts(
+            &finished_batch.final_execution_state.storage_log_queries,
+        );
         let (dedup_writes_count, dedup_reads_count) =
             log_query_write_read_counts(deduped_log_queries.iter());
-        vlog::info!(
+
+        tracing::info!(
             "Sealing L1 batch {current_l1_batch_number} with {total_tx_count} \
              ({l2_tx_count} L2 + {l1_tx_count} L1) txs, {l2_to_l1_log_count} l2_l1_logs, \
              {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 = full_result.l2_to_l1_logs.len(),
-            event_count = full_result.events.len()
+            l2_to_l1_log_count = finished_batch.final_execution_state.l2_to_l1_logs.len(),
+            event_count = finished_batch.final_execution_state.events.len(),
+            current_l1_batch_number = l1_batch_env.number
         );
 
-        let (prev_hash, prev_timestamp) =
-            extractors::wait_for_prev_l1_batch_params(&mut transaction, current_l1_batch_number)
-                .await;
-        let timestamp = block_context.context.block_timestamp;
+        let (_prev_hash, prev_timestamp) =
+            extractors::wait_for_prev_l1_batch_params(&mut transaction, l1_batch_env.number).await;
         assert!(
-            prev_timestamp < timestamp,
+            prev_timestamp < l1_batch_env.timestamp,
             "Cannot seal L1 batch #{}: Timestamp of previous L1 batch ({}) >= provisional L1 batch timestamp ({}), \
              meaning that L1 batch will be rejected by the bootloader",
-            current_l1_batch_number,
+            l1_batch_env.number,
             extractors::display_timestamp(prev_timestamp),
-            extractors::display_timestamp(timestamp)
+            extractors::display_timestamp(l1_batch_env.timestamp)
         );
 
         let l1_batch = L1BatchHeader {
-            number: current_l1_batch_number,
+            number: l1_batch_env.number,
             is_finished: true,
-            timestamp,
-            fee_account_address: block_context.context.operator_address,
+            timestamp: l1_batch_env.timestamp,
+            fee_account_address: l1_batch_env.fee_account,
             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: full_result.l2_to_l1_logs,
-            l2_to_l1_messages: extract_long_l2_to_l1_messages(&full_result.events),
+            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,
+            ),
             bloom: Default::default(),
-            used_contract_hashes: full_result.used_contract_hashes,
-            base_fee_per_gas: block_context.base_fee,
+            used_contract_hashes: finished_batch.final_execution_state.used_contract_hashes,
+            base_fee_per_gas: l1_batch_env.base_fee(),
             l1_gas_price: self.l1_gas_price(),
             l2_fair_gas_price: self.fair_l2_gas_price(),
             base_system_contracts_hashes: self.base_system_contract_hashes(),
             protocol_version: Some(self.protocol_version()),
         };
 
-        let block_context_properties = BlockContextMode::NewBlock(block_context, prev_hash);
         let initial_bootloader_contents =
-            Self::initial_bootloader_memory(&self.l1_batch, block_context_properties);
+            finished_batch.final_bootloader_memory.unwrap_or_default();
 
         transaction
             .blocks_dal()
@@ -231,14 +222,14 @@ impl UpdatesManager {
 
         transaction
             .blocks_dal()
-            .mark_miniblocks_as_executed_in_l1_batch(current_l1_batch_number)
+            .mark_miniblocks_as_executed_in_l1_batch(l1_batch_env.number)
             .await;
         progress.end_stage("set_l1_batch_number_for_miniblocks", None);
 
         transaction
             .transactions_dal()
             .mark_txs_as_executed_in_l1_batch(
-                current_l1_batch_number,
+                l1_batch_env.number,
                 &self.l1_batch.executed_transactions,
             )
             .await;
@@ -249,7 +240,7 @@ impl UpdatesManager {
             .partition(|log_query| log_query.rw_flag);
         transaction
             .storage_logs_dedup_dal()
-            .insert_protective_reads(current_l1_batch_number, &protective_reads)
+            .insert_protective_reads(l1_batch_env.number, &protective_reads)
             .await;
         progress.end_stage("insert_protective_reads", Some(protective_reads.len()));
 
@@ -276,13 +267,9 @@ impl UpdatesManager {
             })
             .collect();
 
-        // One-time migration completion for initial writes' indices.
-        set_missing_initial_writes_indices(&mut transaction).await;
-        progress.end_stage("set_missing_initial_writes_indices", None);
-
         transaction
             .storage_logs_dedup_dal()
-            .insert_initial_writes(current_l1_batch_number, &written_storage_keys)
+            .insert_initial_writes(l1_batch_env.number, &written_storage_keys)
             .await;
         progress.end_stage("insert_initial_writes", Some(deduplicated_writes.len()));
 
@@ -299,43 +286,12 @@ impl UpdatesManager {
 
         self.report_l1_batch_metrics(
             started_at,
-            current_l1_batch_number,
-            timestamp,
+            l1_batch_env.number,
+            l1_batch_env.timestamp,
             &writes_metrics,
         );
     }
 
-    fn initial_bootloader_memory(
-        updates_accumulator: &L1BatchUpdates,
-        block_context: BlockContextMode,
-    ) -> Vec<(usize, U256)> {
-        let transactions_data = updates_accumulator
-            .executed_transactions
-            .iter()
-            .map(|res| res.transaction.clone().into())
-            .collect();
-
-        let refunds = updates_accumulator
-            .executed_transactions
-            .iter()
-            .map(|res| res.operator_suggested_refund)
-            .collect();
-
-        let compressed_bytecodes = updates_accumulator
-            .executed_transactions
-            .iter()
-            .map(|res| res.compressed_bytecodes.clone())
-            .collect();
-
-        get_bootloader_memory(
-            transactions_data,
-            refunds,
-            compressed_bytecodes,
-            TxExecutionMode::VerifyExecute,
-            block_context,
-        )
-    }
-
     fn report_l1_batch_metrics(
         &self,
         started_at: Instant,
@@ -368,7 +324,7 @@ impl UpdatesManager {
             "server.state_keeper.l1_batch.sealed_time",
             started_at.elapsed(),
         );
-        vlog::debug!(
+        tracing::debug!(
             "Sealed L1 batch {current_l1_batch_number} in {:?}",
             started_at.elapsed()
         );
@@ -400,7 +356,7 @@ impl MiniblockSealCommand {
         let (l1_tx_count, l2_tx_count) = l1_l2_tx_count(&self.miniblock.executed_transactions);
         let (writes_count, reads_count) =
             storage_log_query_write_read_counts(&self.miniblock.storage_logs);
-        vlog::info!(
+        tracing::info!(
             "Sealing miniblock {miniblock_number} (L1 batch {l1_batch_number}) \
              with {total_tx_count} ({l2_tx_count} L2 + {l1_tx_count} L1) txs, {event_count} events, \
              {reads_count} reads, {writes_count} writes",
@@ -412,14 +368,15 @@ impl MiniblockSealCommand {
         let miniblock_header = MiniblockHeader {
             number: miniblock_number,
             timestamp: self.miniblock.timestamp,
-            hash: miniblock_hash(miniblock_number),
+            hash: self.miniblock.get_miniblock_hash(),
             l1_tx_count: l1_tx_count as u16,
             l2_tx_count: l2_tx_count as u16,
             base_fee_per_gas: self.base_fee_per_gas,
             l1_gas_price: self.l1_gas_price,
             l2_fair_gas_price: self.fair_l2_gas_price,
             base_system_contracts_hashes: self.base_system_contracts_hashes,
-            protocol_version: Some(self.protocol_version),
+            protocol_version: self.protocol_version,
+            virtual_blocks: self.miniblock.virtual_blocks,
         };
 
         transaction
@@ -441,7 +398,7 @@ impl MiniblockSealCommand {
             Some(self.miniblock.executed_transactions.len()),
         );
 
-        let write_logs = self.extract_write_logs(is_fictive);
+        let write_logs = self.extract_deduplicated_write_logs(is_fictive);
         let write_log_count = write_logs.iter().map(|(_, logs)| logs.len()).sum();
 
         transaction
@@ -502,9 +459,20 @@ impl MiniblockSealCommand {
             .await;
         progress.end_stage("insert_l2_to_l1_logs", Some(l2_to_l1_log_count));
 
+        let current_l2_virtual_block_info = transaction
+            .storage_dal()
+            .get_by_key(&StorageKey::new(
+                AccountTreeId::new(SYSTEM_CONTEXT_ADDRESS),
+                CURRENT_VIRTUAL_BLOCK_INFO_POSITION,
+            ))
+            .await
+            .unwrap_or_default();
+        let (current_l2_virtual_block_number, _) =
+            unpack_block_info(h256_to_u256(current_l2_virtual_block_info));
+
         transaction.commit().await;
         progress.end_stage("commit_miniblock", None);
-        self.report_miniblock_metrics(started_at);
+        self.report_miniblock_metrics(started_at, current_l2_virtual_block_number);
     }
 
     /// Performs several sanity checks to make sure that the miniblock is valid.
@@ -529,25 +497,39 @@ impl MiniblockSealCommand {
         }
     }
 
-    fn extract_write_logs(&self, is_fictive: bool) -> Vec<(H256, Vec<StorageLog>)> {
-        let logs = self.miniblock.storage_logs.iter();
-        let grouped_logs = logs.group_by(|log| log.log_query.tx_number_in_block);
+    fn extract_deduplicated_write_logs(&self, is_fictive: bool) -> Vec<(H256, Vec<StorageLog>)> {
+        let mut storage_writes_deduplicator = StorageWritesDeduplicator::new();
+        storage_writes_deduplicator.apply(
+            self.miniblock
+                .storage_logs
+                .iter()
+                .filter(|log| log.log_query.rw_flag),
+        );
+        let deduplicated_logs = storage_writes_deduplicator.into_modified_key_values();
 
-        let grouped_logs = grouped_logs.into_iter().map(|(tx_index, logs)| {
-            let tx_hash = if is_fictive {
-                assert_eq!(tx_index as usize, self.first_tx_index);
-                H256::zero()
-            } else {
-                self.transaction(tx_index as usize).hash()
-            };
-            let logs = logs.filter_map(|log| {
-                log.log_query
-                    .rw_flag
-                    .then(|| StorageLog::from_log_query(log))
-            });
-            (tx_hash, logs.collect())
-        });
-        grouped_logs.collect()
+        deduplicated_logs
+            .into_iter()
+            .map(|(key, ModifiedSlot { value, tx_index })| (tx_index, (key, value)))
+            .sorted_by_key(|(tx_index, _)| *tx_index)
+            .group_by(|(tx_index, _)| *tx_index)
+            .into_iter()
+            .map(|(tx_index, logs)| {
+                let tx_hash = if is_fictive {
+                    assert_eq!(tx_index as usize, self.first_tx_index);
+                    H256::zero()
+                } else {
+                    self.transaction(tx_index as usize).hash()
+                };
+                (
+                    tx_hash,
+                    logs.into_iter()
+                        .map(|(_, (key, value))| {
+                            StorageLog::new_write_log(key, u256_to_h256(value))
+                        })
+                        .collect(),
+                )
+            })
+            .collect()
     }
 
     fn transaction(&self, index: usize) -> &Transaction {
@@ -562,6 +544,7 @@ impl MiniblockSealCommand {
         for (key, (_, value)) in unique_updates {
             if *key.account().address() == ACCOUNT_CODE_STORAGE_ADDRESS {
                 let bytecode_hash = *value;
+                // TODO(SMA-1554): Support contracts deletion.
                 //  For now, we expected that if the `bytecode_hash` is zero, the contract was not deployed
                 //  in the first place, so we don't do anything
                 if bytecode_hash != H256::zero() {
@@ -611,7 +594,7 @@ impl MiniblockSealCommand {
         })
     }
 
-    fn report_miniblock_metrics(&self, started_at: Instant) {
+    fn report_miniblock_metrics(&self, started_at: Instant, latest_virtual_block_number: u64) {
         let miniblock_number = self.miniblock_number;
 
         metrics::histogram!(
@@ -634,8 +617,13 @@ impl MiniblockSealCommand {
             miniblock_number.0 as f64,
             "stage" => "sealed"
         );
+        metrics::gauge!(
+            "server.miniblock.virtual_block_number",
+            latest_virtual_block_number as f64,
+            "stage" => "sealed"
+        );
 
-        vlog::debug!(
+        tracing::debug!(
             "Sealed miniblock {miniblock_number} in {:?}",
             started_at.elapsed()
         );
diff --git a/core/bin/zksync_core/src/state_keeper/io/tests/mod.rs b/core/bin/zksync_core/src/state_keeper/io/tests/mod.rs
index 1968f6b54b7a..8f8f894ae93a 100644
--- a/core/bin/zksync_core/src/state_keeper/io/tests/mod.rs
+++ b/core/bin/zksync_core/src/state_keeper/io/tests/mod.rs
@@ -3,22 +3,25 @@ use futures::FutureExt;
 use std::time::Duration;
 
 use db_test_macro::db_test;
-use vm::vm_with_bootloader::{derive_base_fee_and_gas_per_pubdata, BlockContextMode};
+
+use vm::utils::fee::derive_base_fee_and_gas_per_pubdata;
 use zksync_contracts::BaseSystemContractsHashes;
 use zksync_dal::ConnectionPool;
 use zksync_mempool::L2TxFilter;
 use zksync_types::{
     block::BlockGasCount, tx::ExecutionMetrics, AccountTreeId, Address, L1BatchNumber,
-    MiniblockNumber, ProtocolVersionId, StorageKey, StorageLog, VmEvent, H256, U256,
+    MiniblockNumber, ProtocolVersionId, StorageKey, VmEvent, H256, U256,
 };
 use zksync_utils::time::seconds_since_epoch;
 
+use crate::state_keeper::tests::{create_l1_batch_metadata, default_l1_batch_env};
+
 use crate::state_keeper::{
-    io::{common::set_missing_initial_writes_indices, MiniblockSealer, StateKeeperIO},
+    io::{MiniblockParams, MiniblockSealer, StateKeeperIO},
     mempool_actor::l2_tx_filter,
     tests::{
-        create_execution_result, create_l1_batch_metadata, create_transaction,
-        create_updates_manager, default_block_context, default_vm_block_result, Query,
+        create_execution_result, create_transaction, create_updates_manager,
+        default_vm_block_result, Query,
     },
     updates::{MiniblockSealCommand, MiniblockUpdates, UpdatesManager},
 };
@@ -151,7 +154,7 @@ async fn test_timestamps_are_distinct(
         .wait_for_new_batch_params(Duration::from_secs(10))
         .await
         .expect("No batch params in the test mempool");
-    assert!(batch_params.context_mode.timestamp() > prev_miniblock_timestamp);
+    assert!(batch_params.1.timestamp > prev_miniblock_timestamp);
 }
 
 #[db_test]
@@ -182,7 +185,8 @@ async fn l1_batch_timestamp_respects_prev_miniblock_with_clock_skew(
 
 #[db_test]
 async fn processing_storage_logs_when_sealing_miniblock(connection_pool: ConnectionPool) {
-    let mut miniblock = MiniblockUpdates::new(0);
+    let mut miniblock =
+        MiniblockUpdates::new(0, 1, H256::zero(), 1, Some(ProtocolVersionId::latest()));
 
     let tx = create_transaction(10, 100);
     let storage_logs = [
@@ -204,6 +208,7 @@ async fn processing_storage_logs_when_sealing_miniblock(connection_pool: Connect
         BlockGasCount::default(),
         ExecutionMetrics::default(),
         vec![],
+        vec![],
     );
 
     let tx = create_transaction(10, 100);
@@ -221,6 +226,7 @@ async fn processing_storage_logs_when_sealing_miniblock(connection_pool: Connect
         BlockGasCount::default(),
         ExecutionMetrics::default(),
         vec![],
+        vec![],
     );
 
     let l1_batch_number = L1BatchNumber(2);
@@ -233,12 +239,12 @@ async fn processing_storage_logs_when_sealing_miniblock(connection_pool: Connect
         fair_l2_gas_price: 100,
         base_fee_per_gas: 10,
         base_system_contracts_hashes: BaseSystemContractsHashes::default(),
-        protocol_version: ProtocolVersionId::default(),
+        protocol_version: Some(ProtocolVersionId::latest()),
         l2_erc20_bridge_addr: Address::default(),
     };
     let mut conn = connection_pool.access_storage_tagged("state_keeper").await;
     conn.protocol_versions_dal()
-        .save_protocol_version(Default::default())
+        .save_protocol_version_with_tx(Default::default())
         .await;
     seal_command.seal(&mut conn).await;
 
@@ -270,7 +276,8 @@ async fn processing_storage_logs_when_sealing_miniblock(connection_pool: Connect
 #[db_test]
 async fn processing_events_when_sealing_miniblock(pool: ConnectionPool) {
     let l1_batch_number = L1BatchNumber(2);
-    let mut miniblock = MiniblockUpdates::new(0);
+    let mut miniblock =
+        MiniblockUpdates::new(0, 1, H256::zero(), 1, Some(ProtocolVersionId::latest()));
 
     let events = (0_u8..10).map(|i| VmEvent {
         location: (l1_batch_number, u32::from(i / 4)),
@@ -282,13 +289,14 @@ async fn processing_events_when_sealing_miniblock(pool: ConnectionPool) {
     for (i, events_chunk) in events.chunks(4).enumerate() {
         let tx = create_transaction(10, 100);
         let mut execution_result = create_execution_result(i as u16, []);
-        execution_result.result.logs.events = events_chunk.to_vec();
+        execution_result.logs.events = events_chunk.to_vec();
         miniblock.extend_from_executed_transaction(
             tx,
             execution_result,
             BlockGasCount::default(),
             ExecutionMetrics::default(),
             vec![],
+            vec![],
         );
     }
 
@@ -302,12 +310,12 @@ async fn processing_events_when_sealing_miniblock(pool: ConnectionPool) {
         fair_l2_gas_price: 100,
         base_fee_per_gas: 10,
         base_system_contracts_hashes: BaseSystemContractsHashes::default(),
-        protocol_version: ProtocolVersionId::default(),
+        protocol_version: Some(ProtocolVersionId::latest()),
         l2_erc20_bridge_addr: Address::default(),
     };
     let mut conn = pool.access_storage_tagged("state_keeper").await;
     conn.protocol_versions_dal()
-        .save_protocol_version(Default::default())
+        .save_protocol_version_with_tx(Default::default())
         .await;
     seal_command.seal(&mut conn).await;
 
@@ -344,13 +352,11 @@ async fn test_miniblock_and_l1_batch_processing(
         .create_test_mempool_io(pool.clone(), miniblock_sealer_capacity)
         .await;
 
-    let mut block_context = default_block_context();
-    block_context.context.block_timestamp = 100; // change timestamp to pass monotonicity check
-    let block_context_mode = BlockContextMode::NewBlock(block_context, 0.into());
+    let l1_batch_env = default_l1_batch_env(0, 1, Address::random());
     let mut updates = UpdatesManager::new(
-        &block_context_mode,
+        l1_batch_env,
         BaseSystemContractsHashes::default(),
-        ProtocolVersionId::default(),
+        ProtocolVersionId::latest(),
     );
 
     let tx = create_transaction(10, 100);
@@ -360,13 +366,19 @@ async fn test_miniblock_and_l1_batch_processing(
         vec![],
         BlockGasCount::default(),
         ExecutionMetrics::default(),
+        vec![],
     );
     mempool.seal_miniblock(&updates).await;
-    updates.push_miniblock(1);
+    updates.push_miniblock(MiniblockParams {
+        timestamp: 1,
+        virtual_blocks: 1,
+    });
 
-    let block_result = default_vm_block_result();
+    let finished_batch = default_vm_block_result();
+
+    let l1_batch_env = default_l1_batch_env(1, 1, Address::random());
     mempool
-        .seal_l1_batch(block_result, updates, block_context)
+        .seal_l1_batch(None, updates, &l1_batch_env, finished_batch)
         .await;
 
     // Check that miniblock #1 and L1 batch #1 are persisted.
@@ -471,123 +483,6 @@ async fn miniblock_sealer_handle_parallel_processing(pool: ConnectionPool) {
     sealer_handle.wait_for_all_commands().await;
 }
 
-#[db_test]
-async fn initial_writes_index_migration(pool: ConnectionPool) {
-    let tester = Tester::new();
-
-    // Genesis is needed for proper mempool initialization.
-    tester.genesis(&pool).await;
-    let (last_index, _) = {
-        let mut storage = pool.access_storage().await;
-        storage
-            .storage_logs_dedup_dal()
-            .max_set_enumeration_index()
-            .await
-            .unwrap()
-    };
-
-    tester.insert_miniblock(&pool, 1, 100, 100, 100).await;
-    tester.insert_sealed_batch(&pool, 1).await;
-    let keys1: Vec<_> = vec![2u64, 3, 5, 7]
-        .into_iter()
-        .map(|k| {
-            StorageKey::new(
-                AccountTreeId::new(Address::from_low_u64_be(1)),
-                H256::from_low_u64_be(k),
-            )
-        })
-        .collect();
-    let storage_logs: Vec<_> = keys1
-        .iter()
-        .map(|k| StorageLog::new_write_log(*k, H256::random()))
-        .collect();
-    {
-        let mut storage = pool.access_storage().await;
-        storage
-            .storage_logs_dal()
-            .insert_storage_logs(1u32.into(), &[(H256::zero(), storage_logs)])
-            .await;
-        storage
-            .storage_logs_dedup_dal()
-            .insert_initial_writes(1u32.into(), &keys1)
-            .await;
-    }
-
-    tester.insert_miniblock(&pool, 2, 100, 100, 100).await;
-    tester.insert_sealed_batch(&pool, 2).await;
-    let keys2: Vec<_> = vec![1u64, 4, 6, 8]
-        .into_iter()
-        .map(|k| {
-            StorageKey::new(
-                AccountTreeId::new(Address::from_low_u64_be(1)),
-                H256::from_low_u64_be(k),
-            )
-        })
-        .collect();
-    let storage_logs: Vec<_> = keys2
-        .iter()
-        .map(|k| StorageLog::new_write_log(*k, H256::random()))
-        .collect();
-    {
-        let mut storage = pool.access_storage().await;
-        storage
-            .storage_logs_dal()
-            .insert_storage_logs(2u32.into(), &[(H256::zero(), storage_logs)])
-            .await;
-        storage
-            .storage_logs_dedup_dal()
-            .insert_initial_writes(2u32.into(), &keys2)
-            .await;
-    }
-
-    let expected: Vec<_> = keys1
-        .iter()
-        .chain(&keys2)
-        .enumerate()
-        .map(|(i, k)| (k.hashed_key(), i as u64 + last_index + 1))
-        .collect();
-    let actual = {
-        let mut storage = pool.access_storage().await;
-        let iw1 = storage
-            .storage_logs_dedup_dal()
-            .initial_writes_for_batch(1u32.into())
-            .await;
-        let iw2 = storage
-            .storage_logs_dedup_dal()
-            .initial_writes_for_batch(2u32.into())
-            .await;
-
-        iw1.into_iter()
-            .chain(iw2)
-            .map(|(key, index)| (key, index.unwrap()))
-            .collect::<Vec<_>>()
-    };
-    assert_eq!(expected, actual);
-
-    {
-        let mut storage = pool.access_storage().await;
-        storage.storage_logs_dedup_dal().reset_indices().await;
-        set_missing_initial_writes_indices(&mut storage).await;
-    };
-    let actual = {
-        let mut storage = pool.access_storage().await;
-        let iw1 = storage
-            .storage_logs_dedup_dal()
-            .initial_writes_for_batch(1u32.into())
-            .await;
-        let iw2 = storage
-            .storage_logs_dedup_dal()
-            .initial_writes_for_batch(2u32.into())
-            .await;
-
-        iw1.into_iter()
-            .chain(iw2)
-            .map(|(key, index)| (key, index.unwrap()))
-            .collect::<Vec<_>>()
-    };
-    assert_eq!(expected, actual);
-}
-
 /// Ensure that subsequent miniblocks that belong to the same L1 batch have different timestamps
 #[db_test]
 async fn different_timestamp_for_miniblocks_in_same_batch(connection_pool: ConnectionPool) {
@@ -597,7 +492,10 @@ async fn different_timestamp_for_miniblocks_in_same_batch(connection_pool: Conne
     tester.genesis(&connection_pool).await;
     let (mut mempool, _) = tester.create_test_mempool_io(connection_pool, 1).await;
     let current_timestamp = seconds_since_epoch();
-    let next_timestamp = mempool
+    let MiniblockParams {
+        timestamp: next_timestamp,
+        ..
+    } = mempool
         .wait_for_new_miniblock_params(Duration::from_secs(10), current_timestamp)
         .await
         .unwrap();
diff --git a/core/bin/zksync_core/src/state_keeper/io/tests/tester.rs b/core/bin/zksync_core/src/state_keeper/io/tests/tester.rs
index 80211e012694..d495bb90dc8a 100644
--- a/core/bin/zksync_core/src/state_keeper/io/tests/tester.rs
+++ b/core/bin/zksync_core/src/state_keeper/io/tests/tester.rs
@@ -1,6 +1,7 @@
 //! Testing harness for the IO.
 
 use std::{sync::Arc, time::Duration};
+use vm::constants::BLOCK_GAS_LIMIT;
 
 use zksync_config::configs::chain::StateKeeperConfig;
 use zksync_config::GasAdjusterConfig;
@@ -76,6 +77,8 @@ impl Tester {
             fair_l2_gas_price: self.fair_l2_gas_price(),
             bootloader_hash: base_contract_hashes.bootloader,
             default_aa_hash: base_contract_hashes.default_aa,
+            virtual_blocks_interval: 1,
+            virtual_blocks_per_miniblock: 1,
             ..StateKeeperConfig::default()
         };
         let l2_erc20_bridge_addr = Address::repeat_byte(0x5a); // Isn't relevant.
@@ -87,6 +90,8 @@ impl Tester {
             &config,
             Duration::from_secs(1),
             l2_erc20_bridge_addr,
+            BLOCK_GAS_LIMIT,
+            L2ChainId(270),
         )
         .await;
 
@@ -104,6 +109,7 @@ impl Tester {
                 &mut storage,
                 Address::repeat_byte(0x01),
                 L2ChainId(270),
+                ProtocolVersionId::latest(),
                 &self.base_system_contracts,
                 &get_system_smart_contracts(),
                 L1VerifierConfig::default(),
@@ -135,6 +141,7 @@ impl Tester {
                 l2_fair_gas_price,
                 base_system_contracts_hashes: self.base_system_contracts.hashes(),
                 protocol_version: Some(ProtocolVersionId::latest()),
+                virtual_blocks: 0,
             })
             .await;
     }
diff --git a/core/bin/zksync_core/src/state_keeper/keeper.rs b/core/bin/zksync_core/src/state_keeper/keeper.rs
index b96a841508c2..32fbe6f94f03 100644
--- a/core/bin/zksync_core/src/state_keeper/keeper.rs
+++ b/core/bin/zksync_core/src/state_keeper/keeper.rs
@@ -2,18 +2,21 @@ use tokio::sync::watch;
 
 use std::time::{Duration, Instant};
 
-use vm::TxRevertReason;
 use zksync_types::{
     block::MiniblockReexecuteData, l2::TransactionType, protocol_version::ProtocolUpgradeTx,
-    storage_writes_deduplicator::StorageWritesDeduplicator,
-    tx::tx_execution_info::TxExecutionStatus, Transaction,
+    storage_writes_deduplicator::StorageWritesDeduplicator, Transaction,
 };
 
+use vm::{Halt, L1BatchEnv, SystemEnv};
+
 use crate::gas_tracker::gas_count_from_writes;
+
+use crate::state_keeper::io::MiniblockParams;
+
 use crate::state_keeper::{
     batch_executor::{BatchExecutorHandle, L1BatchExecutorBuilder, TxExecutionResult},
     extractors,
-    io::{L1BatchParams, PendingBatchData, StateKeeperIO},
+    io::{PendingBatchData, StateKeeperIO},
     seal_criteria::{SealData, SealManager, SealResolution},
     types::ExecutionMetricsForCriteria,
     updates::UpdatesManager,
@@ -59,21 +62,22 @@ impl ZkSyncStateKeeper {
         }
     }
 
-    pub async fn run(mut self) {
+    pub async fn run(mut self) -> anyhow::Result<()> {
         match self.run_inner().await {
             Ok(()) => {
                 // Normally, state keeper can only exit its routine if the task was cancelled.
-                panic!("State keeper exited the main loop")
+                anyhow::bail!("State keeper exited the main loop");
             }
             Err(Canceled) => {
-                vlog::info!("Stop signal received, state keeper is shutting down");
+                tracing::info!("Stop signal received, state keeper is shutting down");
+                Ok(())
             }
         }
     }
 
     /// Fallible version of `run` routine that allows to easily exit upon cancellation.
     async fn run_inner(&mut self) -> Result<(), Canceled> {
-        vlog::info!(
+        tracing::info!(
             "Starting state keeper. Next l1 batch to seal: {}, Next miniblock to seal: {}",
             self.io.current_l1_batch_number(),
             self.io.current_miniblock_number()
@@ -81,11 +85,12 @@ impl ZkSyncStateKeeper {
 
         // Re-execute pending batch if it exists. Otherwise, initialize a new batch.
         let PendingBatchData {
-            params,
+            mut l1_batch_env,
+            mut system_env,
             pending_miniblocks,
         } = match self.io.load_pending_batch().await {
             Some(params) => {
-                vlog::info!(
+                tracing::info!(
                     "There exists a pending batch consisting of {} miniblocks, the first one is {}",
                     params.pending_miniblocks.len(),
                     params
@@ -97,43 +102,33 @@ impl ZkSyncStateKeeper {
                 params
             }
             None => {
-                vlog::info!("There is no open pending batch, starting a new empty batch");
+                tracing::info!("There is no open pending batch, starting a new empty batch");
+                let (system_env, l1_batch_env) = self.wait_for_new_batch_params().await?;
                 PendingBatchData {
-                    params: self.wait_for_new_batch_params().await?,
+                    l1_batch_env,
                     pending_miniblocks: Vec::new(),
+                    system_env,
                 }
             }
         };
 
-        let mut l1_batch_params = params;
+        let protocol_version = system_env.version;
         let mut updates_manager = UpdatesManager::new(
-            &l1_batch_params.context_mode,
-            l1_batch_params.base_system_contracts.hashes(),
-            l1_batch_params.protocol_version,
+            l1_batch_env.clone(),
+            system_env.base_system_smart_contracts.hashes(),
+            protocol_version,
         );
 
-        let previous_batch_protocol_version = self.io.load_previous_batch_version_id().await;
-        let version_changed = match previous_batch_protocol_version {
-            Some(previous_batch_protocol_version) => {
-                l1_batch_params.protocol_version != previous_batch_protocol_version
-            }
-            // None is only the case for old blocks. Match will be removed when migration will be done.
-            None => false,
-        };
+        let previous_batch_protocol_version =
+            self.io.load_previous_batch_version_id().await.unwrap();
+        let version_changed = protocol_version != previous_batch_protocol_version;
 
         let mut protocol_upgrade_tx = if pending_miniblocks.is_empty() && version_changed {
-            self.io
-                .load_upgrade_tx(l1_batch_params.protocol_version)
-                .await
+            self.io.load_upgrade_tx(protocol_version).await
         } else if !pending_miniblocks.is_empty() && version_changed {
             // Sanity check: if `txs_to_reexecute` is not empty and upgrade tx is present for this block
             // then it must be the first one in `txs_to_reexecute`.
-            if self
-                .io
-                .load_upgrade_tx(l1_batch_params.protocol_version)
-                .await
-                .is_some()
-            {
+            if self.io.load_upgrade_tx(protocol_version).await.is_some() {
                 let first_tx_to_reexecute = &pending_miniblocks[0].txs[0];
                 assert_eq!(
                     first_tx_to_reexecute.tx_format(),
@@ -148,8 +143,9 @@ impl ZkSyncStateKeeper {
 
         let mut batch_executor = self
             .batch_executor_base
-            .init_batch(l1_batch_params.clone())
+            .init_batch(l1_batch_env.clone(), system_env.clone())
             .await;
+
         self.restore_state(&batch_executor, &mut updates_manager, pending_miniblocks)
             .await?;
 
@@ -166,18 +162,24 @@ impl ZkSyncStateKeeper {
                 self.io.seal_miniblock(&updates_manager).await;
                 // We've sealed the miniblock that we had, but we still need to setup the timestamp
                 // for the fictive miniblock.
-                let fictive_miniblock_timestamp = self
+                let new_miniblock_params = self
                     .wait_for_new_miniblock_params(updates_manager.miniblock.timestamp)
                     .await?;
-                updates_manager.push_miniblock(fictive_miniblock_timestamp);
+                Self::start_next_miniblock(
+                    new_miniblock_params,
+                    &mut updates_manager,
+                    &batch_executor,
+                )
+                .await;
             }
-            let block_result = batch_executor.finish_batch().await;
+            let (finished_batch, witness_block_state) = batch_executor.finish_batch().await;
             let sealed_batch_protocol_version = updates_manager.protocol_version();
             self.io
                 .seal_l1_batch(
-                    block_result,
+                    witness_block_state,
                     updates_manager,
-                    l1_batch_params.context_mode.inner_block_context(),
+                    &l1_batch_env,
+                    finished_batch,
                 )
                 .await;
             if let Some(delta) = l1_batch_seal_delta {
@@ -186,23 +188,21 @@ impl ZkSyncStateKeeper {
             l1_batch_seal_delta = Some(Instant::now());
 
             // Start the new batch.
-            l1_batch_params = self.wait_for_new_batch_params().await?;
-
+            (system_env, l1_batch_env) = self.wait_for_new_batch_params().await?;
             updates_manager = UpdatesManager::new(
-                &l1_batch_params.context_mode,
-                l1_batch_params.base_system_contracts.hashes(),
-                l1_batch_params.protocol_version,
+                l1_batch_env.clone(),
+                system_env.base_system_smart_contracts.hashes(),
+                system_env.version,
             );
             batch_executor = self
                 .batch_executor_base
-                .init_batch(l1_batch_params.clone())
+                .init_batch(l1_batch_env.clone(), system_env.clone())
                 .await;
 
-            let version_changed = l1_batch_params.protocol_version != sealed_batch_protocol_version;
+            let version_changed = system_env.version != sealed_batch_protocol_version;
+
             protocol_upgrade_tx = if version_changed {
-                self.io
-                    .load_upgrade_tx(l1_batch_params.protocol_version)
-                    .await
+                self.io.load_upgrade_tx(system_env.version).await
             } else {
                 None
             };
@@ -216,7 +216,7 @@ impl ZkSyncStateKeeper {
         Ok(())
     }
 
-    async fn wait_for_new_batch_params(&mut self) -> Result<L1BatchParams, Canceled> {
+    async fn wait_for_new_batch_params(&mut self) -> Result<(SystemEnv, L1BatchEnv), Canceled> {
         let params = loop {
             if let Some(params) = self.io.wait_for_new_batch_params(POLL_WAIT_DURATION).await {
                 break params;
@@ -229,7 +229,7 @@ impl ZkSyncStateKeeper {
     async fn wait_for_new_miniblock_params(
         &mut self,
         prev_miniblock_timestamp: u64,
-    ) -> Result<u64, Canceled> {
+    ) -> Result<MiniblockParams, Canceled> {
         let params = loop {
             if let Some(params) = self
                 .io
@@ -243,6 +243,17 @@ impl ZkSyncStateKeeper {
         Ok(params)
     }
 
+    async fn start_next_miniblock(
+        params: MiniblockParams,
+        updates_manager: &mut UpdatesManager,
+        batch_executor: &BatchExecutorHandle,
+    ) {
+        updates_manager.push_miniblock(params);
+        batch_executor
+            .start_next_miniblock(updates_manager.miniblock.get_miniblock_env())
+            .await;
+    }
+
     /// Applies the "pending state" on the `UpdatesManager`.
     /// Pending state means transactions that were executed before the server restart. Before we continue processing the
     /// batch, we need to restore the state. We must ensure that every transaction is executed successfully.
@@ -261,20 +272,30 @@ impl ZkSyncStateKeeper {
         for (index, miniblock) in miniblocks_to_reexecute.into_iter().enumerate() {
             // Push any non-first miniblock to updates manager. The first one was pushed when `updates_manager` was initialized.
             if index > 0 {
-                updates_manager.push_miniblock(miniblock.timestamp);
+                Self::start_next_miniblock(
+                    MiniblockParams {
+                        timestamp: miniblock.timestamp,
+                        virtual_blocks: miniblock.virtual_blocks,
+                    },
+                    updates_manager,
+                    batch_executor,
+                )
+                .await;
             }
 
             let miniblock_number = miniblock.number;
-            vlog::info!(
+            tracing::info!(
                 "Starting to reexecute transactions from sealed miniblock {}",
                 miniblock_number
             );
             for tx in miniblock.txs {
                 let result = batch_executor.execute_tx(tx.clone()).await;
+
                 let TxExecutionResult::Success {
                     tx_result,
                     tx_metrics,
                     compressed_bytecodes,
+                    call_tracer_result,
                     ..
                 } = result
                 else {
@@ -290,19 +311,21 @@ impl ZkSyncStateKeeper {
                     execution_metrics: tx_execution_metrics,
                 } = tx_metrics;
 
-                let exec_result_status = tx_result.status;
-
                 let tx_hash = tx.hash();
-                let initiator_account = tx.initiator_account();
                 let is_l1 = tx.is_l1();
+                let exec_result_status = tx_result.result.clone();
+                let initiator_account = tx.initiator_account();
+
                 updates_manager.extend_from_executed_transaction(
                     tx,
                     *tx_result,
                     compressed_bytecodes,
                     tx_l1_gas_this_tx,
                     tx_execution_metrics,
+                    call_tracer_result,
                 );
-                vlog::debug!(
+
+                tracing::debug!(
                     "Finished re-executing tx {tx_hash} by {initiator_account} (is_l1: {is_l1}, \
                      #{idx_in_l1_batch} in L1 batch {l1_batch_number}, #{idx_in_miniblock} in miniblock {miniblock_number}); \
                      status: {exec_result_status:?}. L1 gas spent: {tx_l1_gas_this_tx:?}, total in L1 batch: {pending_l1_gas:?}, \
@@ -317,10 +340,10 @@ impl ZkSyncStateKeeper {
         }
 
         // We've processed all the miniblocks, and right now we're initializing the next *actual* miniblock.
-        let new_timestamp = self
+        let new_miniblock_params = self
             .wait_for_new_miniblock_params(updates_manager.miniblock.timestamp)
             .await?;
-        updates_manager.push_miniblock(new_timestamp);
+        Self::start_next_miniblock(new_miniblock_params, updates_manager, batch_executor).await;
 
         Ok(())
     }
@@ -342,7 +365,7 @@ impl ZkSyncStateKeeper {
                 .sealer
                 .should_seal_l1_batch_unconditionally(updates_manager)
             {
-                vlog::debug!(
+                tracing::debug!(
                     "L1 batch #{} should be sealed unconditionally as per sealing rules",
                     self.io.current_l1_batch_number()
                 );
@@ -350,23 +373,24 @@ impl ZkSyncStateKeeper {
             }
 
             if self.sealer.should_seal_miniblock(updates_manager) {
-                vlog::debug!(
+                tracing::debug!(
                     "Miniblock #{} (L1 batch #{}) should be sealed as per sealing rules",
                     self.io.current_miniblock_number(),
                     self.io.current_l1_batch_number()
                 );
                 self.io.seal_miniblock(updates_manager).await;
 
-                let new_timestamp = self
+                let new_miniblock_params = self
                     .wait_for_new_miniblock_params(updates_manager.miniblock.timestamp)
                     .await?;
-                vlog::debug!(
+                tracing::debug!(
                     "Initialized new miniblock #{} (L1 batch #{}) with timestamp {}",
                     self.io.current_miniblock_number(),
                     self.io.current_l1_batch_number(),
-                    extractors::display_timestamp(new_timestamp)
+                    extractors::display_timestamp(new_miniblock_params.timestamp)
                 );
-                updates_manager.push_miniblock(new_timestamp);
+                Self::start_next_miniblock(new_miniblock_params, updates_manager, batch_executor)
+                    .await;
             }
 
             let started_waiting = Instant::now();
@@ -376,7 +400,7 @@ impl ZkSyncStateKeeper {
                     "server.state_keeper.waiting_for_tx",
                     started_waiting.elapsed()
                 );
-                vlog::trace!("No new transactions. Waiting!");
+                tracing::trace!("No new transactions. Waiting!");
                 continue;
             };
 
@@ -395,6 +419,7 @@ impl ZkSyncStateKeeper {
                     let TxExecutionResult::Success {
                         tx_result,
                         tx_metrics,
+                        call_tracer_result,
                         compressed_bytecodes,
                         ..
                     } = exec_result
@@ -413,6 +438,7 @@ impl ZkSyncStateKeeper {
                         compressed_bytecodes,
                         tx_l1_gas_this_tx,
                         tx_execution_metrics,
+                        call_tracer_result,
                     );
                 }
                 SealResolution::ExcludeAndSeal => {
@@ -426,7 +452,7 @@ impl ZkSyncStateKeeper {
             };
 
             if seal_resolution.should_seal() {
-                vlog::debug!(
+                tracing::debug!(
                     "L1 batch #{} should be sealed with resolution {seal_resolution:?} after executing \
                      transaction {tx_hash}",
                     self.io.current_l1_batch_number()
@@ -466,7 +492,7 @@ impl ZkSyncStateKeeper {
 
                 // Despite success of upgrade transaction is not enforced by protocol,
                 // we panic here because failed upgrade tx is not intended in any case.
-                if tx_result.status != TxExecutionStatus::Success {
+                if tx_result.result.is_failed() {
                     panic!("Failed upgrade tx {:?}", tx.hash());
                 }
 
@@ -481,6 +507,7 @@ impl ZkSyncStateKeeper {
                     compressed_bytecodes,
                     tx_l1_gas_this_tx,
                     tx_execution_metrics,
+                    vec![],
                 );
             }
             SealResolution::ExcludeAndSeal => {
@@ -527,8 +554,8 @@ impl ZkSyncStateKeeper {
                 );
                 SealResolution::ExcludeAndSeal
             }
-            TxExecutionResult::RejectedByVm { rejection_reason } => match rejection_reason {
-                TxRevertReason::NotEnoughGasProvided => {
+            TxExecutionResult::RejectedByVm { reason } => match reason {
+                Halt::NotEnoughGasProvided => {
                     metrics::increment_counter!(
                         "server.tx_aggregation.reason",
                         "criterion" => "not_enough_gas_provided_to_start_tx",
@@ -536,7 +563,7 @@ impl ZkSyncStateKeeper {
                     );
                     SealResolution::ExcludeAndSeal
                 }
-                _ => SealResolution::Unexecutable(rejection_reason.to_string()),
+                _ => SealResolution::Unexecutable(reason.to_string()),
             },
             TxExecutionResult::Success {
                 tx_result,
@@ -545,13 +572,13 @@ impl ZkSyncStateKeeper {
                 bootloader_dry_run_result,
                 ..
             } => {
-                let tx_execution_status = tx_result.status;
+                let tx_execution_status = &tx_result.result;
                 let ExecutionMetricsForCriteria {
                     l1_gas: tx_l1_gas_this_tx,
                     execution_metrics: tx_execution_metrics,
                 } = *tx_metrics;
 
-                vlog::trace!(
+                tracing::trace!(
                     "finished tx {:?} by {:?} (is_l1: {}) (#{} in l1 batch {}) (#{} in miniblock {}) \
                     status: {:?}. L1 gas spent: {:?}, total in l1 batch: {:?}, \
                     tx execution metrics: {:?}, block execution metrics: {:?}",
@@ -574,18 +601,20 @@ impl ZkSyncStateKeeper {
                     execution_metrics: finish_block_execution_metrics,
                 } = *bootloader_dry_run_metrics;
 
-                let encoding_len = extractors::encoded_transaction_size(tx);
+                let encoding_len = tx.encoding_len();
 
-                let logs_to_apply = tx_result.result.logs.storage_logs.iter();
-                let logs_to_apply =
-                    logs_to_apply.chain(&bootloader_dry_run_result.logs.storage_logs);
+                let logs_to_apply_iter = tx_result
+                    .logs
+                    .storage_logs
+                    .iter()
+                    .chain(&bootloader_dry_run_result.logs.storage_logs);
                 let block_writes_metrics = updates_manager
                     .storage_writes_deduplicator
-                    .apply_and_rollback(logs_to_apply.clone());
+                    .apply_and_rollback(logs_to_apply_iter.clone());
                 let block_writes_l1_gas = gas_count_from_writes(&block_writes_metrics);
 
                 let tx_writes_metrics =
-                    StorageWritesDeduplicator::apply_on_empty_state(logs_to_apply);
+                    StorageWritesDeduplicator::apply_on_empty_state(logs_to_apply_iter);
                 let tx_writes_l1_gas = gas_count_from_writes(&tx_writes_metrics);
                 let tx_gas_excluding_writes = tx_l1_gas_this_tx + finish_block_l1_gas;
 
diff --git a/core/bin/zksync_core/src/state_keeper/mempool_actor.rs b/core/bin/zksync_core/src/state_keeper/mempool_actor.rs
index 30a2335ee1fd..f1d510bea0d6 100644
--- a/core/bin/zksync_core/src/state_keeper/mempool_actor.rs
+++ b/core/bin/zksync_core/src/state_keeper/mempool_actor.rs
@@ -4,7 +4,7 @@ use std::sync::Arc;
 use std::time::Duration;
 use std::time::Instant;
 use tokio::sync::watch;
-use vm::vm_with_bootloader::derive_base_fee_and_gas_per_pubdata;
+use vm::utils::fee::derive_base_fee_and_gas_per_pubdata;
 use zksync_config::configs::chain::MempoolConfig;
 
 use zksync_dal::ConnectionPool;
@@ -57,7 +57,7 @@ impl<G: L1GasPriceProvider> MempoolFetcher<G> {
         stuck_tx_timeout: Duration,
         fair_l2_gas_price: u64,
         stop_receiver: watch::Receiver<bool>,
-    ) {
+    ) -> anyhow::Result<()> {
         {
             let mut storage = pool.access_storage_tagged("state_keeper").await;
             if remove_stuck_txs {
@@ -65,14 +65,14 @@ impl<G: L1GasPriceProvider> MempoolFetcher<G> {
                     .transactions_dal()
                     .remove_stuck_txs(stuck_tx_timeout)
                     .await;
-                vlog::info!("Number of stuck txs was removed: {}", removed_txs);
+                tracing::info!("Number of stuck txs was removed: {}", removed_txs);
             }
             storage.transactions_dal().reset_mempool().await;
         }
 
         loop {
             if *stop_receiver.borrow() {
-                vlog::info!("Stop signal received, mempool is shutting down");
+                tracing::info!("Stop signal received, mempool is shutting down");
                 break;
             }
             let started_at = Instant::now();
@@ -97,5 +97,6 @@ impl<G: L1GasPriceProvider> MempoolFetcher<G> {
                 tokio::time::sleep(self.sync_interval).await;
             }
         }
+        Ok(())
     }
 }
diff --git a/core/bin/zksync_core/src/state_keeper/mod.rs b/core/bin/zksync_core/src/state_keeper/mod.rs
index 3d01aff3926d..5ccae06a3f4b 100644
--- a/core/bin/zksync_core/src/state_keeper/mod.rs
+++ b/core/bin/zksync_core/src/state_keeper/mod.rs
@@ -3,11 +3,12 @@ use tokio::sync::watch;
 use std::sync::Arc;
 
 use zksync_config::{
-    configs::chain::{MempoolConfig, StateKeeperConfig},
+    configs::chain::{MempoolConfig, NetworkConfig, StateKeeperConfig},
     constants::MAX_TXS_IN_BLOCK,
     ContractsConfig, DBConfig,
 };
 use zksync_dal::ConnectionPool;
+use zksync_types::L2ChainId;
 
 mod batch_executor;
 pub(crate) mod extractors;
@@ -17,12 +18,11 @@ mod mempool_actor;
 pub(crate) mod seal_criteria;
 #[cfg(test)]
 mod tests;
-mod types;
+pub(crate) mod types;
 pub(crate) mod updates;
 
 pub use self::{
-    batch_executor::{L1BatchExecutorBuilder, MainBatchExecutorBuilder, MultiVMConfig},
-    io::common::set_missing_initial_writes_indices,
+    batch_executor::{L1BatchExecutorBuilder, MainBatchExecutorBuilder},
     keeper::ZkSyncStateKeeper,
     seal_criteria::SealManager,
 };
@@ -36,6 +36,7 @@ pub(crate) async fn create_state_keeper<G>(
     contracts_config: &ContractsConfig,
     state_keeper_config: StateKeeperConfig,
     db_config: &DBConfig,
+    network_config: &NetworkConfig,
     mempool_config: &MempoolConfig,
     pool: ConnectionPool,
     mempool: MempoolGuard,
@@ -58,8 +59,7 @@ where
         pool.clone(),
         state_keeper_config.max_allowed_l2_tx_gas_limit.into(),
         state_keeper_config.save_call_traces,
-        state_keeper_config.validation_computational_gas_limit,
-        None, // MultiVM is not used on the main node, we always use the latest version.
+        state_keeper_config.upload_witness_inputs_to_gcs,
     );
 
     let io = MempoolIO::new(
@@ -70,6 +70,8 @@ where
         &state_keeper_config,
         mempool_config.delay_interval(),
         contracts_config.l2_erc20_bridge_addr,
+        state_keeper_config.validation_computational_gas_limit,
+        L2ChainId(network_config.zksync_network_id),
     )
     .await;
 
diff --git a/core/bin/zksync_core/src/state_keeper/seal_criteria/conditional_sealer.rs b/core/bin/zksync_core/src/state_keeper/seal_criteria/conditional_sealer.rs
index 202f40670ad5..3fc378bcb6b5 100644
--- a/core/bin/zksync_core/src/state_keeper/seal_criteria/conditional_sealer.rs
+++ b/core/bin/zksync_core/src/state_keeper/seal_criteria/conditional_sealer.rs
@@ -53,7 +53,7 @@ impl ConditionalSealer {
         block_data: &SealData,
         tx_data: &SealData,
     ) -> SealResolution {
-        vlog::trace!(
+        tracing::trace!(
             "Determining seal resolution for L1 batch #{l1_batch_number} with {tx_count} transactions \
              and metrics {:?}",
             block_data.execution_metrics
@@ -72,7 +72,7 @@ impl ConditionalSealer {
                 SealResolution::IncludeAndSeal
                 | SealResolution::ExcludeAndSeal
                 | SealResolution::Unexecutable(_) => {
-                    vlog::debug!(
+                    tracing::debug!(
                         "L1 batch #{l1_batch_number} processed by `{name}` with resolution {seal_resolution:?}",
                         name = sealer.prom_criterion_name()
                     );
diff --git a/core/bin/zksync_core/src/state_keeper/seal_criteria/criteria/geometry_seal_criteria.rs b/core/bin/zksync_core/src/state_keeper/seal_criteria/criteria/geometry_seal_criteria.rs
index 43c20183b333..6e5224f40326 100644
--- a/core/bin/zksync_core/src/state_keeper/seal_criteria/criteria/geometry_seal_criteria.rs
+++ b/core/bin/zksync_core/src/state_keeper/seal_criteria/criteria/geometry_seal_criteria.rs
@@ -1,7 +1,5 @@
 use std::fmt;
-
-// Workspace uses.
-use vm::{zk_evm::zkevm_opcode_defs::system_params::ERGS_PER_CIRCUIT, MAX_CYCLES_FOR_TX};
+use vm::constants::{ERGS_PER_CIRCUIT, MAX_CYCLES_FOR_TX};
 use zksync_config::configs::chain::StateKeeperConfig;
 use zksync_types::{
     circuit::{GEOMETRY_CONFIG, SCHEDULER_UPPER_BOUND},
diff --git a/core/bin/zksync_core/src/state_keeper/seal_criteria/criteria/tx_encoding_size.rs b/core/bin/zksync_core/src/state_keeper/seal_criteria/criteria/tx_encoding_size.rs
index d5d804fafee7..d405358ae333 100644
--- a/core/bin/zksync_core/src/state_keeper/seal_criteria/criteria/tx_encoding_size.rs
+++ b/core/bin/zksync_core/src/state_keeper/seal_criteria/criteria/tx_encoding_size.rs
@@ -1,4 +1,4 @@
-use vm::vm_with_bootloader::BOOTLOADER_TX_ENCODING_SPACE;
+use vm::constants::BOOTLOADER_TX_ENCODING_SPACE;
 
 use crate::state_keeper::seal_criteria::{
     SealCriterion, SealData, SealResolution, StateKeeperConfig,
diff --git a/core/bin/zksync_core/src/state_keeper/seal_criteria/mod.rs b/core/bin/zksync_core/src/state_keeper/seal_criteria/mod.rs
index a6f34f90325c..a77849257e65 100644
--- a/core/bin/zksync_core/src/state_keeper/seal_criteria/mod.rs
+++ b/core/bin/zksync_core/src/state_keeper/seal_criteria/mod.rs
@@ -11,6 +11,7 @@
 //! thus now every criterion is independent of the others.
 
 use std::fmt;
+use vm::TransactionVmExt;
 
 use zksync_config::configs::chain::StateKeeperConfig;
 use zksync_types::{
@@ -106,7 +107,7 @@ impl SealData {
         Self {
             execution_metrics,
             gas_count,
-            cumulative_size: extractors::encoded_transaction_size(transaction),
+            cumulative_size: transaction.bootloader_encoding_size(),
             writes_metrics,
         }
     }
@@ -197,7 +198,7 @@ impl SealManager {
 
             if should_seal_timeout {
                 metrics::increment_counter!("server.tx_aggregation.reason", "criterion" => RULE_NAME);
-                vlog::debug!(
+                tracing::debug!(
                     "Decided to seal L1 batch using rule `{RULE_NAME}`; batch timestamp: {}, \
                      commit deadline: {block_commit_deadline_ms}ms",
                     extractors::display_timestamp(manager.batch_timestamp())
@@ -282,6 +283,7 @@ mod tests {
             vec![],
             BlockGasCount::default(),
             ExecutionMetrics::default(),
+            vec![],
         );
     }
 
diff --git a/core/bin/zksync_core/src/state_keeper/tests/mod.rs b/core/bin/zksync_core/src/state_keeper/tests/mod.rs
index 8365d120682a..4f8f1fe364d3 100644
--- a/core/bin/zksync_core/src/state_keeper/tests/mod.rs
+++ b/core/bin/zksync_core/src/state_keeper/tests/mod.rs
@@ -9,28 +9,26 @@ use std::{
 };
 
 use vm::{
-    vm::{VmPartialExecutionResult, VmTxExecutionResult},
-    vm_with_bootloader::{BlockContext, BlockContextMode, DerivedBlockContext},
-    VmBlockResult, VmExecutionResult,
+    constants::BLOCK_GAS_LIMIT, CurrentExecutionState, ExecutionResult, FinishedL1Batch,
+    L1BatchEnv, L2BlockEnv, SystemEnv, TxExecutionMode, VmExecutionResultAndLogs,
+    VmExecutionStatistics,
 };
 use zksync_config::{configs::chain::StateKeeperConfig, constants::ZKPORTER_IS_AVAILABLE};
 use zksync_contracts::{BaseSystemContracts, BaseSystemContractsHashes};
 use zksync_types::{
     aggregated_operations::AggregatedActionType,
+    block::legacy_miniblock_hash,
+    block::miniblock_hash,
     block::BlockGasCount,
     block::MiniblockReexecuteData,
     commitment::{L1BatchMetaParameters, L1BatchMetadata},
     fee::Fee,
     l2::L2Tx,
     transaction_request::PaymasterParams,
-    tx::tx_execution_info::{TxExecutionStatus, VmExecutionLogs},
-    vm_trace::{VmExecutionTrace, VmTrace},
-    zk_evm::aux_structures::{LogQuery, Timestamp},
-    zk_evm::block_properties::BlockProperties,
-    Address, L2ChainId, MiniblockNumber, Nonce, ProtocolVersionId, StorageLogQuery,
-    StorageLogQueryType, Transaction, H256, U256,
+    tx::tx_execution_info::VmExecutionLogs,
+    Address, L1BatchNumber, L2ChainId, LogQuery, MiniblockNumber, Nonce, ProtocolVersionId,
+    StorageLogQuery, StorageLogQueryType, Timestamp, Transaction, H256, U256,
 };
-use zksync_utils::h256_to_u256;
 
 use self::tester::{
     bootloader_tip_out_of_gas, pending_batch_data, random_tx, rejected_exec, successful_exec,
@@ -52,10 +50,37 @@ mod tester;
 pub(super) static BASE_SYSTEM_CONTRACTS: Lazy<BaseSystemContracts> =
     Lazy::new(BaseSystemContracts::load_from_disk);
 
-pub(super) fn default_block_properties() -> BlockProperties {
-    BlockProperties {
-        default_aa_code_hash: h256_to_u256(BASE_SYSTEM_CONTRACTS.default_aa.hash),
-        zkporter_is_available: ZKPORTER_IS_AVAILABLE,
+pub(super) fn default_system_env() -> SystemEnv {
+    SystemEnv {
+        zk_porter_available: ZKPORTER_IS_AVAILABLE,
+        version: ProtocolVersionId::latest(),
+        base_system_smart_contracts: BASE_SYSTEM_CONTRACTS.clone(),
+        gas_limit: BLOCK_GAS_LIMIT,
+        execution_mode: TxExecutionMode::VerifyExecute,
+        default_validation_computational_gas_limit: BLOCK_GAS_LIMIT,
+        chain_id: L2ChainId(270),
+    }
+}
+
+pub(super) fn default_l1_batch_env(
+    number: u32,
+    timestamp: u64,
+    fee_account: Address,
+) -> L1BatchEnv {
+    L1BatchEnv {
+        previous_batch_hash: None,
+        number: L1BatchNumber(number),
+        timestamp,
+        l1_gas_price: 1,
+        fair_l2_gas_price: 1,
+        fee_account,
+        enforced_base_fee: None,
+        first_l2_block: L2BlockEnv {
+            number,
+            timestamp,
+            prev_block_hash: legacy_miniblock_hash(MiniblockNumber(number - 1)),
+            max_virtual_blocks_to_create: 1,
+        },
     }
 }
 
@@ -80,51 +105,32 @@ pub(super) fn create_l1_batch_metadata(number: u32) -> L1BatchMetadata {
     }
 }
 
-pub(super) fn default_vm_block_result() -> VmBlockResult {
-    VmBlockResult {
-        full_result: VmExecutionResult {
+pub(super) fn default_vm_block_result() -> FinishedL1Batch {
+    FinishedL1Batch {
+        block_tip_execution_result: VmExecutionResultAndLogs {
+            result: ExecutionResult::Success { output: vec![] },
+            logs: Default::default(),
+            statistics: Default::default(),
+            refunds: Default::default(),
+        },
+        final_execution_state: CurrentExecutionState {
             events: vec![],
             storage_log_queries: vec![],
             used_contract_hashes: vec![],
             l2_to_l1_logs: vec![],
-            return_data: vec![],
-            gas_used: 0,
-            contracts_used: 0,
-            revert_reason: None,
-            trace: VmTrace::ExecutionTrace(VmExecutionTrace::default()),
             total_log_queries: 0,
             cycles_used: 0,
-            computational_gas_used: 0,
         },
-        block_tip_result: VmPartialExecutionResult {
-            logs: VmExecutionLogs::default(),
-            revert_reason: None,
-            contracts_used: 0,
-            cycles_used: 0,
-            computational_gas_used: 0,
-        },
-    }
-}
-
-pub(super) fn default_block_context() -> DerivedBlockContext {
-    DerivedBlockContext {
-        context: BlockContext {
-            block_number: 0,
-            block_timestamp: 0,
-            l1_gas_price: 0,
-            fair_l2_gas_price: 0,
-            operator_address: Address::default(),
-        },
-        base_fee: 0,
+        final_bootloader_memory: Some(vec![]),
     }
 }
 
 pub(super) fn create_updates_manager() -> UpdatesManager {
-    let block_context = BlockContextMode::NewBlock(default_block_context(), 0.into());
+    let l1_batch_env = default_l1_batch_env(1, 1, Address::default());
     UpdatesManager::new(
-        &block_context,
+        l1_batch_env,
         BaseSystemContractsHashes::default(),
-        ProtocolVersionId::default(),
+        ProtocolVersionId::latest(),
     )
 }
 
@@ -161,30 +167,29 @@ pub(super) fn create_transaction(fee_per_gas: u64, gas_per_pubdata: u32) -> Tran
 pub(super) fn create_execution_result(
     tx_number_in_block: u16,
     storage_logs: impl IntoIterator<Item = (U256, Query)>,
-) -> VmTxExecutionResult {
+) -> VmExecutionResultAndLogs {
     let storage_logs: Vec<_> = storage_logs
         .into_iter()
         .map(|(key, query)| query.into_log(key, tx_number_in_block))
         .collect();
 
-    let logs = VmExecutionLogs {
-        total_log_queries_count: storage_logs.len() + 2,
-        storage_logs,
-        events: vec![],
-        l2_to_l1_logs: vec![],
-    };
-    VmTxExecutionResult {
-        status: TxExecutionStatus::Success,
-        result: VmPartialExecutionResult {
-            logs,
-            revert_reason: None,
+    let total_log_queries = storage_logs.len() + 2;
+    VmExecutionResultAndLogs {
+        result: ExecutionResult::Success { output: vec![] },
+        logs: VmExecutionLogs {
+            events: vec![],
+            l2_to_l1_logs: vec![],
+            storage_logs,
+            total_log_queries_count: total_log_queries,
+        },
+        statistics: VmExecutionStatistics {
             contracts_used: 0,
             cycles_used: 0,
+            gas_used: 0,
             computational_gas_used: 0,
+            total_log_queries,
         },
-        call_traces: vec![],
-        gas_refunded: 0,
-        operator_suggested_refund: 0,
+        refunds: Default::default(),
     }
 }
 
@@ -523,11 +528,15 @@ async fn pending_batch_is_applied() {
         MiniblockReexecuteData {
             number: MiniblockNumber(1),
             timestamp: 1,
+            prev_block_hash: miniblock_hash(MiniblockNumber(0), 0, H256::zero(), H256::zero()),
+            virtual_blocks: 1,
             txs: vec![random_tx(1)],
         },
         MiniblockReexecuteData {
             number: MiniblockNumber(2),
             timestamp: 2,
+            prev_block_hash: miniblock_hash(MiniblockNumber(1), 1, H256::zero(), H256::zero()),
+            virtual_blocks: 1,
             txs: vec![random_tx(2)],
         },
     ]);
@@ -621,6 +630,8 @@ async fn miniblock_timestamp_after_pending_batch() {
     let pending_batch = pending_batch_data(vec![MiniblockReexecuteData {
         number: MiniblockNumber(1),
         timestamp: 1,
+        prev_block_hash: miniblock_hash(MiniblockNumber(0), 0, H256::zero(), H256::zero()),
+        virtual_blocks: 1,
         txs: vec![random_tx(1)],
     }]);
 
diff --git a/core/bin/zksync_core/src/state_keeper/tests/tester.rs b/core/bin/zksync_core/src/state_keeper/tests/tester.rs
index 44b793bab345..9e8e79902d78 100644
--- a/core/bin/zksync_core/src/state_keeper/tests/tester.rs
+++ b/core/bin/zksync_core/src/state_keeper/tests/tester.rs
@@ -9,23 +9,21 @@ use std::{
 };
 
 use vm::{
-    vm::{VmPartialExecutionResult, VmTxExecutionResult},
-    vm_with_bootloader::{BlockContext, BlockContextMode, DerivedBlockContext},
-    VmBlockResult,
+    constants::BLOCK_GAS_LIMIT, ExecutionResult, FinishedL1Batch, L1BatchEnv, L2BlockEnv,
+    SystemEnv, TxExecutionMode, VmExecutionResultAndLogs,
 };
 use zksync_types::{
     block::MiniblockReexecuteData, protocol_version::ProtocolUpgradeTx,
-    tx::tx_execution_info::TxExecutionStatus, Address, L1BatchNumber, MiniblockNumber,
-    ProtocolVersionId, Transaction, H256, U256,
+    witness_block_state::WitnessBlockState, Address, L1BatchNumber, L2ChainId, MiniblockNumber,
+    ProtocolVersionId, Transaction, H256,
 };
 
 use crate::state_keeper::{
     batch_executor::{BatchExecutorHandle, Command, L1BatchExecutorBuilder, TxExecutionResult},
-    io::{L1BatchParams, PendingBatchData, StateKeeperIO},
+    io::{MiniblockParams, PendingBatchData, StateKeeperIO},
     seal_criteria::SealManager,
     tests::{
-        create_l2_transaction, default_block_properties, default_vm_block_result,
-        BASE_SYSTEM_CONTRACTS,
+        create_l2_transaction, default_l1_batch_env, default_vm_block_result, BASE_SYSTEM_CONTRACTS,
     },
     types::ExecutionMetricsForCriteria,
     updates::UpdatesManager,
@@ -148,7 +146,7 @@ impl TestScenario {
     /// Accepts a function that would be given access to the received batch seal params, which can implement
     /// additional assertions on the sealed batch.
     pub(crate) fn batch_sealed_with<
-        F: FnOnce(&VmBlockResult, &UpdatesManager, &BlockContext) + Send + 'static,
+        F: FnOnce(&VmExecutionResultAndLogs, &UpdatesManager, &L1BatchEnv) + Send + 'static,
     >(
         mut self,
         description: &'static str,
@@ -187,7 +185,8 @@ impl TestScenario {
             if sk_thread.is_finished() {
                 sk_thread
                     .await
-                    .unwrap_or_else(|_| panic!("State keeper thread panicked"));
+                    .unwrap_or_else(|_| panic!("State keeper thread panicked"))
+                    .unwrap();
                 return;
             }
             tokio::time::sleep(poll_interval).await;
@@ -206,25 +205,14 @@ pub(crate) fn random_tx(tx_number: u64) -> Transaction {
     tx.into()
 }
 
-fn partial_execution_result() -> VmPartialExecutionResult {
-    VmPartialExecutionResult {
-        logs: Default::default(),
-        revert_reason: Default::default(),
-        contracts_used: Default::default(),
-        cycles_used: Default::default(),
-        computational_gas_used: Default::default(),
-    }
-}
-
 /// Creates a `TxExecutionResult` object denoting a successful tx execution.
 pub(crate) fn successful_exec() -> TxExecutionResult {
     TxExecutionResult::Success {
-        tx_result: Box::new(VmTxExecutionResult {
-            status: TxExecutionStatus::Success,
-            result: partial_execution_result(),
-            call_traces: vec![],
-            gas_refunded: 0,
-            operator_suggested_refund: 0,
+        tx_result: Box::new(VmExecutionResultAndLogs {
+            result: ExecutionResult::Success { output: vec![] },
+            logs: Default::default(),
+            statistics: Default::default(),
+            refunds: Default::default(),
         }),
         tx_metrics: ExecutionMetricsForCriteria {
             l1_gas: Default::default(),
@@ -234,8 +222,14 @@ pub(crate) fn successful_exec() -> TxExecutionResult {
             l1_gas: Default::default(),
             execution_metrics: Default::default(),
         },
-        bootloader_dry_run_result: Box::new(partial_execution_result()),
+        bootloader_dry_run_result: Box::new(VmExecutionResultAndLogs {
+            result: ExecutionResult::Success { output: vec![] },
+            logs: Default::default(),
+            statistics: Default::default(),
+            refunds: Default::default(),
+        }),
         compressed_bytecodes: vec![],
+        call_tracer_result: vec![],
     }
 }
 
@@ -244,27 +238,32 @@ pub(crate) fn successful_exec_with_metrics(
     tx_metrics: ExecutionMetricsForCriteria,
 ) -> TxExecutionResult {
     TxExecutionResult::Success {
-        tx_result: Box::new(VmTxExecutionResult {
-            status: TxExecutionStatus::Success,
-            result: partial_execution_result(),
-            call_traces: vec![],
-            gas_refunded: 0,
-            operator_suggested_refund: 0,
+        tx_result: Box::new(VmExecutionResultAndLogs {
+            result: ExecutionResult::Success { output: vec![] },
+            logs: Default::default(),
+            statistics: Default::default(),
+            refunds: Default::default(),
         }),
         tx_metrics,
         bootloader_dry_run_metrics: ExecutionMetricsForCriteria {
             l1_gas: Default::default(),
             execution_metrics: Default::default(),
         },
-        bootloader_dry_run_result: Box::new(partial_execution_result()),
+        bootloader_dry_run_result: Box::new(VmExecutionResultAndLogs {
+            result: ExecutionResult::Success { output: vec![] },
+            logs: Default::default(),
+            statistics: Default::default(),
+            refunds: Default::default(),
+        }),
         compressed_bytecodes: vec![],
+        call_tracer_result: vec![],
     }
 }
 
 /// Creates a `TxExecutionResult` object denoting a tx that was rejected.
 pub(crate) fn rejected_exec() -> TxExecutionResult {
     TxExecutionResult::RejectedByVm {
-        rejection_reason: vm::TxRevertReason::InnerTxError,
+        reason: vm::Halt::InnerTxError,
     }
 }
 
@@ -278,29 +277,17 @@ pub(crate) fn bootloader_tip_out_of_gas() -> TxExecutionResult {
 pub(crate) fn pending_batch_data(
     pending_miniblocks: Vec<MiniblockReexecuteData>,
 ) -> PendingBatchData {
-    let block_properties = default_block_properties();
-
-    let context = BlockContext {
-        block_number: 1,
-        block_timestamp: 1,
-        l1_gas_price: 1,
-        fair_l2_gas_price: 1,
-        operator_address: FEE_ACCOUNT,
-    };
-    let derived_context = DerivedBlockContext {
-        context,
-        base_fee: 1,
-    };
-
-    let params = L1BatchParams {
-        context_mode: BlockContextMode::NewBlock(derived_context, Default::default()),
-        properties: block_properties,
-        base_system_contracts: BASE_SYSTEM_CONTRACTS.clone(),
-        protocol_version: ProtocolVersionId::latest(),
-    };
-
     PendingBatchData {
-        params,
+        l1_batch_env: default_l1_batch_env(1, 1, FEE_ACCOUNT),
+        system_env: SystemEnv {
+            zk_porter_available: false,
+            version: ProtocolVersionId::latest(),
+            base_system_smart_contracts: BASE_SYSTEM_CONTRACTS.clone(),
+            gas_limit: BLOCK_GAS_LIMIT,
+            execution_mode: TxExecutionMode::VerifyExecute,
+            default_validation_computational_gas_limit: BLOCK_GAS_LIMIT,
+            chain_id: L2ChainId(270),
+        },
         pending_miniblocks,
     }
 }
@@ -320,7 +307,7 @@ enum ScenarioItem {
     ),
     BatchSeal(
         &'static str,
-        Option<Box<dyn FnOnce(&VmBlockResult, &UpdatesManager, &BlockContext) + Send>>,
+        Option<Box<dyn FnOnce(&VmExecutionResultAndLogs, &UpdatesManager, &L1BatchEnv) + Send>>,
     ),
 }
 
@@ -427,7 +414,11 @@ impl TestBatchExecutorBuilder {
 
 #[async_trait]
 impl L1BatchExecutorBuilder for TestBatchExecutorBuilder {
-    async fn init_batch(&self, _l1batch_params: L1BatchParams) -> BatchExecutorHandle {
+    async fn init_batch(
+        &self,
+        _l1batch_params: L1BatchEnv,
+        _system_env: SystemEnv,
+    ) -> BatchExecutorHandle {
         let (commands_sender, commands_receiver) = mpsc::channel(1);
 
         let executor = TestBatchExecutor::new(
@@ -485,6 +476,9 @@ impl TestBatchExecutor {
                     resp.send(result).unwrap();
                     self.last_tx = tx.hash();
                 }
+                Command::StartNextMiniblock(_, resp) => {
+                    resp.send(()).unwrap();
+                }
                 Command::RollbackLastTx(resp) => {
                     // This is an additional safety check: IO would check that every rollback is included in the
                     // test scenario, but here we want to additionally check that each such request goes to the
@@ -502,7 +496,7 @@ impl TestBatchExecutor {
                 }
                 Command::FinishBatch(resp) => {
                     // Blanket result, it doesn't really matter.
-                    resp.send(default_vm_block_result()).unwrap();
+                    resp.send((default_vm_block_result(), None)).unwrap();
                     return;
                 }
             }
@@ -589,36 +583,49 @@ impl StateKeeperIO for TestIO {
         self.scenario.pending_batch.take()
     }
 
-    async fn wait_for_new_batch_params(&mut self, _max_wait: Duration) -> Option<L1BatchParams> {
-        let block_properties = default_block_properties();
-
-        let previous_block_hash = U256::zero();
-        let context = BlockContext {
-            block_number: self.batch_number.0,
-            block_timestamp: self.timestamp,
-            l1_gas_price: self.l1_gas_price,
-            fair_l2_gas_price: self.fair_l2_gas_price,
-            operator_address: self.fee_account,
-        };
-        let derived_context = DerivedBlockContext {
-            context,
-            base_fee: 1,
+    async fn wait_for_new_batch_params(
+        &mut self,
+        _max_wait: Duration,
+    ) -> Option<(SystemEnv, L1BatchEnv)> {
+        let first_miniblock_info = L2BlockEnv {
+            number: self.miniblock_number.0,
+            timestamp: self.timestamp,
+            prev_block_hash: H256::zero(),
+            max_virtual_blocks_to_create: 1,
         };
-
-        Some(L1BatchParams {
-            context_mode: BlockContextMode::NewBlock(derived_context, previous_block_hash),
-            properties: block_properties,
-            base_system_contracts: BASE_SYSTEM_CONTRACTS.clone(),
-            protocol_version: self.protocol_version,
-        })
+        Some((
+            SystemEnv {
+                zk_porter_available: false,
+                version: self.protocol_version,
+                base_system_smart_contracts: BASE_SYSTEM_CONTRACTS.clone(),
+                gas_limit: BLOCK_GAS_LIMIT,
+                execution_mode: TxExecutionMode::VerifyExecute,
+                default_validation_computational_gas_limit: BLOCK_GAS_LIMIT,
+                chain_id: L2ChainId(270),
+            },
+            L1BatchEnv {
+                previous_batch_hash: Some(H256::zero()),
+                number: self.batch_number,
+                timestamp: self.timestamp,
+                l1_gas_price: self.l1_gas_price,
+                fair_l2_gas_price: self.fair_l2_gas_price,
+                fee_account: self.fee_account,
+                enforced_base_fee: None,
+                first_l2_block: first_miniblock_info,
+            },
+        ))
     }
 
     async fn wait_for_new_miniblock_params(
         &mut self,
         _max_wait: Duration,
         _prev_miniblock_timestamp: u64,
-    ) -> Option<u64> {
-        Some(self.timestamp)
+    ) -> Option<MiniblockParams> {
+        Some(MiniblockParams {
+            timestamp: self.timestamp,
+            // 1 is just a constant used for tests.
+            virtual_blocks: 1,
+        })
     }
 
     async fn wait_for_next_tx(&mut self, max_wait: Duration) -> Option<Transaction> {
@@ -684,16 +691,21 @@ impl StateKeeperIO for TestIO {
 
     async fn seal_l1_batch(
         &mut self,
-        block_result: VmBlockResult,
+        _witness_block_state: Option<WitnessBlockState>,
         updates_manager: UpdatesManager,
-        block_context: DerivedBlockContext,
+        l1_batch_env: &L1BatchEnv,
+        finished_batch: FinishedL1Batch,
     ) {
         let action = self.pop_next_item("seal_l1_batch");
         let ScenarioItem::BatchSeal(_, check_fn) = action else {
             panic!("Unexpected action: {:?}", action);
         };
         if let Some(check_fn) = check_fn {
-            check_fn(&block_result, &updates_manager, &block_context.context);
+            check_fn(
+                &finished_batch.block_tip_execution_result,
+                &updates_manager,
+                l1_batch_env,
+            );
         }
 
         self.miniblock_number += 1; // Seal the fictive miniblock.
diff --git a/core/bin/zksync_core/src/state_keeper/updates/l1_batch_updates.rs b/core/bin/zksync_core/src/state_keeper/updates/l1_batch_updates.rs
index 36c113c73b5d..c7ab405d9dab 100644
--- a/core/bin/zksync_core/src/state_keeper/updates/l1_batch_updates.rs
+++ b/core/bin/zksync_core/src/state_keeper/updates/l1_batch_updates.rs
@@ -44,20 +44,21 @@ impl L1BatchUpdates {
 
 #[cfg(test)]
 mod tests {
+    use zksync_types::{ProtocolVersionId, H256};
+
     use super::*;
     use crate::{
         gas_tracker::new_block_gas_count,
-        state_keeper::{
-            extractors,
-            tests::{create_execution_result, create_transaction},
-        },
+        state_keeper::tests::{create_execution_result, create_transaction},
     };
+    use vm::TransactionVmExt;
 
     #[test]
     fn apply_miniblock_with_empty_tx() {
-        let mut miniblock_accumulator = MiniblockUpdates::new(0);
+        let mut miniblock_accumulator =
+            MiniblockUpdates::new(0, 0, H256::zero(), 1, Some(ProtocolVersionId::latest()));
         let tx = create_transaction(10, 100);
-        let expected_tx_size = extractors::encoded_transaction_size(tx.clone());
+        let expected_tx_size = tx.bootloader_encoding_size();
 
         miniblock_accumulator.extend_from_executed_transaction(
             tx,
@@ -65,6 +66,7 @@ mod tests {
             BlockGasCount::default(),
             ExecutionMetrics::default(),
             vec![],
+            vec![],
         );
 
         let mut l1_batch_accumulator = L1BatchUpdates::new();
diff --git a/core/bin/zksync_core/src/state_keeper/updates/miniblock_updates.rs b/core/bin/zksync_core/src/state_keeper/updates/miniblock_updates.rs
index d66d9982b561..a49edbee2257 100644
--- a/core/bin/zksync_core/src/state_keeper/updates/miniblock_updates.rs
+++ b/core/bin/zksync_core/src/state_keeper/updates/miniblock_updates.rs
@@ -1,16 +1,17 @@
 use std::collections::HashMap;
+use vm::{ExecutionResult, L2BlockEnv, TransactionVmExt, VmExecutionResultAndLogs};
 
-use vm::vm::VmTxExecutionResult;
 use zksync_types::{
-    block::BlockGasCount,
+    block::{legacy_miniblock_hash, miniblock_hash, BlockGasCount},
     event::extract_bytecodes_marked_as_known,
     l2_to_l1_log::L2ToL1Log,
-    tx::{tx_execution_info::VmExecutionLogs, ExecutionMetrics, TransactionExecutionResult},
-    StorageLogQuery, Transaction, VmEvent, H256,
+    tx::tx_execution_info::TxExecutionStatus,
+    tx::{ExecutionMetrics, TransactionExecutionResult},
+    vm_trace::Call,
+    MiniblockNumber, ProtocolVersionId, StorageLogQuery, Transaction, VmEvent, H256,
 };
 use zksync_utils::bytecode::{hash_bytecode, CompressedBytecodeInfo};
-
-use crate::state_keeper::extractors;
+use zksync_utils::concat_and_hash;
 
 #[derive(Debug, Clone, PartialEq)]
 pub struct MiniblockUpdates {
@@ -24,10 +25,21 @@ pub struct MiniblockUpdates {
     pub block_execution_metrics: ExecutionMetrics,
     pub txs_encoding_size: usize,
     pub timestamp: u64,
+    pub number: u32,
+    pub prev_block_hash: H256,
+    pub txs_rolling_hash: H256,
+    pub virtual_blocks: u32,
+    pub protocol_version: Option<ProtocolVersionId>,
 }
 
 impl MiniblockUpdates {
-    pub(crate) fn new(timestamp: u64) -> Self {
+    pub(crate) fn new(
+        timestamp: u64,
+        number: u32,
+        prev_block_hash: H256,
+        virtual_blocks: u32,
+        protocol_version: Option<ProtocolVersionId>,
+    ) -> Self {
         Self {
             executed_transactions: vec![],
             events: vec![],
@@ -38,26 +50,48 @@ impl MiniblockUpdates {
             block_execution_metrics: ExecutionMetrics::default(),
             txs_encoding_size: 0,
             timestamp,
+            number,
+            prev_block_hash,
+            txs_rolling_hash: H256::zero(),
+            virtual_blocks,
+            protocol_version,
         }
     }
 
-    pub(crate) fn extend_from_fictive_transaction(&mut self, vm_execution_logs: VmExecutionLogs) {
-        self.events.extend(vm_execution_logs.events);
-        self.storage_logs.extend(vm_execution_logs.storage_logs);
-        self.l2_to_l1_logs.extend(vm_execution_logs.l2_to_l1_logs);
+    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);
     }
 
     pub(crate) fn extend_from_executed_transaction(
         &mut self,
         tx: Transaction,
-        tx_execution_result: VmTxExecutionResult,
+        tx_execution_result: VmExecutionResultAndLogs,
         tx_l1_gas_this_tx: BlockGasCount,
         execution_metrics: ExecutionMetrics,
         compressed_bytecodes: Vec<CompressedBytecodeInfo>,
+        call_traces: Vec<Call>,
     ) {
-        // Get bytecode hashes that were marked as known
         let saved_factory_deps =
-            extract_bytecodes_marked_as_known(&tx_execution_result.result.logs.events);
+            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);
+
+        let gas_refunded = tx_execution_result.refunds.gas_refunded;
+        let operator_suggested_refund = tx_execution_result.refunds.operator_suggested_refund;
+        let execution_status = if tx_execution_result.result.is_failed() {
+            TxExecutionStatus::Failure
+        } else {
+            TxExecutionStatus::Success
+        };
+
+        let revert_reason = match &tx_execution_result.result {
+            ExecutionResult::Success { .. } => None,
+            ExecutionResult::Revert { output } => Some(output.to_string()),
+            ExecutionResult::Halt { reason } => Some(reason.to_string()),
+        };
 
         // Get transaction factory deps
         let factory_deps = tx.execute.factory_deps.as_deref().unwrap_or_default();
@@ -79,50 +113,70 @@ impl MiniblockUpdates {
         });
         self.new_factory_deps.extend(known_bytecodes);
 
-        self.events.extend(tx_execution_result.result.logs.events);
-        self.storage_logs
-            .extend(tx_execution_result.result.logs.storage_logs);
-        self.l2_to_l1_logs
-            .extend(tx_execution_result.result.logs.l2_to_l1_logs);
-
         self.l1_gas_count += tx_l1_gas_this_tx;
         self.block_execution_metrics += execution_metrics;
-        self.txs_encoding_size += extractors::encoded_transaction_size(tx.clone());
+        self.txs_encoding_size += tx.bootloader_encoding_size();
+
+        self.storage_logs
+            .extend(tx_execution_result.logs.storage_logs);
+
+        self.txs_rolling_hash = concat_and_hash(self.txs_rolling_hash, tx.hash());
 
         self.executed_transactions.push(TransactionExecutionResult {
             hash: tx.hash(),
             transaction: tx,
             execution_info: execution_metrics,
-            execution_status: tx_execution_result.status,
-            refunded_gas: tx_execution_result.gas_refunded,
-            operator_suggested_refund: tx_execution_result.operator_suggested_refund,
+            execution_status,
+            refunded_gas: gas_refunded,
+            operator_suggested_refund,
             compressed_bytecodes,
-            call_traces: tx_execution_result.call_traces,
-            revert_reason: tx_execution_result
-                .result
-                .revert_reason
-                .map(|reason| reason.to_string()),
+            call_traces,
+            revert_reason,
         });
     }
+
+    /// Calculates miniblock hash based on the protocol version.
+    pub(crate) fn get_miniblock_hash(&self) -> H256 {
+        match self.protocol_version {
+            Some(id) if id >= ProtocolVersionId::Version13 => miniblock_hash(
+                MiniblockNumber(self.number),
+                self.timestamp,
+                self.prev_block_hash,
+                self.txs_rolling_hash,
+            ),
+            _ => legacy_miniblock_hash(MiniblockNumber(self.number)),
+        }
+    }
+
+    pub(crate) fn get_miniblock_env(&self) -> L2BlockEnv {
+        L2BlockEnv {
+            number: self.number,
+            timestamp: self.timestamp,
+            prev_block_hash: self.prev_block_hash,
+            max_virtual_blocks_to_create: self.virtual_blocks,
+        }
+    }
 }
 
 #[cfg(test)]
 mod tests {
     use super::*;
     use crate::state_keeper::tests::{create_execution_result, create_transaction};
+    use vm::TransactionVmExt;
 
     #[test]
     fn apply_empty_l2_tx() {
-        let mut accumulator = MiniblockUpdates::new(0);
+        let mut accumulator =
+            MiniblockUpdates::new(0, 0, H256::random(), 0, Some(ProtocolVersionId::latest()));
         let tx = create_transaction(10, 100);
-        let expected_tx_size = extractors::encoded_transaction_size(tx.clone());
-
+        let bootloader_encoding_size = tx.bootloader_encoding_size();
         accumulator.extend_from_executed_transaction(
             tx,
             create_execution_result(0, []),
             BlockGasCount::default(),
             ExecutionMetrics::default(),
             vec![],
+            vec![],
         );
 
         assert_eq!(accumulator.executed_transactions.len(), 1);
@@ -132,6 +186,6 @@ mod tests {
         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.txs_encoding_size, expected_tx_size);
+        assert_eq!(accumulator.txs_encoding_size, bootloader_encoding_size);
     }
 }
diff --git a/core/bin/zksync_core/src/state_keeper/updates/mod.rs b/core/bin/zksync_core/src/state_keeper/updates/mod.rs
index b537e7eea9c1..0837bc6da60d 100644
--- a/core/bin/zksync_core/src/state_keeper/updates/mod.rs
+++ b/core/bin/zksync_core/src/state_keeper/updates/mod.rs
@@ -1,12 +1,11 @@
-use std::mem;
+use vm::{L1BatchEnv, VmExecutionResultAndLogs};
 
-use vm::{vm::VmTxExecutionResult, vm_with_bootloader::BlockContextMode};
 use zksync_contracts::BaseSystemContractsHashes;
+use zksync_types::vm_trace::Call;
 use zksync_types::{
-    block::BlockGasCount,
-    storage_writes_deduplicator::StorageWritesDeduplicator,
-    tx::tx_execution_info::{ExecutionMetrics, VmExecutionLogs},
-    Address, L1BatchNumber, MiniblockNumber, ProtocolVersionId, Transaction,
+    block::BlockGasCount, storage_writes_deduplicator::StorageWritesDeduplicator,
+    tx::tx_execution_info::ExecutionMetrics, Address, L1BatchNumber, MiniblockNumber,
+    ProtocolVersionId, Transaction,
 };
 use zksync_utils::bytecode::CompressedBytecodeInfo;
 
@@ -15,6 +14,8 @@ pub mod miniblock_updates;
 
 pub(crate) use self::{l1_batch_updates::L1BatchUpdates, miniblock_updates::MiniblockUpdates};
 
+use super::io::MiniblockParams;
+
 /// Most of the information needed to seal the l1 batch/mini-block is contained within the VM,
 /// things that are not captured there are accumulated externally.
 /// `MiniblockUpdates` keeps updates for the pending mini-block.
@@ -36,21 +37,25 @@ pub struct UpdatesManager {
 
 impl UpdatesManager {
     pub(crate) fn new(
-        block_context: &BlockContextMode,
+        l1_batch_env: L1BatchEnv,
         base_system_contract_hashes: BaseSystemContractsHashes,
         protocol_version: ProtocolVersionId,
     ) -> Self {
-        let batch_timestamp = block_context.timestamp();
-        let context = block_context.inner_block_context().context;
         Self {
-            batch_timestamp,
-            l1_gas_price: context.l1_gas_price,
-            fair_l2_gas_price: context.fair_l2_gas_price,
-            base_fee_per_gas: block_context.inner_block_context().base_fee,
+            batch_timestamp: l1_batch_env.timestamp,
+            l1_gas_price: l1_batch_env.l1_gas_price,
+            fair_l2_gas_price: l1_batch_env.fair_l2_gas_price,
+            base_fee_per_gas: l1_batch_env.base_fee(),
             protocol_version,
             base_system_contract_hashes,
             l1_batch: L1BatchUpdates::new(),
-            miniblock: MiniblockUpdates::new(batch_timestamp),
+            miniblock: MiniblockUpdates::new(
+                l1_batch_env.first_l2_block.timestamp,
+                l1_batch_env.first_l2_block.number,
+                l1_batch_env.first_l2_block.prev_block_hash,
+                l1_batch_env.first_l2_block.max_virtual_blocks_to_create,
+                Some(protocol_version),
+            ),
             storage_writes_deduplicator: StorageWritesDeduplicator::new(),
         }
     }
@@ -86,7 +91,7 @@ impl UpdatesManager {
             fair_l2_gas_price: self.fair_l2_gas_price,
             base_fee_per_gas: self.base_fee_per_gas,
             base_system_contracts_hashes: self.base_system_contract_hashes,
-            protocol_version: self.protocol_version,
+            protocol_version: Some(self.protocol_version),
             l2_erc20_bridge_addr,
         }
     }
@@ -98,35 +103,41 @@ impl UpdatesManager {
     pub(crate) fn extend_from_executed_transaction(
         &mut self,
         tx: Transaction,
-        tx_execution_result: VmTxExecutionResult,
+        tx_execution_result: VmExecutionResultAndLogs,
         compressed_bytecodes: Vec<CompressedBytecodeInfo>,
         tx_l1_gas_this_tx: BlockGasCount,
         execution_metrics: ExecutionMetrics,
+        call_traces: Vec<Call>,
     ) {
         self.storage_writes_deduplicator
-            .apply(&tx_execution_result.result.logs.storage_logs);
+            .apply(&tx_execution_result.logs.storage_logs);
         self.miniblock.extend_from_executed_transaction(
             tx,
             tx_execution_result,
             tx_l1_gas_this_tx,
             execution_metrics,
             compressed_bytecodes,
+            call_traces,
         );
     }
 
-    pub(crate) fn extend_from_fictive_transaction(&mut self, vm_execution_logs: VmExecutionLogs) {
+    pub(crate) fn extend_from_fictive_transaction(&mut self, result: VmExecutionResultAndLogs) {
         self.storage_writes_deduplicator
-            .apply(&vm_execution_logs.storage_logs);
-        self.miniblock
-            .extend_from_fictive_transaction(vm_execution_logs);
+            .apply(&result.logs.storage_logs);
+        self.miniblock.extend_from_fictive_transaction(result);
     }
 
     /// Pushes a new miniblock with the specified timestamp into this manager. The previously
     /// held miniblock is considered sealed and is used to extend the L1 batch data.
-    pub(crate) fn push_miniblock(&mut self, new_miniblock_timestamp: u64) {
-        let new_miniblock_updates = MiniblockUpdates::new(new_miniblock_timestamp);
-        let old_miniblock_updates = mem::replace(&mut self.miniblock, new_miniblock_updates);
-
+    pub(crate) fn push_miniblock(&mut self, miniblock_params: MiniblockParams) {
+        let new_miniblock_updates = MiniblockUpdates::new(
+            miniblock_params.timestamp,
+            self.miniblock.number + 1,
+            self.miniblock.get_miniblock_hash(),
+            miniblock_params.virtual_blocks,
+            Some(self.protocol_version),
+        );
+        let old_miniblock_updates = std::mem::replace(&mut self.miniblock, new_miniblock_updates);
         self.l1_batch
             .extend_from_sealed_miniblock(old_miniblock_updates);
     }
@@ -159,7 +170,7 @@ pub(crate) struct MiniblockSealCommand {
     pub fair_l2_gas_price: u64,
     pub base_fee_per_gas: u64,
     pub base_system_contracts_hashes: BaseSystemContractsHashes,
-    pub protocol_version: ProtocolVersionId,
+    pub protocol_version: Option<ProtocolVersionId>,
     pub l2_erc20_bridge_addr: Address,
 }
 
@@ -187,6 +198,7 @@ mod tests {
             vec![],
             new_block_gas_count(),
             ExecutionMetrics::default(),
+            vec![],
         );
 
         // Check that only pending state is updated.
@@ -195,7 +207,10 @@ mod tests {
         assert_eq!(updates_manager.l1_batch.executed_transactions.len(), 0);
 
         // Seal miniblock.
-        updates_manager.push_miniblock(2);
+        updates_manager.push_miniblock(MiniblockParams {
+            timestamp: 2,
+            virtual_blocks: 1,
+        });
 
         // Check that L1 batch updates are the same with the pending state
         // and miniblock updates are empty.
diff --git a/core/bin/zksync_core/src/sync_layer/batch_status_updater.rs b/core/bin/zksync_core/src/sync_layer/batch_status_updater.rs
index c6488d98daae..d4a90fa95bb5 100644
--- a/core/bin/zksync_core/src/sync_layer/batch_status_updater.rs
+++ b/core/bin/zksync_core/src/sync_layer/batch_status_updater.rs
@@ -92,17 +92,17 @@ impl BatchStatusUpdater {
         }
     }
 
-    pub async fn run(mut self, stop_receiver: Receiver<bool>) {
+    pub async fn run(mut self, stop_receiver: Receiver<bool>) -> anyhow::Result<()> {
         loop {
             if *stop_receiver.borrow() {
-                vlog::info!("Stop signal received, exiting the batch status updater routine");
-                return;
+                tracing::info!("Stop signal received, exiting the batch status updater routine");
+                return Ok(());
             }
             // Status changes are created externally, so that even if we will receive a network error
             // while requesting the changes, we will be able to process what we already fetched.
             let mut status_changes = StatusChanges::new();
             if let Err(err) = self.get_status_changes(&mut status_changes).await {
-                vlog::warn!("Failed to get status changes from the database: {err}");
+                tracing::warn!("Failed to get status changes from the database: {err}");
             };
 
             if status_changes.is_empty() {
@@ -228,7 +228,7 @@ impl BatchStatusUpdater {
                 l1_tx_hash: batch_info.base.commit_tx_hash.unwrap(),
                 happened_at: batch_info.base.committed_at.unwrap(),
             });
-            vlog::info!("Batch {}: committed", batch_info.l1_batch_number);
+            tracing::info!("Batch {}: committed", batch_info.l1_batch_number);
             metrics::gauge!("external_node.fetcher.l1_batch", batch_info.l1_batch_number.0 as f64, "status" => "committed");
             *last_committed_l1_batch += 1;
         }
@@ -251,7 +251,7 @@ impl BatchStatusUpdater {
                 l1_tx_hash: batch_info.base.prove_tx_hash.unwrap(),
                 happened_at: batch_info.base.proven_at.unwrap(),
             });
-            vlog::info!("Batch {}: proven", batch_info.l1_batch_number);
+            tracing::info!("Batch {}: proven", batch_info.l1_batch_number);
             metrics::gauge!("external_node.fetcher.l1_batch", batch_info.l1_batch_number.0 as f64, "status" => "proven");
             *last_proven_l1_batch += 1;
         }
@@ -274,7 +274,7 @@ impl BatchStatusUpdater {
                 l1_tx_hash: batch_info.base.execute_tx_hash.unwrap(),
                 happened_at: batch_info.base.executed_at.unwrap(),
             });
-            vlog::info!("Batch {}: executed", batch_info.l1_batch_number);
+            tracing::info!("Batch {}: executed", batch_info.l1_batch_number);
             metrics::gauge!("external_node.fetcher.l1_batch", batch_info.l1_batch_number.0 as f64, "status" => "executed");
             *last_executed_l1_batch += 1;
         }
@@ -293,7 +293,7 @@ impl BatchStatusUpdater {
         let mut storage = self.pool.access_storage_tagged("sync_layer").await;
 
         for change in changes.commit.into_iter() {
-            vlog::info!(
+            tracing::info!(
                 "Commit status change: number {}, hash {}, happened at {}",
                 change.number,
                 change.l1_tx_hash,
@@ -311,7 +311,7 @@ impl BatchStatusUpdater {
             self.last_committed_l1_batch = change.number;
         }
         for change in changes.prove.into_iter() {
-            vlog::info!(
+            tracing::info!(
                 "Prove status change: number {}, hash {}, happened at {}",
                 change.number,
                 change.l1_tx_hash,
@@ -329,7 +329,7 @@ impl BatchStatusUpdater {
             self.last_proven_l1_batch = change.number;
         }
         for change in changes.execute.into_iter() {
-            vlog::info!(
+            tracing::info!(
                 "Execute status change: number {}, hash {}, happened at {}",
                 change.number,
                 change.l1_tx_hash,
diff --git a/core/bin/zksync_core/src/sync_layer/external_io.rs b/core/bin/zksync_core/src/sync_layer/external_io.rs
index 01c04db706d3..1a64d57efabd 100644
--- a/core/bin/zksync_core/src/sync_layer/external_io.rs
+++ b/core/bin/zksync_core/src/sync_layer/external_io.rs
@@ -1,13 +1,21 @@
-use std::{collections::HashMap, convert::TryFrom, iter::FromIterator, time::Duration};
+use std::{
+    collections::HashMap,
+    convert::{TryFrom, TryInto},
+    iter::FromIterator,
+    time::Duration,
+};
 
-use super::genesis::fetch_system_contract_by_hash;
 use actix_rt::time::Instant;
 use async_trait::async_trait;
-use zksync_contracts::{BaseSystemContracts, BaseSystemContractsHashes, SystemContractCode};
+
+use vm::{FinishedL1Batch, L1BatchEnv, SystemEnv};
+use zksync_contracts::{BaseSystemContracts, SystemContractCode};
 use zksync_dal::ConnectionPool;
+use zksync_types::block::legacy_miniblock_hash;
+use zksync_types::witness_block_state::WitnessBlockState;
 use zksync_types::{
     ethabi::Address, l1::L1Tx, l2::L2Tx, protocol_version::ProtocolUpgradeTx, L1BatchNumber,
-    L1BlockNumber, MiniblockNumber, ProtocolVersionId, Transaction, H256, U256,
+    L1BlockNumber, L2ChainId, MiniblockNumber, ProtocolVersionId, Transaction, H256, U256,
 };
 use zksync_utils::{be_words_to_bytes, bytes_to_be_words};
 
@@ -15,13 +23,17 @@ use crate::state_keeper::{
     extractors,
     io::{
         common::{l1_batch_params, load_pending_batch, poll_iters},
-        L1BatchParams, PendingBatchData, StateKeeperIO,
+        MiniblockParams, PendingBatchData, StateKeeperIO,
     },
     seal_criteria::SealerFn,
     updates::UpdatesManager,
 };
 
 use super::{
+    genesis::{
+        fetch_protocol_version, fetch_sync_block_without_transactions,
+        fetch_system_contract_by_hash,
+    },
     sync_action::{ActionQueue, SyncAction},
     SyncState,
 };
@@ -46,15 +58,18 @@ impl ExternalNodeSealer {
     fn should_seal_miniblock(&self) -> bool {
         let res = matches!(self.actions.peek_action(), Some(SyncAction::SealMiniblock));
         if res {
-            vlog::info!("Sealing miniblock");
+            tracing::info!("Sealing miniblock");
         }
         res
     }
 
     fn should_seal_batch(&self) -> bool {
-        let res = matches!(self.actions.peek_action(), Some(SyncAction::SealBatch));
+        let res = matches!(
+            self.actions.peek_action(),
+            Some(SyncAction::SealBatch { .. })
+        );
         if res {
-            vlog::info!("Sealing the batch");
+            tracing::info!("Sealing the batch");
         }
         res
     }
@@ -86,6 +101,9 @@ pub struct ExternalIO {
 
     /// Required to extract newly added tokens.
     l2_erc20_bridge_addr: Address,
+    // TODO it's required for system env, probably we have to get rid of getting system env
+    validation_computational_gas_limit: u32,
+    chain_id: L2ChainId,
 }
 
 impl ExternalIO {
@@ -95,13 +113,15 @@ impl ExternalIO {
         sync_state: SyncState,
         main_node_url: String,
         l2_erc20_bridge_addr: Address,
+        validation_computational_gas_limit: u32,
+        chain_id: L2ChainId,
     ) -> Self {
         let mut storage = pool.access_storage_tagged("sync_layer").await;
         let last_sealed_l1_batch_header = storage.blocks_dal().get_newest_l1_batch_header().await;
         let last_miniblock_number = storage.blocks_dal().get_sealed_miniblock_number().await;
         drop(storage);
 
-        vlog::info!(
+        tracing::info!(
             "Initialized the ExternalIO: current L1 batch number {}, current miniblock number {}",
             last_sealed_l1_batch_header.number + 1,
             last_miniblock_number + 1,
@@ -117,9 +137,62 @@ impl ExternalIO {
             sync_state,
             main_node_url,
             l2_erc20_bridge_addr,
+            validation_computational_gas_limit,
+            chain_id,
         }
     }
 
+    pub async fn recalculate_miniblock_hashes(&self) {
+        let mut storage = self.pool.access_storage_tagged("sync_layer").await;
+        let last_blocks: Vec<_> = storage
+            .blocks_dal()
+            .get_last_miniblocks_for_version(5, ProtocolVersionId::Version12)
+            .await;
+
+        // All last miniblocks are good that means we have already applied this migrations
+        if last_blocks
+            .into_iter()
+            .all(|(number, hash)| legacy_miniblock_hash(number) == hash)
+        {
+            return;
+        }
+
+        // August 29 2023
+        let timestamp = 1693267200;
+        let mut miniblock_and_hashes = storage
+            .blocks_dal()
+            .get_miniblock_hashes_from_date(timestamp, 1000, ProtocolVersionId::Version12)
+            .await;
+
+        let mut updated_hashes = vec![];
+
+        let mut last_miniblock_number = 0;
+        while !miniblock_and_hashes.is_empty() {
+            for (number, hash) in miniblock_and_hashes {
+                if hash != legacy_miniblock_hash(number) {
+                    updated_hashes.push((number, legacy_miniblock_hash(number)))
+                }
+                last_miniblock_number = number.0;
+            }
+            if !updated_hashes.is_empty() {
+                storage.blocks_dal().update_hashes(&updated_hashes).await;
+                updated_hashes = vec![];
+            }
+
+            miniblock_and_hashes = storage
+                .blocks_dal()
+                .get_miniblocks_since_block(
+                    last_miniblock_number as i64 + 1,
+                    1000,
+                    ProtocolVersionId::Version12,
+                )
+                .await;
+            tracing::info!("Last updated miniblock {}", last_miniblock_number);
+        }
+
+        tracing::info!("Finish the hash recalculation")
+    }
+
     async fn load_previous_l1_batch_hash(&self) -> U256 {
         let mut storage = self.pool.access_storage_tagged("sync_layer").await;
 
@@ -134,6 +207,55 @@ impl ExternalIO {
         hash
     }
 
+    async fn load_base_system_contracts_by_version_id(
+        &self,
+        id: ProtocolVersionId,
+    ) -> BaseSystemContracts {
+        let base_system_contracts = self
+            .pool
+            .access_storage_tagged("sync_layer")
+            .await
+            .protocol_versions_dal()
+            .load_base_system_contracts_by_version_id(id as u16)
+            .await;
+
+        match base_system_contracts {
+            Some(version) => version,
+            None => {
+                let protocol_version = fetch_protocol_version(&self.main_node_url, id)
+                    .await
+                    .expect("Failed to fetch protocol version from the main node");
+                self.pool
+                    .access_storage_tagged("sync_layer")
+                    .await
+                    .protocol_versions_dal()
+                    .save_protocol_version(
+                        protocol_version.version_id.try_into().unwrap(),
+                        protocol_version.timestamp,
+                        protocol_version.verification_keys_hashes,
+                        protocol_version.base_system_contracts,
+                        // Verifier is not used in the external node, so we can pass an empty
+                        Default::default(),
+                        protocol_version.l2_system_upgrade_tx_hash,
+                    )
+                    .await;
+
+                let bootloader = self
+                    .get_base_system_contract(protocol_version.base_system_contracts.bootloader)
+                    .await;
+
+                let default_aa = self
+                    .get_base_system_contract(protocol_version.base_system_contracts.default_aa)
+                    .await;
+
+                BaseSystemContracts {
+                    bootloader,
+                    default_aa,
+                }
+            }
+        }
+    }
+
     async fn get_base_system_contract(&self, hash: H256) -> SystemContractCode {
         let bytecode = self
             .pool
@@ -150,7 +272,7 @@ impl ExternalIO {
             },
             None => {
                 let main_node_url = self.main_node_url.clone();
-                vlog::info!("Fetching base system contract bytecode from the main node");
+                tracing::info!("Fetching base system contract bytecode from the main node");
                 let contract = fetch_system_contract_by_hash(&main_node_url, hash)
                     .await
                     .expect("Failed to fetch base system contract bytecode from the main node");
@@ -182,6 +304,7 @@ impl StateKeeperIO for ExternalIO {
     async fn load_pending_batch(&mut self) -> Option<PendingBatchData> {
         let mut storage = self.pool.access_storage_tagged("sync_layer").await;
 
+        // TODO (BFT-99): Do not assume that fee account is the same as in previous batch.
         let fee_account = storage
             .blocks_dal()
             .get_l1_batch_header(self.current_l1_batch_number - 1)
@@ -193,11 +316,53 @@ impl StateKeeperIO for ExternalIO {
                 )
             })
             .fee_account_address;
-        load_pending_batch(&mut storage, self.current_l1_batch_number, fee_account).await
+        let pending_miniblock_number = {
+            let (_, last_miniblock_number_included_in_l1_batch) = storage
+                .blocks_dal()
+                .get_miniblock_range_of_l1_batch(self.current_l1_batch_number - 1)
+                .await
+                .unwrap();
+            last_miniblock_number_included_in_l1_batch + 1
+        };
+        let pending_miniblock_header = storage
+            .blocks_dal()
+            .get_miniblock_header(pending_miniblock_number)
+            .await?;
+
+        if pending_miniblock_header.protocol_version.is_none() {
+            // Fetch protocol version ID for pending miniblocks to know which VM to use to reexecute them.
+            let sync_block = fetch_sync_block_without_transactions(
+                &self.main_node_url,
+                pending_miniblock_header.number,
+            )
+            .await
+            .expect("Failed to fetch block from the main node")
+            .expect("Block must exist");
+            // Loading base system contracts will insert protocol version in the database if it's not present there.
+            let _ = self
+                .load_base_system_contracts_by_version_id(sync_block.protocol_version)
+                .await;
+            storage
+                .blocks_dal()
+                .set_protocol_version_for_pending_miniblocks(sync_block.protocol_version)
+                .await;
+        }
+
+        load_pending_batch(
+            &mut storage,
+            self.current_l1_batch_number,
+            fee_account,
+            self.validation_computational_gas_limit,
+            self.chain_id,
+        )
+        .await
     }
 
-    async fn wait_for_new_batch_params(&mut self, max_wait: Duration) -> Option<L1BatchParams> {
-        vlog::debug!("Waiting for the new batch params");
+    async fn wait_for_new_batch_params(
+        &mut self,
+        max_wait: Duration,
+    ) -> Option<(SystemEnv, L1BatchEnv)> {
+        tracing::debug!("Waiting for the new batch params");
         for _ in 0..poll_iters(POLL_INTERVAL, max_wait) {
             match self.actions.pop_action() {
                 Some(SyncAction::OpenBatch {
@@ -205,27 +370,22 @@ impl StateKeeperIO for ExternalIO {
                     timestamp,
                     l1_gas_price,
                     l2_fair_gas_price,
-                    base_system_contracts_hashes:
-                        BaseSystemContractsHashes {
-                            bootloader,
-                            default_aa,
-                        },
                     operator_address,
                     protocol_version,
+                    first_miniblock_info: (miniblock_number, virtual_blocks),
+                    prev_miniblock_hash,
                 }) => {
                     assert_eq!(
                         number, self.current_l1_batch_number,
                         "Batch number mismatch"
                     );
-                    vlog::info!("Getting previous L1 batch hash");
+                    tracing::info!("Getting previous L1 batch hash");
                     let previous_l1_batch_hash = self.load_previous_l1_batch_hash().await;
-                    vlog::info!("Previous L1 batch hash: {previous_l1_batch_hash}");
-
-                    let base_system_contracts = BaseSystemContracts {
-                        bootloader: self.get_base_system_contract(bootloader).await,
-                        default_aa: self.get_base_system_contract(default_aa).await,
-                    };
+                    tracing::info!("Previous L1 batch hash: {previous_l1_batch_hash}");
 
+                    let base_system_contracts = self
+                        .load_base_system_contracts_by_version_id(protocol_version)
+                        .await;
                     return Some(l1_batch_params(
                         number,
                         operator_address,
@@ -233,8 +393,13 @@ impl StateKeeperIO for ExternalIO {
                         previous_l1_batch_hash,
                         l1_gas_price,
                         l2_fair_gas_price,
+                        miniblock_number,
+                        prev_miniblock_hash,
                         base_system_contracts,
-                        protocol_version.unwrap_or_default(),
+                        self.validation_computational_gas_limit,
+                        protocol_version,
+                        virtual_blocks,
+                        self.chain_id,
                     ));
                 }
                 Some(other) => {
@@ -252,25 +417,35 @@ impl StateKeeperIO for ExternalIO {
         &mut self,
         max_wait: Duration,
         _prev_miniblock_timestamp: u64,
-    ) -> Option<u64> {
+    ) -> Option<MiniblockParams> {
         // Wait for the next miniblock to appear in the queue.
         let actions = &self.actions;
         for _ in 0..poll_iters(POLL_INTERVAL, max_wait) {
             match actions.peek_action() {
-                Some(SyncAction::Miniblock { number, timestamp }) => {
+                Some(SyncAction::Miniblock {
+                    number,
+                    timestamp,
+                    virtual_blocks,
+                }) => {
                     self.actions.pop_action(); // We found the miniblock, remove it from the queue.
                     assert_eq!(
                         number, self.current_miniblock_number,
                         "Miniblock number mismatch"
                     );
-                    return Some(timestamp);
+                    return Some(MiniblockParams {
+                        timestamp,
+                        virtual_blocks,
+                    });
                 }
-                Some(SyncAction::SealBatch) => {
+                Some(SyncAction::SealBatch { virtual_blocks }) => {
                     // We've reached the next batch, so this situation would be handled by the batch sealer.
                     // No need to pop the action from the queue.
                     // It also doesn't matter which timestamp we return, since there will be no more miniblocks in this
                     // batch. We return 0 to make it easy to detect if it ever appears somewhere.
-                    return Some(0);
+                    return Some(MiniblockParams {
+                        timestamp: 0,
+                        virtual_blocks,
+                    });
                 }
                 Some(other) => {
                     panic!(
@@ -289,7 +464,7 @@ impl StateKeeperIO for ExternalIO {
 
     async fn wait_for_next_tx(&mut self, max_wait: Duration) -> Option<Transaction> {
         let actions = &self.actions;
-        vlog::debug!(
+        tracing::debug!(
             "Waiting for the new tx, next action is {:?}",
             actions.peek_action()
         );
@@ -356,6 +531,13 @@ impl StateKeeperIO for ExternalIO {
                     .transactions_dal()
                     .insert_transaction_l2(l2_tx, Default::default())
                     .await;
+            } else if let Ok(protocol_system_upgrade_tx) =
+                ProtocolUpgradeTx::try_from(tx.transaction.clone())
+            {
+                transaction
+                    .transactions_dal()
+                    .insert_system_transaction(protocol_system_upgrade_tx)
+                    .await;
             } else {
                 unreachable!("Transaction {:?} is neither L1 nor L2", tx.transaction);
             }
@@ -378,17 +560,19 @@ impl StateKeeperIO for ExternalIO {
         self.sync_state
             .set_local_block(self.current_miniblock_number);
         self.current_miniblock_number += 1;
-        vlog::info!("Miniblock {} is sealed", self.current_miniblock_number);
+        tracing::info!("Miniblock {} is sealed", self.current_miniblock_number);
     }
 
     async fn seal_l1_batch(
         &mut self,
-        block_result: vm::VmBlockResult,
+        // needed as part of the interface, to be removed once we transition to Merkle Paths
+        _witness_block_state: Option<WitnessBlockState>,
         updates_manager: UpdatesManager,
-        block_context: vm::vm_with_bootloader::DerivedBlockContext,
+        l1_batch_env: &L1BatchEnv,
+        finished_batch: FinishedL1Batch,
     ) {
         match self.actions.pop_action() {
-            Some(SyncAction::SealBatch) => {}
+            Some(SyncAction::SealBatch { .. }) => {}
             other => panic!(
                 "State keeper requested to seal the batch, but the next action is {:?}",
                 other
@@ -400,14 +584,13 @@ impl StateKeeperIO for ExternalIO {
             .seal_l1_batch(
                 &mut storage,
                 self.current_miniblock_number,
-                self.current_l1_batch_number,
-                block_result,
-                block_context,
+                l1_batch_env,
+                finished_batch,
                 self.l2_erc20_bridge_addr,
             )
             .await;
 
-        vlog::info!("Batch {} is sealed", self.current_l1_batch_number);
+        tracing::info!("Batch {} is sealed", self.current_l1_batch_number);
 
         // Mimic the metric emitted by the main node to reuse existing grafana charts.
         metrics::gauge!(
diff --git a/core/bin/zksync_core/src/sync_layer/fetcher.rs b/core/bin/zksync_core/src/sync_layer/fetcher.rs
index f55201409655..728f361708f4 100644
--- a/core/bin/zksync_core/src/sync_layer/fetcher.rs
+++ b/core/bin/zksync_core/src/sync_layer/fetcher.rs
@@ -4,7 +4,7 @@ use tokio::sync::watch::Receiver;
 
 use crate::sync_layer::sync_action::{ActionQueue, SyncAction};
 use zksync_dal::ConnectionPool;
-use zksync_types::{L1BatchNumber, MiniblockNumber};
+use zksync_types::{L1BatchNumber, MiniblockNumber, H256};
 use zksync_web3_decl::jsonrpsee::core::Error as RpcError;
 use zksync_web3_decl::RpcResult;
 
@@ -19,7 +19,6 @@ pub struct MainNodeFetcher {
     client: CachedMainNodeClient,
     current_l1_batch: L1BatchNumber,
     current_miniblock: MiniblockNumber,
-
     actions: ActionQueue,
     sync_state: SyncState,
     stop_receiver: Receiver<bool>,
@@ -58,15 +57,14 @@ impl MainNodeFetcher {
             client,
             current_l1_batch,
             current_miniblock,
-
             actions,
             sync_state,
             stop_receiver,
         }
     }
 
-    pub async fn run(mut self) {
-        vlog::info!(
+    pub async fn run(mut self) -> anyhow::Result<()> {
+        tracing::info!(
             "Starting the fetcher routine. Initial miniblock: {}, initial l1 batch: {}",
             self.current_miniblock,
             self.current_l1_batch
@@ -75,16 +73,16 @@ impl MainNodeFetcher {
         loop {
             match self.run_inner().await {
                 Ok(()) => {
-                    vlog::info!("Stop signal received, exiting the fetcher routine");
-                    return;
+                    tracing::info!("Stop signal received, exiting the fetcher routine");
+                    return Ok(());
                 }
                 Err(err @ RpcError::Transport(_) | err @ RpcError::RequestTimeout) => {
-                    vlog::warn!("Following transport error occurred: {}", err);
-                    vlog::info!("Trying again after a delay");
-                    tokio::time::sleep(RETRY_DELAY_INTERVAL).await;
+                    tracing::warn!("Following transport error occurred: {}", err);
+                    tracing::info!("Trying again after a delay");
+                    tokio::time::sleep(RETRY_DELAY_INTERVAL).await; // TODO (BFT-100): Implement the fibonacci backoff.
                 }
                 Err(err) => {
-                    panic!("Unexpected error in the fetcher: {}", err);
+                    anyhow::bail!("Unexpected error in the fetcher: {}", err);
                 }
             }
         }
@@ -121,7 +119,7 @@ impl MainNodeFetcher {
                 } else {
                     "Local action queue is full, waiting for state keeper to process the queue"
                 };
-                vlog::debug!("{log_message}");
+                tracing::debug!("{log_message}");
                 tokio::time::sleep(DELAY_INTERVAL).await;
             }
         }
@@ -136,6 +134,14 @@ impl MainNodeFetcher {
         let Some(block) = self.client.sync_l2_block(self.current_miniblock).await? else {
             return Ok(false);
         };
+
+        // This will be fetched from cache.
+        let prev_block = self
+            .client
+            .sync_l2_block(self.current_miniblock - 1)
+            .await?
+            .expect("Previous block must exist");
+
         metrics::histogram!(
             "external_node.fetcher.requests",
             request_start.elapsed(),
@@ -151,7 +157,7 @@ impl MainNodeFetcher {
                 "Unexpected batch number in the next received miniblock"
             );
 
-            vlog::info!(
+            tracing::info!(
                 "New batch: {}. Timestamp: {}",
                 block.l1_batch_number,
                 block.timestamp
@@ -162,9 +168,12 @@ impl MainNodeFetcher {
                 timestamp: block.timestamp,
                 l1_gas_price: block.l1_gas_price,
                 l2_fair_gas_price: block.l2_fair_gas_price,
-                base_system_contracts_hashes: block.base_system_contracts_hashes,
                 operator_address: block.operator_address,
-                protocol_version: None,
+                protocol_version: block.protocol_version,
+                // `block.virtual_blocks` can be `None` only for old VM versions where it's not used, so it's fine to provide any number.
+                first_miniblock_info: (block.number, block.virtual_blocks.unwrap_or(0)),
+                // Same for `prev_block.hash` as above.
+                prev_miniblock_hash: prev_block.hash.unwrap_or_else(H256::zero),
             });
             metrics::gauge!("external_node.fetcher.l1_batch", block.l1_batch_number.0 as f64, "status" => "open");
             self.current_l1_batch += 1;
@@ -174,6 +183,8 @@ impl MainNodeFetcher {
             new_actions.push(SyncAction::Miniblock {
                 number: block.number,
                 timestamp: block.timestamp,
+                // `block.virtual_blocks` can be `None` only for old VM versions where it's not used, so it's fine to provide any number.
+                virtual_blocks: block.virtual_blocks.unwrap_or(0),
             });
             metrics::gauge!("external_node.fetcher.miniblock", block.number.0 as f64);
         }
@@ -191,17 +202,22 @@ impl MainNodeFetcher {
         // Last miniblock of the batch is a "fictive" miniblock and would be replicated locally.
         // We don't need to seal it explicitly, so we only put the seal miniblock command if it's not the last miniblock.
         if block.last_in_batch {
-            new_actions.push(SyncAction::SealBatch);
+            new_actions.push(SyncAction::SealBatch {
+                // `block.virtual_blocks` can be `None` only for old VM versions where it's not used, so it's fine to provide any number.
+                virtual_blocks: block.virtual_blocks.unwrap_or(0),
+            });
         } else {
             new_actions.push(SyncAction::SealMiniblock);
         }
 
-        vlog::info!(
+        tracing::info!(
             "New miniblock: {} / {}",
             block.number,
             self.sync_state.get_main_node_block().max(block.number)
         );
-        self.client.forget_miniblock(self.current_miniblock);
+        // Forgetting only the previous one because we still need the current one in cache for the next iteration.
+        self.client
+            .forget_miniblock(MiniblockNumber(self.current_miniblock.0.saturating_sub(1)));
         self.current_miniblock += 1;
         self.actions.push_actions(new_actions);
 
diff --git a/core/bin/zksync_core/src/sync_layer/genesis.rs b/core/bin/zksync_core/src/sync_layer/genesis.rs
index 6843d12757ee..74a9f42d017e 100644
--- a/core/bin/zksync_core/src/sync_layer/genesis.rs
+++ b/core/bin/zksync_core/src/sync_layer/genesis.rs
@@ -6,7 +6,7 @@ use zksync_dal::StorageProcessor;
 use zksync_types::{
     api, block::DeployedContract, get_code_key, protocol_version::L1VerifierConfig,
     system_contracts::get_system_smart_contracts, AccountTreeId, Address, L1BatchNumber, L2ChainId,
-    MiniblockNumber, ACCOUNT_CODE_STORAGE_ADDRESS, H256, U64,
+    MiniblockNumber, ProtocolVersionId, ACCOUNT_CODE_STORAGE_ADDRESS, H256, U64,
 };
 use zksync_utils::h256_to_u256;
 use zksync_web3_decl::{
@@ -24,15 +24,15 @@ pub async fn perform_genesis_if_needed(
     // make the node startup slower.
     let genesis_block_hash = if transaction.blocks_dal().is_genesis_needed().await {
         let genesis_params = create_genesis_params(&main_node_url).await?;
-        let genesis_block_hash =
-            ensure_genesis_state(&mut transaction, zksync_chain_id, &genesis_params).await;
-        genesis_block_hash
+        ensure_genesis_state(&mut transaction, zksync_chain_id, &genesis_params)
+            .await
+            .context("ensure_genesis_state")?
     } else {
         transaction
             .blocks_dal()
             .get_l1_batch_state_root(L1BatchNumber(0))
             .await
-            .expect("genesis block hash is empty")
+            .context("genesis block hash is empty")?
     };
 
     validate_genesis_state(&main_node_url, genesis_block_hash).await;
@@ -95,7 +95,7 @@ async fn create_genesis_params(main_node_url: &str) -> anyhow::Result<GenesisPar
         else {
             // It's OK for some of contracts to be absent.
             // If this is a bug, the genesis root hash won't match.
-            vlog::debug!("System contract with address {system_contract_address:?} is absent at genesis state");
+            tracing::debug!("System contract with address {system_contract_address:?} is absent at genesis state");
             continue;
         };
         let contract = DeployedContract::new(AccountTreeId::new(system_contract_address), bytecode);
@@ -106,10 +106,17 @@ async fn create_genesis_params(main_node_url: &str) -> anyhow::Result<GenesisPar
         "No system contracts were fetched: this is a bug"
     );
 
+    let protocol_version = fetch_sync_block_without_transactions(main_node_url, MiniblockNumber(0))
+        .await
+        .context("Failed to fetch sync block from main node")?
+        .context("Genesis miniblock is missing on main node")?
+        .protocol_version;
+
     // Use default L1 verifier config and verifier address for genesis as they are not used by EN.
     let first_l1_verifier_config = L1VerifierConfig::default();
     let first_verifier_address = Address::default();
     Ok(GenesisParams {
+        protocol_version,
         base_system_contracts,
         system_contracts,
         first_validator,
@@ -184,3 +191,23 @@ pub async fn fetch_base_system_contracts(
         default_aa: fetch_system_contract_by_hash(main_node_url, hashes.default_aa).await?,
     })
 }
+
+pub async fn fetch_protocol_version(
+    main_node_url: &str,
+    protocol_version: ProtocolVersionId,
+) -> Result<api::ProtocolVersion, Error> {
+    let client = HttpClientBuilder::default().build(main_node_url).unwrap();
+
+    Ok(client
+        .get_protocol_version(Some(protocol_version as u16))
+        .await?
+        .expect("Protocol version must exist"))
+}
+
+pub async fn fetch_sync_block_without_transactions(
+    main_node_url: &str,
+    miniblock_number: MiniblockNumber,
+) -> Result<Option<api::en::SyncBlock>, Error> {
+    let client = HttpClientBuilder::default().build(main_node_url).unwrap();
+    client.sync_l2_block(miniblock_number, false).await
+}
diff --git a/core/bin/zksync_core/src/sync_layer/sync_action.rs b/core/bin/zksync_core/src/sync_layer/sync_action.rs
index 24ccecc7bdfe..ebceae791828 100644
--- a/core/bin/zksync_core/src/sync_layer/sync_action.rs
+++ b/core/bin/zksync_core/src/sync_layer/sync_action.rs
@@ -4,11 +4,13 @@ use std::{
     time::Instant,
 };
 
-use zksync_contracts::BaseSystemContractsHashes;
-use zksync_types::{Address, L1BatchNumber, MiniblockNumber, ProtocolVersionId, Transaction};
+use zksync_types::{Address, L1BatchNumber, MiniblockNumber, ProtocolVersionId, Transaction, H256};
 
 /// Action queue is used to communicate between the fetcher and the rest of the external node
 /// by collecting the fetched data in memory until it gets processed by the different entities.
+///
+/// TODO (BFT-82): This structure right now expects no more than a single consumer. Using `peek/pop` pairs in
+/// two different threads may lead to a race condition.
 #[derive(Debug, Clone, Default)]
 pub struct ActionQueue {
     inner: Arc<RwLock<ActionQueueInner>>,
@@ -35,7 +37,7 @@ impl ActionQueue {
     /// Returns true if the queue has capacity for a new action.
     /// Capacity is limited to avoid memory exhaustion.
     pub(crate) fn has_action_capacity(&self) -> bool {
-        const ACTION_CAPACITY: usize = 32_768;
+        const ACTION_CAPACITY: usize = 32_768; // TODO: Make it configurable.
 
         // Since the capacity is read before the action is pushed,
         // it is possible that the capacity will be exceeded, since the fetcher will
@@ -86,7 +88,7 @@ impl ActionQueue {
                         return Err(format!("Unexpected Tx: {:?}", actions));
                     }
                 }
-                SyncAction::SealMiniblock | SyncAction::SealBatch => {
+                SyncAction::SealMiniblock | SyncAction::SealBatch { .. } => {
                     if !opened || miniblock_sealed {
                         return Err(format!("Unexpected SealMiniblock/SealBatch: {:?}", actions));
                     }
@@ -128,13 +130,16 @@ pub(crate) enum SyncAction {
         timestamp: u64,
         l1_gas_price: u64,
         l2_fair_gas_price: u64,
-        base_system_contracts_hashes: BaseSystemContractsHashes,
         operator_address: Address,
-        protocol_version: Option<ProtocolVersionId>,
+        protocol_version: ProtocolVersionId,
+        // Miniblock number and virtual blocks count.
+        first_miniblock_info: (MiniblockNumber, u32),
+        prev_miniblock_hash: H256,
     },
     Miniblock {
         number: MiniblockNumber,
         timestamp: u64,
+        virtual_blocks: u32,
     },
     Tx(Box<Transaction>),
     /// We need an explicit action for the miniblock sealing, since we fetch the whole miniblocks and already know
@@ -143,7 +148,10 @@ pub(crate) enum SyncAction {
     /// the next one is sealed on the main node.
     SealMiniblock,
     /// Similarly to `SealMiniblock` we must be able to seal the batch even if there is no next miniblock yet.
-    SealBatch,
+    SealBatch {
+        // Virtual blocks count for the fictive miniblock.
+        virtual_blocks: u32,
+    },
 }
 
 impl From<Transaction> for SyncAction {
@@ -164,9 +172,10 @@ mod tests {
             timestamp: 1,
             l1_gas_price: 1,
             l2_fair_gas_price: 1,
-            base_system_contracts_hashes: BaseSystemContractsHashes::default(),
             operator_address: Default::default(),
-            protocol_version: Some(ProtocolVersionId::latest()),
+            protocol_version: ProtocolVersionId::latest(),
+            first_miniblock_info: (1.into(), 1),
+            prev_miniblock_hash: H256::default(),
         }
     }
 
@@ -174,6 +183,7 @@ mod tests {
         SyncAction::Miniblock {
             number: 1.into(),
             timestamp: 1,
+            virtual_blocks: 1,
         }
     }
 
@@ -198,7 +208,7 @@ mod tests {
     }
 
     fn seal_batch() -> SyncAction {
-        SyncAction::SealBatch
+        SyncAction::SealBatch { virtual_blocks: 1 }
     }
 
     #[test]
diff --git a/core/bin/zksync_core/src/sync_layer/sync_state.rs b/core/bin/zksync_core/src/sync_layer/sync_state.rs
index 83027a446723..3705f3dd5ed9 100644
--- a/core/bin/zksync_core/src/sync_layer/sync_state.rs
+++ b/core/bin/zksync_core/src/sync_layer/sync_state.rs
@@ -38,9 +38,11 @@ impl SyncState {
         let mut inner = self.inner.write().unwrap();
         if let Some(local_block) = inner.local_block {
             if block.0 < local_block.0 {
-                panic!(
+                // Probably it's fine -- will be checked by the reorg detector.
+                tracing::warn!(
                     "main_node_block({}) is less than local_block({})",
-                    block, local_block
+                    block,
+                    local_block
                 );
             }
         }
@@ -53,7 +55,7 @@ impl SyncState {
         if let Some(main_node_block) = inner.main_node_block {
             if block.0 > main_node_block.0 {
                 // Probably it's fine -- will be checked by the reorg detector.
-                vlog::info!(
+                tracing::warn!(
                     "local_block({}) is greater than main_node_block({})",
                     block,
                     main_node_block
@@ -140,11 +142,14 @@ mod tests {
     }
 
     #[test]
-    #[should_panic(expected = "main_node_block(1) is less than local_block(2)")]
-    fn test_sync_state_panic_on_main_node_block() {
+    fn test_sync_state_doesnt_panic_on_main_node_block() {
         let sync_state = SyncState::new();
 
         sync_state.set_local_block(MiniblockNumber(2));
         sync_state.set_main_node_block(MiniblockNumber(1));
+        // ^ should not panic, as we defer the situation to the reorg detector.
+
+        // At the same time, we should consider ourselves synced unless `ReorgDetector` tells us otherwise.
+        assert!(sync_state.is_synced());
     }
 }
diff --git a/core/bin/zksync_core/src/witness_generator/basic_circuits.rs b/core/bin/zksync_core/src/witness_generator/basic_circuits.rs
index d2a814fa48db..d96f3a30e2e1 100644
--- a/core/bin/zksync_core/src/witness_generator/basic_circuits.rs
+++ b/core/bin/zksync_core/src/witness_generator/basic_circuits.rs
@@ -1,6 +1,7 @@
 use std::collections::hash_map::DefaultHasher;
 use std::collections::{HashMap, HashSet};
 use std::hash::{Hash, Hasher};
+
 use std::sync::Arc;
 use std::time::Instant;
 
@@ -8,19 +9,18 @@ use async_trait::async_trait;
 use rand::Rng;
 use serde::{Deserialize, Serialize};
 
-use vm::zk_evm::ethereum_types::H256;
-use vm::HistoryDisabled;
-use vm::{memory::SimpleMemory, StorageOracle, MAX_CYCLES_FOR_TX};
+use vm::{constants::MAX_CYCLES_FOR_TX, HistoryDisabled, SimpleMemory, StorageOracle};
+use zksync_config::configs::witness_generator::BasicWitnessGeneratorDataSource;
 use zksync_config::configs::WitnessGeneratorConfig;
 use zksync_config::constants::BOOTLOADER_ADDRESS;
 use zksync_dal::ConnectionPool;
 use zksync_object_store::{Bucket, ObjectStore, ObjectStoreFactory, StoredObject};
 use zksync_queued_job_processor::JobProcessor;
-use zksync_state::{PostgresStorage, StorageView};
-use zksync_types::zkevm_test_harness::toolset::GeometryConfig;
+use zksync_state::{PostgresStorage, ReadStorage, ShadowStorage, StorageView, WitnessStorage};
 use zksync_types::{
     circuit::GEOMETRY_CONFIG,
     proofs::{AggregationRound, BasicCircuitWitnessGeneratorInput, PrepareBasicCircuitsJob},
+    zkevm_test_harness::toolset::GeometryConfig,
     zkevm_test_harness::{
         abstract_zksync_circuit::concrete_circuits::ZkSyncCircuit,
         bellman::bn256::Bn256,
@@ -28,7 +28,7 @@ use zksync_types::{
         witness::oracle::VmWitnessOracle,
         SchedulerCircuitInstanceWitness,
     },
-    Address, L1BatchNumber, ProtocolVersionId, U256,
+    Address, L1BatchNumber, ProtocolVersionId, H256, U256,
 };
 use zksync_utils::{bytes_to_chunks, h256_to_u256, u256_to_h256};
 
@@ -100,7 +100,7 @@ impl BasicWitnessGenerator {
             // In this case job should be skipped.
             if threshold > blocks_proving_percentage {
                 metrics::counter!("server.witness_generator.skipped_blocks", 1);
-                vlog::info!(
+                tracing::info!(
                     "Skipping witness generation for block {}, blocks_proving_percentage: {}",
                     block_number.0,
                     blocks_proving_percentage
@@ -120,7 +120,7 @@ impl BasicWitnessGenerator {
         }
 
         metrics::counter!("server.witness_generator.sampled_blocks", 1);
-        vlog::info!(
+        tracing::info!(
             "Starting witness generation of type {:?} for block {}",
             AggregationRound::BasicCircuits,
             block_number.0
@@ -242,7 +242,7 @@ pub async fn process_basic_circuits_job(
         generate_witness(object_store, config, connection_pool, witness_gen_input).await;
     let circuits = basic_circuits.clone().into_flattened_set();
 
-    vlog::info!(
+    tracing::info!(
         "Witness generation for block {} is complete in {:?}. Number of circuits: {}",
         block_number.0,
         started_at.elapsed(),
@@ -451,21 +451,58 @@ pub async fn generate_witness(
 
     // The following part is CPU-heavy, so we move it to a separate thread.
     tokio::task::spawn_blocking(move || {
-        let connection = rt_handle.block_on(connection_pool.access_storage());
-        let storage =
-            PostgresStorage::new(rt_handle.clone(), connection, last_miniblock_number, true);
+        // NOTE: this `match` will be moved higher up, as we need to load EVERYTHING from Blob, not just storage
+        // Until we can derive Storage from Merkle Paths, we'll have this version as testing ground.
+        let storage: Box<dyn ReadStorage> = match config.data_source {
+            BasicWitnessGeneratorDataSource::FromPostgres => {
+                let connection = rt_handle.block_on(connection_pool.access_storage());
+                Box::new(PostgresStorage::new(
+                    rt_handle.clone(),
+                    connection,
+                    last_miniblock_number,
+                    true,
+                ))
+            }
+            BasicWitnessGeneratorDataSource::FromPostgresShadowBlob => {
+                let connection = rt_handle.block_on(connection_pool.access_storage());
+                let source_storage = Box::new(PostgresStorage::new(
+                    rt_handle.clone(),
+                    connection,
+                    last_miniblock_number,
+                    true,
+                ));
+                let block_state = input
+                    .merkle_paths_input
+                    .clone()
+                    .into_witness_hash_block_state();
+                let checked_storage = Box::new(WitnessStorage::new(block_state));
+                Box::new(ShadowStorage::new(
+                    source_storage,
+                    checked_storage,
+                    input.block_number,
+                ))
+            }
+            BasicWitnessGeneratorDataSource::FromBlob => {
+                let block_state = input
+                    .merkle_paths_input
+                    .clone()
+                    .into_witness_hash_block_state();
+                Box::new(WitnessStorage::new(block_state))
+            }
+        };
         let mut tree = PrecalculatedMerklePathsProvider::new(
             input.merkle_paths_input,
             input.previous_block_hash.0,
         );
 
-        let storage_view = &mut StorageView::new(storage);
-        let storage_oracle: StorageOracle<HistoryDisabled> =
-            StorageOracle::new(storage_view.as_ptr());
+        let storage_view = StorageView::new(storage);
+        let storage_view = storage_view.to_rc_ptr();
+        let storage_oracle: StorageOracle<StorageView<Box<dyn ReadStorage>>, HistoryDisabled> =
+            StorageOracle::new(storage_view);
         let memory: SimpleMemory<HistoryDisabled> = SimpleMemory::default();
         let mut hasher = DefaultHasher::new();
         GEOMETRY_CONFIG.hash(&mut hasher);
-        vlog::info!(
+        tracing::info!(
             "generating witness for block {} using geometry config hash: {}",
             input.block_number.0,
             hasher.finish()
diff --git a/core/bin/zksync_core/src/witness_generator/leaf_aggregation.rs b/core/bin/zksync_core/src/witness_generator/leaf_aggregation.rs
index 62280926733d..eedb2d4d8e9c 100644
--- a/core/bin/zksync_core/src/witness_generator/leaf_aggregation.rs
+++ b/core/bin/zksync_core/src/witness_generator/leaf_aggregation.rs
@@ -76,7 +76,7 @@ impl LeafAggregationWitnessGenerator {
     ) -> LeafAggregationArtifacts {
         let LeafAggregationWitnessGeneratorJob { block_number, job } = leaf_job;
 
-        vlog::info!(
+        tracing::info!(
             "Starting witness generation of type {:?} for block {}",
             AggregationRound::LeafAggregation,
             block_number.0
@@ -179,7 +179,7 @@ pub fn process_leaf_aggregation_job(
         VerificationKey<Bn256, ZkSyncCircuit<Bn256, VmWitnessOracle<Bn256>>>,
     > = get_vks_for_basic_circuits();
 
-    vlog::info!(
+    tracing::info!(
         "Verification keys loaded in {:?}",
         stage_started_at.elapsed()
     );
@@ -194,7 +194,7 @@ pub fn process_leaf_aggregation_job(
             verification_keys,
         ));
 
-    vlog::info!("Commitments generated in {:?}", stage_started_at.elapsed());
+    tracing::info!("Commitments generated in {:?}", stage_started_at.elapsed());
 
     let stage_started_at = Instant::now();
 
@@ -210,11 +210,11 @@ pub fn process_leaf_aggregation_job(
             g2_points,
         );
 
-    vlog::info!(
+    tracing::info!(
         "prepare_leaf_aggregations took {:?}",
         stage_started_at.elapsed()
     );
-    vlog::info!(
+    tracing::info!(
         "Leaf witness generation for block {} is complete in {:?}. Number of circuits: {}",
         block_number.0,
         started_at.elapsed(),
diff --git a/core/bin/zksync_core/src/witness_generator/mod.rs b/core/bin/zksync_core/src/witness_generator/mod.rs
index c39a9d8eb605..4700318d5b39 100644
--- a/core/bin/zksync_core/src/witness_generator/mod.rs
+++ b/core/bin/zksync_core/src/witness_generator/mod.rs
@@ -26,7 +26,7 @@ mod tests;
 /// each of them starts with an invocation of `WitnessGenerator` with a corresponding `WitnessGeneratorJobType`:
 ///  * `WitnessGeneratorJobType::BasicCircuits`:
 ///         generates basic circuits (circuits like `Main VM` - up to 50 * 48 = 2400 circuits):
-///         input table: `basic_circuit_witness_jobs`
+///         input table: `basic_circuit_witness_jobs` (todo SMA-1362: will be renamed from `witness_inputs`)
 ///         artifact/output table: `leaf_aggregation_jobs` (also creates job stubs in `node_aggregation_jobs` and `scheduler_aggregation_jobs`)
 ///         value in `aggregation_round` field of `prover_jobs` table: 0
 ///  * `WitnessGeneratorJobType::LeafAggregation`:
@@ -52,7 +52,7 @@ mod tests;
 ///    setting its status to `queued`
 ///  * `WitnessGenerator` picks up such job and proceeds to the next round
 ///
-/// Note that the very first input table (`basic_circuit_witness_jobs`)
+/// Note that the very first input table (`basic_circuit_witness_jobs` (todo SMA-1362: will be renamed from `witness_inputs`))
 /// is populated by the tree (as the input artifact for the `WitnessGeneratorJobType::BasicCircuits` is the merkle proofs)
 ///
 
diff --git a/core/bin/zksync_core/src/witness_generator/node_aggregation.rs b/core/bin/zksync_core/src/witness_generator/node_aggregation.rs
index ac9009a1ea8e..7bcaaec077f6 100644
--- a/core/bin/zksync_core/src/witness_generator/node_aggregation.rs
+++ b/core/bin/zksync_core/src/witness_generator/node_aggregation.rs
@@ -84,7 +84,7 @@ impl NodeAggregationWitnessGenerator {
         let config: WitnessGeneratorConfig = WitnessGeneratorConfig::from_env();
         let NodeAggregationWitnessGeneratorJob { block_number, job } = node_job;
 
-        vlog::info!(
+        tracing::info!(
             "Starting witness generation of type {:?} for block {}",
             AggregationRound::NodeAggregation,
             block_number.0
@@ -179,7 +179,7 @@ pub fn process_node_aggregation_job(
         &config.key_download_url,
     );
     env::set_var("CRS_FILE", config.initial_setup_key_path);
-    vlog::info!("Keys loaded in {:?}", stage_started_at.elapsed());
+    tracing::info!("Keys loaded in {:?}", stage_started_at.elapsed());
     let stage_started_at = Instant::now();
 
     let verification_keys: HashMap<
@@ -208,13 +208,13 @@ pub fn process_node_aggregation_job(
             node_aggregation_vk,
         ));
 
-    vlog::info!(
+    tracing::info!(
         "commitments: basic set: {:?}, leaf: {:?}, node: {:?}",
         to_hex(&set_committment),
         to_hex(&leaf_aggregation_vk_committment),
         to_hex(&node_aggregation_vk_committment)
     );
-    vlog::info!("Commitments generated in {:?}", stage_started_at.elapsed());
+    tracing::info!("Commitments generated in {:?}", stage_started_at.elapsed());
 
     // fs::write("previous_level_proofs.bincode", bincode::serialize(&job.previous_level_proofs).unwrap()).unwrap();
     // fs::write("leaf_aggregation_vk.bincode", bincode::serialize(&leaf_aggregation_vk).unwrap()).unwrap();
@@ -245,7 +245,7 @@ pub fn process_node_aggregation_job(
             g2_points,
         );
 
-    vlog::info!(
+    tracing::info!(
         "prepare_node_aggregations took {:?}",
         stage_started_at.elapsed()
     );
@@ -261,7 +261,7 @@ pub fn process_node_aggregation_job(
         "prepare_node_aggregations returned more than one node aggregation"
     );
 
-    vlog::info!(
+    tracing::info!(
         "Node witness generation for block {} is complete in {:?}. Number of circuits: {}",
         block_number.0,
         started_at.elapsed(),
diff --git a/core/bin/zksync_core/src/witness_generator/precalculated_merkle_paths_provider.rs b/core/bin/zksync_core/src/witness_generator/precalculated_merkle_paths_provider.rs
index 48c063857b14..96705de7e918 100644
--- a/core/bin/zksync_core/src/witness_generator/precalculated_merkle_paths_provider.rs
+++ b/core/bin/zksync_core/src/witness_generator/precalculated_merkle_paths_provider.rs
@@ -22,7 +22,7 @@ pub struct PrecalculatedMerklePathsProvider {
 impl PrecalculatedMerklePathsProvider {
     pub fn new(input: PrepareBasicCircuitsJob, root_hash: [u8; 32]) -> Self {
         let next_enumeration_index = input.next_enumeration_index();
-        vlog::debug!("Initializing PrecalculatedMerklePathsProvider. Initial root_hash: {:?}, initial next_enumeration_index: {:?}", root_hash, next_enumeration_index);
+        tracing::debug!("Initializing PrecalculatedMerklePathsProvider. Initial root_hash: {:?}, initial next_enumeration_index: {:?}", root_hash, next_enumeration_index);
         Self {
             root_hash,
             pending_leaves: input.into_merkle_paths().collect(),
@@ -54,7 +54,7 @@ impl BinarySparseStorageTree<256, 32, 32, 8, 32, Blake2s256, ZkSyncStorageLeaf>
     }
 
     fn get_leaf(&mut self, index: &[u8; 32]) -> LeafQuery<256, 32, 32, 32, ZkSyncStorageLeaf> {
-        vlog::trace!(
+        tracing::trace!(
             "Invoked get_leaf({:?}). pending leaves size: {:?}. current root: {:?}",
             index,
             self.pending_leaves.len(),
@@ -107,7 +107,7 @@ impl BinarySparseStorageTree<256, 32, 32, 8, 32, Blake2s256, ZkSyncStorageLeaf>
         index: &[u8; 32],
         leaf: ZkSyncStorageLeaf,
     ) -> LeafQuery<256, 32, 32, 32, ZkSyncStorageLeaf> {
-        vlog::trace!(
+        tracing::trace!(
             "Invoked insert_leaf({:?}). pending leaves size: {:?}. current root: {:?}",
             index,
             self.pending_leaves.len(),
@@ -172,7 +172,7 @@ impl BinarySparseStorageTree<256, 32, 32, 8, 32, Blake2s256, ZkSyncStorageLeaf>
         Vec<([u8; 32], ZkSyncStorageLeaf)>,
         Vec<ZkSyncStorageLeaf>,
     ) {
-        vlog::trace!(
+        tracing::trace!(
             "invoked filter_renumerate(), pending leaves size: {:?}",
             self.pending_leaves.len()
         );
@@ -221,7 +221,7 @@ impl BinarySparseStorageTree<256, 32, 32, 8, 32, Blake2s256, ZkSyncStorageLeaf>
         query: &LeafQuery<256, 32, 32, 32, ZkSyncStorageLeaf>,
     ) -> bool {
         //copied from zkevm_test_harness/src/witness/tree/mod.rs with minor changes
-        vlog::trace!(
+        tracing::trace!(
             "invoked verify_inclusion. Index: {:?}, root: {:?})",
             query.index,
             root
diff --git a/core/bin/zksync_core/src/witness_generator/scheduler.rs b/core/bin/zksync_core/src/witness_generator/scheduler.rs
index f4dce3d2c353..834111fe59e0 100644
--- a/core/bin/zksync_core/src/witness_generator/scheduler.rs
+++ b/core/bin/zksync_core/src/witness_generator/scheduler.rs
@@ -71,7 +71,7 @@ impl SchedulerWitnessGenerator {
     ) -> SchedulerArtifacts {
         let SchedulerWitnessGeneratorJob { block_number, job } = scheduler_job;
 
-        vlog::info!(
+        tracing::info!(
             "Starting witness generation of type {:?} for block {}",
             AggregationRound::Scheduler,
             block_number.0
@@ -196,7 +196,7 @@ pub fn process_scheduler_job(
             verification_keys,
         ));
 
-    vlog::info!(
+    tracing::info!(
         "Verification keys loaded in {:?}",
         stage_started_at.elapsed()
     );
@@ -215,7 +215,7 @@ pub fn process_scheduler_job(
             node_aggregation_vk.clone(),
         ));
 
-    vlog::info!("Commitments generated in {:?}", stage_started_at.elapsed());
+    tracing::info!("Commitments generated in {:?}", stage_started_at.elapsed());
     let stage_started_at = Instant::now();
 
     let (scheduler_circuit, final_aggregation_result) =
@@ -233,12 +233,12 @@ pub fn process_scheduler_job(
             g2_points,
         );
 
-    vlog::info!(
+    tracing::info!(
         "prepare_scheduler_circuit took {:?}",
         stage_started_at.elapsed()
     );
 
-    vlog::info!(
+    tracing::info!(
         "Scheduler generation for block {} is complete in {:?}",
         block_number.0,
         started_at.elapsed()
diff --git a/core/bin/zksync_core/src/witness_generator/utils.rs b/core/bin/zksync_core/src/witness_generator/utils.rs
index da2a2141d06e..c457e3c4483f 100644
--- a/core/bin/zksync_core/src/witness_generator/utils.rs
+++ b/core/bin/zksync_core/src/witness_generator/utils.rs
@@ -1,10 +1,9 @@
-use vm::zk_evm::ethereum_types::U256;
 use zksync_object_store::{CircuitKey, ObjectStore};
 use zksync_types::zkevm_test_harness::abstract_zksync_circuit::concrete_circuits::ZkSyncCircuit;
 use zksync_types::zkevm_test_harness::bellman::bn256::Bn256;
 use zksync_types::zkevm_test_harness::witness::oracle::VmWitnessOracle;
-use zksync_types::USED_BOOTLOADER_MEMORY_BYTES;
 use zksync_types::{proofs::AggregationRound, L1BatchNumber};
+use zksync_types::{U256, USED_BOOTLOADER_MEMORY_BYTES};
 
 pub fn expand_bootloader_contents(packed: &[(usize, U256)]) -> Vec<u8> {
     let mut result: Vec<u8> = Vec::new();
diff --git a/core/lib/basic_types/Cargo.toml b/core/lib/basic_types/Cargo.toml
index 29ef4032142d..e96dd0c0ce2b 100644
--- a/core/lib/basic_types/Cargo.toml
+++ b/core/lib/basic_types/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "zksync_basic_types"
-version = "1.0.0"
+version="0.1.0"
 edition = "2018"
 authors = ["The Matter Labs Team <hello@matterlabs.dev>"]
 homepage = "https://zksync.io/"
diff --git a/core/lib/circuit_breaker/Cargo.toml b/core/lib/circuit_breaker/Cargo.toml
index 3b4ae3d3fef8..b116eafd4725 100644
--- a/core/lib/circuit_breaker/Cargo.toml
+++ b/core/lib/circuit_breaker/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "zksync_circuit_breaker"
-version = "1.0.0"
+version = "0.1.0"
 edition = "2018"
 authors = ["The Matter Labs Team <hello@matterlabs.dev>"]
 homepage = "https://zksync.io/"
@@ -10,15 +10,16 @@ keywords = ["blockchain", "zksync"]
 categories = ["cryptography"]
 
 [dependencies]
-zksync_types = { path = "../types", version = "1.0" }
-zksync_config = { path = "../config", version = "1.0" }
-zksync_contracts = { path = "../contracts", version = "1.0" }
-zksync_dal = { path = "../dal", version = "1.0" }
-zksync_eth_client = { path = "../eth_client", version = "1.0" }
+zksync_types = { path = "../types" }
+zksync_config = { path = "../config" }
+zksync_contracts = { path = "../contracts" }
+zksync_dal = { path = "../dal" }
+zksync_eth_client = { path = "../eth_client" }
 thiserror = "1.0"
 serde_json = "1.0"
 futures = { version = "0.3", features = ["compat"] }
 tokio = { version = "1", features = ["time"] }
+anyhow = "1.0"
 async-trait = "0.1"
 hex = "0.4"
 convert_case = "0.6.0"
diff --git a/core/lib/circuit_breaker/src/lib.rs b/core/lib/circuit_breaker/src/lib.rs
index ce7fa30686d2..c2a03e04e686 100644
--- a/core/lib/circuit_breaker/src/lib.rs
+++ b/core/lib/circuit_breaker/src/lib.rs
@@ -1,5 +1,6 @@
 use std::time::Duration;
 
+use anyhow::Context as _;
 use futures::channel::oneshot;
 use thiserror::Error;
 use tokio::sync::watch;
@@ -57,18 +58,19 @@ impl CircuitBreakerChecker {
         self,
         circuit_breaker_sender: oneshot::Sender<CircuitBreakerError>,
         stop_receiver: watch::Receiver<bool>,
-    ) {
+    ) -> anyhow::Result<()> {
         loop {
             if *stop_receiver.borrow() {
                 break;
             }
             if let Err(error) = self.check().await {
-                circuit_breaker_sender
+                return circuit_breaker_sender
                     .send(error)
-                    .expect("failed to send circuit breaker messsage");
-                return;
+                    .ok()
+                    .context("failed to send circuit breaker messsage");
             }
             tokio::time::sleep(self.sync_interval).await;
         }
+        Ok(())
     }
 }
diff --git a/core/lib/config/Cargo.toml b/core/lib/config/Cargo.toml
index d6e88c4e4c1e..b1059e719dfe 100644
--- a/core/lib/config/Cargo.toml
+++ b/core/lib/config/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "zksync_config"
-version = "1.0.0"
+version = "0.1.0"
 edition = "2018"
 authors = ["The Matter Labs Team <hello@matterlabs.dev>"]
 homepage = "https://zksync.io/"
@@ -10,9 +10,9 @@ keywords = ["blockchain", "zksync"]
 categories = ["cryptography"]
 
 [dependencies]
-zksync_basic_types = { path = "../../lib/basic_types", version = "1.0" }
-zksync_utils = { path = "../../lib/utils", version = "1.0" }
-zksync_contracts = { path = "../../lib/contracts", version = "1.0" }
+zksync_basic_types = { path = "../../lib/basic_types" }
+zksync_utils = { path = "../../lib/utils" }
+zksync_contracts = { path = "../../lib/contracts" }
 
 url = "2.1"
 num = "0.3.1"
@@ -21,3 +21,4 @@ serde_json = "1.0"
 envy = "0.4"
 once_cell = "1.13.0"
 bigdecimal = "0.2.2"
+hex = "0.4"
diff --git a/core/lib/config/src/configs/alerts.rs b/core/lib/config/src/configs/alerts.rs
index 59b6d0ebddf6..0fa4b6322a8a 100644
--- a/core/lib/config/src/configs/alerts.rs
+++ b/core/lib/config/src/configs/alerts.rs
@@ -29,7 +29,7 @@ mod tests {
             sporadic_crypto_errors_substrs: vec![
                 "EventDestroyErr".to_string(),
                 "Can't free memory of DeviceBuf".to_string(),
-                "called `Result::unwrap()` on an `Err` value: PoisonError".to_string(),
+                "value: PoisonError".to_string(),
             ],
         }
     }
@@ -38,7 +38,7 @@ mod tests {
     fn test_from_env() {
         let mut lock = MUTEX.lock();
         let config = r#"
-            ALERTS_SPORADIC_CRYPTO_ERRORS_SUBSTRS=EventDestroyErr,Can't free memory of DeviceBuf,called `Result::unwrap()` on an `Err` value: PoisonError
+            ALERTS_SPORADIC_CRYPTO_ERRORS_SUBSTRS="EventDestroyErr,Can't free memory of DeviceBuf,value: PoisonError"
         "#;
         lock.set_env(config);
 
diff --git a/core/lib/config/src/configs/api.rs b/core/lib/config/src/configs/api.rs
index 271793ee52ad..37a39dde7385 100644
--- a/core/lib/config/src/configs/api.rs
+++ b/core/lib/config/src/configs/api.rs
@@ -95,6 +95,10 @@ pub struct Web3JsonRpcConfig {
     pub max_batch_request_size: Option<usize>,
     /// Maximum response body size in MiBs. Default is 10 MiB.
     pub max_response_body_size_mb: Option<usize>,
+    /// Maximum number of requests per minute for the WebSocket server.
+    /// The value is per active connection.
+    /// Note: For HTTP, rate limiting is expected to be configured on the infra level.
+    pub websocket_requests_per_minute_limit: Option<u32>,
 }
 
 impl Web3JsonRpcConfig {
@@ -176,6 +180,11 @@ impl Web3JsonRpcConfig {
     pub fn max_response_body_size(&self) -> usize {
         self.max_response_body_size_mb.unwrap_or(10) * super::BYTES_IN_MEGABYTE
     }
+
+    pub fn websocket_requests_per_minute_limit(&self) -> u32 {
+        // The default limit is chosen to be reasonably permissive.
+        self.websocket_requests_per_minute_limit.unwrap_or(6000)
+    }
 }
 
 #[derive(Debug, Deserialize, Clone, PartialEq)]
@@ -256,6 +265,7 @@ mod tests {
                 fee_history_limit: Some(100),
                 max_batch_request_size: Some(200),
                 max_response_body_size_mb: Some(10),
+                websocket_requests_per_minute_limit: Some(10),
             },
             contract_verification: ContractVerificationApiConfig {
                 port: 3070,
@@ -288,7 +298,7 @@ mod tests {
             API_WEB3_JSON_RPC_GAS_PRICE_SCALE_FACTOR=1.2
             API_WEB3_JSON_RPC_TRANSACTIONS_PER_SEC_LIMIT=1000
             API_WEB3_JSON_RPC_REQUEST_TIMEOUT=10
-            API_WEB3_JSON_RPC_ACCOUNT_PKS=0x0000000000000000000000000000000000000000000000000000000000000001,0x0000000000000000000000000000000000000000000000000000000000000002
+            API_WEB3_JSON_RPC_ACCOUNT_PKS="0x0000000000000000000000000000000000000000000000000000000000000001,0x0000000000000000000000000000000000000000000000000000000000000002"
             API_WEB3_JSON_RPC_ESTIMATE_GAS_SCALE_FACTOR=1.0
             API_WEB3_JSON_RPC_ESTIMATE_GAS_ACCEPTABLE_OVERESTIMATION=1000
             API_WEB3_JSON_RPC_MAX_TX_SIZE=1000000
@@ -300,6 +310,7 @@ mod tests {
             API_WEB3_JSON_RPC_WS_THREADS=256
             API_WEB3_JSON_RPC_FEE_HISTORY_LIMIT=100
             API_WEB3_JSON_RPC_MAX_BATCH_REQUEST_SIZE=200
+            API_WEB3_JSON_RPC_WEBSOCKET_REQUESTS_PER_MINUTE_LIMIT=10
             API_CONTRACT_VERIFICATION_PORT="3070"
             API_CONTRACT_VERIFICATION_URL="http://127.0.0.1:3070"
             API_CONTRACT_VERIFICATION_THREADS_PER_SERVER=128
diff --git a/core/lib/config/src/configs/chain.rs b/core/lib/config/src/configs/chain.rs
index ceeb2cf75d1a..baeff958e8e8 100644
--- a/core/lib/config/src/configs/chain.rs
+++ b/core/lib/config/src/configs/chain.rs
@@ -26,6 +26,7 @@ pub struct ChainConfig {
 impl ChainConfig {
     pub fn from_env() -> Self {
         Self {
+            // TODO rename `eth` to `network`
             network: NetworkConfig::from_env(),
             state_keeper: StateKeeperConfig::from_env(),
             operations_manager: OperationsManagerConfig::from_env(),
@@ -99,6 +100,13 @@ pub struct StateKeeperConfig {
     /// Max number of computational gas that validation step is allowed to take.
     pub validation_computational_gas_limit: u32,
     pub save_call_traces: bool,
+
+    pub virtual_blocks_interval: u32,
+    pub virtual_blocks_per_miniblock: u32,
+
+    /// Flag which will enable storage to cache witness_inputs during State Keeper's run.
+    /// NOTE: This will slow down StateKeeper, to be used in non-production environments!
+    pub upload_witness_inputs_to_gcs: bool,
 }
 
 impl StateKeeperConfig {
@@ -212,6 +220,9 @@ mod tests {
                 default_aa_hash: H256::from(&[254; 32]),
                 validation_computational_gas_limit: 10_000_000,
                 save_call_traces: false,
+                virtual_blocks_interval: 1,
+                virtual_blocks_per_miniblock: 1,
+                upload_witness_inputs_to_gcs: false,
             },
             operations_manager: OperationsManagerConfig {
                 delay_interval: 100,
@@ -257,6 +268,7 @@ mod tests {
             CHAIN_STATE_KEEPER_DEFAULT_AA_HASH="0xfefefefefefefefefefefefefefefefefefefefefefefefefefefefefefefefe"
             CHAIN_STATE_KEEPER_VALIDATION_COMPUTATIONAL_GAS_LIMIT="10000000"
             CHAIN_STATE_KEEPER_SAVE_CALL_TRACES="false"
+            CHAIN_STATE_KEEPER_UPLOAD_WITNESS_INPUTS_TO_GCS="false"
             CHAIN_OPERATIONS_MANAGER_DELAY_INTERVAL="100"
             CHAIN_MEMPOOL_SYNC_INTERVAL_MS="10"
             CHAIN_MEMPOOL_SYNC_BATCH_SIZE="1000"
diff --git a/core/lib/config/src/configs/contracts.rs b/core/lib/config/src/configs/contracts.rs
index f6530e18ee3f..35c1bbecf9c5 100644
--- a/core/lib/config/src/configs/contracts.rs
+++ b/core/lib/config/src/configs/contracts.rs
@@ -31,6 +31,9 @@ pub struct ContractsConfig {
     pub recursion_leaf_level_vk_hash: H256,
     pub recursion_circuits_set_vks_hash: H256,
     pub l1_multicall3_addr: Address,
+    pub fri_recursion_scheduler_level_vk_hash: H256,
+    pub fri_recursion_node_level_vk_hash: H256,
+    pub fri_recursion_leaf_level_vk_hash: H256,
 }
 
 impl ContractsConfig {
@@ -81,6 +84,15 @@ mod tests {
                 "0x142a364ef2073132eaf07aa7f3d8495065be5b92a2dc14fda09b4216affed9c0",
             ),
             l1_multicall3_addr: addr("0xcA11bde05977b3631167028862bE2a173976CA11"),
+            fri_recursion_scheduler_level_vk_hash: hash(
+                "0x201d4c7d8e781d51a3bbd451a43a8f45240bb765b565ae6ce69192d918c3563d",
+            ),
+            fri_recursion_node_level_vk_hash: hash(
+                "0x5a3ef282b21e12fe1f4438e5bb158fc5060b160559c5158c6389d62d9fe3d080",
+            ),
+            fri_recursion_leaf_level_vk_hash: hash(
+                "0x72167c43a46cf38875b267d67716edc4563861364a3c03ab7aee73498421e828",
+            ),
         }
     }
 
@@ -111,6 +123,10 @@ CONTRACTS_RECURSION_NODE_LEVEL_VK_HASH="0x1186ec268d49f1905f8d9c1e9d39fc33e98c74
 CONTRACTS_RECURSION_LEAF_LEVEL_VK_HASH="0x101e08b00193e529145ee09823378ef51a3bc8966504064f1f6ba3f1ba863210"
 CONTRACTS_RECURSION_CIRCUITS_SET_VKS_HASH="0x142a364ef2073132eaf07aa7f3d8495065be5b92a2dc14fda09b4216affed9c0"
 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"
+
         "#;
         lock.set_env(config);
 
diff --git a/core/lib/config/src/configs/eth_sender.rs b/core/lib/config/src/configs/eth_sender.rs
index d4651d60a04c..ca1f49421423 100644
--- a/core/lib/config/src/configs/eth_sender.rs
+++ b/core/lib/config/src/configs/eth_sender.rs
@@ -32,6 +32,12 @@ pub enum ProofSendingMode {
     SkipEveryProof,
 }
 
+#[derive(Debug, Deserialize, Clone, Copy, PartialEq)]
+pub enum ProofLoadingMode {
+    OldProofFromDb,
+    FriProofFromGcs,
+}
+
 #[derive(Debug, Deserialize, Clone, PartialEq)]
 pub struct SenderConfig {
     pub aggregated_proof_sizes: Vec<usize>,
@@ -62,6 +68,9 @@ pub struct SenderConfig {
     pub l1_batch_min_age_before_execute_seconds: Option<u64>,
     // Max acceptable fee for sending tx it acts as a safeguard to prevent sending tx with very high fees.
     pub max_acceptable_priority_fee_in_gwei: u64,
+
+    /// The mode in which proofs are loaded, either from DB/GCS for FRI/Old proof.
+    pub proof_loading_mode: ProofLoadingMode,
 }
 
 impl SenderConfig {
@@ -148,6 +157,7 @@ mod tests {
                 proof_sending_mode: ProofSendingMode::SkipEveryProof,
                 l1_batch_min_age_before_execute_seconds: Some(1000),
                 max_acceptable_priority_fee_in_gwei: 100_000_000_000,
+                proof_loading_mode: ProofLoadingMode::OldProofFromDb,
             },
             gas_adjuster: GasAdjusterConfig {
                 default_priority_fee_per_gas: 20000000000,
@@ -191,6 +201,7 @@ mod tests {
             ETH_SENDER_SENDER_MAX_ETH_TX_DATA_SIZE="120000"
             ETH_SENDER_SENDER_L1_BATCH_MIN_AGE_BEFORE_EXECUTE_SECONDS="1000"
             ETH_SENDER_SENDER_MAX_ACCEPTABLE_PRIORITY_FEE_IN_GWEI="100000000000"
+            ETH_SENDER_SENDER_PROOF_LOADING_MODE="OldProofFromDb"
         "#;
         lock.set_env(config);
 
diff --git a/core/lib/config/src/configs/fri_proof_compressor.rs b/core/lib/config/src/configs/fri_proof_compressor.rs
new file mode 100644
index 000000000000..a464a8bf4535
--- /dev/null
+++ b/core/lib/config/src/configs/fri_proof_compressor.rs
@@ -0,0 +1,68 @@
+use serde::Deserialize;
+use std::time::Duration;
+
+use super::envy_load;
+
+/// Configuration for the fri proof compressor
+#[derive(Debug, Deserialize, Clone, PartialEq)]
+pub struct FriProofCompressorConfig {
+    /// The compression mode to use
+    pub compression_mode: u8,
+
+    /// Configurations for prometheus
+    pub prometheus_listener_port: u16,
+    pub prometheus_pushgateway_url: String,
+    pub prometheus_push_interval_ms: Option<u64>,
+
+    /// Max time for proof compression to be performed
+    pub generation_timeout_in_secs: u16,
+    /// Max attempts for proof compression to be performed
+    pub max_attempts: u32,
+}
+
+impl FriProofCompressorConfig {
+    pub fn from_env() -> Self {
+        envy_load("fri_proof_compressor", "FRI_PROOF_COMPRESSOR_")
+    }
+
+    pub fn generation_timeout(&self) -> Duration {
+        Duration::from_secs(self.generation_timeout_in_secs as u64)
+    }
+}
+
+#[cfg(test)]
+mod tests {
+    use crate::configs::test_utils::EnvMutex;
+
+    use super::*;
+
+    static MUTEX: EnvMutex = EnvMutex::new();
+
+    fn expected_config() -> FriProofCompressorConfig {
+        FriProofCompressorConfig {
+            compression_mode: 1,
+            prometheus_listener_port: 3316,
+            prometheus_pushgateway_url: "http://127.0.0.1:9091".to_string(),
+            prometheus_push_interval_ms: Some(100),
+            generation_timeout_in_secs: 3000,
+            max_attempts: 5,
+        }
+    }
+
+    #[test]
+    fn from_env() {
+        let mut lock = MUTEX.lock();
+        let config = r#"
+            FRI_PROOF_COMPRESSOR_COMPRESSION_MODE=1
+            FRI_PROOF_COMPRESSOR_PROMETHEUS_LISTENER_PORT=3316
+            FRI_PROOF_COMPRESSOR_PROMETHEUS_PUSHGATEWAY_URL="http://127.0.0.1:9091"
+            FRI_PROOF_COMPRESSOR_PROMETHEUS_PUSH_INTERVAL_MS=100
+            FRI_PROOF_COMPRESSOR_GENERATION_TIMEOUT_IN_SECS=3000
+            FRI_PROOF_COMPRESSOR_MAX_ATTEMPTS=5
+        "#;
+        lock.set_env(config);
+
+        let actual = FriProofCompressorConfig::from_env();
+        assert_eq!(actual, expected_config());
+    }
+}
diff --git a/core/lib/config/src/configs/fri_prover_gateway.rs b/core/lib/config/src/configs/fri_prover_gateway.rs
new file mode 100644
index 000000000000..d326e577b3cb
--- /dev/null
+++ b/core/lib/config/src/configs/fri_prover_gateway.rs
@@ -0,0 +1,57 @@
+use super::envy_load;
+use serde::Deserialize;
+use std::time::Duration;
+
+#[derive(Debug, Deserialize, Clone, PartialEq)]
+pub struct FriProverGatewayConfig {
+    pub api_url: String,
+    pub api_poll_duration_secs: u16,
+
+    /// Configurations for prometheus
+    pub prometheus_listener_port: u16,
+    pub prometheus_pushgateway_url: String,
+    pub prometheus_push_interval_ms: Option<u64>,
+}
+
+impl FriProverGatewayConfig {
+    pub fn from_env() -> Self {
+        envy_load("fri_prover_gateway", "FRI_PROVER_GATEWAY_")
+    }
+
+    pub fn api_poll_duration(&self) -> Duration {
+        Duration::from_secs(self.api_poll_duration_secs as u64)
+    }
+}
+
+#[cfg(test)]
+mod tests {
+    use super::*;
+    use crate::configs::test_utils::EnvMutex;
+
+    static MUTEX: EnvMutex = EnvMutex::new();
+
+    fn expected_config() -> FriProverGatewayConfig {
+        FriProverGatewayConfig {
+            api_url: "http://private-dns-for-server".to_string(),
+            api_poll_duration_secs: 100,
+            prometheus_listener_port: 3316,
+            prometheus_pushgateway_url: "http://127.0.0.1:9091".to_string(),
+            prometheus_push_interval_ms: Some(100),
+        }
+    }
+
+    #[test]
+    fn from_env() {
+        let config = r#"
+            FRI_PROVER_GATEWAY_API_URL="http://private-dns-for-server"
+            FRI_PROVER_GATEWAY_API_POLL_DURATION_SECS="100"
+            FRI_PROVER_GATEWAY_PROMETHEUS_LISTENER_PORT=3316
+            FRI_PROVER_GATEWAY_PROMETHEUS_PUSHGATEWAY_URL="http://127.0.0.1:9091"
+            FRI_PROVER_GATEWAY_PROMETHEUS_PUSH_INTERVAL_MS=100
+        "#;
+        let mut lock = MUTEX.lock();
+        lock.set_env(config);
+        let actual = FriProverGatewayConfig::from_env();
+        assert_eq!(actual, expected_config());
+    }
+}
diff --git a/core/lib/config/src/configs/fri_prover_group.rs b/core/lib/config/src/configs/fri_prover_group.rs
index 6d3223d2e247..38d01552e867 100644
--- a/core/lib/config/src/configs/fri_prover_group.rs
+++ b/core/lib/config/src/configs/fri_prover_group.rs
@@ -215,7 +215,7 @@ impl FriProverGroupConfig {
                     assert!(not_in_range.is_empty(), "Aggregation round 1 should only contain circuit IDs 3 to 15. Ids out of range: {:?}", not_in_range);
                 }
                 2 => {
-                    let expected_range = vec![2];
+                    let expected_range = [2];
                     let missing_ids: Vec<_> = expected_range
                         .iter()
                         .filter(|id| !circuit_ids.contains(id))
@@ -240,7 +240,7 @@ impl FriProverGroupConfig {
                     assert!(not_in_range.is_empty(), "Aggregation round 2 should only contain circuit ID 2. Ids out of range: {:?}", not_in_range);
                 }
                 3 => {
-                    let expected_range = vec![1];
+                    let expected_range = [1];
                     let missing_ids: Vec<_> = expected_range
                         .iter()
                         .filter(|id| !circuit_ids.contains(id))
diff --git a/core/lib/config/src/configs/house_keeper.rs b/core/lib/config/src/configs/house_keeper.rs
index f941c2a9f251..5e88702be315 100644
--- a/core/lib/config/src/configs/house_keeper.rs
+++ b/core/lib/config/src/configs/house_keeper.rs
@@ -17,6 +17,8 @@ pub struct HouseKeeperConfig {
     pub fri_witness_generator_job_retrying_interval_ms: u64,
     pub prover_db_pool_size: u32,
     pub fri_prover_stats_reporting_interval_ms: u64,
+    pub fri_proof_compressor_job_retrying_interval_ms: u64,
+    pub fri_proof_compressor_stats_reporting_interval_ms: u64,
 }
 
 impl HouseKeeperConfig {
@@ -46,6 +48,8 @@ mod tests {
             fri_witness_generator_job_retrying_interval_ms: 30_000,
             prover_db_pool_size: 2,
             fri_prover_stats_reporting_interval_ms: 30_000,
+            fri_proof_compressor_job_retrying_interval_ms: 30_000,
+            fri_proof_compressor_stats_reporting_interval_ms: 30_000,
         }
     }
 
@@ -65,6 +69,8 @@ mod tests {
             HOUSE_KEEPER_FRI_WITNESS_GENERATOR_JOB_RETRYING_INTERVAL_MS="30000"
             HOUSE_KEEPER_PROVER_DB_POOL_SIZE="2"
             HOUSE_KEEPER_FRI_PROVER_STATS_REPORTING_INTERVAL_MS="30000"
+            HOUSE_KEEPER_FRI_PROOF_COMPRESSOR_STATS_REPORTING_INTERVAL_MS="30000"
+            HOUSE_KEEPER_FRI_PROOF_COMPRESSOR_JOB_RETRYING_INTERVAL_MS="30000"
         "#;
         lock.set_env(config);
 
diff --git a/core/lib/config/src/configs/mod.rs b/core/lib/config/src/configs/mod.rs
index 292ed1161a81..edc64d112e4f 100644
--- a/core/lib/config/src/configs/mod.rs
+++ b/core/lib/config/src/configs/mod.rs
@@ -4,7 +4,8 @@ pub use self::{
     circuit_synthesizer::CircuitSynthesizerConfig, contract_verifier::ContractVerifierConfig,
     contracts::ContractsConfig, database::DBConfig, eth_client::ETHClientConfig,
     eth_sender::ETHSenderConfig, eth_sender::GasAdjusterConfig, eth_watch::ETHWatchConfig,
-    fetcher::FetcherConfig, fri_prover::FriProverConfig,
+    fetcher::FetcherConfig, fri_proof_compressor::FriProofCompressorConfig,
+    fri_prover::FriProverConfig, fri_prover_gateway::FriProverGatewayConfig,
     fri_witness_generator::FriWitnessGeneratorConfig,
     fri_witness_vector_generator::FriWitnessVectorGeneratorConfig, object_store::ObjectStoreConfig,
     proof_data_handler::ProofDataHandlerConfig, prover::ProverConfig, prover::ProverConfigs,
@@ -25,7 +26,9 @@ pub mod eth_client;
 pub mod eth_sender;
 pub mod eth_watch;
 pub mod fetcher;
+pub mod fri_proof_compressor;
 pub mod fri_prover;
+pub mod fri_prover_gateway;
 pub mod fri_prover_group;
 pub mod fri_witness_generator;
 pub mod fri_witness_vector_generator;
diff --git a/core/lib/config/src/configs/object_store.rs b/core/lib/config/src/configs/object_store.rs
index 12793594813b..ecfaa250185b 100644
--- a/core/lib/config/src/configs/object_store.rs
+++ b/core/lib/config/src/configs/object_store.rs
@@ -27,6 +27,10 @@ impl ObjectStoreConfig {
     pub fn public_from_env() -> Self {
         envy_load("public_object_store", "PUBLIC_OBJECT_STORE_")
     }
+
+    pub fn prover_from_env() -> Self {
+        envy_load("prover_object_store", "PROVER_OBJECT_STORE_")
+    }
 }
 
 #[cfg(test)]
@@ -75,4 +79,19 @@ mod tests {
         let actual = ObjectStoreConfig::public_from_env();
         assert_eq!(actual, expected_config("/public_base_url"));
     }
+
+    #[test]
+    fn prover_bucket_config_from_env() {
+        let mut lock = MUTEX.lock();
+        let config = r#"
+            PROVER_OBJECT_STORE_BUCKET_BASE_URL="/prover_base_url"
+            PROVER_OBJECT_STORE_MODE="FileBacked"
+            PROVER_OBJECT_STORE_FILE_BACKED_BASE_PATH="artifacts"
+            PROVER_OBJECT_STORE_GCS_CREDENTIAL_FILE_PATH="/path/to/credentials.json"
+            PROVER_OBJECT_STORE_MAX_RETRIES="5"
+        "#;
+        lock.set_env(config);
+        let actual = ObjectStoreConfig::prover_from_env();
+        assert_eq!(actual, expected_config("/prover_base_url"));
+    }
 }
diff --git a/core/lib/config/src/configs/proof_data_handler.rs b/core/lib/config/src/configs/proof_data_handler.rs
index d15fed3c8821..cf420540d9e4 100644
--- a/core/lib/config/src/configs/proof_data_handler.rs
+++ b/core/lib/config/src/configs/proof_data_handler.rs
@@ -2,10 +2,18 @@ use super::envy_load;
 use serde::Deserialize;
 use std::time::Duration;
 
+#[derive(Debug, Deserialize, Clone, Copy, PartialEq)]
+pub enum ProtocolVersionLoadingMode {
+    FromDb,
+    FromEnvVar,
+}
+
 #[derive(Debug, Deserialize, Clone, PartialEq)]
 pub struct ProofDataHandlerConfig {
     pub http_port: u16,
     pub proof_generation_timeout_in_secs: u16,
+    pub protocol_version_loading_mode: ProtocolVersionLoadingMode,
+    pub fri_protocol_version_id: u16,
 }
 
 impl ProofDataHandlerConfig {
@@ -29,6 +37,8 @@ mod tests {
         ProofDataHandlerConfig {
             http_port: 3320,
             proof_generation_timeout_in_secs: 18000,
+            protocol_version_loading_mode: ProtocolVersionLoadingMode::FromEnvVar,
+            fri_protocol_version_id: 2,
         }
     }
 
@@ -37,6 +47,8 @@ mod tests {
         let config = r#"
             PROOF_DATA_HANDLER_PROOF_GENERATION_TIMEOUT_IN_SECS="18000"
             PROOF_DATA_HANDLER_HTTP_PORT="3320"
+            PROOF_DATA_HANDLER_PROTOCOL_VERSION_LOADING_MODE="FromEnvVar"
+            PROOF_DATA_HANDLER_FRI_PROTOCOL_VERSION_ID="2"
         "#;
         let mut lock = MUTEX.lock();
         lock.set_env(config);
diff --git a/core/lib/config/src/configs/utils.rs b/core/lib/config/src/configs/utils.rs
index 2d091dc59b0c..b8bee2e96d42 100644
--- a/core/lib/config/src/configs/utils.rs
+++ b/core/lib/config/src/configs/utils.rs
@@ -1,12 +1,14 @@
-use crate::configs::envy_load;
 use serde::Deserialize;
-use std::time::Duration;
+
+use std::{env, time::Duration};
+
+use crate::configs::envy_load;
 
 #[derive(Debug, Deserialize, Clone, PartialEq)]
 pub struct PrometheusConfig {
     /// Port to which the Prometheus exporter server is listening.
     pub listener_port: u16,
-    /// Url of Pushgateway.
+    /// URL of the push gateway.
     pub pushgateway_url: String,
     /// Push interval in ms.
     pub push_interval_ms: Option<u64>,
@@ -16,7 +18,18 @@ impl PrometheusConfig {
     pub fn from_env() -> Self {
         envy_load("prometheus", "API_PROMETHEUS_")
     }
+
     pub fn push_interval(&self) -> Duration {
         Duration::from_millis(self.push_interval_ms.unwrap_or(100))
     }
+
+    /// Returns the full endpoint URL for the push gateway.
+    pub fn gateway_endpoint(&self) -> String {
+        let gateway_url = &self.pushgateway_url;
+        let job_id = "zksync-pushgateway";
+        let namespace =
+            env::var("POD_NAMESPACE").unwrap_or_else(|_| "UNKNOWN_NAMESPACE".to_owned());
+        let pod = env::var("POD_NAME").unwrap_or_else(|_| "UNKNOWN_POD".to_owned());
+        format!("{gateway_url}/metrics/job/{job_id}/namespace/{namespace}/pod/{pod}")
+    }
 }
diff --git a/core/lib/config/src/configs/witness_generator.rs b/core/lib/config/src/configs/witness_generator.rs
index 8af1a04b1ccb..45ddbfbce3e7 100644
--- a/core/lib/config/src/configs/witness_generator.rs
+++ b/core/lib/config/src/configs/witness_generator.rs
@@ -7,6 +7,13 @@ use serde::Deserialize;
 // Local uses
 use super::envy_load;
 
+#[derive(Debug, Deserialize, Clone, PartialEq)]
+pub enum BasicWitnessGeneratorDataSource {
+    FromPostgres,
+    FromPostgresShadowBlob,
+    FromBlob,
+}
+
 /// Configuration for the witness generation
 #[derive(Debug, Deserialize, Clone, PartialEq)]
 pub struct WitnessGeneratorConfig {
@@ -26,6 +33,8 @@ pub struct WitnessGeneratorConfig {
     // This parameter is used in case of performing circuit upgrades(VK/Setup keys),
     // to not let witness-generator pick new job and finish all the existing jobs with old circuit.
     pub last_l1_batch_to_process: Option<u32>,
+    /// Where will basic Witness Generator load its data from
+    pub data_source: BasicWitnessGeneratorDataSource,
 }
 
 impl WitnessGeneratorConfig {
@@ -58,6 +67,7 @@ mod tests {
             blocks_proving_percentage: Some(30),
             dump_arguments_for_blocks: vec![2, 3],
             last_l1_batch_to_process: None,
+            data_source: BasicWitnessGeneratorDataSource::FromBlob,
         }
     }
 
@@ -71,6 +81,7 @@ mod tests {
             WITNESS_MAX_ATTEMPTS=4
             WITNESS_DUMP_ARGUMENTS_FOR_BLOCKS="2,3"
             WITNESS_BLOCKS_PROVING_PERCENTAGE="30"
+            WITNESS_DATA_SOURCE="FromBlob"
         "#;
         lock.set_env(config);
 
diff --git a/core/lib/config/src/constants/contracts.rs b/core/lib/config/src/constants/contracts.rs
index 15b9c9c08207..33b735c8a2d7 100644
--- a/core/lib/config/src/constants/contracts.rs
+++ b/core/lib/config/src/constants/contracts.rs
@@ -100,6 +100,7 @@ pub const ERC20_TRANSFER_TOPIC: H256 = H256([
     99, 196, 161, 22, 40, 245, 90, 77, 245, 35, 179, 239,
 ]);
 
+// TODO (SMA-240): Research whether using zero address is ok
 pub const MINT_AND_BURN_ADDRESS: H160 = H160::zero();
 
 // The storage_log.value database value for a contract that was deployed in a failed transaction.
diff --git a/core/lib/config/src/constants/crypto.rs b/core/lib/config/src/constants/crypto.rs
index dcc9d34a9ebd..e9ed44ff3081 100644
--- a/core/lib/config/src/constants/crypto.rs
+++ b/core/lib/config/src/constants/crypto.rs
@@ -6,10 +6,13 @@ pub const ZKPORTER_IS_AVAILABLE: bool = false;
 /// Depth of the account tree.
 pub const ROOT_TREE_DEPTH: usize = 256;
 /// Cost of 1 byte of calldata in bytes.
+// TODO (SMA-1609): Double check this value.
+// TODO: possibly remove this value.
 pub const GAS_PER_PUBDATA_BYTE: u32 = 16;
 
 /// Maximum amount of bytes in one packed write storage slot.
 /// Calculated as `(len(hash) + 1) + len(u256)`
+// TODO (SMA-1609): Double check this value.
 pub const MAX_BYTES_PER_PACKED_SLOT: u64 = 65;
 
 /// Amount of gas required to publish one slot in pubdata.
diff --git a/core/lib/config/src/constants/ethereum.rs b/core/lib/config/src/constants/ethereum.rs
index 61889d8afba5..15187892ae86 100644
--- a/core/lib/config/src/constants/ethereum.rs
+++ b/core/lib/config/src/constants/ethereum.rs
@@ -13,6 +13,7 @@ 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;
 
+// TODO: import from zkevm_opcode_defs once VM1.3 is supported
 pub const MAX_L2_TX_GAS_LIMIT: u64 = 80000000;
 
 // The users should always be able to provide `MAX_GAS_PER_PUBDATA_BYTE` gas per pubdata in their
diff --git a/core/lib/config/src/constants/fees/intrinsic.rs b/core/lib/config/src/constants/fees/intrinsic.rs
index b36c8d57086e..604ba95fc570 100644
--- a/core/lib/config/src/constants/fees/intrinsic.rs
+++ b/core/lib/config/src/constants/fees/intrinsic.rs
@@ -2,6 +2,9 @@
 //! The file with constants related to fees most of which need to be computed
 use super::IntrinsicSystemGasConstants;
 
+// TODO (SMA-1699): Use this method to ensure that the transactions provide enough
+// intrinsic gas on the API level.
+
 pub const fn get_intrinsic_constants() -> IntrinsicSystemGasConstants {
     IntrinsicSystemGasConstants {
         l2_tx_intrinsic_gas: 14070,
diff --git a/core/lib/config/src/constants/system_context.rs b/core/lib/config/src/constants/system_context.rs
index 4802cf3cc8e5..c142d6e73ec0 100644
--- a/core/lib/config/src/constants/system_context.rs
+++ b/core/lib/config/src/constants/system_context.rs
@@ -2,7 +2,7 @@
 // all user-set slots will have the two highest bits set to 0.
 // That is why all internal slots will have the form `b11...` but we use `b1111 = xff` for simplicity.
 
-use zksync_basic_types::H256;
+use zksync_basic_types::{H256, U256};
 
 pub const SYSTEM_CONTEXT_CHAIN_ID_POSITION: H256 = H256::zero();
 
@@ -55,3 +55,41 @@ pub const SYSTEM_CONTEXT_BLOCK_INFO_POSITION: H256 = H256([
     0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
     0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x07,
 ]);
+
+pub const SYSTEM_CONTEXT_BLOCK_HASH_POSITION: H256 = H256([
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x08,
+]);
+
+pub const SYSTEM_CONTEXT_CURRENT_L2_BLOCK_INFO_POSITION: H256 = H256([
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x09,
+]);
+
+pub const SYSTEM_CONTEXT_CURRENT_TX_ROLLING_HASH_POSITION: H256 = H256([
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x0a,
+]);
+
+pub const SYSTEM_CONTEXT_CURRENT_L2_BLOCK_HASHES_POSITION: H256 = H256([
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x0b,
+]);
+
+pub const SYSTEM_CONTEXT_STORED_L2_BLOCK_HASHES: u32 = 257;
+
+// It is equal to SYSTEM_CONTEXT_CURRENT_L2_BLOCK_HASHES_POSITION + SYSTEM_CONTEXT_STORED_L2_BLOCK_HASHES
+pub const CURRENT_VIRTUAL_BLOCK_INFO_POSITION: H256 = H256([
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x0c,
+]);
+
+// It is equal to CURRENT_VIRTUAL_BLOCK_INFO_POSITION + 1
+pub const VIRTUIAL_BLOCK_UPGRADE_INFO_POSITION: H256 = H256([
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x0d,
+]);
+
+/// Block info is stored compactly as SYSTEM_BLOCK_INFO_BLOCK_NUMBER_MULTIPLIER * block_number + block_timestamp.
+/// This number is equal to 2**128
+pub const SYSTEM_BLOCK_INFO_BLOCK_NUMBER_MULTIPLIER: U256 = U256([0, 0, 1, 0]);
diff --git a/core/lib/contracts/Cargo.toml b/core/lib/contracts/Cargo.toml
index 380aeddf3a5b..029938f663ee 100644
--- a/core/lib/contracts/Cargo.toml
+++ b/core/lib/contracts/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "zksync_contracts"
-version = "1.0.0"
+version = "0.1.0"
 edition = "2018"
 authors = ["The Matter Labs Team <hello@matterlabs.dev>"]
 homepage = "https://zksync.io/"
@@ -10,10 +10,11 @@ keywords = ["blockchain", "zksync"]
 categories = ["cryptography"]
 
 [dependencies]
-zksync_utils = { path = "../utils", version = "1.0" }
+zksync_utils = { path = "../utils" }
 
 ethabi = "18.0.0"
 serde_json = "1.0"
 serde = "1.0"
 once_cell = "1.7"
 hex = "0.4"
+envy = "0.4"
diff --git a/core/lib/contracts/src/lib.rs b/core/lib/contracts/src/lib.rs
index be67ceb9131b..20111285e866 100644
--- a/core/lib/contracts/src/lib.rs
+++ b/core/lib/contracts/src/lib.rs
@@ -1,3 +1,7 @@
+//! Set of utility functions to read contracts both in Yul and Sol format.
+//!
+//! Careful: some of the methods are reading the contracts based on the ZKSYNC_HOME environment variable.
+
 #![allow(clippy::derive_partial_eq_without_eq)]
 use ethabi::{
     ethereum_types::{H256, U256},
@@ -7,12 +11,14 @@ use once_cell::sync::Lazy;
 use serde::{Deserialize, Serialize};
 use std::{
     fs::{self, File},
-    path::Path,
+    path::{Path, PathBuf},
 };
 
 use zksync_utils::{bytecode::hash_bytecode, bytes_to_be_words};
 
-#[derive(Debug)]
+pub mod test_contracts;
+
+#[derive(Debug, Clone)]
 pub enum ContractLanguage {
     Sol,
     Yul,
@@ -132,9 +138,14 @@ pub fn known_codes_contract() -> Contract {
     load_sys_contract("KnownCodesStorage")
 }
 
-pub fn read_bytecode(path: impl AsRef<Path>) -> Vec<u8> {
+/// Reads bytecode from the path RELATIVE to the ZKSYNC_HOME environment variable.
+pub fn read_bytecode(relative_path: impl AsRef<Path>) -> Vec<u8> {
     let zksync_home = std::env::var("ZKSYNC_HOME").unwrap_or_else(|_| ".".into());
-    let artifact_path = Path::new(&zksync_home).join(path);
+    let artifact_path = Path::new(&zksync_home).join(relative_path);
+    read_bytecode_from_path(artifact_path)
+}
+/// Reads bytecode from a given path.
+pub fn read_bytecode_from_path(artifact_path: PathBuf) -> Vec<u8> {
     let artifact = read_file_to_json_value(artifact_path.clone());
 
     let bytecode = artifact["bytecode"]
@@ -152,18 +163,44 @@ pub fn default_erc20_bytecode() -> Vec<u8> {
 }
 
 pub fn read_sys_contract_bytecode(directory: &str, name: &str, lang: ContractLanguage) -> Vec<u8> {
-    match lang {
-        ContractLanguage::Sol => {
-            read_bytecode(format!(
-                "etc/system-contracts/artifacts-zk/cache-zk/solpp-generated-contracts/{0}{1}.sol/{1}.json",
+    DEFAULT_SYSTEM_CONTRACTS_REPO.read_sys_contract_bytecode(directory, name, lang)
+}
+
+pub static DEFAULT_SYSTEM_CONTRACTS_REPO: Lazy<SystemContractsRepo> =
+    Lazy::new(SystemContractsRepo::from_env);
+
+/// Structure representing a system contract repository - that allows
+/// fetching contracts that are located there.
+/// As most of the static methods in this file, is loading data based on ZKSYNC_HOME environment variable.
+pub struct SystemContractsRepo {
+    // Path to the root of the system contracts repo.
+    pub root: PathBuf,
+}
+
+impl SystemContractsRepo {
+    /// Returns the default system contracts repo with directory based on the ZKSYNC_HOME environment variable.
+    pub fn from_env() -> Self {
+        let zksync_home = std::env::var("ZKSYNC_HOME").expect("ZKSYNC_HOME env variable not set.");
+        let zksync_home = PathBuf::from(zksync_home);
+        SystemContractsRepo {
+            root: zksync_home.join("etc/system-contracts"),
+        }
+    }
+    pub fn read_sys_contract_bytecode(
+        &self,
+        directory: &str,
+        name: &str,
+        lang: ContractLanguage,
+    ) -> Vec<u8> {
+        match lang {
+            ContractLanguage::Sol => read_bytecode_from_path(self.root.join(format!(
+                "artifacts-zk/cache-zk/solpp-generated-contracts/{0}{1}.sol/{1}.json",
                 directory, name
-            ))
-        },
-        ContractLanguage::Yul => {
-            read_zbin_bytecode(format!(
-                "etc/system-contracts/contracts/{0}artifacts/{1}.yul/{1}.yul.zbin",
+            ))),
+            ContractLanguage::Yul => read_zbin_bytecode_from_path(self.root.join(format!(
+                "contracts/{0}artifacts/{1}.yul/{1}.yul.zbin",
                 directory, name
-            ))
+            ))),
         }
     }
 }
@@ -175,12 +212,12 @@ pub fn read_bootloader_code(bootloader_type: &str) -> Vec<u8> {
     ))
 }
 
-pub fn read_proved_block_bootloader_bytecode() -> Vec<u8> {
-    read_bootloader_code("proved_block")
+pub fn read_proved_batch_bootloader_bytecode() -> Vec<u8> {
+    read_bootloader_code("proved_batch")
 }
 
-pub fn read_playground_block_bootloader_bytecode() -> Vec<u8> {
-    read_bootloader_code("playground_block")
+pub fn read_playground_batch_bootloader_bytecode() -> Vec<u8> {
+    read_bootloader_code("playground_batch")
 }
 
 pub fn get_loadnext_test_contract_path(file_name: &str, contract_name: &str) -> String {
@@ -196,9 +233,16 @@ pub fn get_loadnext_test_contract_bytecode(file_name: &str, contract_name: &str)
         file_name, contract_name
     )
 }
-pub fn read_zbin_bytecode(zbin_path: impl AsRef<Path>) -> Vec<u8> {
+
+/// Reads zbin bytecode from a given path, relative to ZKSYNC_HOME.
+pub fn read_zbin_bytecode(relative_zbin_path: impl AsRef<Path>) -> Vec<u8> {
     let zksync_home = std::env::var("ZKSYNC_HOME").unwrap_or_else(|_| ".".into());
-    let bytecode_path = Path::new(&zksync_home).join(zbin_path);
+    let bytecode_path = Path::new(&zksync_home).join(relative_zbin_path);
+    read_zbin_bytecode_from_path(bytecode_path)
+}
+
+/// Reads zbin bytecode from a given path.
+pub fn read_zbin_bytecode_from_path(bytecode_path: PathBuf) -> Vec<u8> {
     fs::read(&bytecode_path)
         .unwrap_or_else(|err| panic!("Can't read .zbin bytecode at {:?}: {}", bytecode_path, err))
 }
@@ -229,7 +273,7 @@ impl PartialEq for BaseSystemContracts {
 }
 
 pub static PLAYGROUND_BLOCK_BOOTLOADER_CODE: Lazy<SystemContractCode> = Lazy::new(|| {
-    let bytecode = read_playground_block_bootloader_bytecode();
+    let bytecode = read_playground_batch_bootloader_bytecode();
     let hash = hash_bytecode(&bytecode);
 
     SystemContractCode {
@@ -272,13 +316,30 @@ impl BaseSystemContracts {
     }
     // BaseSystemContracts with proved bootloader - for handling transactions.
     pub fn load_from_disk() -> Self {
-        let bootloader_bytecode = read_proved_block_bootloader_bytecode();
+        let bootloader_bytecode = read_proved_batch_bootloader_bytecode();
         BaseSystemContracts::load_with_bootloader(bootloader_bytecode)
     }
 
     /// BaseSystemContracts with playground bootloader - used for handling 'eth_calls'.
     pub fn playground() -> Self {
-        let bootloader_bytecode = read_playground_block_bootloader_bytecode();
+        let bootloader_bytecode = read_playground_batch_bootloader_bytecode();
+        BaseSystemContracts::load_with_bootloader(bootloader_bytecode)
+    }
+
+    pub fn playground_pre_virtual_blocks() -> Self {
+        let bootloader_bytecode = read_zbin_bytecode(
+            "etc/multivm_bootloaders/vm_1_3_2/playground_block.yul/playground_block.yul.zbin",
+        );
+        BaseSystemContracts::load_with_bootloader(bootloader_bytecode)
+    }
+
+    pub fn playground_post_virtual_blocks() -> Self {
+        let bootloader_bytecode = read_zbin_bytecode("etc/multivm_bootloaders/vm_virtual_blocks/playground_batch.yul/playground_batch.yul.zbin");
+        BaseSystemContracts::load_with_bootloader(bootloader_bytecode)
+    }
+
+    pub fn playground_post_virtual_blocks_finish_upgrade_fix() -> Self {
+        let bootloader_bytecode = read_zbin_bytecode("etc/multivm_bootloaders/vm_virtual_blocks_finish_upgrade_fix/playground_batch.yul/playground_batch.yul.zbin");
         BaseSystemContracts::load_with_bootloader(bootloader_bytecode)
     }
 
@@ -288,6 +349,27 @@ impl BaseSystemContracts {
         BaseSystemContracts::load_with_bootloader(bootloader_bytecode)
     }
 
+    pub fn estimate_gas_pre_virtual_blocks() -> Self {
+        let bootloader_bytecode = read_zbin_bytecode(
+            "etc/multivm_bootloaders/vm_1_3_2/fee_estimate.yul/fee_estimate.yul.zbin",
+        );
+        BaseSystemContracts::load_with_bootloader(bootloader_bytecode)
+    }
+
+    pub fn estimate_gas_post_virtual_blocks() -> Self {
+        let bootloader_bytecode = read_zbin_bytecode(
+            "etc/multivm_bootloaders/vm_virtual_blocks/fee_estimate.yul/fee_estimate.yul.zbin",
+        );
+        BaseSystemContracts::load_with_bootloader(bootloader_bytecode)
+    }
+
+    pub fn estimate_gas_post_virtual_blocks_finish_upgrade_fix() -> Self {
+        let bootloader_bytecode = read_zbin_bytecode(
+            "etc/multivm_bootloaders/vm_virtual_blocks_finish_upgrade_fix/fee_estimate.yul/fee_estimate.yul.zbin",
+        );
+        BaseSystemContracts::load_with_bootloader(bootloader_bytecode)
+    }
+
     pub fn hashes(&self) -> BaseSystemContractsHashes {
         BaseSystemContractsHashes {
             bootloader: self.bootloader.hash,
diff --git a/core/lib/utils/src/test_utils.rs b/core/lib/contracts/src/test_contracts.rs
similarity index 52%
rename from core/lib/utils/src/test_utils.rs
rename to core/lib/contracts/src/test_contracts.rs
index 00f57491b7eb..9db4051cfdbd 100644
--- a/core/lib/utils/src/test_utils.rs
+++ b/core/lib/contracts/src/test_contracts.rs
@@ -1,3 +1,6 @@
+use crate::get_loadnext_contract;
+use ethabi::ethereum_types::U256;
+use ethabi::{Bytes, Token};
 use serde::Deserialize;
 
 #[derive(Debug, Clone, Deserialize)]
@@ -39,3 +42,23 @@ impl Default for LoadnextContractExecutionParams {
         }
     }
 }
+
+impl LoadnextContractExecutionParams {
+    pub fn to_bytes(&self) -> Bytes {
+        let loadnext_contract = get_loadnext_contract();
+        let contract_function = loadnext_contract.contract.function("execute").unwrap();
+
+        let params = vec![
+            Token::Uint(U256::from(self.reads)),
+            Token::Uint(U256::from(self.writes)),
+            Token::Uint(U256::from(self.hashes)),
+            Token::Uint(U256::from(self.events)),
+            Token::Uint(U256::from(self.recursive_calls)),
+            Token::Uint(U256::from(self.deploys)),
+        ];
+
+        contract_function
+            .encode_input(&params)
+            .expect("failed to encode parameters")
+    }
+}
diff --git a/core/lib/crypto/Cargo.toml b/core/lib/crypto/Cargo.toml
index 838247374c48..56ee24ddfe9a 100644
--- a/core/lib/crypto/Cargo.toml
+++ b/core/lib/crypto/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "zksync_crypto"
-version = "1.0.0"
+version = "0.1.0"
 edition = "2018"
 authors = ["The Matter Labs Team <hello@matterlabs.dev>"]
 homepage = "https://zksync.io/"
@@ -11,7 +11,7 @@ categories = ["cryptography"]
 readme = "README.md"
 
 [dependencies]
-zksync_basic_types = { path = "../basic_types", version = "1.0" }
+zksync_basic_types = { path = "../basic_types" }
 serde = "1.0"
 thiserror = "1.0"
 once_cell = "1.7"
diff --git a/core/lib/dal/Cargo.toml b/core/lib/dal/Cargo.toml
index decf249876b0..1355f37a58d3 100644
--- a/core/lib/dal/Cargo.toml
+++ b/core/lib/dal/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "zksync_dal"
-version = "1.0.0"
+version = "0.1.0"
 edition = "2018"
 authors = ["The Matter Labs Team <hello@matterlabs.dev>"]
 homepage = "https://zksync.io/"
@@ -10,18 +10,17 @@ keywords = ["blockchain", "zksync"]
 categories = ["cryptography"]
 
 [dependencies]
-vlog = { path = "../../lib/vlog", version = "1.0" }
-zksync_utils = { path = "../utils", version = "1.0" }
-zksync_config = { path = "../config", version = "1.0" }
-zksync_contracts = { path = "../contracts", version = "1.0" }
-zksync_types = { path = "../types", version = "1.0" }
-zksync_health_check = { path = "../health_check", version = "0.1.0" }
+zksync_utils = { path = "../utils" }
+zksync_config = { path = "../config" }
+zksync_contracts = { path = "../contracts" }
+zksync_types = { path = "../types" }
+zksync_health_check = { path = "../health_check" }
 
 itertools = "0.10.1"
 thiserror = "1.0"
 anyhow = "1.0"
-metrics = "0.20"
-tokio = { version = "1", features = ["time"] }
+metrics = "0.21"
+tokio = { version = "1", features = ["full"] }
 sqlx = { version = "0.5.13", default-features = false, features = [
     "runtime-tokio-native-tls",
     "macros",
@@ -31,7 +30,7 @@ sqlx = { version = "0.5.13", default-features = false, features = [
     "json",
     "offline",
     "migrate",
-    "ipnetwork"
+    "ipnetwork",
 ] }
 serde = { version = "1.0", features = ["derive"] }
 serde_json = "1.0"
@@ -41,7 +40,8 @@ num = "0.3.1"
 hex = "0.4"
 once_cell = "1.7"
 strum = { version = "0.24", features = ["derive"] }
+tracing = "0.1"
 
 [dev-dependencies]
 assert_matches = "1.5.0"
-db_test_macro = { path = "../db_test_macro", version = "0.1.0" }
+db_test_macro = { path = "../db_test_macro" }
diff --git a/core/lib/dal/migrations/20230807152355_virtual_blocks.down.sql b/core/lib/dal/migrations/20230807152355_virtual_blocks.down.sql
new file mode 100644
index 000000000000..19bc9003ae74
--- /dev/null
+++ b/core/lib/dal/migrations/20230807152355_virtual_blocks.down.sql
@@ -0,0 +1,2 @@
+ALTER TABLE miniblocks
+DROP COLUMN virtual_blocks;
diff --git a/core/lib/dal/migrations/20230807152355_virtual_blocks.up.sql b/core/lib/dal/migrations/20230807152355_virtual_blocks.up.sql
new file mode 100644
index 000000000000..babe1e1c1e9c
--- /dev/null
+++ b/core/lib/dal/migrations/20230807152355_virtual_blocks.up.sql
@@ -0,0 +1,2 @@
+ALTER TABLE miniblocks
+ADD virtual_blocks BIGINT NOT NULL DEFAULT 0;
diff --git a/core/lib/dal/migrations/20230822133227_prover_protocol_versions.down.sql b/core/lib/dal/migrations/20230822133227_prover_protocol_versions.down.sql
new file mode 100644
index 000000000000..cb8628abbe82
--- /dev/null
+++ b/core/lib/dal/migrations/20230822133227_prover_protocol_versions.down.sql
@@ -0,0 +1,21 @@
+ALTER TABLE witness_inputs DROP CONSTRAINT IF EXISTS witness_inputs_prover_protocol_version_fkey;
+ALTER TABLE witness_inputs ADD CONSTRAINT witness_inputs_protocol_version_fkey
+    FOREIGN KEY (protocol_version) REFERENCES protocol_versions (id);
+
+ALTER TABLE leaf_aggregation_witness_jobs DROP CONSTRAINT IF EXISTS leaf_aggregation_witness_jobs_prover_protocol_version_fkey;
+ALTER TABLE leaf_aggregation_witness_jobs ADD CONSTRAINT leaf_aggregation_witness_jobs_protocol_version_fkey
+    FOREIGN KEY (protocol_version) REFERENCES protocol_versions (id);
+
+ALTER TABLE node_aggregation_witness_jobs DROP CONSTRAINT IF EXISTS node_aggregation_witness_jobs_prover_protocol_version_fkey;
+ALTER TABLE node_aggregation_witness_jobs ADD CONSTRAINT node_aggregation_witness_jobs_protocol_version_fkey
+    FOREIGN KEY (protocol_version) REFERENCES protocol_versions (id);
+
+ALTER TABLE scheduler_witness_jobs DROP CONSTRAINT IF EXISTS scheduler_witness_jobs_prover_protocol_version_fkey;
+ALTER TABLE scheduler_witness_jobs ADD CONSTRAINT scheduler_witness_jobs_protocol_version_fkey
+    FOREIGN KEY (protocol_version) REFERENCES protocol_versions (id);
+
+ALTER TABLE prover_jobs DROP CONSTRAINT IF EXISTS prover_jobs_prover_protocol_version_fkey;
+ALTER TABLE prover_jobs ADD CONSTRAINT prover_jobs_protocol_version_fkey
+    FOREIGN KEY (protocol_version) REFERENCES protocol_versions (id);
+
+DROP TABLE IF EXISTS prover_protocol_versions;
diff --git a/core/lib/dal/migrations/20230822133227_prover_protocol_versions.up.sql b/core/lib/dal/migrations/20230822133227_prover_protocol_versions.up.sql
new file mode 100644
index 000000000000..bc60c23deca4
--- /dev/null
+++ b/core/lib/dal/migrations/20230822133227_prover_protocol_versions.up.sql
@@ -0,0 +1,30 @@
+CREATE TABLE prover_protocol_versions (
+     id INT PRIMARY KEY,
+     timestamp BIGINT NOT NULL,
+     recursion_scheduler_level_vk_hash BYTEA NOT NULL,
+     recursion_node_level_vk_hash BYTEA NOT NULL,
+     recursion_leaf_level_vk_hash BYTEA NOT NULL,
+     recursion_circuits_set_vks_hash BYTEA NOT NULL,
+     verifier_address BYTEA NOT NULL,
+     created_at TIMESTAMP NOT NULL
+);
+
+ALTER TABLE witness_inputs DROP CONSTRAINT IF EXISTS witness_inputs_protocol_version_fkey;
+ALTER TABLE witness_inputs ADD CONSTRAINT witness_inputs_prover_protocol_version_fkey
+    FOREIGN KEY (protocol_version) REFERENCES prover_protocol_versions (id);
+
+ALTER TABLE leaf_aggregation_witness_jobs DROP CONSTRAINT IF EXISTS leaf_aggregation_witness_jobs_protocol_version_fkey;
+ALTER TABLE leaf_aggregation_witness_jobs ADD CONSTRAINT leaf_aggregation_witness_jobs_prover_protocol_version_fkey
+    FOREIGN KEY (protocol_version) REFERENCES prover_protocol_versions (id);
+
+ALTER TABLE node_aggregation_witness_jobs DROP CONSTRAINT IF EXISTS node_aggregation_witness_jobs_protocol_version_fkey;
+ALTER TABLE node_aggregation_witness_jobs ADD CONSTRAINT node_aggregation_witness_jobs_prover_protocol_version_fkey
+    FOREIGN KEY (protocol_version) REFERENCES prover_protocol_versions (id);
+
+ALTER TABLE scheduler_witness_jobs DROP CONSTRAINT IF EXISTS scheduler_witness_jobs_protocol_version_fkey;
+ALTER TABLE scheduler_witness_jobs ADD CONSTRAINT scheduler_witness_jobs_prover_protocol_version_fkey
+    FOREIGN KEY (protocol_version) REFERENCES prover_protocol_versions (id);
+
+ALTER TABLE prover_jobs DROP CONSTRAINT IF EXISTS prover_jobs_protocol_version_fkey;
+ALTER TABLE prover_jobs ADD CONSTRAINT prover_jobs_prover_protocol_version_fkey
+    FOREIGN KEY (protocol_version) REFERENCES prover_protocol_versions (id);
diff --git a/core/lib/dal/migrations/20230824105133_drop_protocol_versions_tx_fk.down.sql b/core/lib/dal/migrations/20230824105133_drop_protocol_versions_tx_fk.down.sql
new file mode 100644
index 000000000000..7a63c6657b9f
--- /dev/null
+++ b/core/lib/dal/migrations/20230824105133_drop_protocol_versions_tx_fk.down.sql
@@ -0,0 +1,2 @@
+ALTER TABLE protocol_versions ADD CONSTRAINT protocol_versions_upgrade_tx_hash_fkey
+    FOREIGN KEY (upgrade_tx_hash) REFERENCES transactions (hash);
diff --git a/core/lib/dal/migrations/20230824105133_drop_protocol_versions_tx_fk.up.sql b/core/lib/dal/migrations/20230824105133_drop_protocol_versions_tx_fk.up.sql
new file mode 100644
index 000000000000..bff0190f68db
--- /dev/null
+++ b/core/lib/dal/migrations/20230824105133_drop_protocol_versions_tx_fk.up.sql
@@ -0,0 +1 @@
+ALTER TABLE protocol_versions DROP CONSTRAINT IF EXISTS protocol_versions_upgrade_tx_hash_fkey;
diff --git a/core/lib/dal/migrations/20230825103341_fix_prover_jobs_protocol_version_index.down.sql b/core/lib/dal/migrations/20230825103341_fix_prover_jobs_protocol_version_index.down.sql
new file mode 100644
index 000000000000..53ac23db5b11
--- /dev/null
+++ b/core/lib/dal/migrations/20230825103341_fix_prover_jobs_protocol_version_index.down.sql
@@ -0,0 +1,21 @@
+DROP INDEX IF EXISTS ix_prover_jobs_circuits_0_2;
+DROP INDEX IF EXISTS ix_prover_jobs_circuits_1_2;
+DROP INDEX IF EXISTS ix_prover_jobs_circuits_2_2;
+DROP INDEX IF EXISTS ix_prover_jobs_circuits_3_2;
+DROP INDEX IF EXISTS ix_prover_jobs_circuits_4_2;
+DROP INDEX IF EXISTS ix_prover_jobs_circuits_5_2;
+DROP INDEX IF EXISTS ix_prover_jobs_circuits_6_2;
+DROP INDEX IF EXISTS ix_prover_jobs_circuits_7_2;
+DROP INDEX IF EXISTS ix_prover_jobs_circuits_8_2;
+DROP INDEX IF EXISTS ix_prover_jobs_circuits_9_2;
+
+CREATE INDEX IF NOT EXISTS ix_prover_jobs_circuits_0_1 ON public.prover_jobs USING btree (protocol_version, aggregation_round DESC, l1_batch_number, id) WHERE ((status = 'queued'::text) AND (circuit_type = ANY ('{Scheduler,"L1 messages merklizer"}'::text[])));
+CREATE INDEX IF NOT EXISTS ix_prover_jobs_circuits_1_1 ON public.prover_jobs USING btree (protocol_version, aggregation_round DESC, l1_batch_number, id) WHERE ((status = 'queued'::text) AND (circuit_type = ANY ('{"Node aggregation","Decommitts sorter"}'::text[])));
+CREATE INDEX IF NOT EXISTS ix_prover_jobs_circuits_2_1 ON public.prover_jobs USING btree (protocol_version, aggregation_round DESC, l1_batch_number, id) WHERE ((status = 'queued'::text) AND (circuit_type = ANY ('{"Leaf aggregation","Code decommitter"}'::text[])));
+CREATE INDEX IF NOT EXISTS ix_prover_jobs_circuits_3_1 ON public.prover_jobs USING btree (protocol_version, aggregation_round DESC, l1_batch_number, id) WHERE ((status = 'queued'::text) AND (circuit_type = ANY ('{"Log demuxer",Keccak}'::text[])));
+CREATE INDEX IF NOT EXISTS ix_prover_jobs_circuits_4_1 ON public.prover_jobs USING btree (protocol_version, aggregation_round DESC, l1_batch_number, id) WHERE ((status = 'queued'::text) AND (circuit_type = ANY ('{SHA256,ECRecover}'::text[])));
+CREATE INDEX IF NOT EXISTS ix_prover_jobs_circuits_5_1 ON public.prover_jobs USING btree (protocol_version, aggregation_round DESC, l1_batch_number, id) WHERE ((status = 'queued'::text) AND (circuit_type = ANY ('{"RAM permutation","Storage sorter"}'::text[])));
+CREATE INDEX IF NOT EXISTS ix_prover_jobs_circuits_6_1 ON public.prover_jobs USING btree (protocol_version, aggregation_round DESC, l1_batch_number, id) WHERE ((status = 'queued'::text) AND (circuit_type = ANY ('{"Storage application","Initial writes pubdata rehasher"}'::text[])));
+CREATE INDEX IF NOT EXISTS ix_prover_jobs_circuits_7_1 ON public.prover_jobs USING btree (protocol_version, aggregation_round DESC, l1_batch_number, id) WHERE ((status = 'queued'::text) AND (circuit_type = ANY ('{"Repeated writes pubdata rehasher","Events sorter"}'::text[])));
+CREATE INDEX IF NOT EXISTS ix_prover_jobs_circuits_8_1 ON public.prover_jobs USING btree (protocol_version, aggregation_round DESC, l1_batch_number, id) WHERE ((status = 'queued'::text) AND (circuit_type = ANY ('{"L1 messages sorter","L1 messages rehasher"}'::text[])));
+CREATE INDEX IF NOT EXISTS ix_prover_jobs_circuits_9_1 ON public.prover_jobs USING btree (protocol_version, aggregation_round DESC, l1_batch_number, id) WHERE ((status = 'queued'::text) AND (circuit_type = ANY ('{"Main VM"}'::text[])));
diff --git a/core/lib/dal/migrations/20230825103341_fix_prover_jobs_protocol_version_index.up.sql b/core/lib/dal/migrations/20230825103341_fix_prover_jobs_protocol_version_index.up.sql
new file mode 100644
index 000000000000..be184909137f
--- /dev/null
+++ b/core/lib/dal/migrations/20230825103341_fix_prover_jobs_protocol_version_index.up.sql
@@ -0,0 +1,21 @@
+DROP INDEX IF EXISTS ix_prover_jobs_circuits_0_1;
+DROP INDEX IF EXISTS ix_prover_jobs_circuits_1_1;
+DROP INDEX IF EXISTS ix_prover_jobs_circuits_2_1;
+DROP INDEX IF EXISTS ix_prover_jobs_circuits_3_1;
+DROP INDEX IF EXISTS ix_prover_jobs_circuits_4_1;
+DROP INDEX IF EXISTS ix_prover_jobs_circuits_5_1;
+DROP INDEX IF EXISTS ix_prover_jobs_circuits_6_1;
+DROP INDEX IF EXISTS ix_prover_jobs_circuits_7_1;
+DROP INDEX IF EXISTS ix_prover_jobs_circuits_8_1;
+DROP INDEX IF EXISTS ix_prover_jobs_circuits_9_1;
+
+CREATE INDEX IF NOT EXISTS ix_prover_jobs_circuits_0_2 ON public.prover_jobs USING btree (aggregation_round DESC, l1_batch_number, id) INCLUDE (protocol_version) WHERE ((status = 'queued'::text) AND (circuit_type = ANY ('{Scheduler,"L1 messages merklizer"}'::text[])));
+CREATE INDEX IF NOT EXISTS ix_prover_jobs_circuits_1_2 ON public.prover_jobs USING btree (aggregation_round DESC, l1_batch_number, id) INCLUDE (protocol_version) WHERE ((status = 'queued'::text) AND (circuit_type = ANY ('{"Node aggregation","Decommitts sorter"}'::text[])));
+CREATE INDEX IF NOT EXISTS ix_prover_jobs_circuits_2_2 ON public.prover_jobs USING btree (aggregation_round DESC, l1_batch_number, id) INCLUDE (protocol_version) WHERE ((status = 'queued'::text) AND (circuit_type = ANY ('{"Leaf aggregation","Code decommitter"}'::text[])));
+CREATE INDEX IF NOT EXISTS ix_prover_jobs_circuits_3_2 ON public.prover_jobs USING btree (aggregation_round DESC, l1_batch_number, id) INCLUDE (protocol_version) WHERE ((status = 'queued'::text) AND (circuit_type = ANY ('{"Log demuxer",Keccak}'::text[])));
+CREATE INDEX IF NOT EXISTS ix_prover_jobs_circuits_4_2 ON public.prover_jobs USING btree (aggregation_round DESC, l1_batch_number, id) INCLUDE (protocol_version) WHERE ((status = 'queued'::text) AND (circuit_type = ANY ('{SHA256,ECRecover}'::text[])));
+CREATE INDEX IF NOT EXISTS ix_prover_jobs_circuits_5_2 ON public.prover_jobs USING btree (aggregation_round DESC, l1_batch_number, id) INCLUDE (protocol_version) WHERE ((status = 'queued'::text) AND (circuit_type = ANY ('{"RAM permutation","Storage sorter"}'::text[])));
+CREATE INDEX IF NOT EXISTS ix_prover_jobs_circuits_6_2 ON public.prover_jobs USING btree (aggregation_round DESC, l1_batch_number, id) INCLUDE (protocol_version) WHERE ((status = 'queued'::text) AND (circuit_type = ANY ('{"Storage application","Initial writes pubdata rehasher"}'::text[])));
+CREATE INDEX IF NOT EXISTS ix_prover_jobs_circuits_7_2 ON public.prover_jobs USING btree (aggregation_round DESC, l1_batch_number, id) INCLUDE (protocol_version) WHERE ((status = 'queued'::text) AND (circuit_type = ANY ('{"Repeated writes pubdata rehasher","Events sorter"}'::text[])));
+CREATE INDEX IF NOT EXISTS ix_prover_jobs_circuits_8_2 ON public.prover_jobs USING btree (aggregation_round DESC, l1_batch_number, id) INCLUDE (protocol_version) WHERE ((status = 'queued'::text) AND (circuit_type = ANY ('{"L1 messages sorter","L1 messages rehasher"}'::text[])));
+CREATE INDEX IF NOT EXISTS ix_prover_jobs_circuits_9_2 ON public.prover_jobs USING btree (aggregation_round DESC, l1_batch_number, id) INCLUDE (protocol_version) WHERE ((status = 'queued'::text) AND (circuit_type = ANY ('{"Main VM"}'::text[])));
diff --git a/core/lib/dal/migrations/20230831110448_add_prover_fri_protocol_versions_table.down.sql b/core/lib/dal/migrations/20230831110448_add_prover_fri_protocol_versions_table.down.sql
new file mode 100644
index 000000000000..0598e2b72c5c
--- /dev/null
+++ b/core/lib/dal/migrations/20230831110448_add_prover_fri_protocol_versions_table.down.sql
@@ -0,0 +1 @@
+DROP TABLE IF EXISTS prover_fri_protocol_versions;
diff --git a/core/lib/dal/migrations/20230831110448_add_prover_fri_protocol_versions_table.up.sql b/core/lib/dal/migrations/20230831110448_add_prover_fri_protocol_versions_table.up.sql
new file mode 100644
index 000000000000..c4b3a95d89b9
--- /dev/null
+++ b/core/lib/dal/migrations/20230831110448_add_prover_fri_protocol_versions_table.up.sql
@@ -0,0 +1,15 @@
+CREATE TABLE IF NOT EXISTS prover_fri_protocol_versions
+(
+    id                                INT PRIMARY KEY,
+    recursion_scheduler_level_vk_hash BYTEA     NOT NULL,
+    recursion_node_level_vk_hash      BYTEA     NOT NULL,
+    recursion_leaf_level_vk_hash      BYTEA     NOT NULL,
+    recursion_circuits_set_vks_hash   BYTEA     NOT NULL,
+    created_at                        TIMESTAMP NOT NULL
+);
+
+ALTER TABLE witness_inputs_fri ADD COLUMN IF NOT EXISTS protocol_version INT REFERENCES prover_fri_protocol_versions (id);
+ALTER TABLE leaf_aggregation_witness_jobs_fri ADD COLUMN IF NOT EXISTS protocol_version INT REFERENCES prover_fri_protocol_versions (id);
+ALTER TABLE node_aggregation_witness_jobs_fri ADD COLUMN IF NOT EXISTS protocol_version INT REFERENCES prover_fri_protocol_versions (id);
+ALTER TABLE scheduler_witness_jobs_fri ADD COLUMN IF NOT EXISTS protocol_version INT REFERENCES prover_fri_protocol_versions (id);
+ALTER TABLE prover_jobs_fri ADD COLUMN IF NOT EXISTS protocol_version INT REFERENCES prover_fri_protocol_versions (id);
diff --git a/core/lib/dal/migrations/20230906070159_miniblocks_pending_batch_index.down.sql b/core/lib/dal/migrations/20230906070159_miniblocks_pending_batch_index.down.sql
new file mode 100644
index 000000000000..beea4e546669
--- /dev/null
+++ b/core/lib/dal/migrations/20230906070159_miniblocks_pending_batch_index.down.sql
@@ -0,0 +1 @@
+DROP INDEX IF EXISTS miniblocks_pending_batch;
diff --git a/core/lib/dal/migrations/20230906070159_miniblocks_pending_batch_index.up.sql b/core/lib/dal/migrations/20230906070159_miniblocks_pending_batch_index.up.sql
new file mode 100644
index 000000000000..d332f64a5ade
--- /dev/null
+++ b/core/lib/dal/migrations/20230906070159_miniblocks_pending_batch_index.up.sql
@@ -0,0 +1,2 @@
+CREATE INDEX IF NOT EXISTS miniblocks_pending_batch ON miniblocks USING btree (number) INCLUDE (timestamp)
+    WHERE l1_batch_number IS NULL;
diff --git a/core/lib/dal/migrations/20230906090541_add_proof_compression_table.down.sql b/core/lib/dal/migrations/20230906090541_add_proof_compression_table.down.sql
new file mode 100644
index 000000000000..63bade7ab94a
--- /dev/null
+++ b/core/lib/dal/migrations/20230906090541_add_proof_compression_table.down.sql
@@ -0,0 +1,3 @@
+DROP TABLE IF EXISTS proof_compression_jobs_fri;
+
+DROP INDEX IF EXISTS idx_proof_compression_jobs_fri_status_processing_attempts;
diff --git a/core/lib/dal/migrations/20230906090541_add_proof_compression_table.up.sql b/core/lib/dal/migrations/20230906090541_add_proof_compression_table.up.sql
new file mode 100644
index 000000000000..f3e6be6ead07
--- /dev/null
+++ b/core/lib/dal/migrations/20230906090541_add_proof_compression_table.up.sql
@@ -0,0 +1,17 @@
+CREATE TABLE IF NOT EXISTS proof_compression_jobs_fri
+(
+    l1_batch_number       BIGINT    NOT NULL PRIMARY KEY,
+    attempts              SMALLINT  NOT NULL DEFAULT 0,
+    status                TEXT      NOT NULL,
+    fri_proof_blob_url    TEXT      NOT NULL,
+    l1_proof_blob_url     TEXT,
+    error                 TEXT,
+    created_at            TIMESTAMP NOT NULL,
+    updated_at            TIMESTAMP NOT NULL,
+    processing_started_at TIMESTAMP,
+    time_taken            TIME
+);
+
+CREATE INDEX IF NOT EXISTS idx_proof_compression_jobs_fri_status_processing_attempts
+    ON proof_compression_jobs_fri (processing_started_at, attempts)
+    WHERE status IN ('in_progress', 'failed');
diff --git a/core/lib/dal/migrations/20230911090548_add_index_for_proof_compressor_table.down.sql b/core/lib/dal/migrations/20230911090548_add_index_for_proof_compressor_table.down.sql
new file mode 100644
index 000000000000..524d259a05ee
--- /dev/null
+++ b/core/lib/dal/migrations/20230911090548_add_index_for_proof_compressor_table.down.sql
@@ -0,0 +1,2 @@
+DROP INDEX IF EXISTS idx_proof_compressor_jobs_fri_queued_order;
+DROP INDEX IF EXISTS idx_witness_inputs_fri_queued_order;
diff --git a/core/lib/dal/migrations/20230911090548_add_index_for_proof_compressor_table.up.sql b/core/lib/dal/migrations/20230911090548_add_index_for_proof_compressor_table.up.sql
new file mode 100644
index 000000000000..da468c1f48e5
--- /dev/null
+++ b/core/lib/dal/migrations/20230911090548_add_index_for_proof_compressor_table.up.sql
@@ -0,0 +1,8 @@
+-- Add up migration script here
+CREATE INDEX IF NOT EXISTS idx_proof_compressor_jobs_fri_queued_order
+    ON proof_compression_jobs_fri (l1_batch_number ASC)
+    WHERE status = 'queued';
+
+CREATE INDEX IF NOT EXISTS idx_witness_inputs_fri_queued_order
+    ON witness_inputs_fri (l1_batch_number ASC)
+    WHERE status = 'queued';
diff --git a/core/lib/dal/migrations/20230913092159_update_prover_fri_index_to_include_protocol_version.down.sql b/core/lib/dal/migrations/20230913092159_update_prover_fri_index_to_include_protocol_version.down.sql
new file mode 100644
index 000000000000..3bcacdc8852c
--- /dev/null
+++ b/core/lib/dal/migrations/20230913092159_update_prover_fri_index_to_include_protocol_version.down.sql
@@ -0,0 +1,8 @@
+DROP INDEX IF EXISTS prover_jobs_fri_composite_index_1;
+DROP INDEX IF EXISTS leaf_aggregation_witness_jobs_fri_composite_index_1;
+DROP INDEX IF EXISTS node_aggregation_witness_jobs_fri_composite_index_1;
+DROP INDEX IF EXISTS scheduler_witness_jobs_fri_composite_index_1;
+
+CREATE UNIQUE INDEX IF NOT EXISTS prover_jobs_fri_composite_index ON prover_jobs_fri(l1_batch_number, aggregation_round, circuit_id, depth, sequence_number);
+CREATE UNIQUE INDEX IF NOT EXISTS leaf_aggregation_witness_jobs_fri_composite_index ON leaf_aggregation_witness_jobs_fri(l1_batch_number, circuit_id);
+CREATE UNIQUE INDEX IF NOT EXISTS node_aggregation_witness_jobs_fri_composite_index ON node_aggregation_witness_jobs_fri(l1_batch_number, circuit_id, depth);
diff --git a/core/lib/dal/migrations/20230913092159_update_prover_fri_index_to_include_protocol_version.up.sql b/core/lib/dal/migrations/20230913092159_update_prover_fri_index_to_include_protocol_version.up.sql
new file mode 100644
index 000000000000..24edd21e7b3f
--- /dev/null
+++ b/core/lib/dal/migrations/20230913092159_update_prover_fri_index_to_include_protocol_version.up.sql
@@ -0,0 +1,9 @@
+DROP INDEX IF EXISTS prover_jobs_fri_composite_index;
+DROP INDEX IF EXISTS leaf_aggregation_witness_jobs_fri_composite_index;
+DROP INDEX IF EXISTS node_aggregation_witness_jobs_fri_composite_index;
+
+CREATE UNIQUE INDEX IF NOT EXISTS prover_jobs_fri_composite_index_1 ON prover_jobs_fri(l1_batch_number, aggregation_round, circuit_id, depth, sequence_number) INCLUDE(protocol_version);
+CREATE UNIQUE INDEX IF NOT EXISTS leaf_aggregation_witness_jobs_fri_composite_index_1 ON leaf_aggregation_witness_jobs_fri(l1_batch_number, circuit_id) INCLUDE(protocol_version);
+CREATE UNIQUE INDEX IF NOT EXISTS node_aggregation_witness_jobs_fri_composite_index_1 ON node_aggregation_witness_jobs_fri(l1_batch_number, circuit_id, depth) INCLUDE(protocol_version);
+CREATE UNIQUE INDEX IF NOT EXISTS scheduler_witness_jobs_fri_composite_index_1 ON scheduler_witness_jobs_fri(l1_batch_number) INCLUDE(protocol_version);
+
diff --git a/core/lib/dal/migrations/20230914150834_enum-indices-not-null.down.sql b/core/lib/dal/migrations/20230914150834_enum-indices-not-null.down.sql
new file mode 100644
index 000000000000..4f38d0d56db2
--- /dev/null
+++ b/core/lib/dal/migrations/20230914150834_enum-indices-not-null.down.sql
@@ -0,0 +1 @@
+ALTER TABLE initial_writes ALTER COLUMN index DROP NOT NULL;
diff --git a/core/lib/dal/migrations/20230914150834_enum-indices-not-null.up.sql b/core/lib/dal/migrations/20230914150834_enum-indices-not-null.up.sql
new file mode 100644
index 000000000000..ac0d0fd76e0e
--- /dev/null
+++ b/core/lib/dal/migrations/20230914150834_enum-indices-not-null.up.sql
@@ -0,0 +1 @@
+ALTER TABLE initial_writes ALTER COLUMN index SET NOT NULL;
diff --git a/core/lib/dal/migrations/20230918093855_remove_not_null_constraint_fri_proof_blob_url_proof_compression_jobs_fri.down.sql b/core/lib/dal/migrations/20230918093855_remove_not_null_constraint_fri_proof_blob_url_proof_compression_jobs_fri.down.sql
new file mode 100644
index 000000000000..9461e6cf65e0
--- /dev/null
+++ b/core/lib/dal/migrations/20230918093855_remove_not_null_constraint_fri_proof_blob_url_proof_compression_jobs_fri.down.sql
@@ -0,0 +1,2 @@
+ALTER TABLE proof_compression_jobs_fri
+    ALTER COLUMN fri_proof_blob_url SET NOT NULL;
diff --git a/core/lib/dal/migrations/20230918093855_remove_not_null_constraint_fri_proof_blob_url_proof_compression_jobs_fri.up.sql b/core/lib/dal/migrations/20230918093855_remove_not_null_constraint_fri_proof_blob_url_proof_compression_jobs_fri.up.sql
new file mode 100644
index 000000000000..13b19c5d19e4
--- /dev/null
+++ b/core/lib/dal/migrations/20230918093855_remove_not_null_constraint_fri_proof_blob_url_proof_compression_jobs_fri.up.sql
@@ -0,0 +1,2 @@
+ALTER TABLE proof_compression_jobs_fri
+    ALTER COLUMN fri_proof_blob_url DROP NOT NULL;
diff --git a/core/lib/dal/migrations/20230918134637_add_picked_by_column_to_prover_fri_related_tables.down.sql b/core/lib/dal/migrations/20230918134637_add_picked_by_column_to_prover_fri_related_tables.down.sql
new file mode 100644
index 000000000000..547dbb7e4b16
--- /dev/null
+++ b/core/lib/dal/migrations/20230918134637_add_picked_by_column_to_prover_fri_related_tables.down.sql
@@ -0,0 +1,12 @@
+ALTER TABLE witness_inputs_fri
+    DROP COLUMN IF EXISTS picked_by;
+ALTER TABLE leaf_aggregation_witness_jobs_fri
+    DROP COLUMN IF EXISTS picked_by;
+ALTER TABLE node_aggregation_witness_jobs_fri
+    DROP COLUMN IF EXISTS picked_by;
+ALTER TABLE scheduler_witness_jobs_fri
+    DROP COLUMN IF EXISTS picked_by;
+ALTER TABLE prover_jobs_fri
+    DROP COLUMN IF EXISTS picked_by;
+ALTER TABLE proof_compression_jobs_fri
+    DROP COLUMN IF EXISTS picked_by;
diff --git a/core/lib/dal/migrations/20230918134637_add_picked_by_column_to_prover_fri_related_tables.up.sql b/core/lib/dal/migrations/20230918134637_add_picked_by_column_to_prover_fri_related_tables.up.sql
new file mode 100644
index 000000000000..6b73d566527f
--- /dev/null
+++ b/core/lib/dal/migrations/20230918134637_add_picked_by_column_to_prover_fri_related_tables.up.sql
@@ -0,0 +1,12 @@
+ALTER TABLE witness_inputs_fri
+    ADD COLUMN IF NOT EXISTS picked_by TEXT;
+ALTER TABLE leaf_aggregation_witness_jobs_fri
+    ADD COLUMN IF NOT EXISTS picked_by TEXT;
+ALTER TABLE node_aggregation_witness_jobs_fri
+    ADD COLUMN IF NOT EXISTS picked_by TEXT;
+ALTER TABLE scheduler_witness_jobs_fri
+    ADD COLUMN IF NOT EXISTS picked_by TEXT;
+ALTER TABLE prover_jobs_fri
+    ADD COLUMN IF NOT EXISTS picked_by TEXT;
+ALTER TABLE proof_compression_jobs_fri
+    ADD COLUMN IF NOT EXISTS picked_by TEXT;
diff --git a/core/lib/dal/sqlx-data.json b/core/lib/dal/sqlx-data.json
index 2bdee59ce8f4..84799dd2180f 100644
--- a/core/lib/dal/sqlx-data.json
+++ b/core/lib/dal/sqlx-data.json
@@ -1,5 +1,123 @@
 {
   "db": "PostgreSQL",
+  "0002e8b596794ae9396de8ac621b30dcf0befdff28c5bc23d713185f7a410df4": {
+    "describe": {
+      "columns": [],
+      "nullable": [],
+      "parameters": {
+        "Left": [
+          "Text",
+          "Int8"
+        ]
+      }
+    },
+    "query": "UPDATE proof_generation_details SET status=$1, updated_at = now() WHERE l1_batch_number = $2"
+  },
+  "00bd80fd83aff559d8d9232c2e98a12a1dd2c8f31792cd915e2cf11f28e583b7": {
+    "describe": {
+      "columns": [
+        {
+          "name": "id",
+          "ordinal": 0,
+          "type_info": "Int8"
+        },
+        {
+          "name": "l1_batch_number",
+          "ordinal": 1,
+          "type_info": "Int8"
+        },
+        {
+          "name": "circuit_id",
+          "ordinal": 2,
+          "type_info": "Int2"
+        },
+        {
+          "name": "depth",
+          "ordinal": 3,
+          "type_info": "Int4"
+        },
+        {
+          "name": "status",
+          "ordinal": 4,
+          "type_info": "Text"
+        },
+        {
+          "name": "attempts",
+          "ordinal": 5,
+          "type_info": "Int2"
+        },
+        {
+          "name": "aggregations_url",
+          "ordinal": 6,
+          "type_info": "Text"
+        },
+        {
+          "name": "processing_started_at",
+          "ordinal": 7,
+          "type_info": "Timestamp"
+        },
+        {
+          "name": "time_taken",
+          "ordinal": 8,
+          "type_info": "Time"
+        },
+        {
+          "name": "error",
+          "ordinal": 9,
+          "type_info": "Text"
+        },
+        {
+          "name": "created_at",
+          "ordinal": 10,
+          "type_info": "Timestamp"
+        },
+        {
+          "name": "updated_at",
+          "ordinal": 11,
+          "type_info": "Timestamp"
+        },
+        {
+          "name": "number_of_dependent_jobs",
+          "ordinal": 12,
+          "type_info": "Int4"
+        },
+        {
+          "name": "protocol_version",
+          "ordinal": 13,
+          "type_info": "Int4"
+        },
+        {
+          "name": "picked_by",
+          "ordinal": 14,
+          "type_info": "Text"
+        }
+      ],
+      "nullable": [
+        false,
+        false,
+        false,
+        false,
+        false,
+        false,
+        true,
+        true,
+        true,
+        true,
+        false,
+        false,
+        true,
+        true,
+        true
+      ],
+      "parameters": {
+        "Left": [
+          "Int4Array",
+          "Text"
+        ]
+      }
+    },
+    "query": "\n                UPDATE node_aggregation_witness_jobs_fri\n                SET status = 'in_progress', attempts = attempts + 1,\n                    updated_at = now(), processing_started_at = now(),\n                    picked_by = $2\n                WHERE id = (\n                    SELECT id\n                    FROM node_aggregation_witness_jobs_fri\n                    WHERE status = 'queued'\n                    AND protocol_version = ANY($1)\n                    ORDER BY l1_batch_number ASC, depth ASC, id ASC\n                    LIMIT 1\n                    FOR UPDATE\n                    SKIP LOCKED\n                )\n                RETURNING node_aggregation_witness_jobs_fri.*\n                "
+  },
   "01a21fe42c5c0ec0f848739235b8175b62b0ffe503b823c128dd620fec047784": {
     "describe": {
       "columns": [],
@@ -126,92 +244,33 @@
     },
     "query": "\n                WITH events_select AS (\n                    SELECT\n                        address, topic1, topic2, topic3, topic4, value,\n                        miniblock_number, tx_hash, tx_index_in_block,\n                        event_index_in_block, event_index_in_tx\n                    FROM events\n                    WHERE miniblock_number > $1\n                    ORDER BY miniblock_number ASC, event_index_in_block ASC\n                )\n                SELECT miniblocks.hash as \"block_hash?\",\n                    address as \"address!\", topic1 as \"topic1!\", topic2 as \"topic2!\", topic3 as \"topic3!\", topic4 as \"topic4!\", value as \"value!\",\n                    miniblock_number as \"miniblock_number!\", miniblocks.l1_batch_number as \"l1_batch_number?\", tx_hash as \"tx_hash!\",\n                    tx_index_in_block as \"tx_index_in_block!\", event_index_in_block as \"event_index_in_block!\", event_index_in_tx as \"event_index_in_tx!\"\n                FROM events_select\n                INNER JOIN miniblocks ON events_select.miniblock_number = miniblocks.number\n                ORDER BY miniblock_number ASC, event_index_in_block ASC\n                "
   },
-  "073d304fe756940303f00b514ef1e24036a1d3d3c3c7fb204b484f681a3520d7": {
+  "073582051133075adfc51a18d15639129dd00628aa4994b602843ac979ad4419": {
     "describe": {
       "columns": [],
       "nullable": [],
       "parameters": {
         "Left": [
-          "Int4",
+          "Int8",
+          "Bytea",
+          "Text",
           "Int4"
         ]
       }
     },
-    "query": "UPDATE eth_txs\n                    SET confirmed_eth_tx_history_id = $1\n                    WHERE id = $2"
+    "query": "INSERT INTO witness_inputs(l1_batch_number, merkle_tree_paths, merkel_tree_paths_blob_url, status, protocol_version, created_at, updated_at) VALUES ($1, $2, $3, 'queued', $4, now(), now())\n                 ON CONFLICT (l1_batch_number) DO NOTHING"
   },
-  "078adbe9a9973c96c8911725c2b2ce449f83897b324c434b04ffe4d1dd40484c": {
+  "073d304fe756940303f00b514ef1e24036a1d3d3c3c7fb204b484f681a3520d7": {
     "describe": {
-      "columns": [
-        {
-          "name": "l1_batch_number",
-          "ordinal": 0,
-          "type_info": "Int8"
-        },
-        {
-          "name": "merkle_tree_paths_blob_url",
-          "ordinal": 1,
-          "type_info": "Text"
-        },
-        {
-          "name": "attempts",
-          "ordinal": 2,
-          "type_info": "Int2"
-        },
-        {
-          "name": "status",
-          "ordinal": 3,
-          "type_info": "Text"
-        },
-        {
-          "name": "error",
-          "ordinal": 4,
-          "type_info": "Text"
-        },
-        {
-          "name": "created_at",
-          "ordinal": 5,
-          "type_info": "Timestamp"
-        },
-        {
-          "name": "updated_at",
-          "ordinal": 6,
-          "type_info": "Timestamp"
-        },
-        {
-          "name": "processing_started_at",
-          "ordinal": 7,
-          "type_info": "Timestamp"
-        },
-        {
-          "name": "time_taken",
-          "ordinal": 8,
-          "type_info": "Time"
-        },
-        {
-          "name": "is_blob_cleaned",
-          "ordinal": 9,
-          "type_info": "Bool"
-        }
-      ],
-      "nullable": [
-        false,
-        true,
-        false,
-        false,
-        true,
-        false,
-        false,
-        true,
-        true,
-        true
-      ],
+      "columns": [],
+      "nullable": [],
       "parameters": {
         "Left": [
-          "Int8"
+          "Int4",
+          "Int4"
         ]
       }
     },
-    "query": "\n                UPDATE witness_inputs_fri\n                SET status = 'in_progress', attempts = attempts + 1,\n                    updated_at = now(), processing_started_at = now()\n                WHERE l1_batch_number = (\n                    SELECT l1_batch_number\n                    FROM witness_inputs_fri\n                    WHERE l1_batch_number <= $1\n                    AND status = 'queued'\n                    ORDER BY l1_batch_number ASC\n                    LIMIT 1\n                    FOR UPDATE\n                    SKIP LOCKED\n                )\n                RETURNING witness_inputs_fri.*\n               "
+    "query": "UPDATE eth_txs\n                    SET confirmed_eth_tx_history_id = $1\n                    WHERE id = $2"
   },
   "0c212f47b9a0e719f947a419be8284837b1b01aa23994ba6401b420790b802b8": {
     "describe": {
@@ -593,117 +652,25 @@
     },
     "query": "SELECT tx_hash FROM eth_txs_history\n                WHERE eth_tx_id = $1 AND confirmed_at IS NOT NULL"
   },
-  "142c812f70d8c0cef986bef9b3c058e148f2cfb1c2c933ff321cf498b9c6e3b2": {
+  "14815f61d37d274f9aea1125ca4d368fd8c45098b0017710c0ee18d23d994c15": {
     "describe": {
       "columns": [
         {
           "name": "number",
           "ordinal": 0,
           "type_info": "Int8"
-        },
-        {
-          "name": "l1_batch_number!",
-          "ordinal": 1,
-          "type_info": "Int8"
-        },
-        {
-          "name": "last_batch_miniblock?",
-          "ordinal": 2,
-          "type_info": "Int8"
-        },
-        {
-          "name": "timestamp",
-          "ordinal": 3,
-          "type_info": "Int8"
-        },
-        {
-          "name": "root_hash?",
-          "ordinal": 4,
-          "type_info": "Bytea"
-        },
-        {
-          "name": "commit_tx_hash?",
-          "ordinal": 5,
-          "type_info": "Text"
-        },
-        {
-          "name": "committed_at?",
-          "ordinal": 6,
-          "type_info": "Timestamp"
-        },
-        {
-          "name": "prove_tx_hash?",
-          "ordinal": 7,
-          "type_info": "Text"
-        },
-        {
-          "name": "proven_at?",
-          "ordinal": 8,
-          "type_info": "Timestamp"
-        },
-        {
-          "name": "execute_tx_hash?",
-          "ordinal": 9,
-          "type_info": "Text"
-        },
-        {
-          "name": "executed_at?",
-          "ordinal": 10,
-          "type_info": "Timestamp"
-        },
-        {
-          "name": "l1_gas_price",
-          "ordinal": 11,
-          "type_info": "Int8"
-        },
-        {
-          "name": "l2_fair_gas_price",
-          "ordinal": 12,
-          "type_info": "Int8"
-        },
-        {
-          "name": "bootloader_code_hash",
-          "ordinal": 13,
-          "type_info": "Bytea"
-        },
-        {
-          "name": "default_aa_code_hash",
-          "ordinal": 14,
-          "type_info": "Bytea"
-        },
-        {
-          "name": "fee_account_address?",
-          "ordinal": 15,
-          "type_info": "Bytea"
         }
       ],
       "nullable": [
-        false,
-        null,
-        null,
-        false,
-        false,
-        false,
-        true,
-        false,
-        true,
-        false,
-        true,
-        false,
-        false,
-        true,
-        true,
         false
       ],
       "parameters": {
-        "Left": [
-          "Int8"
-        ]
+        "Left": []
       }
     },
-    "query": "\n                SELECT miniblocks.number,\n                    COALESCE(miniblocks.l1_batch_number, (SELECT (max(number) + 1) FROM l1_batches)) as \"l1_batch_number!\",\n                    (SELECT max(m2.number) FROM miniblocks m2 WHERE miniblocks.l1_batch_number = m2.l1_batch_number) as \"last_batch_miniblock?\",\n                    miniblocks.timestamp,\n                    miniblocks.hash as \"root_hash?\",\n                    commit_tx.tx_hash as \"commit_tx_hash?\",\n                    commit_tx.confirmed_at as \"committed_at?\",\n                    prove_tx.tx_hash as \"prove_tx_hash?\",\n                    prove_tx.confirmed_at as \"proven_at?\",\n                    execute_tx.tx_hash as \"execute_tx_hash?\",\n                    execute_tx.confirmed_at as \"executed_at?\",\n                    miniblocks.l1_gas_price,\n                    miniblocks.l2_fair_gas_price,\n                    miniblocks.bootloader_code_hash,\n                    miniblocks.default_aa_code_hash,\n                    l1_batches.fee_account_address as \"fee_account_address?\"\n                FROM miniblocks\n                LEFT JOIN l1_batches ON miniblocks.l1_batch_number = l1_batches.number\n                LEFT JOIN eth_txs_history as commit_tx ON (l1_batches.eth_commit_tx_id = commit_tx.eth_tx_id AND commit_tx.confirmed_at IS NOT NULL)\n                LEFT JOIN eth_txs_history as prove_tx ON (l1_batches.eth_prove_tx_id = prove_tx.eth_tx_id AND prove_tx.confirmed_at IS NOT NULL)\n                LEFT JOIN eth_txs_history as execute_tx ON (l1_batches.eth_execute_tx_id = execute_tx.eth_tx_id AND execute_tx.confirmed_at IS NOT NULL)\n                WHERE miniblocks.number = $1\n            "
+    "query": "SELECT number FROM l1_batches LEFT JOIN eth_txs_history AS prove_tx ON (l1_batches.eth_prove_tx_id = prove_tx.eth_tx_id) WHERE prove_tx.confirmed_at IS NOT NULL ORDER BY number DESC LIMIT 1"
   },
-  "14815f61d37d274f9aea1125ca4d368fd8c45098b0017710c0ee18d23d994c15": {
+  "15135331e56e3e4e3eeae3aac609d8e8c7146d190dfe26c1a24f92d21cd34858": {
     "describe": {
       "columns": [
         {
@@ -715,34 +682,13 @@
       "nullable": [
         false
       ],
-      "parameters": {
-        "Left": []
-      }
-    },
-    "query": "SELECT number FROM l1_batches LEFT JOIN eth_txs_history AS prove_tx ON (l1_batches.eth_prove_tx_id = prove_tx.eth_tx_id) WHERE prove_tx.confirmed_at IS NOT NULL ORDER BY number DESC LIMIT 1"
-  },
-  "14fb05ec0acec5a4f24752c60768d72bf19d9953468dc691e3f3b8519e6d3ada": {
-    "describe": {
-      "columns": [],
-      "nullable": [],
       "parameters": {
         "Left": [
-          "Int8",
-          "Int8",
-          "Bytea",
-          "Int4",
-          "Int4",
-          "Numeric",
-          "Int8",
-          "Int8",
-          "Int8",
-          "Bytea",
-          "Bytea",
-          "Int4"
+          "Int8"
         ]
       }
     },
-    "query": "INSERT INTO miniblocks ( number, timestamp, hash, l1_tx_count, l2_tx_count, base_fee_per_gas, l1_gas_price, l2_fair_gas_price, gas_per_pubdata_limit, bootloader_code_hash, default_aa_code_hash, protocol_version, created_at, updated_at ) VALUES ($1, $2, $3, $4, $5, $6, $7, $8, $9, $10, $11, $12, now(), now())"
+    "query": "SELECT number from miniblocks where timestamp > $1 ORDER BY number ASC LIMIT 1"
   },
   "151aa7cab859c275f74f981ed146415e1e5242ebe259552d5b9fac333c0d9ce8": {
     "describe": {
@@ -1196,6 +1142,19 @@
     },
     "query": "\n                SELECT COUNT(*) as \"count!\", circuit_id as \"circuit_id!\", aggregation_round as \"aggregation_round!\", status as \"status!\"\n                FROM prover_jobs_fri\n                GROUP BY circuit_id, aggregation_round, status\n                "
   },
+  "1ed353a16e8d0abaf426e5c235b20a79c727c08bc23fb1708a833a6930131691": {
+    "describe": {
+      "columns": [],
+      "nullable": [],
+      "parameters": {
+        "Left": [
+          "Int8",
+          "Text"
+        ]
+      }
+    },
+    "query": "INSERT INTO proof_compression_jobs_fri(l1_batch_number, status, created_at, updated_at) VALUES ($1, $2, now(), now()) ON CONFLICT (l1_batch_number) DO NOTHING"
+  },
   "1eede5c2169aee5a767b3b6b829f53721c0c353956ccec31a75226a65325ae46": {
     "describe": {
       "columns": [],
@@ -1520,6 +1479,20 @@
     },
     "query": "SELECT MAX(priority_op_id) as \"op_id\" from transactions where is_priority = true AND miniblock_number IS NOT NULL"
   },
+  "22e50b6def0365ddf979b64c3c943e2a3f8e5a1abcf72e61a00a82780d2d364e": {
+    "describe": {
+      "columns": [],
+      "nullable": [],
+      "parameters": {
+        "Left": [
+          "Int8",
+          "Text",
+          "Text"
+        ]
+      }
+    },
+    "query": "INSERT INTO proof_compression_jobs_fri(l1_batch_number, fri_proof_blob_url, status, created_at, updated_at) VALUES ($1, $2, $3, now(), now()) ON CONFLICT (l1_batch_number) DO NOTHING"
+  },
   "2397c1a050d358b596c9881c379bf823e267c03172f72c42da84cc0c04cc9d93": {
     "describe": {
       "columns": [
@@ -1558,6 +1531,20 @@
     },
     "query": "\n                    SELECT miniblock_number as \"miniblock_number!\",\n                        hash, index_in_block as \"index_in_block!\", l1_batch_tx_index as \"l1_batch_tx_index!\"\n                    FROM transactions\n                    WHERE l1_batch_number = $1\n                    ORDER BY miniblock_number, index_in_block\n                "
   },
+  "23c154c243f27912320ea0d68bc7bb372517010fb8c5737621cadd7b408afe8d": {
+    "describe": {
+      "columns": [],
+      "nullable": [],
+      "parameters": {
+        "Left": [
+          "Text",
+          "Text",
+          "Int8"
+        ]
+      }
+    },
+    "query": "UPDATE proof_compression_jobs_fri SET status =$1, error= $2, updated_at = now() WHERE l1_batch_number = $3"
+  },
   "2424f0ab2b156e953841107cfc0ccd76519d13c62fdcd5fd6b39e3503d6ec82c": {
     "describe": {
       "columns": [],
@@ -1643,55 +1630,193 @@
         }
       ],
       "nullable": [
-        false,
-        false,
-        false
+        false,
+        false,
+        false
+      ],
+      "parameters": {
+        "Left": [
+          "Int8"
+        ]
+      }
+    },
+    "query": "SELECT hash, number, timestamp FROM miniblocks WHERE number > $1 ORDER BY number ASC"
+  },
+  "26ac14152ade97892cd78d37884523187a5619093887b5e6564c3a80741b9d94": {
+    "describe": {
+      "columns": [
+        {
+          "name": "id",
+          "ordinal": 0,
+          "type_info": "Int4"
+        },
+        {
+          "name": "timestamp",
+          "ordinal": 1,
+          "type_info": "Int8"
+        },
+        {
+          "name": "recursion_scheduler_level_vk_hash",
+          "ordinal": 2,
+          "type_info": "Bytea"
+        },
+        {
+          "name": "recursion_node_level_vk_hash",
+          "ordinal": 3,
+          "type_info": "Bytea"
+        },
+        {
+          "name": "recursion_leaf_level_vk_hash",
+          "ordinal": 4,
+          "type_info": "Bytea"
+        },
+        {
+          "name": "recursion_circuits_set_vks_hash",
+          "ordinal": 5,
+          "type_info": "Bytea"
+        },
+        {
+          "name": "bootloader_code_hash",
+          "ordinal": 6,
+          "type_info": "Bytea"
+        },
+        {
+          "name": "default_account_code_hash",
+          "ordinal": 7,
+          "type_info": "Bytea"
+        },
+        {
+          "name": "verifier_address",
+          "ordinal": 8,
+          "type_info": "Bytea"
+        },
+        {
+          "name": "upgrade_tx_hash",
+          "ordinal": 9,
+          "type_info": "Bytea"
+        },
+        {
+          "name": "created_at",
+          "ordinal": 10,
+          "type_info": "Timestamp"
+        }
+      ],
+      "nullable": [
+        false,
+        false,
+        false,
+        false,
+        false,
+        false,
+        false,
+        false,
+        false,
+        true,
+        false
+      ],
+      "parameters": {
+        "Left": [
+          "Int4"
+        ]
+      }
+    },
+    "query": "SELECT * FROM protocol_versions WHERE id = $1"
+  },
+  "297d6517ec5f050e8d8fe4878e4ff330b4b10af4d60de86e8a25e2cd70e0363b": {
+    "describe": {
+      "columns": [
+        {
+          "name": "verification_info",
+          "ordinal": 0,
+          "type_info": "Jsonb"
+        }
+      ],
+      "nullable": [
+        true
       ],
       "parameters": {
         "Left": [
+          "Bytea"
+        ]
+      }
+    },
+    "query": "SELECT verification_info FROM contracts_verification_info WHERE address = $1"
+  },
+  "2985ea2bf34a94573103654c00a49d2a946afe5d552ac1c2a2d055eb9d6f2cf1": {
+    "describe": {
+      "columns": [],
+      "nullable": [],
+      "parameters": {
+        "Left": [
+          "Time",
           "Int8"
         ]
       }
     },
-    "query": "SELECT hash, number, timestamp FROM miniblocks WHERE number > $1 ORDER BY number ASC"
+    "query": "\n                UPDATE node_aggregation_witness_jobs_fri\n                SET status = 'successful', updated_at = now(), time_taken = $1\n                WHERE id = $2\n               "
   },
-  "2928cd054e9d6898559f964906a2ee0d3750fbe6fbd99209a48fc7b197fa2a22": {
+  "2a38561e789af470d6ef1a905143f2d8d102b4ff23cebe97586681da9e4084a9": {
     "describe": {
       "columns": [
         {
-          "name": "id",
+          "name": "number",
           "ordinal": 0,
           "type_info": "Int8"
         },
         {
-          "name": "l1_batch_number",
+          "name": "timestamp",
           "ordinal": 1,
           "type_info": "Int8"
         },
         {
-          "name": "circuit_id",
+          "name": "hash",
           "ordinal": 2,
-          "type_info": "Int2"
+          "type_info": "Bytea"
         },
         {
-          "name": "aggregation_round",
+          "name": "l1_tx_count",
           "ordinal": 3,
-          "type_info": "Int2"
+          "type_info": "Int4"
         },
         {
-          "name": "sequence_number",
+          "name": "l2_tx_count",
           "ordinal": 4,
           "type_info": "Int4"
         },
         {
-          "name": "depth",
+          "name": "base_fee_per_gas",
           "ordinal": 5,
-          "type_info": "Int4"
+          "type_info": "Numeric"
         },
         {
-          "name": "is_node_final_proof",
+          "name": "l1_gas_price",
           "ordinal": 6,
-          "type_info": "Bool"
+          "type_info": "Int8"
+        },
+        {
+          "name": "l2_fair_gas_price",
+          "ordinal": 7,
+          "type_info": "Int8"
+        },
+        {
+          "name": "bootloader_code_hash",
+          "ordinal": 8,
+          "type_info": "Bytea"
+        },
+        {
+          "name": "default_aa_code_hash",
+          "ordinal": 9,
+          "type_info": "Bytea"
+        },
+        {
+          "name": "protocol_version",
+          "ordinal": 10,
+          "type_info": "Int4"
+        },
+        {
+          "name": "virtual_blocks",
+          "ordinal": 11,
+          "type_info": "Int8"
         }
       ],
       "nullable": [
@@ -1701,49 +1826,41 @@
         false,
         false,
         false,
+        false,
+        false,
+        true,
+        true,
+        true,
         false
       ],
       "parameters": {
         "Left": [
-          "Int2Array",
-          "Int2Array"
+          "Int8"
         ]
       }
     },
-    "query": "\n                UPDATE prover_jobs_fri\n                SET status = 'in_progress', attempts = attempts + 1,\n                    updated_at = now(), processing_started_at = now()\n                WHERE id = (\n                    SELECT id\n                    FROM prover_jobs_fri\n                    WHERE status = 'queued'\n                    AND (circuit_id, aggregation_round) IN (\n                        SELECT * FROM UNNEST($1::smallint[], $2::smallint[])\n                    )\n                    ORDER BY aggregation_round DESC, l1_batch_number ASC, id ASC\n                    LIMIT 1\n                    FOR UPDATE\n                    SKIP LOCKED\n                )\n                RETURNING prover_jobs_fri.id, prover_jobs_fri.l1_batch_number, prover_jobs_fri.circuit_id,\n                prover_jobs_fri.aggregation_round, prover_jobs_fri.sequence_number, prover_jobs_fri.depth,\n                prover_jobs_fri.is_node_final_proof\n                "
+    "query": "SELECT number, timestamp, hash, l1_tx_count, l2_tx_count, base_fee_per_gas, l1_gas_price, l2_fair_gas_price, bootloader_code_hash, default_aa_code_hash, protocol_version, virtual_blocks\n            FROM miniblocks WHERE number = $1"
   },
-  "297d6517ec5f050e8d8fe4878e4ff330b4b10af4d60de86e8a25e2cd70e0363b": {
+  "2a98f1b149045f25d2830c0b4ffaaa400b4c572eb3842add22e8540f44943711": {
     "describe": {
       "columns": [
         {
-          "name": "verification_info",
+          "name": "id",
           "ordinal": 0,
-          "type_info": "Jsonb"
+          "type_info": "Int8"
         }
       ],
       "nullable": [
-        true
+        false
       ],
       "parameters": {
         "Left": [
-          "Bytea"
-        ]
-      }
-    },
-    "query": "SELECT verification_info FROM contracts_verification_info WHERE address = $1"
-  },
-  "2985ea2bf34a94573103654c00a49d2a946afe5d552ac1c2a2d055eb9d6f2cf1": {
-    "describe": {
-      "columns": [],
-      "nullable": [],
-      "parameters": {
-        "Left": [
-          "Time",
-          "Int8"
+          "Int8",
+          "Int2"
         ]
       }
     },
-    "query": "\n                UPDATE node_aggregation_witness_jobs_fri\n                SET status = 'successful', updated_at = now(), time_taken = $1\n                WHERE id = $2\n               "
+    "query": "SELECT id from prover_jobs_fri WHERE l1_batch_number = $1 AND status = 'successful' AND aggregation_round = $2"
   },
   "2adfdba6fa2b6b967ba03ae6f930e7f3ea851f678d30df699ced27b2dbb01c2a": {
     "describe": {
@@ -2075,18 +2192,18 @@
     },
     "query": "UPDATE transactions\n                SET in_mempool = TRUE\n                FROM (\n                    SELECT hash FROM (\n                        SELECT hash\n                        FROM transactions\n                        WHERE miniblock_number IS NULL AND in_mempool = FALSE AND error IS NULL\n                            AND (is_priority = TRUE OR (max_fee_per_gas >= $2 and gas_per_pubdata_limit >= $3))\n                            AND tx_format != $4\n                        ORDER BY is_priority DESC, priority_op_id, received_at\n                        LIMIT $1\n                    ) as subquery1\n                    ORDER BY hash\n                ) as subquery2\n                WHERE transactions.hash = subquery2.hash\n                RETURNING transactions.*"
   },
-  "2dbadf3ff3134bc35bc98cf7201097256aed32b75d3809d7d24c95f70672e21c": {
+  "2e3f116ca05ae70b7c83ac550302194c91f57b69902ff8e42140fde732ae5e6a": {
     "describe": {
       "columns": [],
       "nullable": [],
       "parameters": {
         "Left": [
-          "ByteaArray",
-          "Int8Array"
+          "Int8",
+          "Int4Array"
         ]
       }
     },
-    "query": "UPDATE initial_writes SET index = data_table.index FROM ( SELECT UNNEST($1::bytea[]) as hashed_key, UNNEST($2::bigint[]) as index ) as data_table WHERE initial_writes.hashed_key = data_table.hashed_key"
+    "query": "DELETE FROM storage_logs WHERE miniblock_number = $1 AND operation_number != ALL($2)"
   },
   "2e543dc0013150040bb86e278bbe86765ce1ebad72a32bb931fe02a9c516a11c": {
     "describe": {
@@ -2370,6 +2487,23 @@
     },
     "query": "SELECT * FROM transactions WHERE miniblock_number IS NOT NULL AND l1_batch_number IS NULL ORDER BY miniblock_number, index_in_block"
   },
+  "3055b9f38a04f26dac9adbba978679e6877f44c758fd03461e940a8f9a4e5af1": {
+    "describe": {
+      "columns": [],
+      "nullable": [],
+      "parameters": {
+        "Left": [
+          "Int8",
+          "Int2",
+          "Int4",
+          "Text",
+          "Int4",
+          "Int4"
+        ]
+      }
+    },
+    "query": "INSERT INTO node_aggregation_witness_jobs_fri (l1_batch_number, circuit_id, depth, aggregations_url, number_of_dependent_jobs, protocol_version, status, created_at, updated_at)\n                    VALUES ($1, $2, $3, $4, $5, $6, 'waiting_for_proofs', now(), now())\n                    ON CONFLICT(l1_batch_number, circuit_id, depth)\n                    DO UPDATE SET updated_at=now()"
+  },
   "334197fef9eeca55790d366ae67bbe95d77181bdfd2ad3208a32bd50585aef2d": {
     "describe": {
       "columns": [
@@ -2408,6 +2542,134 @@
     },
     "query": "SELECT MAX(number) as \"number\" FROM miniblocks"
   },
+  "3365f652e8e0070672ab522bd60f92d002dac7bb782763575a0337a8b5502994": {
+    "describe": {
+      "columns": [
+        {
+          "name": "number",
+          "ordinal": 0,
+          "type_info": "Int8"
+        },
+        {
+          "name": "l1_batch_number!",
+          "ordinal": 1,
+          "type_info": "Int8"
+        },
+        {
+          "name": "last_batch_miniblock?",
+          "ordinal": 2,
+          "type_info": "Int8"
+        },
+        {
+          "name": "timestamp",
+          "ordinal": 3,
+          "type_info": "Int8"
+        },
+        {
+          "name": "root_hash?",
+          "ordinal": 4,
+          "type_info": "Bytea"
+        },
+        {
+          "name": "commit_tx_hash?",
+          "ordinal": 5,
+          "type_info": "Text"
+        },
+        {
+          "name": "committed_at?",
+          "ordinal": 6,
+          "type_info": "Timestamp"
+        },
+        {
+          "name": "prove_tx_hash?",
+          "ordinal": 7,
+          "type_info": "Text"
+        },
+        {
+          "name": "proven_at?",
+          "ordinal": 8,
+          "type_info": "Timestamp"
+        },
+        {
+          "name": "execute_tx_hash?",
+          "ordinal": 9,
+          "type_info": "Text"
+        },
+        {
+          "name": "executed_at?",
+          "ordinal": 10,
+          "type_info": "Timestamp"
+        },
+        {
+          "name": "l1_gas_price",
+          "ordinal": 11,
+          "type_info": "Int8"
+        },
+        {
+          "name": "l2_fair_gas_price",
+          "ordinal": 12,
+          "type_info": "Int8"
+        },
+        {
+          "name": "bootloader_code_hash",
+          "ordinal": 13,
+          "type_info": "Bytea"
+        },
+        {
+          "name": "default_aa_code_hash",
+          "ordinal": 14,
+          "type_info": "Bytea"
+        },
+        {
+          "name": "virtual_blocks",
+          "ordinal": 15,
+          "type_info": "Int8"
+        },
+        {
+          "name": "hash",
+          "ordinal": 16,
+          "type_info": "Bytea"
+        },
+        {
+          "name": "protocol_version!",
+          "ordinal": 17,
+          "type_info": "Int4"
+        },
+        {
+          "name": "fee_account_address?",
+          "ordinal": 18,
+          "type_info": "Bytea"
+        }
+      ],
+      "nullable": [
+        false,
+        null,
+        null,
+        false,
+        false,
+        false,
+        true,
+        false,
+        true,
+        false,
+        true,
+        false,
+        false,
+        true,
+        true,
+        false,
+        false,
+        true,
+        false
+      ],
+      "parameters": {
+        "Left": [
+          "Int8"
+        ]
+      }
+    },
+    "query": "\n                SELECT miniblocks.number,\n                    COALESCE(miniblocks.l1_batch_number, (SELECT (max(number) + 1) FROM l1_batches)) as \"l1_batch_number!\",\n                    (SELECT max(m2.number) FROM miniblocks m2 WHERE miniblocks.l1_batch_number = m2.l1_batch_number) as \"last_batch_miniblock?\",\n                    miniblocks.timestamp,\n                    miniblocks.hash as \"root_hash?\",\n                    commit_tx.tx_hash as \"commit_tx_hash?\",\n                    commit_tx.confirmed_at as \"committed_at?\",\n                    prove_tx.tx_hash as \"prove_tx_hash?\",\n                    prove_tx.confirmed_at as \"proven_at?\",\n                    execute_tx.tx_hash as \"execute_tx_hash?\",\n                    execute_tx.confirmed_at as \"executed_at?\",\n                    miniblocks.l1_gas_price,\n                    miniblocks.l2_fair_gas_price,\n                    miniblocks.bootloader_code_hash,\n                    miniblocks.default_aa_code_hash,\n                    miniblocks.virtual_blocks,\n                    miniblocks.hash,\n                    miniblocks.protocol_version as \"protocol_version!\",\n                    l1_batches.fee_account_address as \"fee_account_address?\"\n                FROM miniblocks\n                LEFT JOIN l1_batches ON miniblocks.l1_batch_number = l1_batches.number\n                LEFT JOIN eth_txs_history as commit_tx ON (l1_batches.eth_commit_tx_id = commit_tx.eth_tx_id AND commit_tx.confirmed_at IS NOT NULL)\n                LEFT JOIN eth_txs_history as prove_tx ON (l1_batches.eth_prove_tx_id = prove_tx.eth_tx_id AND prove_tx.confirmed_at IS NOT NULL)\n                LEFT JOIN eth_txs_history as execute_tx ON (l1_batches.eth_execute_tx_id = execute_tx.eth_tx_id AND execute_tx.confirmed_at IS NOT NULL)\n                WHERE miniblocks.number = $1\n            "
+  },
   "357347157ed8ff19d223c54533c3a85bd7e64a37514d657f8d49bd6eb5be1806": {
     "describe": {
       "columns": [
@@ -2506,17 +2768,35 @@
         }
       ],
       "nullable": [
-        false,
-        true,
-        true
+        false,
+        true,
+        true
+      ],
+      "parameters": {
+        "Left": [
+          "Int8"
+        ]
+      }
+    },
+    "query": "\n                    SELECT l1_batch_number, leaf_layer_subqueues_blob_url, aggregation_outputs_blob_url FROM node_aggregation_witness_jobs\n                    WHERE status='successful' AND is_blob_cleaned=FALSE\n                    AND leaf_layer_subqueues_blob_url is NOT NULL\n                    AND aggregation_outputs_blob_url is NOT NULL\n                    AND updated_at < NOW() - INTERVAL '30 days'\n                    LIMIT $1;\n                "
+  },
+  "37e4a0eea7b72bd3b75c26e003f3fa62039d9b614f0f2fa3d61e8c5e95f002fd": {
+    "describe": {
+      "columns": [
+        {
+          "name": "max?",
+          "ordinal": 0,
+          "type_info": "Int8"
+        }
+      ],
+      "nullable": [
+        null
       ],
       "parameters": {
-        "Left": [
-          "Int8"
-        ]
+        "Left": []
       }
     },
-    "query": "\n                    SELECT l1_batch_number, leaf_layer_subqueues_blob_url, aggregation_outputs_blob_url FROM node_aggregation_witness_jobs\n                    WHERE status='successful' AND is_blob_cleaned=FALSE\n                    AND leaf_layer_subqueues_blob_url is NOT NULL\n                    AND aggregation_outputs_blob_url is NOT NULL\n                    AND updated_at < NOW() - INTERVAL '30 days'\n                    LIMIT $1;\n                "
+    "query": "SELECT MAX(index) as \"max?\" FROM initial_writes"
   },
   "38a3bdae346fdd362452af152c6886c93696dd2db561f6622f8eaf6fabb1e5be": {
     "describe": {
@@ -2598,6 +2878,94 @@
     },
     "query": "\n                    SELECT * FROM call_traces\n                    WHERE tx_hash = $1\n                "
   },
+  "3a18d0d1e236d8f57e8b3b1218a24414639a7c8235ba6a514c3d03b8a1790f17": {
+    "describe": {
+      "columns": [
+        {
+          "name": "l1_batch_number",
+          "ordinal": 0,
+          "type_info": "Int8"
+        },
+        {
+          "name": "merkle_tree_paths_blob_url",
+          "ordinal": 1,
+          "type_info": "Text"
+        },
+        {
+          "name": "attempts",
+          "ordinal": 2,
+          "type_info": "Int2"
+        },
+        {
+          "name": "status",
+          "ordinal": 3,
+          "type_info": "Text"
+        },
+        {
+          "name": "error",
+          "ordinal": 4,
+          "type_info": "Text"
+        },
+        {
+          "name": "created_at",
+          "ordinal": 5,
+          "type_info": "Timestamp"
+        },
+        {
+          "name": "updated_at",
+          "ordinal": 6,
+          "type_info": "Timestamp"
+        },
+        {
+          "name": "processing_started_at",
+          "ordinal": 7,
+          "type_info": "Timestamp"
+        },
+        {
+          "name": "time_taken",
+          "ordinal": 8,
+          "type_info": "Time"
+        },
+        {
+          "name": "is_blob_cleaned",
+          "ordinal": 9,
+          "type_info": "Bool"
+        },
+        {
+          "name": "protocol_version",
+          "ordinal": 10,
+          "type_info": "Int4"
+        },
+        {
+          "name": "picked_by",
+          "ordinal": 11,
+          "type_info": "Text"
+        }
+      ],
+      "nullable": [
+        false,
+        true,
+        false,
+        false,
+        true,
+        false,
+        false,
+        true,
+        true,
+        true,
+        true,
+        true
+      ],
+      "parameters": {
+        "Left": [
+          "Int8",
+          "Int4Array",
+          "Text"
+        ]
+      }
+    },
+    "query": "\n                UPDATE witness_inputs_fri\n                SET status = 'in_progress', attempts = attempts + 1,\n                    updated_at = now(), processing_started_at = now(),\n                    picked_by = $3\n                WHERE l1_batch_number = (\n                    SELECT l1_batch_number\n                    FROM witness_inputs_fri\n                    WHERE l1_batch_number <= $1\n                    AND status = 'queued'\n                    AND protocol_version = ANY($2)\n                    ORDER BY l1_batch_number ASC\n                    LIMIT 1\n                    FOR UPDATE\n                    SKIP LOCKED\n                )\n                RETURNING witness_inputs_fri.*\n               "
+  },
   "3ac1fe562e9664bbf8c02ba3090cf97a37663e228eff48fec326f74b2313daa9": {
     "describe": {
       "columns": [],
@@ -2782,6 +3150,33 @@
     },
     "query": "UPDATE storage SET value = u.value FROM UNNEST($1::bytea[], $2::bytea[]) AS u(key, value) WHERE u.key = hashed_key"
   },
+  "400bb5f012b95f5b327a65bf8a55e61a9e41a8040f546d75b9b8aa6be45e78d5": {
+    "describe": {
+      "columns": [
+        {
+          "name": "number",
+          "ordinal": 0,
+          "type_info": "Int8"
+        },
+        {
+          "name": "hash",
+          "ordinal": 1,
+          "type_info": "Bytea"
+        }
+      ],
+      "nullable": [
+        false,
+        false
+      ],
+      "parameters": {
+        "Left": [
+          "Int4",
+          "Int8"
+        ]
+      }
+    },
+    "query": "SELECT number, hash FROM miniblocks WHERE protocol_version = $1 ORDER BY number DESC LIMIT $2"
+  },
   "40a86f39a74ab22bdcd8b40446ea063c68bfb3e930e3150212474a657e82b38f": {
     "describe": {
       "columns": [],
@@ -3034,6 +3429,26 @@
     },
     "query": "\n                    UPDATE node_aggregation_witness_jobs\n                        SET number_of_leaf_circuits = $1,\n                            leaf_layer_subqueues_blob_url = $3,\n                            aggregation_outputs_blob_url = $4,\n                            status = 'waiting_for_proofs',\n                            updated_at = now()\n                    WHERE l1_batch_number = $2 AND status != 'queued'\n                    "
   },
+  "43b5082ff7673ee3a8e8f3fafa64667fac4f7f5c8bd26a21ead6b4ba0f8fd17b": {
+    "describe": {
+      "columns": [
+        {
+          "name": "hash",
+          "ordinal": 0,
+          "type_info": "Bytea"
+        }
+      ],
+      "nullable": [
+        false
+      ],
+      "parameters": {
+        "Left": [
+          "Int8"
+        ]
+      }
+    },
+    "query": "SELECT hash FROM miniblocks WHERE number = $1"
+  },
   "448d283cab6ae334de9676f69416974656d11563b58e0188d53ca9e0995dd287": {
     "describe": {
       "columns": [],
@@ -3046,6 +3461,16 @@
     },
     "query": "\n                UPDATE scheduler_dependency_tracker_fri\n                SET status='queued'\n                WHERE l1_batch_number = ANY($1)\n                "
   },
+  "4588d998b3454d8210190c6b16116b5885f6f3e74606aec8250e6c1e8f55d242": {
+    "describe": {
+      "columns": [],
+      "nullable": [],
+      "parameters": {
+        "Left": []
+      }
+    },
+    "query": "VACUUM storage_logs"
+  },
   "4ab8a25620b5400d836e1b847320d4e176629a27e1a6cb0666ab02bb55371769": {
     "describe": {
       "columns": [
@@ -3110,25 +3535,21 @@
     },
     "query": "SELECT hashed_key, value as \"value!\" FROM storage WHERE hashed_key = ANY($1)"
   },
-  "4acb725974d006c388be8965c3dff2e4c538ab8d2366addb3fb8cff3b789f114": {
+  "4aef34fb19a07dbfe2be09024d6c7fc2033a8e1570cc7f002a5c78317ff8ff3f": {
     "describe": {
-      "columns": [
-        {
-          "name": "count!",
-          "ordinal": 0,
-          "type_info": "Int8"
-        }
-      ],
-      "nullable": [
-        null
-      ],
+      "columns": [],
+      "nullable": [],
       "parameters": {
         "Left": [
-          "Int8"
+          "Int8",
+          "Int2",
+          "Text",
+          "Int4",
+          "Int4"
         ]
       }
     },
-    "query": "SELECT COUNT(*) as \"count!\" FROM storage_logs WHERE miniblock_number = $1"
+    "query": "\n                    INSERT INTO leaf_aggregation_witness_jobs_fri\n                        (l1_batch_number, circuit_id, closed_form_inputs_blob_url, number_of_basic_circuits, protocol_version, status, created_at, updated_at)\n                    VALUES ($1, $2, $3, $4, $5, 'waiting_for_proofs', now(), now())\n                    ON CONFLICT(l1_batch_number, circuit_id)\n                    DO UPDATE SET updated_at=now()\n                    "
   },
   "4b8597a47c0724155ad9592dc32134523bcbca11c9d82763d1bebbe17479c7b4": {
     "describe": {
@@ -3395,6 +3816,39 @@
     },
     "query": "\n                UPDATE gpu_prover_queue\n                SET instance_status = 'reserved',\n                    updated_at = now(),\n                    processing_started_at = now()\n                WHERE id in (\n                    SELECT id\n                    FROM gpu_prover_queue\n                    WHERE specialized_prover_group_id=$2\n                    AND region=$3\n                    AND zone=$4\n                    AND (\n                        instance_status = 'available'\n                        OR (instance_status = 'reserved' AND  processing_started_at < now() - $1::interval)\n                    )\n                    ORDER BY updated_at ASC\n                    LIMIT 1\n                    FOR UPDATE\n                    SKIP LOCKED\n                )\n                RETURNING gpu_prover_queue.*\n                "
   },
+  "4fca2f4497b3b5040cb8ccefe44a29c2583578942fd7c58e71c0eaeb2d9bec9e": {
+    "describe": {
+      "columns": [
+        {
+          "name": "l1_batch_number",
+          "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": "UPDATE proof_compression_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 = 'failed' AND attempts < $2) RETURNING l1_batch_number, status, attempts"
+  },
   "5089dfb745ff04a9b071b5785e68194a6f6a7a72754d23a65adc7d6838f7f640": {
     "describe": {
       "columns": [],
@@ -3433,24 +3887,6 @@
     },
     "query": "SELECT bootloader_code_hash, default_account_code_hash FROM protocol_versions\n                WHERE id = $1\n            "
   },
-  "51d788b5e8d808db143b6c057485f0a0b314a0c33e3eb2dff99ca0b32d12f8e4": {
-    "describe": {
-      "columns": [],
-      "nullable": [],
-      "parameters": {
-        "Left": [
-          "Int8",
-          "Int2",
-          "Text",
-          "Int2",
-          "Int4",
-          "Int4",
-          "Bool"
-        ]
-      }
-    },
-    "query": "\n                    INSERT INTO prover_jobs_fri (l1_batch_number, circuit_id, circuit_blob_url, aggregation_round, sequence_number, depth, is_node_final_proof, status, created_at, updated_at)\n                    VALUES ($1, $2, $3, $4, $5, $6, $7, 'queued', now(), now())\n                    ON CONFLICT(l1_batch_number, aggregation_round, circuit_id, depth, sequence_number)\n                    DO UPDATE SET updated_at=now()\n                    "
-  },
   "52eeb8c529efb796fdefb30a381fcf6c931512f30e55e24c155f6c649e662909": {
     "describe": {
       "columns": [
@@ -3469,19 +3905,6 @@
     },
     "query": "\n                UPDATE scheduler_dependency_tracker_fri\n                SET status='queuing'\n                WHERE l1_batch_number IN\n                      (SELECT l1_batch_number FROM scheduler_dependency_tracker_fri\n                       WHERE status != 'queued'\n                         AND circuit_1_final_prover_job_id IS NOT NULL\n                         AND circuit_2_final_prover_job_id IS NOT NULL\n                         AND circuit_3_final_prover_job_id IS NOT NULL\n                         AND circuit_4_final_prover_job_id IS NOT NULL\n                         AND circuit_5_final_prover_job_id IS NOT NULL\n                         AND circuit_6_final_prover_job_id IS NOT NULL\n                         AND circuit_7_final_prover_job_id IS NOT NULL\n                         AND circuit_8_final_prover_job_id IS NOT NULL\n                         AND circuit_9_final_prover_job_id IS NOT NULL\n                         AND circuit_10_final_prover_job_id IS NOT NULL\n                         AND circuit_11_final_prover_job_id IS NOT NULL\n                         AND circuit_12_final_prover_job_id IS NOT NULL\n                         AND circuit_13_final_prover_job_id IS NOT NULL\n                       )\n                RETURNING l1_batch_number;\n            "
   },
-  "53726a35b24a838df04c1f7201da322aab287830c96fc2c712a67d360bbc2bd0": {
-    "describe": {
-      "columns": [],
-      "nullable": [],
-      "parameters": {
-        "Left": [
-          "Int8",
-          "Text"
-        ]
-      }
-    },
-    "query": "INSERT INTO witness_inputs_fri(l1_batch_number, merkle_tree_paths_blob_url, status, created_at, updated_at) VALUES ($1, $2, 'queued', now(), now())\n                 ON CONFLICT (l1_batch_number) DO NOTHING"
-  },
   "5490012051be6faaaa11fad0f196eb53160a9c5c045fe9d66afcef7f33403fe2": {
     "describe": {
       "columns": [
@@ -3618,6 +4041,18 @@
     },
     "query": "\n                SELECT region, zone, SUM(num_gpu) AS total_gpus\n                FROM gpu_prover_queue\n                GROUP BY region, zone\n               "
   },
+  "565a302151a5a55aa717048e3e21b5d7379ab47c2b80229024f0cb2699136b11": {
+    "describe": {
+      "columns": [],
+      "nullable": [],
+      "parameters": {
+        "Left": [
+          "Int4"
+        ]
+      }
+    },
+    "query": "UPDATE miniblocks SET protocol_version = $1 WHERE l1_batch_number IS NULL"
+  },
   "57742ed088179b89b50920a2ab1a103b745598ee0ba05d1793fc54e63b477319": {
     "describe": {
       "columns": [],
@@ -3668,20 +4103,41 @@
       "nullable": [],
       "parameters": {
         "Left": [
-          "Int4",
-          "Int4"
+          "Int4",
+          "Int4"
+        ]
+      }
+    },
+    "query": "UPDATE eth_txs_history SET sent_at_block = $2, sent_at = now()\n                WHERE id = $1 AND sent_at_block IS NULL"
+  },
+  "58489a4e8730646ce20efee849742444740c72f59fad2495647742417ed0ab5a": {
+    "describe": {
+      "columns": [
+        {
+          "name": "base_fee_per_gas",
+          "ordinal": 0,
+          "type_info": "Numeric"
+        }
+      ],
+      "nullable": [
+        false
+      ],
+      "parameters": {
+        "Left": [
+          "Int8",
+          "Int8"
         ]
       }
     },
-    "query": "UPDATE eth_txs_history SET sent_at_block = $2, sent_at = now()\n                WHERE id = $1 AND sent_at_block IS NULL"
+    "query": "SELECT base_fee_per_gas FROM miniblocks WHERE number <= $1 ORDER BY number DESC LIMIT $2"
   },
-  "58489a4e8730646ce20efee849742444740c72f59fad2495647742417ed0ab5a": {
+  "58ae859333cf7fadbb83d9cde66dee2abe18b4883f883e69130024d11a4a5cc6": {
     "describe": {
       "columns": [
         {
-          "name": "base_fee_per_gas",
+          "name": "number",
           "ordinal": 0,
-          "type_info": "Numeric"
+          "type_info": "Int8"
         }
       ],
       "nullable": [
@@ -3690,11 +4146,11 @@
       "parameters": {
         "Left": [
           "Int8",
-          "Int8"
+          "Numeric"
         ]
       }
     },
-    "query": "SELECT base_fee_per_gas FROM miniblocks WHERE number <= $1 ORDER BY number DESC LIMIT $2"
+    "query": "SELECT number FROM ( SELECT number, sum(virtual_blocks) OVER(ORDER BY number) AS virtual_block_sum FROM miniblocks WHERE l1_batch_number >= $1 ) AS vts WHERE virtual_block_sum <= $2 ORDER BY number DESC LIMIT 1"
   },
   "5922fdf40632a6ffecfe824a3ba29bcf7b379aff5253db2739cc7be6145524e8": {
     "describe": {
@@ -3744,7 +4200,7 @@
       ],
       "nullable": [
         false,
-        true
+        false
       ],
       "parameters": {
         "Left": [
@@ -3772,6 +4228,27 @@
     },
     "query": "SELECT MAX(l1_batch_number) FROM witness_inputs WHERE merkel_tree_paths_blob_url IS NOT NULL"
   },
+  "5a31eab41a980cc82ad3609610d377a185ce38bd654ee93766c119aa6cae1040": {
+    "describe": {
+      "columns": [
+        {
+          "name": "number",
+          "ordinal": 0,
+          "type_info": "Int8"
+        }
+      ],
+      "nullable": [
+        false
+      ],
+      "parameters": {
+        "Left": [
+          "Int8",
+          "Numeric"
+        ]
+      }
+    },
+    "query": "SELECT number FROM ( SELECT number, sum(virtual_blocks) OVER(ORDER BY number) AS virtual_block_sum FROM miniblocks WHERE l1_batch_number >= $1 ) AS vts WHERE virtual_block_sum >= $2 ORDER BY number LIMIT 1"
+  },
   "5a5844af61cc685a414fcd3cad70900bdce8f48e905c105f8dd50dc52e0c6f14": {
     "describe": {
       "columns": [
@@ -4091,6 +4568,19 @@
     },
     "query": "SELECT version FROM compiler_versions WHERE compiler = $1 ORDER by version"
   },
+  "633765abd4635ee7acb24c13af55153de09e911ecdf70fcd9cd08c7c5c452d7a": {
+    "describe": {
+      "columns": [],
+      "nullable": [],
+      "parameters": {
+        "Left": [
+          "TextArray",
+          "Text"
+        ]
+      }
+    },
+    "query": "\n                INSERT INTO compiler_versions (version, compiler, created_at, updated_at)\n                SELECT u.version, $2, now(), now()\n                FROM UNNEST($1::text[])\n                AS u(version)\n                ON CONFLICT (version, compiler) DO NOTHING"
+  },
   "64b1bce209f43ee9f8294a270047cd58c20b973d8fef29c662742cad89363ffe": {
     "describe": {
       "columns": [
@@ -4123,6 +4613,65 @@
     },
     "query": "\n                SELECT status, error, compilation_errors FROM contract_verification_requests\n                WHERE id = $1\n                "
   },
+  "654e133230ee435e95cfda5bc4d72c8dd26412fe9d364e218e95eb4fe64559e9": {
+    "describe": {
+      "columns": [
+        {
+          "name": "id",
+          "ordinal": 0,
+          "type_info": "Int8"
+        },
+        {
+          "name": "l1_batch_number",
+          "ordinal": 1,
+          "type_info": "Int8"
+        },
+        {
+          "name": "circuit_id",
+          "ordinal": 2,
+          "type_info": "Int2"
+        },
+        {
+          "name": "aggregation_round",
+          "ordinal": 3,
+          "type_info": "Int2"
+        },
+        {
+          "name": "sequence_number",
+          "ordinal": 4,
+          "type_info": "Int4"
+        },
+        {
+          "name": "depth",
+          "ordinal": 5,
+          "type_info": "Int4"
+        },
+        {
+          "name": "is_node_final_proof",
+          "ordinal": 6,
+          "type_info": "Bool"
+        }
+      ],
+      "nullable": [
+        false,
+        false,
+        false,
+        false,
+        false,
+        false,
+        false
+      ],
+      "parameters": {
+        "Left": [
+          "Int2Array",
+          "Int2Array",
+          "Int4Array",
+          "Text"
+        ]
+      }
+    },
+    "query": "\n                UPDATE prover_jobs_fri\n                SET status = 'in_progress', attempts = attempts + 1,\n                    updated_at = now(), processing_started_at = now(),\n                    picked_by = $4\n                WHERE id = (\n                    SELECT id\n                    FROM prover_jobs_fri\n                    WHERE status = 'queued'\n                    AND (circuit_id, aggregation_round) IN (\n                        SELECT * FROM UNNEST($1::smallint[], $2::smallint[])\n                    )\n                    AND protocol_version = ANY($3)\n                    ORDER BY aggregation_round DESC, l1_batch_number ASC, id ASC\n                    LIMIT 1\n                    FOR UPDATE\n                    SKIP LOCKED\n                )\n                RETURNING prover_jobs_fri.id, prover_jobs_fri.l1_batch_number, prover_jobs_fri.circuit_id,\n                prover_jobs_fri.aggregation_round, prover_jobs_fri.sequence_number, prover_jobs_fri.depth,\n                prover_jobs_fri.is_node_final_proof\n                "
+  },
   "665112c83ed7f126f94d1c47408de3495ee6431970e334d94ae75f853496eb48": {
     "describe": {
       "columns": [],
@@ -4265,6 +4814,29 @@
     },
     "query": "SELECT MAX(id) as \"max?\" FROM protocol_versions"
   },
+  "6a3af113a71bffa445d4a729e24fbc2be90bfffbdd072c74f9ca58669b7e5f80": {
+    "describe": {
+      "columns": [
+        {
+          "name": "id",
+          "ordinal": 0,
+          "type_info": "Int4"
+        }
+      ],
+      "nullable": [
+        false
+      ],
+      "parameters": {
+        "Left": [
+          "Bytea",
+          "Bytea",
+          "Bytea",
+          "Bytea"
+        ]
+      }
+    },
+    "query": "SELECT id FROM prover_fri_protocol_versions WHERE recursion_circuits_set_vks_hash = $1 AND recursion_leaf_level_vk_hash = $2 AND recursion_node_level_vk_hash = $3 AND recursion_scheduler_level_vk_hash = $4 "
+  },
   "6ac39e83e446e70a2875624db78a05e56eb35f46e11d0f2fbb2165cda56fbacd": {
     "describe": {
       "columns": [
@@ -4298,15 +4870,50 @@
     },
     "query": "\n                    SELECT factory_deps.bytecode, transactions.data as \"data?\", transactions.contract_address as \"contract_address?\"\n                    FROM (\n                        SELECT * FROM storage_logs\n                        WHERE storage_logs.hashed_key = $1\n                        ORDER BY miniblock_number DESC, operation_number DESC\n                        LIMIT 1\n                    ) storage_logs\n                    JOIN factory_deps ON factory_deps.bytecode_hash = storage_logs.value\n                    LEFT JOIN transactions ON transactions.hash = storage_logs.tx_hash\n                    WHERE storage_logs.value != $2\n                "
   },
-  "6ea2cd1c5df69ba8ab1ef635b64870587325219abbef188007747851e313b084": {
+  "6b53e5cb619c9649d28ae33df6a43e6984e2d9320f894f3d04156a2d1235bb60": {
+    "describe": {
+      "columns": [
+        {
+          "name": "hash",
+          "ordinal": 0,
+          "type_info": "Bytea"
+        }
+      ],
+      "nullable": [
+        false
+      ],
+      "parameters": {
+        "Left": [
+          "Int8",
+          "Int8"
+        ]
+      }
+    },
+    "query": "SELECT hash FROM miniblocks WHERE number BETWEEN $1 AND $2 ORDER BY number"
+  },
+  "6c0915ed87e6d0fdf83cb24a51cc277e366bea0ba8821c048092d2a0aadb2771": {
     "describe": {
       "columns": [],
       "nullable": [],
       "parameters": {
-        "Left": []
+        "Left": [
+          "Int8",
+          "Int8",
+          "Bytea",
+          "Int4",
+          "Int4",
+          "Numeric",
+          "Int8",
+          "Int8",
+          "Int8",
+          "Bytea",
+          "Bytea",
+          "Int4",
+          "Int8"
+        ]
       }
     },
-    "query": "UPDATE initial_writes SET index = NULL"
+    "query": "INSERT INTO miniblocks ( number, timestamp, hash, l1_tx_count, l2_tx_count, base_fee_per_gas, l1_gas_price, l2_fair_gas_price, gas_per_pubdata_limit, bootloader_code_hash, default_aa_code_hash, protocol_version, virtual_blocks, created_at, updated_at ) VALUES ($1, $2, $3, $4, $5, $6, $7, $8, $9, $10, $11, $12, $13, now(), now())"
   },
   "6ffd22b0590341c38ce3957dccdb5a4edf47fb558bc64e4df08897a0c72dbf23": {
     "describe": {
@@ -4714,30 +5321,6 @@
     },
     "query": "SELECT max(l1_batches.number) FROM l1_batches JOIN eth_txs ON (l1_batches.eth_commit_tx_id = eth_txs.id) JOIN eth_txs_history AS commit_tx ON (eth_txs.confirmed_eth_tx_history_id = commit_tx.id) WHERE commit_tx.confirmed_at IS NOT NULL AND eth_prove_tx_id IS NOT NULL AND eth_execute_tx_id IS NULL AND EXTRACT(epoch FROM commit_tx.confirmed_at) < $1"
   },
-  "778dd9ef4d302f38f068aceabf3872c0325fbdb5cfc7c18feb5db3768d98564f": {
-    "describe": {
-      "columns": [
-        {
-          "name": "index",
-          "ordinal": 0,
-          "type_info": "Int8"
-        },
-        {
-          "name": "l1_batch_number",
-          "ordinal": 1,
-          "type_info": "Int8"
-        }
-      ],
-      "nullable": [
-        true,
-        false
-      ],
-      "parameters": {
-        "Left": []
-      }
-    },
-    "query": "SELECT index, l1_batch_number FROM initial_writes WHERE index IS NOT NULL ORDER BY index DESC LIMIT 1"
-  },
   "780b30e56a3ecfb3daa5310168ac6cd9e94bd5f1d871e1eaf36fbfd463a5e7e0": {
     "describe": {
       "columns": [
@@ -4846,20 +5429,19 @@
     },
     "query": "SELECT l1_batch_number, merkel_tree_paths_blob_url FROM witness_inputs WHERE status = 'successful' AND is_blob_cleaned = FALSE AND merkel_tree_paths_blob_url is NOT NULL AND updated_at < NOW() - INTERVAL '30 days' LIMIT $1"
   },
-  "7bbb3ba8c9860818d04bad46dee94f59d054619c961fd3d59d26fcb364598d5d": {
+  "7b8043a59029a19a3ba2433a438e8a4fe560aba7eda57b7a63b580de2e19aacb": {
     "describe": {
       "columns": [],
       "nullable": [],
       "parameters": {
         "Left": [
           "Int8",
-          "Int2",
           "Text",
           "Int4"
         ]
       }
     },
-    "query": "\n                    INSERT INTO leaf_aggregation_witness_jobs_fri\n                        (l1_batch_number, circuit_id, closed_form_inputs_blob_url, number_of_basic_circuits, status, created_at, updated_at)\n                    VALUES ($1, $2, $3, $4, 'waiting_for_proofs', now(), now())\n                    ON CONFLICT(l1_batch_number, circuit_id)\n                    DO UPDATE SET updated_at=now()\n                    "
+    "query": "INSERT INTO witness_inputs_fri(l1_batch_number, merkle_tree_paths_blob_url, protocol_version, status, created_at, updated_at) VALUES ($1, $2, $3, 'queued', now(), now()) ON CONFLICT (l1_batch_number) DO NOTHING"
   },
   "7c3e55a10c8cf90e60001bca401113fd5335ec6c4b1ffdb6d6ff063d244d23e2": {
     "describe": {
@@ -5153,95 +5735,32 @@
     },
     "query": "SELECT miniblock_number, log_index_in_miniblock, log_index_in_tx, tx_hash, Null::bytea as \"block_hash\", Null::bigint as \"l1_batch_number?\", shard_id, is_service, tx_index_in_miniblock, tx_index_in_l1_batch, sender, key, value FROM l2_to_l1_logs WHERE tx_hash = $1 ORDER BY log_index_in_tx ASC"
   },
-  "84b6ac6bc44503de193e0e4e1201ffd200eddf690722659dad6ddea0604427dc": {
+  "84703029e09ab1362aa4b4177b38be594d2daf17e69508cae869647028055efb": {
     "describe": {
       "columns": [
-        {
-          "name": "id",
-          "ordinal": 0,
-          "type_info": "Int8"
-        },
         {
           "name": "l1_batch_number",
-          "ordinal": 1,
+          "ordinal": 0,
           "type_info": "Int8"
         },
-        {
-          "name": "circuit_id",
-          "ordinal": 2,
-          "type_info": "Int2"
-        },
-        {
-          "name": "depth",
-          "ordinal": 3,
-          "type_info": "Int4"
-        },
         {
           "name": "status",
-          "ordinal": 4,
-          "type_info": "Text"
-        },
-        {
-          "name": "attempts",
-          "ordinal": 5,
-          "type_info": "Int2"
-        },
-        {
-          "name": "aggregations_url",
-          "ordinal": 6,
-          "type_info": "Text"
-        },
-        {
-          "name": "processing_started_at",
-          "ordinal": 7,
-          "type_info": "Timestamp"
-        },
-        {
-          "name": "time_taken",
-          "ordinal": 8,
-          "type_info": "Time"
-        },
-        {
-          "name": "error",
-          "ordinal": 9,
+          "ordinal": 1,
           "type_info": "Text"
-        },
-        {
-          "name": "created_at",
-          "ordinal": 10,
-          "type_info": "Timestamp"
-        },
-        {
-          "name": "updated_at",
-          "ordinal": 11,
-          "type_info": "Timestamp"
-        },
-        {
-          "name": "number_of_dependent_jobs",
-          "ordinal": 12,
-          "type_info": "Int4"
         }
       ],
       "nullable": [
         false,
-        false,
-        false,
-        false,
-        false,
-        false,
-        true,
-        true,
-        true,
-        true,
-        false,
-        false,
-        true
+        false
       ],
       "parameters": {
-        "Left": []
+        "Left": [
+          "Text",
+          "Text"
+        ]
       }
     },
-    "query": "\n                UPDATE node_aggregation_witness_jobs_fri\n                SET status = 'in_progress', attempts = attempts + 1,\n                    updated_at = now(), processing_started_at = now()\n                WHERE id = (\n                    SELECT id\n                    FROM node_aggregation_witness_jobs_fri\n                    WHERE status = 'queued'\n                    ORDER BY l1_batch_number ASC, depth ASC, id ASC\n                    LIMIT 1\n                    FOR UPDATE\n                    SKIP LOCKED\n                )\n                RETURNING node_aggregation_witness_jobs_fri.*\n                "
+    "query": "SELECT l1_batch_number, status FROM proof_compression_jobs_fri\n            WHERE l1_batch_number = ( SELECT MIN(l1_batch_number) FROM proof_compression_jobs_fri WHERE status = $1 OR status = $2\n            )"
   },
   "852b8d72a8dcbf620e528e983b836b2b05596eb0b7c5d7d1791080bef6a6b821": {
     "describe": {
@@ -5678,72 +6197,6 @@
     },
     "query": "SELECT DISTINCT ON (hashed_key) hashed_key FROM (SELECT * FROM storage_logs WHERE miniblock_number > $1) inn"
   },
-  "8d48fb84bd08f6103fe28d13331f4e3422b61adab6037e8760b0ca7b1a48907e": {
-    "describe": {
-      "columns": [
-        {
-          "name": "l1_batch_number",
-          "ordinal": 0,
-          "type_info": "Int8"
-        },
-        {
-          "name": "scheduler_partial_input_blob_url",
-          "ordinal": 1,
-          "type_info": "Text"
-        },
-        {
-          "name": "status",
-          "ordinal": 2,
-          "type_info": "Text"
-        },
-        {
-          "name": "processing_started_at",
-          "ordinal": 3,
-          "type_info": "Timestamp"
-        },
-        {
-          "name": "time_taken",
-          "ordinal": 4,
-          "type_info": "Time"
-        },
-        {
-          "name": "error",
-          "ordinal": 5,
-          "type_info": "Text"
-        },
-        {
-          "name": "created_at",
-          "ordinal": 6,
-          "type_info": "Timestamp"
-        },
-        {
-          "name": "updated_at",
-          "ordinal": 7,
-          "type_info": "Timestamp"
-        },
-        {
-          "name": "attempts",
-          "ordinal": 8,
-          "type_info": "Int2"
-        }
-      ],
-      "nullable": [
-        false,
-        false,
-        false,
-        true,
-        true,
-        true,
-        false,
-        false,
-        false
-      ],
-      "parameters": {
-        "Left": []
-      }
-    },
-    "query": "\n                UPDATE scheduler_witness_jobs_fri\n                SET status = 'in_progress', attempts = attempts + 1,\n                    updated_at = now(), processing_started_at = now()\n                WHERE l1_batch_number = (\n                    SELECT l1_batch_number\n                    FROM scheduler_witness_jobs_fri\n                    WHERE status = 'queued'\n                    ORDER BY l1_batch_number ASC\n                    LIMIT 1\n                    FOR UPDATE\n                    SKIP LOCKED\n                )\n                RETURNING scheduler_witness_jobs_fri.*\n               "
-  },
   "8dcbaaa6186da52ca8b440b6428826288dc668af5a6fc99ef3078c8bcb38c419": {
     "describe": {
       "columns": [
@@ -5774,95 +6227,17 @@
     },
     "query": "\n                UPDATE node_aggregation_witness_jobs_fri\n                SET status='queued'\n                WHERE (l1_batch_number, circuit_id, depth) IN\n                      (SELECT prover_jobs_fri.l1_batch_number, prover_jobs_fri.circuit_id, prover_jobs_fri.depth\n                       FROM prover_jobs_fri\n                                JOIN node_aggregation_witness_jobs_fri nawj ON\n                                prover_jobs_fri.l1_batch_number = nawj.l1_batch_number\n                                AND prover_jobs_fri.circuit_id = nawj.circuit_id\n                                AND prover_jobs_fri.depth = nawj.depth\n                       WHERE nawj.status = 'waiting_for_proofs'\n                         AND prover_jobs_fri.status = 'successful'\n                         AND prover_jobs_fri.aggregation_round = 2\n                       GROUP BY prover_jobs_fri.l1_batch_number, prover_jobs_fri.circuit_id, prover_jobs_fri.depth, nawj.number_of_dependent_jobs\n                       HAVING COUNT(*) = nawj.number_of_dependent_jobs)\n                RETURNING l1_batch_number, circuit_id, depth;\n            "
   },
-  "8de48960815f48f5d66e82b770a2e0caee42261643ec535a8f21cba1b5d4f50d": {
+  "8f75c5aa615080fc02b60baccae9c49a81e282a54864ea3eb874ebe10a23eafe": {
     "describe": {
-      "columns": [
-        {
-          "name": "id",
-          "ordinal": 0,
-          "type_info": "Int8"
-        },
-        {
-          "name": "l1_batch_number",
-          "ordinal": 1,
-          "type_info": "Int8"
-        },
-        {
-          "name": "circuit_id",
-          "ordinal": 2,
-          "type_info": "Int2"
-        },
-        {
-          "name": "closed_form_inputs_blob_url",
-          "ordinal": 3,
-          "type_info": "Text"
-        },
-        {
-          "name": "attempts",
-          "ordinal": 4,
-          "type_info": "Int2"
-        },
-        {
-          "name": "status",
-          "ordinal": 5,
-          "type_info": "Text"
-        },
-        {
-          "name": "error",
-          "ordinal": 6,
-          "type_info": "Text"
-        },
-        {
-          "name": "created_at",
-          "ordinal": 7,
-          "type_info": "Timestamp"
-        },
-        {
-          "name": "updated_at",
-          "ordinal": 8,
-          "type_info": "Timestamp"
-        },
-        {
-          "name": "processing_started_at",
-          "ordinal": 9,
-          "type_info": "Timestamp"
-        },
-        {
-          "name": "time_taken",
-          "ordinal": 10,
-          "type_info": "Time"
-        },
-        {
-          "name": "is_blob_cleaned",
-          "ordinal": 11,
-          "type_info": "Bool"
-        },
-        {
-          "name": "number_of_basic_circuits",
-          "ordinal": 12,
-          "type_info": "Int4"
-        }
-      ],
-      "nullable": [
-        false,
-        false,
-        false,
-        true,
-        false,
-        false,
-        true,
-        false,
-        false,
-        true,
-        true,
-        true,
-        true
-      ],
+      "columns": [],
+      "nullable": [],
       "parameters": {
-        "Left": []
+        "Left": [
+          "Int8"
+        ]
       }
     },
-    "query": "\n                UPDATE leaf_aggregation_witness_jobs_fri\n                SET status = 'in_progress', attempts = attempts + 1,\n                    updated_at = now(), processing_started_at = now()\n                WHERE id = (\n                    SELECT id\n                    FROM leaf_aggregation_witness_jobs_fri\n                    WHERE status = 'queued'\n                    ORDER BY l1_batch_number ASC, id ASC\n                    LIMIT 1\n                    FOR UPDATE\n                    SKIP LOCKED\n                )\n                RETURNING leaf_aggregation_witness_jobs_fri.*\n                "
+    "query": "UPDATE prover_jobs_fri SET status = 'sent_to_server', updated_at = now() WHERE l1_batch_number = $1"
   },
   "8fa1a390d7b11b60b3352fafc0a8a7fa15bc761b1bb902f5105fd66b2e3087f2": {
     "describe": {
@@ -5945,22 +6320,6 @@
     },
     "query": "INSERT INTO eth_txs_history\n                (eth_tx_id, base_fee_per_gas, priority_fee_per_gas, tx_hash, signed_raw_tx, created_at, updated_at)\n                VALUES ($1, $2, $3, $4, $5, now(), now())\n                ON CONFLICT (tx_hash) DO NOTHING\n                RETURNING id"
   },
-  "908f10640f805957e3f77ed685a7170345d835166e1857c12d76c15b09dffff5": {
-    "describe": {
-      "columns": [],
-      "nullable": [],
-      "parameters": {
-        "Left": [
-          "Int8",
-          "Int2",
-          "Int4",
-          "Text",
-          "Int4"
-        ]
-      }
-    },
-    "query": "INSERT INTO node_aggregation_witness_jobs_fri (l1_batch_number, circuit_id, depth, aggregations_url, number_of_dependent_jobs, status, created_at, updated_at)\n                    VALUES ($1, $2, $3, $4, $5, 'waiting_for_proofs', now(), now())\n                    ON CONFLICT(l1_batch_number, circuit_id, depth)\n                    DO UPDATE SET updated_at=now()"
-  },
   "91db60cc4f98ebcaef1435342607da0a86fe16e20a696cb81a569772d5d5ae88": {
     "describe": {
       "columns": [
@@ -6204,130 +6563,43 @@
           "type_info": "Time"
         },
         {
-          "name": "aggregation_round",
-          "ordinal": 10,
-          "type_info": "Int4"
-        },
-        {
-          "name": "result",
-          "ordinal": 11,
-          "type_info": "Bytea"
-        },
-        {
-          "name": "sequence_number",
-          "ordinal": 12,
-          "type_info": "Int4"
-        },
-        {
-          "name": "attempts",
-          "ordinal": 13,
-          "type_info": "Int4"
-        },
-        {
-          "name": "circuit_input_blob_url",
-          "ordinal": 14,
-          "type_info": "Text"
-        },
-        {
-          "name": "proccesed_by",
-          "ordinal": 15,
-          "type_info": "Text"
-        },
-        {
-          "name": "is_blob_cleaned",
-          "ordinal": 16,
-          "type_info": "Bool"
-        },
-        {
-          "name": "protocol_version",
-          "ordinal": 17,
-          "type_info": "Int4"
-        }
-      ],
-      "nullable": [
-        false,
-        false,
-        false,
-        false,
-        false,
-        true,
-        true,
-        false,
-        false,
-        false,
-        false,
-        true,
-        false,
-        false,
-        true,
-        true,
-        false,
-        true
-      ],
-      "parameters": {
-        "Left": [
-          "Int4Array"
-        ]
-      }
-    },
-    "query": "\n                UPDATE prover_jobs\n                SET status = 'in_progress', attempts = attempts + 1,\n                    updated_at = now(), processing_started_at = now()\n                WHERE id = (\n                        SELECT id\n                        FROM prover_jobs\n                        WHERE status = 'queued'\n                        AND protocol_version = ANY($1)\n                        ORDER BY aggregation_round DESC, l1_batch_number ASC, id ASC\n                        LIMIT 1\n                        FOR UPDATE\n                        SKIP LOCKED\n                )\n                RETURNING prover_jobs.*\n                "
-  },
-  "997229f1dd293ccc0379ffb3df49d69a4ea145b5d263eea53b7abc635dd53cc6": {
-    "describe": {
-      "columns": [
-        {
-          "name": "number",
-          "ordinal": 0,
-          "type_info": "Int8"
-        },
-        {
-          "name": "timestamp",
-          "ordinal": 1,
-          "type_info": "Int8"
-        },
-        {
-          "name": "hash",
-          "ordinal": 2,
-          "type_info": "Bytea"
-        },
-        {
-          "name": "l1_tx_count",
-          "ordinal": 3,
+          "name": "aggregation_round",
+          "ordinal": 10,
           "type_info": "Int4"
         },
         {
-          "name": "l2_tx_count",
-          "ordinal": 4,
-          "type_info": "Int4"
+          "name": "result",
+          "ordinal": 11,
+          "type_info": "Bytea"
         },
         {
-          "name": "base_fee_per_gas",
-          "ordinal": 5,
-          "type_info": "Numeric"
+          "name": "sequence_number",
+          "ordinal": 12,
+          "type_info": "Int4"
         },
         {
-          "name": "l1_gas_price",
-          "ordinal": 6,
-          "type_info": "Int8"
+          "name": "attempts",
+          "ordinal": 13,
+          "type_info": "Int4"
         },
         {
-          "name": "l2_fair_gas_price",
-          "ordinal": 7,
-          "type_info": "Int8"
+          "name": "circuit_input_blob_url",
+          "ordinal": 14,
+          "type_info": "Text"
         },
         {
-          "name": "bootloader_code_hash",
-          "ordinal": 8,
-          "type_info": "Bytea"
+          "name": "proccesed_by",
+          "ordinal": 15,
+          "type_info": "Text"
         },
         {
-          "name": "default_aa_code_hash",
-          "ordinal": 9,
-          "type_info": "Bytea"
+          "name": "is_blob_cleaned",
+          "ordinal": 16,
+          "type_info": "Bool"
         },
         {
           "name": "protocol_version",
-          "ordinal": 10,
+          "ordinal": 17,
           "type_info": "Int4"
         }
       ],
@@ -6337,18 +6609,27 @@
         false,
         false,
         false,
+        true,
+        true,
+        false,
+        false,
         false,
         false,
+        true,
+        false,
         false,
         true,
         true,
+        false,
         true
       ],
       "parameters": {
-        "Left": []
+        "Left": [
+          "Int4Array"
+        ]
       }
     },
-    "query": "SELECT number, timestamp, hash, l1_tx_count, l2_tx_count, base_fee_per_gas, l1_gas_price, l2_fair_gas_price, bootloader_code_hash, default_aa_code_hash, protocol_version FROM miniblocks ORDER BY number DESC LIMIT 1"
+    "query": "\n                UPDATE prover_jobs\n                SET status = 'in_progress', attempts = attempts + 1,\n                    updated_at = now(), processing_started_at = now()\n                WHERE id = (\n                        SELECT id\n                        FROM prover_jobs\n                        WHERE status = 'queued'\n                        AND protocol_version = ANY($1)\n                        ORDER BY aggregation_round DESC, l1_batch_number ASC, id ASC\n                        LIMIT 1\n                        FOR UPDATE\n                        SKIP LOCKED\n                )\n                RETURNING prover_jobs.*\n                "
   },
   "99d331d233d357302ab0cc7e3269ef9e414f0c3111785212660f471e3b4f6a04": {
     "describe": {
@@ -6498,6 +6779,25 @@
     },
     "query": "UPDATE l1_batches SET hash = $1, merkle_root_hash = $2, commitment = $3, compressed_repeated_writes = $4, compressed_initial_writes = $5, l2_l1_compressed_messages = $6, l2_l1_merkle_root = $7, zkporter_is_available = $8, parent_hash = $9, rollup_last_leaf_index = $10, aux_data_hash = $11, pass_through_data_hash = $12, meta_parameters_hash = $13, updated_at = now() WHERE number = $14 AND hash IS NULL"
   },
+  "9d28c1be3bda0c4fb37567d4a56730e801f48fbb2abad42ea894ebd8ee40412d": {
+    "describe": {
+      "columns": [],
+      "nullable": [],
+      "parameters": {
+        "Left": [
+          "Int8",
+          "Int2",
+          "Text",
+          "Int2",
+          "Int4",
+          "Int4",
+          "Bool",
+          "Int4"
+        ]
+      }
+    },
+    "query": "\n                    INSERT INTO prover_jobs_fri (l1_batch_number, circuit_id, circuit_blob_url, aggregation_round, sequence_number, depth, is_node_final_proof, protocol_version, status, created_at, updated_at)\n                    VALUES ($1, $2, $3, $4, $5, $6, $7, $8, 'queued', now(), now())\n                    ON CONFLICT(l1_batch_number, aggregation_round, circuit_id, depth, sequence_number)\n                    DO UPDATE SET updated_at=now()\n                    "
+  },
   "9feee3fd267dc4e58185aeae7cab798c03eefa69470e4b98716615cecf6c012a": {
     "describe": {
       "columns": [
@@ -6572,6 +6872,111 @@
     },
     "query": "UPDATE contract_verification_requests\n                SET status = 'in_progress', attempts = attempts + 1,\n                    updated_at = now(), processing_started_at = now()\n                WHERE id = (\n                    SELECT id FROM contract_verification_requests\n                    WHERE status = 'queued' OR (status = 'in_progress' AND processing_started_at < now() - $1::interval)\n                    ORDER BY created_at\n                    LIMIT 1\n                    FOR UPDATE\n                    SKIP LOCKED\n                )\n                RETURNING id, contract_address, source_code, contract_name, zk_compiler_version, compiler_version, optimization_used,\n                    optimizer_mode, constructor_arguments, is_system\n                "
   },
+  "a074cd2c23434a8e801c2c0b42e63f1657765aceabd6d8a50ef2d2299bba99ab": {
+    "describe": {
+      "columns": [
+        {
+          "name": "id",
+          "ordinal": 0,
+          "type_info": "Int8"
+        },
+        {
+          "name": "l1_batch_number",
+          "ordinal": 1,
+          "type_info": "Int8"
+        },
+        {
+          "name": "circuit_id",
+          "ordinal": 2,
+          "type_info": "Int2"
+        },
+        {
+          "name": "closed_form_inputs_blob_url",
+          "ordinal": 3,
+          "type_info": "Text"
+        },
+        {
+          "name": "attempts",
+          "ordinal": 4,
+          "type_info": "Int2"
+        },
+        {
+          "name": "status",
+          "ordinal": 5,
+          "type_info": "Text"
+        },
+        {
+          "name": "error",
+          "ordinal": 6,
+          "type_info": "Text"
+        },
+        {
+          "name": "created_at",
+          "ordinal": 7,
+          "type_info": "Timestamp"
+        },
+        {
+          "name": "updated_at",
+          "ordinal": 8,
+          "type_info": "Timestamp"
+        },
+        {
+          "name": "processing_started_at",
+          "ordinal": 9,
+          "type_info": "Timestamp"
+        },
+        {
+          "name": "time_taken",
+          "ordinal": 10,
+          "type_info": "Time"
+        },
+        {
+          "name": "is_blob_cleaned",
+          "ordinal": 11,
+          "type_info": "Bool"
+        },
+        {
+          "name": "number_of_basic_circuits",
+          "ordinal": 12,
+          "type_info": "Int4"
+        },
+        {
+          "name": "protocol_version",
+          "ordinal": 13,
+          "type_info": "Int4"
+        },
+        {
+          "name": "picked_by",
+          "ordinal": 14,
+          "type_info": "Text"
+        }
+      ],
+      "nullable": [
+        false,
+        false,
+        false,
+        true,
+        false,
+        false,
+        true,
+        false,
+        false,
+        true,
+        true,
+        true,
+        true,
+        true,
+        true
+      ],
+      "parameters": {
+        "Left": [
+          "Int4Array",
+          "Text"
+        ]
+      }
+    },
+    "query": "\n                UPDATE leaf_aggregation_witness_jobs_fri\n                SET status = 'in_progress', attempts = attempts + 1,\n                    updated_at = now(), processing_started_at = now(),\n                    picked_by = $2\n                WHERE id = (\n                    SELECT id\n                    FROM leaf_aggregation_witness_jobs_fri\n                    WHERE status = 'queued'\n                    AND protocol_version = ANY($1)\n                    ORDER BY l1_batch_number ASC, id ASC\n                    LIMIT 1\n                    FOR UPDATE\n                    SKIP LOCKED\n                )\n                RETURNING leaf_aggregation_witness_jobs_fri.*\n                "
+  },
   "a19b7137403c5cdf1be5f5122ce4d297ed661fa8bdb3bc91f8a81fe9da47469e": {
     "describe": {
       "columns": [
@@ -6592,6 +6997,22 @@
     },
     "query": "\n                SELECT upgrade_tx_hash FROM protocol_versions\n                WHERE id = $1\n            "
   },
+  "a1a6b52403c1db35c8d83d0a512ac453ecd54b34ec516027d540ee1890b40291": {
+    "describe": {
+      "columns": [],
+      "nullable": [],
+      "parameters": {
+        "Left": [
+          "Int4",
+          "Bytea",
+          "Bytea",
+          "Bytea",
+          "Bytea"
+        ]
+      }
+    },
+    "query": "INSERT INTO prover_fri_protocol_versions (id, recursion_scheduler_level_vk_hash, recursion_node_level_vk_hash, recursion_leaf_level_vk_hash, recursion_circuits_set_vks_hash, created_at) VALUES ($1, $2, $3, $4, $5, now()) ON CONFLICT(id) DO NOTHING"
+  },
   "a39f760d2cd879a78112e57d8611d7099802b03b7cc4933cafb4c47e133ad543": {
     "describe": {
       "columns": [
@@ -6737,28 +7158,38 @@
     },
     "query": "SELECT transactions.hash, transactions.received_at FROM transactions LEFT JOIN miniblocks ON miniblocks.number = miniblock_number WHERE received_at > $1 ORDER BY received_at ASC LIMIT $2"
   },
-  "a5f23ec9759a7d8bc02125a67d6139bb885cc80225519346d4c7ecfe45c59704": {
+  "a5115658f3a53462a9570fd6676f1931604d1c17a9a2b5f1475519006aaf03ba": {
+    "describe": {
+      "columns": [],
+      "nullable": [],
+      "parameters": {
+        "Left": [
+          "Int8",
+          "Text"
+        ]
+      }
+    },
+    "query": "INSERT INTO proof_generation_details (l1_batch_number, status, proof_gen_data_blob_url, created_at, updated_at) VALUES ($1, 'ready_to_be_proven', $2, now(), now()) ON CONFLICT (l1_batch_number) DO NOTHING"
+  },
+  "a7abde5a53248d6e63aa998acac521194231bbe08140c9c4efa548c4f3ae17fa": {
     "describe": {
       "columns": [
         {
-          "name": "id",
+          "name": "max?",
           "ordinal": 0,
           "type_info": "Int4"
         }
       ],
       "nullable": [
-        false
+        null
       ],
       "parameters": {
         "Left": [
-          "Bytea",
-          "Bytea",
-          "Bytea",
-          "Bytea"
+          "Int8"
         ]
       }
     },
-    "query": "\n                SELECT id\n                FROM protocol_versions\n                WHERE recursion_circuits_set_vks_hash = $1\n                AND recursion_leaf_level_vk_hash = $2\n                AND recursion_node_level_vk_hash = $3\n                AND recursion_scheduler_level_vk_hash = $4\n               "
+    "query": "SELECT MAX(operation_number) as \"max?\" FROM storage_logs WHERE miniblock_number = $1"
   },
   "a8878258bac2876686f1218213457edd70652e8145743b6b44a846220829bbe2": {
     "describe": {
@@ -7143,6 +7574,21 @@
     },
     "query": "SELECT * FROM eth_txs \n                   WHERE id > (SELECT COALESCE(MAX(eth_tx_id), 0) FROM eth_txs_history)\n                   ORDER BY id\n                   LIMIT $1\n                   "
   },
+  "aa279ce3351b30788711be6c65cb99cb14304ac38f8fed6d332237ffafc7c86b": {
+    "describe": {
+      "columns": [],
+      "nullable": [],
+      "parameters": {
+        "Left": [
+          "Text",
+          "Time",
+          "Text",
+          "Int8"
+        ]
+      }
+    },
+    "query": "UPDATE proof_compression_jobs_fri SET status = $1, updated_at = now(), time_taken = $2, l1_proof_blob_url = $3WHERE l1_batch_number = $4"
+  },
   "aa7ae476aed5979227887891e9be995924588aa10ccba7424d6ce58f811eaa02": {
     "describe": {
       "columns": [
@@ -7474,26 +7920,18 @@
     },
     "query": "\n                UPDATE leaf_aggregation_witness_jobs_fri\n                SET status ='failed', error= $1, updated_at = now()\n                WHERE id = $2\n               "
   },
-  "b18718ad56a6b543df407d4cc5094ff4b1f26a407b07b97c3eee2b2fbf787c76": {
+  "b14d9a82e6b0a4174dde61642d3abc001cd8cb80d988eb81a685255e3ce920de": {
     "describe": {
-      "columns": [
-        {
-          "name": "timestamp",
-          "ordinal": 0,
-          "type_info": "Int8"
-        }
-      ],
-      "nullable": [
-        false
-      ],
+      "columns": [],
+      "nullable": [],
       "parameters": {
         "Left": [
-          "Int8",
-          "Int8"
+          "Int8Array",
+          "ByteaArray"
         ]
       }
     },
-    "query": "SELECT timestamp FROM miniblocks WHERE number BETWEEN $1 AND $2 ORDER BY number"
+    "query": "UPDATE miniblocks SET hash = u.hash   FROM UNNEST($1::bigint[], $2::bytea[]) AS u(number, hash) WHERE miniblocks.number = u.number\n        "
   },
   "b479b7d3334f8d4566c294a44e2adb282fbc66a87be5c248c65211c2a8a07db0": {
     "describe": {
@@ -7573,28 +8011,7 @@
         "Left": []
       }
     },
-    "query": "SELECT l1_address, l2_address FROM tokens WHERE well_known = true"
-  },
-  "b58a33c9c056b58e597a888fbaacb309520dff728ea65f8b7f756ca185f4ae57": {
-    "describe": {
-      "columns": [],
-      "nullable": [],
-      "parameters": {
-        "Left": [
-          "Int4",
-          "Int8",
-          "Bytea",
-          "Bytea",
-          "Bytea",
-          "Bytea",
-          "Bytea",
-          "Bytea",
-          "Bytea",
-          "Bytea"
-        ]
-      }
-    },
-    "query": "INSERT INTO protocol_versions\n                    (id, timestamp, recursion_scheduler_level_vk_hash, recursion_node_level_vk_hash,\n                        recursion_leaf_level_vk_hash, recursion_circuits_set_vks_hash, bootloader_code_hash,\n                        default_account_code_hash, verifier_address, upgrade_tx_hash, created_at)\n                VALUES ($1, $2, $3, $4, $5, $6, $7, $8, $9, $10, now())\n                "
+    "query": "SELECT l1_address, l2_address FROM tokens WHERE well_known = true"
   },
   "b6c8e0827b2389a14433c031332962495311562ae9652ae7e9409a4bf48dc55b": {
     "describe": {
@@ -7680,6 +8097,24 @@
     },
     "query": "SELECT * FROM eth_txs WHERE confirmed_eth_tx_history_id IS NULL \n                 AND id <= (SELECT COALESCE(MAX(eth_tx_id), 0) FROM eth_txs_history WHERE sent_at_block IS NOT NULL)\n                 ORDER BY id"
   },
+  "b6f9874059c57e5e59f3021936437e9ff71a68065dfc19c295d806d7a9aafc93": {
+    "describe": {
+      "columns": [],
+      "nullable": [],
+      "parameters": {
+        "Left": [
+          "Int4",
+          "Int8",
+          "Bytea",
+          "Bytea",
+          "Bytea",
+          "Bytea",
+          "Bytea"
+        ]
+      }
+    },
+    "query": "INSERT INTO prover_protocol_versions\n                    (id, timestamp, recursion_scheduler_level_vk_hash, recursion_node_level_vk_hash,\n                        recursion_leaf_level_vk_hash, recursion_circuits_set_vks_hash, verifier_address, created_at)\n                VALUES ($1, $2, $3, $4, $5, $6, $7, now())\n                "
+  },
   "b79f02c8663c6b99d0aa46b430de32103afa0333e8293cf8661cfc1c3f9fc12e": {
     "describe": {
       "columns": [
@@ -8062,85 +8497,27 @@
     },
     "query": "UPDATE proof_generation_details SET status = 'picked_by_prover', updated_at = now(), prover_taken_at = now() WHERE l1_batch_number = ( SELECT l1_batch_number FROM proof_generation_details WHERE status = 'ready_to_be_proven' OR (status = 'picked_by_prover' AND prover_taken_at < now() - $1::interval) ORDER BY l1_batch_number ASC LIMIT 1 FOR UPDATE SKIP LOCKED ) RETURNING proof_generation_details.l1_batch_number"
   },
-  "bc360f5148a0a8ddb2475068b651781873f757cf46035e0f05cf420f34c738c6": {
+  "bc4433cdfa499830fe6a6a95759c9fbe343ac25b371c7fa980bfd1b0afc86629": {
     "describe": {
       "columns": [
         {
-          "name": "number",
+          "name": "l1_batch_number",
           "ordinal": 0,
           "type_info": "Int8"
-        },
-        {
-          "name": "timestamp",
-          "ordinal": 1,
-          "type_info": "Int8"
-        },
-        {
-          "name": "hash",
-          "ordinal": 2,
-          "type_info": "Bytea"
-        },
-        {
-          "name": "l1_tx_count",
-          "ordinal": 3,
-          "type_info": "Int4"
-        },
-        {
-          "name": "l2_tx_count",
-          "ordinal": 4,
-          "type_info": "Int4"
-        },
-        {
-          "name": "base_fee_per_gas",
-          "ordinal": 5,
-          "type_info": "Numeric"
-        },
-        {
-          "name": "l1_gas_price",
-          "ordinal": 6,
-          "type_info": "Int8"
-        },
-        {
-          "name": "l2_fair_gas_price",
-          "ordinal": 7,
-          "type_info": "Int8"
-        },
-        {
-          "name": "bootloader_code_hash",
-          "ordinal": 8,
-          "type_info": "Bytea"
-        },
-        {
-          "name": "default_aa_code_hash",
-          "ordinal": 9,
-          "type_info": "Bytea"
-        },
-        {
-          "name": "protocol_version",
-          "ordinal": 10,
-          "type_info": "Int4"
         }
       ],
       "nullable": [
-        false,
-        false,
-        false,
-        false,
-        false,
-        false,
-        false,
-        false,
-        true,
-        true,
-        true
+        false
       ],
       "parameters": {
         "Left": [
-          "Int8"
+          "Text",
+          "Text",
+          "Text"
         ]
       }
     },
-    "query": "SELECT number, timestamp, hash, l1_tx_count, l2_tx_count, base_fee_per_gas, l1_gas_price, l2_fair_gas_price, bootloader_code_hash, default_aa_code_hash, protocol_version FROM miniblocks WHERE number = $1"
+    "query": "UPDATE proof_compression_jobs_fri SET status = $1, attempts = attempts + 1, updated_at = now(), processing_started_at = now(), picked_by = $3 WHERE l1_batch_number = ( SELECT l1_batch_number FROM proof_compression_jobs_fri WHERE status = $2 ORDER BY l1_batch_number ASC LIMIT 1 FOR UPDATE SKIP LOCKED ) RETURNING proof_compression_jobs_fri.l1_batch_number"
   },
   "be824de76050461afe29dfd229e524bdf113eab3ca24208782c200531db1c940": {
     "describe": {
@@ -8191,18 +8568,106 @@
     },
     "query": "SELECT bytecode, bytecode_hash FROM factory_deps WHERE bytecode_hash = ANY($1)"
   },
-  "c115b25ea0d6b33331d1737cbc4e37ed44c466782d25f3d9c5519dd886f103ee": {
+  "c178e1574d2a16cb90bcc5d5333a4f8dd2a69e0c12b4e7e108a8dcc6000669a5": {
     "describe": {
-      "columns": [],
-      "nullable": [],
+      "columns": [
+        {
+          "name": "protocol_version",
+          "ordinal": 0,
+          "type_info": "Int4"
+        }
+      ],
+      "nullable": [
+        true
+      ],
       "parameters": {
         "Left": [
-          "TextArray",
+          "Int8"
+        ]
+      }
+    },
+    "query": "SELECT protocol_version FROM miniblocks WHERE number = $1"
+  },
+  "c1e5f85be88ef0b6ab81daf8dec2011797086a7ec5aeaffe5665ebf9584bf84a": {
+    "describe": {
+      "columns": [
+        {
+          "name": "l1_batch_number",
+          "ordinal": 0,
+          "type_info": "Int8"
+        },
+        {
+          "name": "scheduler_partial_input_blob_url",
+          "ordinal": 1,
+          "type_info": "Text"
+        },
+        {
+          "name": "status",
+          "ordinal": 2,
+          "type_info": "Text"
+        },
+        {
+          "name": "processing_started_at",
+          "ordinal": 3,
+          "type_info": "Timestamp"
+        },
+        {
+          "name": "time_taken",
+          "ordinal": 4,
+          "type_info": "Time"
+        },
+        {
+          "name": "error",
+          "ordinal": 5,
+          "type_info": "Text"
+        },
+        {
+          "name": "created_at",
+          "ordinal": 6,
+          "type_info": "Timestamp"
+        },
+        {
+          "name": "updated_at",
+          "ordinal": 7,
+          "type_info": "Timestamp"
+        },
+        {
+          "name": "attempts",
+          "ordinal": 8,
+          "type_info": "Int2"
+        },
+        {
+          "name": "protocol_version",
+          "ordinal": 9,
+          "type_info": "Int4"
+        },
+        {
+          "name": "picked_by",
+          "ordinal": 10,
+          "type_info": "Text"
+        }
+      ],
+      "nullable": [
+        false,
+        false,
+        false,
+        true,
+        true,
+        true,
+        false,
+        false,
+        false,
+        true,
+        true
+      ],
+      "parameters": {
+        "Left": [
+          "Int4Array",
           "Text"
         ]
       }
     },
-    "query": "\n                INSERT INTO compiler_versions (version, compiler, created_at, updated_at)\n                SELECT u.version, $2, now(), now()\n                FROM UNNEST($1::text[])\n                AS u(version)"
+    "query": "\n                UPDATE scheduler_witness_jobs_fri\n                SET status = 'in_progress', attempts = attempts + 1,\n                    updated_at = now(), processing_started_at = now(),\n                    picked_by = $2\n                WHERE l1_batch_number = (\n                    SELECT l1_batch_number\n                    FROM scheduler_witness_jobs_fri\n                    WHERE status = 'queued'\n                    AND protocol_version = ANY($1)\n                    ORDER BY l1_batch_number ASC\n                    LIMIT 1\n                    FOR UPDATE\n                    SKIP LOCKED\n                )\n                RETURNING scheduler_witness_jobs_fri.*\n               "
   },
   "c2cf96a9eb6893c5ba7d9e5418d9f24084ccd87980cb6ee05de1b3bde5c654bd": {
     "describe": {
@@ -8516,6 +8981,27 @@
     },
     "query": "\n                    INSERT INTO gpu_prover_queue (instance_host, instance_port, queue_capacity, queue_free_slots, instance_status, specialized_prover_group_id, region, zone, num_gpu, created_at, updated_at)\n                    VALUES (cast($1::text as inet), $2, $3, $3, 'available', $4, $5, $6, $7, now(), now())\n                    ON CONFLICT(instance_host, instance_port, region, zone)\n                    DO UPDATE SET instance_status='available', queue_capacity=$3, queue_free_slots=$3, specialized_prover_group_id=$4, region=$5, zone=$6, num_gpu=$7, updated_at=now()"
   },
+  "cc20350af9e837ae6b6160be65f88e6b675f62e207252f91f2ce7dcaaddb12b1": {
+    "describe": {
+      "columns": [],
+      "nullable": [],
+      "parameters": {
+        "Left": [
+          "Int4",
+          "Int8",
+          "Bytea",
+          "Bytea",
+          "Bytea",
+          "Bytea",
+          "Bytea",
+          "Bytea",
+          "Bytea",
+          "Bytea"
+        ]
+      }
+    },
+    "query": "INSERT INTO protocol_versions (id, timestamp, recursion_scheduler_level_vk_hash, recursion_node_level_vk_hash, recursion_leaf_level_vk_hash, recursion_circuits_set_vks_hash, bootloader_code_hash, default_account_code_hash, verifier_address, upgrade_tx_hash, created_at) VALUES ($1, $2, $3, $4, $5, $6, $7, $8, $9, $10, now())"
+  },
   "ce3666b149f7fc62a68139a8efb83ed149c7deace17b8968817941763e45a147": {
     "describe": {
       "columns": [],
@@ -8567,30 +9053,87 @@
         }
       ],
       "nullable": [
-        null
+        null
+      ],
+      "parameters": {
+        "Left": []
+      }
+    },
+    "query": "SELECT COUNT(*) as \"count!\" FROM l1_batches"
+  },
+  "d11ff84327058721c3c36bc3371c3139f41e2a2255f64bbc5108c1876848d8bb": {
+    "describe": {
+      "columns": [],
+      "nullable": [],
+      "parameters": {
+        "Left": [
+          "Text",
+          "Text",
+          "Int4",
+          "Int4",
+          "Text",
+          "Text"
+        ]
+      }
+    },
+    "query": "\n                UPDATE gpu_prover_queue\n                SET instance_status = $1, updated_at = now(), queue_free_slots = $4\n                WHERE instance_host = $2::text::inet\n                AND instance_port = $3\n                AND region = $5\n                AND zone = $6\n                "
+  },
+  "d12724ae2bda6214b68e19dc290281907383926abf5ad471eef89529908b2673": {
+    "describe": {
+      "columns": [
+        {
+          "name": "id",
+          "ordinal": 0,
+          "type_info": "Int8"
+        },
+        {
+          "name": "l1_batch_number",
+          "ordinal": 1,
+          "type_info": "Int8"
+        },
+        {
+          "name": "circuit_id",
+          "ordinal": 2,
+          "type_info": "Int2"
+        },
+        {
+          "name": "aggregation_round",
+          "ordinal": 3,
+          "type_info": "Int2"
+        },
+        {
+          "name": "sequence_number",
+          "ordinal": 4,
+          "type_info": "Int4"
+        },
+        {
+          "name": "depth",
+          "ordinal": 5,
+          "type_info": "Int4"
+        },
+        {
+          "name": "is_node_final_proof",
+          "ordinal": 6,
+          "type_info": "Bool"
+        }
+      ],
+      "nullable": [
+        false,
+        false,
+        false,
+        false,
+        false,
+        false,
+        false
       ],
-      "parameters": {
-        "Left": []
-      }
-    },
-    "query": "SELECT COUNT(*) as \"count!\" FROM l1_batches"
-  },
-  "d11ff84327058721c3c36bc3371c3139f41e2a2255f64bbc5108c1876848d8bb": {
-    "describe": {
-      "columns": [],
-      "nullable": [],
       "parameters": {
         "Left": [
-          "Text",
-          "Text",
-          "Int4",
-          "Int4",
-          "Text",
+          "Int4Array",
           "Text"
         ]
       }
     },
-    "query": "\n                UPDATE gpu_prover_queue\n                SET instance_status = $1, updated_at = now(), queue_free_slots = $4\n                WHERE instance_host = $2::text::inet\n                AND instance_port = $3\n                AND region = $5\n                AND zone = $6\n                "
+    "query": "\n                UPDATE prover_jobs_fri\n                SET status = 'in_progress', attempts = attempts + 1,\n                    updated_at = now(), processing_started_at = now(),\n                    picked_by = $2\n                WHERE id = (\n                    SELECT id\n                    FROM prover_jobs_fri\n                    WHERE status = 'queued'\n                    AND protocol_version = ANY($1)\n                    ORDER BY aggregation_round DESC, l1_batch_number ASC, id ASC\n                    LIMIT 1\n                    FOR UPDATE\n                    SKIP LOCKED\n                )\n                RETURNING prover_jobs_fri.id, prover_jobs_fri.l1_batch_number, prover_jobs_fri.circuit_id,\n                prover_jobs_fri.aggregation_round, prover_jobs_fri.sequence_number, prover_jobs_fri.depth,\n                prover_jobs_fri.is_node_final_proof\n                "
   },
   "d5dea31f2a325bb44e8ef2cbbabbeb73fd6996a3e6cb99d62c6b97a4aa49c1ca": {
     "describe": {
@@ -8832,6 +9375,29 @@
     },
     "query": "UPDATE tokens SET token_list_name = $2, token_list_symbol = $3,\n                token_list_decimals = $4, well_known = true, updated_at = now()\n                WHERE l1_address = $1\n                "
   },
+  "d7060880fe56fd99af7b7ed3f4c7fb9d0858cee30f44c5197821aae83c6c9666": {
+    "describe": {
+      "columns": [
+        {
+          "name": "id",
+          "ordinal": 0,
+          "type_info": "Int4"
+        }
+      ],
+      "nullable": [
+        false
+      ],
+      "parameters": {
+        "Left": [
+          "Bytea",
+          "Bytea",
+          "Bytea",
+          "Bytea"
+        ]
+      }
+    },
+    "query": "\n                SELECT id\n                FROM prover_protocol_versions\n                WHERE recursion_circuits_set_vks_hash = $1\n                AND recursion_leaf_level_vk_hash = $2\n                AND recursion_node_level_vk_hash = $3\n                AND recursion_scheduler_level_vk_hash = $4\n               "
+  },
   "d8515595d34dca53e50bbd4ed396f6208e33f596195a5ed02fba9e8364ceb33c": {
     "describe": {
       "columns": [
@@ -9034,6 +9600,26 @@
     },
     "query": "UPDATE gpu_prover_queue_fri SET instance_status = $1, updated_at = now() WHERE instance_host = $2::text::inet AND instance_port = $3 AND zone = $4\n                "
   },
+  "de960625b0fa0b766aacab74473fcd0332a3f7dc356648452a6a63189a8b7cc3": {
+    "describe": {
+      "columns": [
+        {
+          "name": "protocol_version",
+          "ordinal": 0,
+          "type_info": "Int4"
+        }
+      ],
+      "nullable": [
+        true
+      ],
+      "parameters": {
+        "Left": [
+          "Int8"
+        ]
+      }
+    },
+    "query": "SELECT protocol_version FROM witness_inputs_fri WHERE l1_batch_number = $1"
+  },
   "deaf3789ac968e299fe0e5a7f1c72494af8ecd664da9c901ec9c0c5e7c29bb65": {
     "describe": {
       "columns": [],
@@ -9139,72 +9725,32 @@
     },
     "query": "\n                UPDATE witness_inputs\n                SET status = 'in_progress', attempts = attempts + 1,\n                    updated_at = now(), processing_started_at = now()\n                WHERE l1_batch_number = (\n                        SELECT l1_batch_number\n                        FROM witness_inputs\n                        WHERE l1_batch_number <= $3\n                        AND\n                        (   status = 'queued'\n                            OR (status = 'in_progress' AND processing_started_at < now() - $1::interval)\n                            OR (status = 'failed' AND attempts < $2)\n                        )\n                        AND protocol_version = ANY($4)\n                        ORDER BY l1_batch_number ASC\n                        LIMIT 1\n                        FOR UPDATE\n                        SKIP LOCKED\n                )\n                RETURNING witness_inputs.*\n               "
   },
-  "e1235572a080ee86724da2ad5f528e27e6442ad47abd22e04af8efec2c59432b": {
+  "e05a8c74653afc78c892ddfd08e60ab040d2b2f7c4b5ee110988eac2dd0dd90d": {
     "describe": {
       "columns": [
         {
-          "name": "id",
+          "name": "timestamp",
           "ordinal": 0,
           "type_info": "Int8"
         },
         {
-          "name": "l1_batch_number",
+          "name": "virtual_blocks",
           "ordinal": 1,
           "type_info": "Int8"
-        },
-        {
-          "name": "circuit_id",
-          "ordinal": 2,
-          "type_info": "Int2"
-        },
-        {
-          "name": "aggregation_round",
-          "ordinal": 3,
-          "type_info": "Int2"
-        },
-        {
-          "name": "sequence_number",
-          "ordinal": 4,
-          "type_info": "Int4"
-        },
-        {
-          "name": "depth",
-          "ordinal": 5,
-          "type_info": "Int4"
-        },
-        {
-          "name": "is_node_final_proof",
-          "ordinal": 6,
-          "type_info": "Bool"
         }
       ],
       "nullable": [
-        false,
-        false,
-        false,
-        false,
-        false,
         false,
         false
       ],
-      "parameters": {
-        "Left": []
-      }
-    },
-    "query": "\n                UPDATE prover_jobs_fri\n                SET status = 'in_progress', attempts = attempts + 1,\n                    updated_at = now(), processing_started_at = now()\n                WHERE id = (\n                    SELECT id\n                    FROM prover_jobs_fri\n                    WHERE status = 'queued'\n                    ORDER BY aggregation_round DESC, l1_batch_number ASC, id ASC\n                    LIMIT 1\n                    FOR UPDATE\n                    SKIP LOCKED\n                )\n                RETURNING prover_jobs_fri.id, prover_jobs_fri.l1_batch_number, prover_jobs_fri.circuit_id,\n                prover_jobs_fri.aggregation_round, prover_jobs_fri.sequence_number, prover_jobs_fri.depth,\n                prover_jobs_fri.is_node_final_proof\n                "
-  },
-  "e1879cce18ad449d58f02254aa9ae4b115152484187161647d012df798985365": {
-    "describe": {
-      "columns": [],
-      "nullable": [],
       "parameters": {
         "Left": [
           "Int8",
-          "Text"
+          "Int8"
         ]
       }
     },
-    "query": "\n                    INSERT INTO scheduler_witness_jobs_fri\n                        (l1_batch_number, scheduler_partial_input_blob_url, status, created_at, updated_at)\n                    VALUES ($1, $2, 'waiting_for_proofs', now(), now())\n                    ON CONFLICT(l1_batch_number)\n                    DO UPDATE SET updated_at=now()\n                    "
+    "query": "SELECT timestamp, virtual_blocks FROM miniblocks WHERE number BETWEEN $1 AND $2 ORDER BY number"
   },
   "e1ad7a51afef6bd7a95df3294f64b7b1bdc4c4fc7ae5c4195802177986f3e876": {
     "describe": {
@@ -9265,6 +9811,34 @@
     },
     "query": "UPDATE eth_txs_history\n                SET updated_at = now(), confirmed_at = now()\n                WHERE tx_hash = $1\n                RETURNING id, eth_tx_id"
   },
+  "e409b39a5e62a3a4ec5d3b6aae4935c13b93129a22ffe6a0b68b5ade1f6082c8": {
+    "describe": {
+      "columns": [
+        {
+          "name": "number",
+          "ordinal": 0,
+          "type_info": "Int8"
+        },
+        {
+          "name": "hash",
+          "ordinal": 1,
+          "type_info": "Bytea"
+        }
+      ],
+      "nullable": [
+        false,
+        false
+      ],
+      "parameters": {
+        "Left": [
+          "Int8",
+          "Int4",
+          "Int8"
+        ]
+      }
+    },
+    "query": "SELECT number, hash FROM miniblocks WHERE number >= $1 and protocol_version = $2 ORDER BY number LIMIT $3"
+  },
   "e626aa2efb6ba875a12f2b4e37b0ba8052810e73fa5e2d3280f747f7b89b956f": {
     "describe": {
       "columns": [],
@@ -9640,6 +10214,20 @@
     },
     "query": "DELETE FROM eth_txs WHERE id >=\n                (SELECT MIN(id) FROM eth_txs WHERE has_failed = TRUE)"
   },
+  "e9b03a0d79eb40a67eab9bdaac8447fc17922bea89bcc6a89eb8eadf147835fe": {
+    "describe": {
+      "columns": [],
+      "nullable": [],
+      "parameters": {
+        "Left": [
+          "Int8",
+          "Text",
+          "Int4"
+        ]
+      }
+    },
+    "query": "\n                    INSERT INTO scheduler_witness_jobs_fri\n                        (l1_batch_number, scheduler_partial_input_blob_url, protocol_version, status, created_at, updated_at)\n                    VALUES ($1, $2, $3, 'waiting_for_proofs', now(), now())\n                    ON CONFLICT(l1_batch_number)\n                    DO UPDATE SET updated_at=now()\n                    "
+  },
   "ea17481cab38d370e06e7cf8598daa39faf4414152456aab89695e3133477d3e": {
     "describe": {
       "columns": [
@@ -10583,6 +11171,90 @@
     },
     "query": "SELECT trace FROM transaction_traces WHERE tx_hash = $1"
   },
+  "fa177254ba516ad1588f4f6960be96706d1f43c23ff1d57ba2bc7bc7148bdcac": {
+    "describe": {
+      "columns": [
+        {
+          "name": "number",
+          "ordinal": 0,
+          "type_info": "Int8"
+        },
+        {
+          "name": "timestamp",
+          "ordinal": 1,
+          "type_info": "Int8"
+        },
+        {
+          "name": "hash",
+          "ordinal": 2,
+          "type_info": "Bytea"
+        },
+        {
+          "name": "l1_tx_count",
+          "ordinal": 3,
+          "type_info": "Int4"
+        },
+        {
+          "name": "l2_tx_count",
+          "ordinal": 4,
+          "type_info": "Int4"
+        },
+        {
+          "name": "base_fee_per_gas",
+          "ordinal": 5,
+          "type_info": "Numeric"
+        },
+        {
+          "name": "l1_gas_price",
+          "ordinal": 6,
+          "type_info": "Int8"
+        },
+        {
+          "name": "l2_fair_gas_price",
+          "ordinal": 7,
+          "type_info": "Int8"
+        },
+        {
+          "name": "bootloader_code_hash",
+          "ordinal": 8,
+          "type_info": "Bytea"
+        },
+        {
+          "name": "default_aa_code_hash",
+          "ordinal": 9,
+          "type_info": "Bytea"
+        },
+        {
+          "name": "protocol_version",
+          "ordinal": 10,
+          "type_info": "Int4"
+        },
+        {
+          "name": "virtual_blocks",
+          "ordinal": 11,
+          "type_info": "Int8"
+        }
+      ],
+      "nullable": [
+        false,
+        false,
+        false,
+        false,
+        false,
+        false,
+        false,
+        false,
+        true,
+        true,
+        true,
+        false
+      ],
+      "parameters": {
+        "Left": []
+      }
+    },
+    "query": "SELECT number, timestamp, hash, l1_tx_count, l2_tx_count, base_fee_per_gas, l1_gas_price, l2_fair_gas_price, bootloader_code_hash, default_aa_code_hash, protocol_version, virtual_blocks\n            FROM miniblocks ORDER BY number DESC LIMIT 1"
+  },
   "fa2b4316aaef09e96d93b70f96b129ed123951732e01d63f30b4b292d441ea39": {
     "describe": {
       "columns": [
@@ -10803,30 +11475,49 @@
     },
     "query": "SELECT * FROM eth_txs WHERE id = $1"
   },
-  "fadc14334d48d2b29acd8433245e337655aeb3472c65922b7949ba84b32e9938": {
+  "fc52c356fd09d82da89a435d08398d9b773494491404b5c84fc14c1c1d374b59": {
     "describe": {
       "columns": [],
       "nullable": [],
       "parameters": {
         "Left": [
-          "Int8",
-          "Bytea",
-          "Text"
+          "Int8"
         ]
       }
     },
-    "query": "INSERT INTO witness_inputs(l1_batch_number, merkle_tree_paths, merkel_tree_paths_blob_url, status, created_at, updated_at) VALUES ($1, $2, $3, 'queued', now(), now())\n                 ON CONFLICT (l1_batch_number) DO NOTHING"
+    "query": "\n                UPDATE contract_verification_requests\n                SET status = 'successful', updated_at = now()\n                WHERE id = $1\n                "
   },
-  "fc52c356fd09d82da89a435d08398d9b773494491404b5c84fc14c1c1d374b59": {
+  "ff7ff36b86b0e8d1cd7280aa447baef172cb054ffe7e1d742c59bf09b4f414cb": {
+    "describe": {
+      "columns": [
+        {
+          "name": "count!",
+          "ordinal": 0,
+          "type_info": "Int8"
+        }
+      ],
+      "nullable": [
+        null
+      ],
+      "parameters": {
+        "Left": [
+          "Int4"
+        ]
+      }
+    },
+    "query": "SELECT COUNT(*) as \"count!\" FROM prover_protocol_versions WHERE id = $1"
+  },
+  "ffc30c35b713dbde170c0369d5b9f741523778a3f396bd6fa9bfd1705fb4c8ac": {
     "describe": {
       "columns": [],
       "nullable": [],
       "parameters": {
         "Left": [
+          "Text",
           "Int8"
         ]
       }
     },
-    "query": "\n                UPDATE contract_verification_requests\n                SET status = 'successful', updated_at = now()\n                WHERE id = $1\n                "
+    "query": "UPDATE proof_compression_jobs_fri SET status = $1, updated_at = now() WHERE l1_batch_number = $2"
   }
 }
\ No newline at end of file
diff --git a/core/lib/dal/src/blocks_dal.rs b/core/lib/dal/src/blocks_dal.rs
index d8e928b28382..c0c79c034a68 100644
--- a/core/lib/dal/src/blocks_dal.rs
+++ b/core/lib/dal/src/blocks_dal.rs
@@ -35,6 +35,78 @@ impl BlocksDal<'_, '_> {
         count == 0
     }
 
+    pub async fn get_miniblock_hashes_from_date(
+        &mut self,
+        timestamp: u64,
+        limit: u32,
+        version: ProtocolVersionId,
+    ) -> Vec<(MiniblockNumber, H256)> {
+        let number = sqlx::query!(
+            "SELECT number from miniblocks where timestamp > $1 ORDER BY number ASC LIMIT 1",
+            timestamp as i64
+        )
+        .fetch_one(self.storage.conn())
+        .await
+        .unwrap()
+        .number;
+        self.storage
+            .blocks_dal()
+            .get_miniblocks_since_block(number, limit, version)
+            .await
+    }
+
+    pub async fn get_last_miniblocks_for_version(
+        &mut self,
+        limit: u32,
+        version: ProtocolVersionId,
+    ) -> Vec<(MiniblockNumber, H256)> {
+        let minibloks = sqlx::query!(
+            "SELECT number, hash FROM miniblocks WHERE protocol_version = $1 ORDER BY number DESC LIMIT $2",
+            version as i32,
+            limit as i32
+        )
+            .fetch_all(self.storage.conn())
+            .await
+            .unwrap()
+            .iter()
+            .map(|block| {
+                (
+                    MiniblockNumber(block.number as u32),
+                    H256::from_slice(&block.hash),
+                )
+            })
+            .collect();
+
+        minibloks
+    }
+
+    pub async fn get_miniblocks_since_block(
+        &mut self,
+        number: i64,
+        limit: u32,
+        version: ProtocolVersionId,
+    ) -> Vec<(MiniblockNumber, H256)> {
+        let minibloks = sqlx::query!(
+            "SELECT number, hash FROM miniblocks WHERE number >= $1 and protocol_version = $2 ORDER BY number LIMIT $3",
+            number,
+            version as i32,
+            limit as i32
+        )
+        .fetch_all(self.storage.conn())
+        .await
+        .unwrap()
+        .iter()
+        .map(|block| {
+            (
+                MiniblockNumber(block.number as u32),
+                H256::from_slice(&block.hash),
+            )
+        })
+        .collect();
+
+        minibloks
+    }
+
     pub async fn get_sealed_l1_batch_number(&mut self) -> L1BatchNumber {
         let number = sqlx::query!(
             "SELECT MAX(number) as \"number\" FROM l1_batches WHERE is_finished = TRUE"
@@ -286,8 +358,8 @@ impl BlocksDal<'_, '_> {
                 number, timestamp, hash, l1_tx_count, l2_tx_count, \
                 base_fee_per_gas, l1_gas_price, l2_fair_gas_price, gas_per_pubdata_limit, \
                 bootloader_code_hash, default_aa_code_hash, protocol_version, \
-                created_at, updated_at \
-            ) VALUES ($1, $2, $3, $4, $5, $6, $7, $8, $9, $10, $11, $12, now(), now())",
+                virtual_blocks, created_at, updated_at \
+            ) VALUES ($1, $2, $3, $4, $5, $6, $7, $8, $9, $10, $11, $12, $13, now(), now())",
             miniblock_header.number.0 as i64,
             miniblock_header.timestamp as i64,
             miniblock_header.hash.as_bytes(),
@@ -306,6 +378,28 @@ impl BlocksDal<'_, '_> {
                 .default_aa
                 .as_bytes(),
             miniblock_header.protocol_version.map(|v| v as i32),
+            miniblock_header.virtual_blocks as i64,
+        )
+        .execute(self.storage.conn())
+        .await
+        .unwrap();
+    }
+
+    pub async fn update_hashes(&mut self, number_and_hashes: &[(MiniblockNumber, H256)]) {
+        let mut numbers = vec![];
+        let mut hashes = vec![];
+        for (number, hash) in number_and_hashes {
+            numbers.push(number.0 as i64);
+            hashes.push(hash.as_bytes().to_vec());
+        }
+
+        sqlx::query!(
+            "UPDATE miniblocks SET hash = u.hash   \
+            FROM UNNEST($1::bigint[], $2::bytea[]) AS u(number, hash) \
+            WHERE miniblocks.number = u.number
+        ",
+            &numbers,
+            &hashes
         )
         .execute(self.storage.conn())
         .await
@@ -317,7 +411,8 @@ impl BlocksDal<'_, '_> {
             StorageMiniblockHeader,
             "SELECT number, timestamp, hash, l1_tx_count, l2_tx_count, \
                 base_fee_per_gas, l1_gas_price, l2_fair_gas_price, \
-                bootloader_code_hash, default_aa_code_hash, protocol_version \
+                bootloader_code_hash, default_aa_code_hash, protocol_version, \
+                virtual_blocks
             FROM miniblocks \
             ORDER BY number DESC \
             LIMIT 1",
@@ -336,7 +431,8 @@ impl BlocksDal<'_, '_> {
             StorageMiniblockHeader,
             "SELECT number, timestamp, hash, l1_tx_count, l2_tx_count, \
                 base_fee_per_gas, l1_gas_price, l2_fair_gas_price, \
-                bootloader_code_hash, default_aa_code_hash, protocol_version \
+                bootloader_code_hash, default_aa_code_hash, protocol_version, \
+                virtual_blocks
             FROM miniblocks \
             WHERE number = $1",
             miniblock_number.0 as i64,
@@ -431,7 +527,7 @@ impl BlocksDal<'_, '_> {
         .unwrap();
 
         if update_result.rows_affected() == 0 {
-            vlog::debug!(
+            tracing::debug!(
                 "L1 batch {} info wasn't updated. Details: root_hash: {:?}, merkle_root_hash: {:?}, \
                  parent_hash: {:?}, commitment: {:?}, l2_l1_merkle_root: {:?}",
                 number.0 as i64,
@@ -1112,16 +1208,28 @@ impl BlocksDal<'_, '_> {
         &mut self,
         l1_batch_number: L1BatchNumber,
     ) -> Option<ProtocolVersionId> {
-        {
-            let row = sqlx::query!(
-                "SELECT protocol_version FROM l1_batches WHERE number = $1",
-                l1_batch_number.0 as i64
-            )
-            .fetch_optional(self.storage.conn())
-            .await
-            .unwrap()?;
-            row.protocol_version.map(|v| (v as u16).try_into().unwrap())
-        }
+        let row = sqlx::query!(
+            "SELECT protocol_version FROM l1_batches WHERE number = $1",
+            l1_batch_number.0 as i64
+        )
+        .fetch_optional(self.storage.conn())
+        .await
+        .unwrap()?;
+        row.protocol_version.map(|v| (v as u16).try_into().unwrap())
+    }
+
+    pub async fn get_miniblock_protocol_version_id(
+        &mut self,
+        miniblock_number: MiniblockNumber,
+    ) -> Option<ProtocolVersionId> {
+        let row = sqlx::query!(
+            "SELECT protocol_version FROM miniblocks WHERE number = $1",
+            miniblock_number.0 as i64
+        )
+        .fetch_optional(self.storage.conn())
+        .await
+        .unwrap()?;
+        row.protocol_version.map(|v| (v as u16).try_into().unwrap())
     }
 
     pub async fn get_miniblock_timestamp(
@@ -1137,6 +1245,17 @@ impl BlocksDal<'_, '_> {
         .unwrap()
         .map(|row| row.timestamp as u64)
     }
+
+    pub async fn set_protocol_version_for_pending_miniblocks(&mut self, id: ProtocolVersionId) {
+        sqlx::query!(
+            "UPDATE miniblocks SET protocol_version = $1 \
+            WHERE l1_batch_number IS NULL",
+            id as i32,
+        )
+        .execute(self.storage.conn())
+        .await
+        .unwrap();
+    }
 }
 
 /// These functions should only be used for tests.
@@ -1174,7 +1293,7 @@ mod tests {
         let mut conn = pool.access_storage().await;
         conn.blocks_dal().delete_l1_batches(L1BatchNumber(0)).await;
         conn.protocol_versions_dal()
-            .save_protocol_version(ProtocolVersion::default())
+            .save_protocol_version_with_tx(ProtocolVersion::default())
             .await;
 
         let mut header = L1BatchHeader::new(
@@ -1228,7 +1347,7 @@ mod tests {
         let mut conn = pool.access_storage().await;
         conn.blocks_dal().delete_l1_batches(L1BatchNumber(0)).await;
         conn.protocol_versions_dal()
-            .save_protocol_version(ProtocolVersion::default())
+            .save_protocol_version_with_tx(ProtocolVersion::default())
             .await;
         let mut header = L1BatchHeader::new(
             L1BatchNumber(1),
diff --git a/core/lib/dal/src/blocks_web3_dal.rs b/core/lib/dal/src/blocks_web3_dal.rs
index 3c492065e02c..5e710e3d3344 100644
--- a/core/lib/dal/src/blocks_web3_dal.rs
+++ b/core/lib/dal/src/blocks_web3_dal.rs
@@ -8,7 +8,7 @@ use zksync_types::{
     l2_to_l1_log::L2ToL1Log,
     vm_trace::Call,
     web3::types::{BlockHeader, U64},
-    zk_evm::zkevm_opcode_defs::system_params,
+    zkevm_test_harness::zk_evm::zkevm_opcode_defs::system_params,
     Bytes, L1BatchNumber, L2ChainId, MiniblockNumber, H160, H2048, H256, U256,
 };
 use zksync_utils::bigdecimal_to_u256;
@@ -122,6 +122,7 @@ impl BlocksWeb3Dal<'_, '_> {
                     base_fee_per_gas: bigdecimal_to_u256(base_fee_per_gas),
                     timestamp: db_row.get::<i64, &str>("timestamp").into(),
                     l1_batch_timestamp,
+                    // TODO: include logs
                     ..api::Block::default()
                 }
             });
@@ -146,18 +147,18 @@ impl BlocksWeb3Dal<'_, '_> {
     pub async fn get_block_tx_count(
         &mut self,
         block_id: api::BlockId,
-    ) -> Result<Option<U256>, SqlxError> {
+    ) -> Result<Option<(MiniblockNumber, U256)>, SqlxError> {
         let query = format!(
-            "SELECT l1_tx_count + l2_tx_count as tx_count FROM miniblocks WHERE {}",
+            "SELECT number, l1_tx_count + l2_tx_count AS tx_count FROM miniblocks WHERE {}",
             web3_block_where_sql(block_id, 1)
         );
         let query = bind_block_where_sql_params(&block_id, sqlx::query(&query));
 
-        let tx_count: Option<i32> = query
-            .fetch_optional(self.storage.conn())
-            .await?
-            .map(|db_row| db_row.get("tx_count"));
-        Ok(tx_count.map(|t| (t as u32).into()))
+        Ok(query.fetch_optional(self.storage.conn()).await?.map(|row| {
+            let miniblock_number = row.get::<i64, _>("number") as u32;
+            let tx_count = row.get::<i32, _>("tx_count") as u32;
+            (MiniblockNumber(miniblock_number), tx_count.into())
+        }))
     }
 
     /// Returns hashes of blocks with numbers greater than `from_block` and the number of the last block.
@@ -210,6 +211,7 @@ impl BlocksWeb3Dal<'_, '_> {
             gas_limit: U256::zero(),
             base_fee_per_gas: None,
             extra_data: Bytes::default(),
+            // TODO: include logs
             logs_bloom: H2048::default(),
             timestamp: U256::from(row.timestamp),
             difficulty: U256::zero(),
@@ -247,13 +249,26 @@ impl BlocksWeb3Dal<'_, '_> {
         Ok(block_number)
     }
 
-    pub async fn get_block_timestamp(
+    /// Returns L1 batch timestamp for either sealed or pending L1 batch.
+    pub async fn get_expected_l1_batch_timestamp(
         &mut self,
-        block_number: MiniblockNumber,
+        l1_batch_number: L1BatchNumber,
     ) -> Result<Option<u64>, SqlxError> {
+        let first_miniblock_of_batch = if l1_batch_number.0 == 0 {
+            MiniblockNumber(0)
+        } else {
+            match self
+                .get_miniblock_range_of_l1_batch(l1_batch_number - 1)
+                .await?
+            {
+                Some((_, miniblock_number)) => miniblock_number + 1,
+                None => return Ok(None),
+            }
+        };
         let timestamp = sqlx::query!(
-            "SELECT timestamp FROM miniblocks WHERE number = $1",
-            block_number.0 as i64
+            "SELECT timestamp FROM miniblocks \
+            WHERE number = $1",
+            first_miniblock_of_batch.0 as i64
         )
         .fetch_optional(self.storage.conn())
         .await?
@@ -261,6 +276,20 @@ impl BlocksWeb3Dal<'_, '_> {
         Ok(timestamp)
     }
 
+    pub async fn get_miniblock_hash(
+        &mut self,
+        block_number: MiniblockNumber,
+    ) -> Result<Option<H256>, SqlxError> {
+        let hash = sqlx::query!(
+            "SELECT hash FROM miniblocks WHERE number = $1",
+            block_number.0 as i64
+        )
+        .fetch_optional(self.storage.conn())
+        .await?
+        .map(|row| H256::from_slice(&row.hash));
+        Ok(hash)
+    }
+
     pub async fn get_l2_to_l1_logs(
         &mut self,
         block_number: L1BatchNumber,
@@ -466,13 +495,99 @@ impl BlocksWeb3Dal<'_, '_> {
             Ok(l1_batch_details.map(api::L1BatchDetails::from))
         }
     }
+
+    pub async fn get_miniblock_for_virtual_block_from(
+        &mut self,
+        migration_start_l1_batch_number: u64,
+        from_virtual_block_number: u64,
+    ) -> Result<Option<u32>, SqlxError> {
+        // Since virtual blocks are numerated from `migration_start_l1_batch_number` number and not from 0
+        // we have to subtract (migration_start_l1_batch_number - 1) from the `from` virtual block
+        // to find miniblock using query below
+        let virtual_block_offset = from_virtual_block_number - migration_start_l1_batch_number + 1;
+
+        // In the query below `virtual_block_sum` is actually latest virtual block number, created within this miniblock
+        // and that can be calculated as sum of all virtual blocks counts, created in previous miniblocks.
+        // It is considered that all logs are created in the last virtual block of this miniblock,
+        // that's why we are interested in funding it.
+        // The goal of this query is to find the first miniblock, which contains given virtual block.
+        let record = sqlx::query!(
+            "SELECT number \
+            FROM ( \
+                SELECT number, sum(virtual_blocks) OVER(ORDER BY number) AS virtual_block_sum \
+                FROM miniblocks \
+                WHERE l1_batch_number >= $1 \
+            ) AS vts \
+            WHERE virtual_block_sum >= $2 \
+            ORDER BY number LIMIT 1",
+            migration_start_l1_batch_number as i64,
+            virtual_block_offset as i64
+        )
+        .instrument("get_miniblock_for_virtual_block_from")
+        .with_arg(
+            "migration_start_l1_batch_number",
+            &migration_start_l1_batch_number,
+        )
+        .report_latency()
+        .fetch_optional(self.storage.conn())
+        .await?;
+
+        let result = record.map(|row| row.number as u32);
+
+        Ok(result)
+    }
+
+    pub async fn get_miniblock_for_virtual_block_to(
+        &mut self,
+        migration_start_l1_batch_number: u64,
+        to_virtual_block_number: u64,
+    ) -> Result<Option<u32>, SqlxError> {
+        // Since virtual blocks are numerated from `migration_start_l1_batch_number` number and not from 0
+        // we have to subtract (migration_start_l1_batch_number - 1) from the `to` virtual block
+        // to find miniblock using query below
+        let virtual_block_offset = to_virtual_block_number - migration_start_l1_batch_number + 1;
+
+        // In the query below `virtual_block_sum` is actually latest virtual block number, created within this miniblock
+        // and that can be calculated as sum of all virtual blocks counts, created in previous miniblocks.
+        // It is considered that all logs are created in the last virtual block of this miniblock,
+        // that's why we are interested in funding it.
+        // The goal of this query is to find the last miniblock, that contains logs all logs(in the last virtual block),
+        // created before or in a given virtual block.
+        let record = sqlx::query!(
+            "SELECT number \
+            FROM ( \
+                SELECT number, sum(virtual_blocks) OVER(ORDER BY number) AS virtual_block_sum \
+                FROM miniblocks \
+                WHERE l1_batch_number >= $1 \
+            ) AS vts \
+            WHERE virtual_block_sum <= $2 \
+            ORDER BY number DESC LIMIT 1",
+            migration_start_l1_batch_number as i64,
+            virtual_block_offset as i64
+        )
+        .instrument("get_miniblock_for_virtual_block_to")
+        .with_arg(
+            "migration_start_l1_batch_number",
+            &migration_start_l1_batch_number,
+        )
+        .report_latency()
+        .fetch_optional(self.storage.conn())
+        .await?;
+
+        let result = record.map(|row| row.number as u32);
+
+        Ok(result)
+    }
 }
 
 #[cfg(test)]
 mod tests {
     use db_test_macro::db_test;
-    use zksync_types::{block::MiniblockHeader, MiniblockNumber, ProtocolVersion};
-    use zksync_utils::miniblock_hash;
+    use zksync_contracts::BaseSystemContractsHashes;
+    use zksync_types::{
+        block::{miniblock_hash, MiniblockHeader},
+        MiniblockNumber, ProtocolVersion, ProtocolVersionId,
+    };
 
     use super::*;
     use crate::{tests::create_miniblock_header, ConnectionPool};
@@ -484,7 +599,7 @@ mod tests {
             .delete_miniblocks(MiniblockNumber(0))
             .await;
         conn.protocol_versions_dal()
-            .save_protocol_version(ProtocolVersion::default())
+            .save_protocol_version_with_tx(ProtocolVersion::default())
             .await;
         let header = MiniblockHeader {
             l1_tx_count: 3,
@@ -497,7 +612,12 @@ mod tests {
             api::BlockId::Number(api::BlockNumber::Earliest),
             api::BlockId::Number(api::BlockNumber::Latest),
             api::BlockId::Number(api::BlockNumber::Number(0.into())),
-            api::BlockId::Hash(miniblock_hash(MiniblockNumber(0))),
+            api::BlockId::Hash(miniblock_hash(
+                MiniblockNumber(0),
+                0,
+                H256::zero(),
+                H256::zero(),
+            )),
         ];
         for block_id in block_ids {
             let block = conn
@@ -507,16 +627,24 @@ mod tests {
             let block = block.unwrap().unwrap();
             assert!(block.transactions.is_empty());
             assert_eq!(block.number, U64::zero());
-            assert_eq!(block.hash, miniblock_hash(MiniblockNumber(0)));
+            assert_eq!(
+                block.hash,
+                miniblock_hash(MiniblockNumber(0), 0, H256::zero(), H256::zero())
+            );
 
             let tx_count = conn.blocks_web3_dal().get_block_tx_count(block_id).await;
-            assert_eq!(tx_count.unwrap(), Some(8.into()));
+            assert_eq!(tx_count.unwrap(), Some((MiniblockNumber(0), 8.into())));
         }
 
         let non_existing_block_ids = [
             api::BlockId::Number(api::BlockNumber::Pending),
             api::BlockId::Number(api::BlockNumber::Number(1.into())),
-            api::BlockId::Hash(miniblock_hash(MiniblockNumber(1))),
+            api::BlockId::Hash(miniblock_hash(
+                MiniblockNumber(1),
+                1,
+                H256::zero(),
+                H256::zero(),
+            )),
         ];
         for block_id in non_existing_block_ids {
             let block = conn
@@ -551,7 +679,7 @@ mod tests {
             .delete_miniblocks(MiniblockNumber(0))
             .await;
         conn.protocol_versions_dal()
-            .save_protocol_version(ProtocolVersion::default())
+            .save_protocol_version_with_tx(ProtocolVersion::default())
             .await;
         conn.blocks_dal()
             .insert_miniblock(&create_miniblock_header(0))
@@ -603,24 +731,109 @@ mod tests {
             .delete_miniblocks(MiniblockNumber(0))
             .await;
         conn.protocol_versions_dal()
-            .save_protocol_version(ProtocolVersion::default())
+            .save_protocol_version_with_tx(ProtocolVersion::default())
             .await;
         conn.blocks_dal()
             .insert_miniblock(&create_miniblock_header(0))
             .await;
 
-        let hash = miniblock_hash(MiniblockNumber(0));
+        let hash = miniblock_hash(MiniblockNumber(0), 0, H256::zero(), H256::zero());
         let miniblock_number = conn
             .blocks_web3_dal()
             .resolve_block_id(api::BlockId::Hash(hash))
             .await;
         assert_eq!(miniblock_number.unwrap(), Some(MiniblockNumber(0)));
 
-        let hash = miniblock_hash(MiniblockNumber(1));
+        let hash = miniblock_hash(MiniblockNumber(1), 1, H256::zero(), H256::zero());
         let miniblock_number = conn
             .blocks_web3_dal()
             .resolve_block_id(api::BlockId::Hash(hash))
             .await;
         assert_eq!(miniblock_number.unwrap(), None);
     }
+
+    #[db_test(dal_crate)]
+    async fn getting_miniblocks_for_virtual_block(connection_pool: ConnectionPool) {
+        let mut conn = connection_pool.access_test_storage().await;
+
+        conn.protocol_versions_dal()
+            .save_protocol_version_with_tx(ProtocolVersion::default())
+            .await;
+
+        let mut header = MiniblockHeader {
+            number: MiniblockNumber(0),
+            timestamp: 0,
+            hash: miniblock_hash(MiniblockNumber(0), 0, H256::zero(), H256::zero()),
+            l1_tx_count: 0,
+            l2_tx_count: 0,
+            base_fee_per_gas: 100,
+            l1_gas_price: 100,
+            l2_fair_gas_price: 100,
+            base_system_contracts_hashes: BaseSystemContractsHashes::default(),
+            protocol_version: Some(ProtocolVersionId::default()),
+            virtual_blocks: 0,
+        };
+        conn.blocks_dal().insert_miniblock(&header).await;
+        conn.blocks_dal()
+            .mark_miniblocks_as_executed_in_l1_batch(L1BatchNumber(0))
+            .await;
+
+        header.number = MiniblockNumber(1);
+        conn.blocks_dal().insert_miniblock(&header).await;
+        conn.blocks_dal()
+            .mark_miniblocks_as_executed_in_l1_batch(L1BatchNumber(1))
+            .await;
+
+        for i in 2..=100 {
+            header.number = MiniblockNumber(i);
+            header.virtual_blocks = 5;
+
+            conn.blocks_dal().insert_miniblock(&header).await;
+            conn.blocks_dal()
+                .mark_miniblocks_as_executed_in_l1_batch(L1BatchNumber(i))
+                .await;
+        }
+
+        let virtual_block_ranges = [
+            (2, 4),
+            (20, 24),
+            (11, 15),
+            (1, 10),
+            (88, 99),
+            (1, 100),
+            (1000000, 10000000),
+        ];
+        let expected_miniblock_ranges = [
+            (Some(2), Some(1)),
+            (Some(5), Some(5)),
+            (Some(4), Some(4)),
+            (Some(2), Some(3)),
+            (Some(19), Some(20)),
+            (Some(2), Some(21)),
+            (None, Some(100)),
+        ];
+
+        let inputs_with_expected_values =
+            IntoIterator::into_iter(virtual_block_ranges).zip(expected_miniblock_ranges);
+        for (
+            (virtual_block_start, virtual_block_end),
+            (expected_miniblock_from, expected_miniblock_to),
+        ) in inputs_with_expected_values
+        {
+            // migration_start_l1_batch_number = 1
+            let miniblock_from = conn
+                .blocks_web3_dal()
+                .get_miniblock_for_virtual_block_from(1, virtual_block_start)
+                .await
+                .unwrap();
+            assert_eq!(miniblock_from, expected_miniblock_from);
+
+            let miniblock_to = conn
+                .blocks_web3_dal()
+                .get_miniblock_for_virtual_block_to(1, virtual_block_end)
+                .await
+                .unwrap();
+            assert_eq!(miniblock_to, expected_miniblock_to);
+        }
+    }
 }
diff --git a/core/lib/dal/src/connection/mod.rs b/core/lib/dal/src/connection/mod.rs
index b30d80180e03..64229c4d3dee 100644
--- a/core/lib/dal/src/connection/mod.rs
+++ b/core/lib/dal/src/connection/mod.rs
@@ -50,13 +50,13 @@ impl ConnectionPoolBuilder {
     }
 
     /// Builds a connection pool from this builder.
-    pub async fn build(&self) -> ConnectionPool {
+    pub async fn build(&self) -> anyhow::Result<ConnectionPool> {
         let database_url = match self.db {
-            DbVariant::Master => get_master_database_url(),
-            DbVariant::Replica => get_replica_database_url(),
-            DbVariant::Prover => get_prover_database_url(),
+            DbVariant::Master => get_master_database_url()?,
+            DbVariant::Replica => get_replica_database_url()?,
+            DbVariant::Prover => get_prover_database_url()?,
         };
-        self.build_inner(&database_url).await
+        Ok(self.build_inner(&database_url).await)
     }
 
     pub async fn build_inner(&self, database_url: &str) -> ConnectionPool {
@@ -78,7 +78,7 @@ impl ConnectionPoolBuilder {
             .unwrap_or_else(|err| {
                 panic!("Failed connecting to {:?} database: {}", self.db, err);
             });
-        vlog::info!(
+        tracing::info!(
             "Created pool for {db:?} database with {max_connections} max connections \
              and {statement_timeout:?} statement timeout",
             db = self.db,
@@ -169,7 +169,7 @@ impl ConnectionPool {
             };
 
             Self::report_connection_error(&connection_err);
-            vlog::warn!(
+            tracing::warn!(
                 "Failed to get connection to DB, backing off for {BACKOFF_INTERVAL:?}: {connection_err}"
             );
             tokio::time::sleep(BACKOFF_INTERVAL).await;
@@ -216,7 +216,7 @@ mod tests {
     async fn setting_statement_timeout() {
         // We cannot use an ordinary test pool here because it isn't created using `ConnectionPoolBuilder`.
         // Since we don't need to mutate the DB for the test, using a real DB connection is OK.
-        let database_url = get_test_database_url();
+        let database_url = get_test_database_url().unwrap();
         let pool = ConnectionPool::builder(DbVariant::Master)
             .set_statement_timeout(Some(Duration::from_secs(1)))
             .build_inner(&database_url)
diff --git a/core/lib/dal/src/connection/test_pool.rs b/core/lib/dal/src/connection/test_pool.rs
index 7a00eea42201..722f389584ac 100644
--- a/core/lib/dal/src/connection/test_pool.rs
+++ b/core/lib/dal/src/connection/test_pool.rs
@@ -36,7 +36,7 @@ impl fmt::Debug for TestPoolInner {
 
 impl TestPoolInner {
     async fn new() -> Self {
-        let database_url = crate::get_test_database_url();
+        let database_url = crate::get_test_database_url().unwrap();
         let connection = PgConnection::connect(&database_url).await.unwrap();
         let mut connection = Box::pin(connection);
 
diff --git a/core/lib/dal/src/contract_verification_dal.rs b/core/lib/dal/src/contract_verification_dal.rs
index c635d169218b..272da1824c36 100644
--- a/core/lib/dal/src/contract_verification_dal.rs
+++ b/core/lib/dal/src/contract_verification_dal.rs
@@ -358,7 +358,8 @@ impl ContractVerificationDal<'_, '_> {
                 INSERT INTO compiler_versions (version, compiler, created_at, updated_at)
                 SELECT u.version, $2, now(), now()
                 FROM UNNEST($1::text[])
-                AS u(version)",
+                AS u(version)
+                ON CONFLICT (version, compiler) DO NOTHING",
                 &versions,
                 &compiler,
             )
diff --git a/core/lib/dal/src/events_dal.rs b/core/lib/dal/src/events_dal.rs
index 9550a68dd62b..cac0aa9b0d63 100644
--- a/core/lib/dal/src/events_dal.rs
+++ b/core/lib/dal/src/events_dal.rs
@@ -217,7 +217,7 @@ mod tests {
             .delete_miniblocks(MiniblockNumber(0))
             .await;
         conn.protocol_versions_dal()
-            .save_protocol_version(ProtocolVersion::default())
+            .save_protocol_version_with_tx(ProtocolVersion::default())
             .await;
         conn.blocks_dal()
             .insert_miniblock(&create_miniblock_header(1))
@@ -292,7 +292,7 @@ mod tests {
             .delete_miniblocks(MiniblockNumber(0))
             .await;
         conn.protocol_versions_dal()
-            .save_protocol_version(ProtocolVersion::default())
+            .save_protocol_version_with_tx(ProtocolVersion::default())
             .await;
         conn.blocks_dal()
             .insert_miniblock(&create_miniblock_header(1))
diff --git a/core/lib/dal/src/events_web3_dal.rs b/core/lib/dal/src/events_web3_dal.rs
index 2142a66a4ba5..1b38362d6a90 100644
--- a/core/lib/dal/src/events_web3_dal.rs
+++ b/core/lib/dal/src/events_web3_dal.rs
@@ -21,11 +21,11 @@ impl EventsWeb3Dal<'_, '_> {
     /// Used to determine if there is more than `offset` logs that satisfies filter.
     pub async fn get_log_block_number(
         &mut self,
-        filter: GetLogsFilter,
+        filter: &GetLogsFilter,
         offset: usize,
     ) -> Result<Option<MiniblockNumber>, SqlxError> {
         {
-            let (where_sql, arg_index) = self.build_get_logs_where_clause(&filter);
+            let (where_sql, arg_index) = self.build_get_logs_where_clause(filter);
 
             let query = format!(
                 r#"
@@ -52,7 +52,7 @@ impl EventsWeb3Dal<'_, '_> {
             let log = query
                 .instrument("get_log_block_number")
                 .report_latency()
-                .with_arg("filter", &filter)
+                .with_arg("filter", filter)
                 .with_arg("offset", &offset)
                 .fetch_optional(self.storage.conn())
                 .await?;
diff --git a/core/lib/dal/src/fri_proof_compressor_dal.rs b/core/lib/dal/src/fri_proof_compressor_dal.rs
new file mode 100644
index 000000000000..0ca1f435aff2
--- /dev/null
+++ b/core/lib/dal/src/fri_proof_compressor_dal.rs
@@ -0,0 +1,218 @@
+use sqlx::Row;
+use std::collections::HashMap;
+use std::str::FromStr;
+use std::time::Duration;
+use strum::{Display, EnumString};
+
+use zksync_types::proofs::{JobCountStatistics, StuckJobs};
+use zksync_types::L1BatchNumber;
+
+use crate::time_utils::{duration_to_naive_time, pg_interval_from_duration};
+use crate::StorageProcessor;
+
+#[derive(Debug)]
+pub struct FriProofCompressorDal<'a, 'c> {
+    pub(crate) storage: &'a mut StorageProcessor<'c>,
+}
+
+#[derive(Debug, EnumString, Display)]
+pub enum ProofCompressionJobStatus {
+    #[strum(serialize = "queued")]
+    Queued,
+    #[strum(serialize = "in_progress")]
+    InProgress,
+    #[strum(serialize = "successful")]
+    Successful,
+    #[strum(serialize = "failed")]
+    Failed,
+    #[strum(serialize = "sent_to_server")]
+    SentToServer,
+    #[strum(serialize = "skipped")]
+    Skipped,
+}
+
+impl FriProofCompressorDal<'_, '_> {
+    pub async fn insert_proof_compression_job(
+        &mut self,
+        block_number: L1BatchNumber,
+        fri_proof_blob_url: &str,
+    ) {
+        sqlx::query!(
+                "INSERT INTO proof_compression_jobs_fri(l1_batch_number, fri_proof_blob_url, status, created_at, updated_at) \
+                 VALUES ($1, $2, $3, now(), now()) \
+                 ON CONFLICT (l1_batch_number) DO NOTHING",
+                block_number.0 as i64,
+                fri_proof_blob_url,
+            ProofCompressionJobStatus::Queued.to_string(),
+            )
+            .fetch_optional(self.storage.conn())
+            .await
+            .unwrap();
+    }
+
+    pub async fn skip_proof_compression_job(&mut self, block_number: L1BatchNumber) {
+        sqlx::query!(
+                "INSERT INTO proof_compression_jobs_fri(l1_batch_number, status, created_at, updated_at) \
+                 VALUES ($1, $2, now(), now()) \
+                 ON CONFLICT (l1_batch_number) DO NOTHING",
+                block_number.0 as i64,
+            ProofCompressionJobStatus::Skipped.to_string(),
+            )
+            .fetch_optional(self.storage.conn())
+            .await
+            .unwrap();
+    }
+
+    pub async fn get_next_proof_compression_job(
+        &mut self,
+        picked_by: &str,
+    ) -> Option<L1BatchNumber> {
+        let result: Option<L1BatchNumber> = sqlx::query!(
+            "UPDATE proof_compression_jobs_fri \
+                SET status = $1, attempts = attempts + 1, \
+                    updated_at = now(), processing_started_at = now(), \
+                    picked_by = $3 \
+                WHERE l1_batch_number = ( \
+                    SELECT l1_batch_number \
+                    FROM proof_compression_jobs_fri \
+                    WHERE status = $2 \
+                    ORDER BY l1_batch_number ASC \
+                    LIMIT 1 \
+                    FOR UPDATE \
+                    SKIP LOCKED \
+                ) \
+                RETURNING proof_compression_jobs_fri.l1_batch_number",
+            ProofCompressionJobStatus::InProgress.to_string(),
+            ProofCompressionJobStatus::Queued.to_string(),
+            picked_by,
+        )
+        .fetch_optional(self.storage.conn())
+        .await
+        .unwrap()
+        .map(|row| L1BatchNumber(row.l1_batch_number as u32));
+        result
+    }
+
+    pub async fn mark_proof_compression_job_successful(
+        &mut self,
+        block_number: L1BatchNumber,
+        time_taken: Duration,
+        l1_proof_blob_url: &str,
+    ) {
+        sqlx::query!(
+            "UPDATE proof_compression_jobs_fri \
+             SET status = $1, updated_at = now(), time_taken = $2, l1_proof_blob_url = $3\
+             WHERE l1_batch_number = $4",
+            ProofCompressionJobStatus::Successful.to_string(),
+            duration_to_naive_time(time_taken),
+            l1_proof_blob_url,
+            block_number.0 as i64,
+        )
+        .execute(self.storage.conn())
+        .await
+        .unwrap();
+    }
+
+    pub async fn mark_proof_compression_job_failed(
+        &mut self,
+        error: &str,
+        block_number: L1BatchNumber,
+    ) {
+        sqlx::query!(
+            "UPDATE proof_compression_jobs_fri \
+            SET status =$1, error= $2, updated_at = now() \
+            WHERE l1_batch_number = $3",
+            ProofCompressionJobStatus::Failed.to_string(),
+            error,
+            block_number.0 as i64
+        )
+        .execute(self.storage.conn())
+        .await
+        .unwrap();
+    }
+
+    pub async fn get_least_proven_block_number_not_sent_to_server(
+        &mut self,
+    ) -> Option<(L1BatchNumber, ProofCompressionJobStatus)> {
+        let row = sqlx::query!(
+            "SELECT l1_batch_number, status \
+            FROM proof_compression_jobs_fri
+            WHERE l1_batch_number = ( \
+                SELECT MIN(l1_batch_number) \
+                FROM proof_compression_jobs_fri \
+                WHERE status = $1 OR status = $2
+            )",
+            ProofCompressionJobStatus::Successful.to_string(),
+            ProofCompressionJobStatus::Skipped.to_string()
+        )
+        .fetch_optional(self.storage.conn())
+        .await
+        .ok()?;
+        match row {
+            Some(row) => Some((
+                L1BatchNumber(row.l1_batch_number as u32),
+                ProofCompressionJobStatus::from_str(&row.status).unwrap(),
+            )),
+            None => None,
+        }
+    }
+
+    pub async fn mark_proof_sent_to_server(&mut self, block_number: L1BatchNumber) {
+        sqlx::query!(
+            "UPDATE proof_compression_jobs_fri \
+            SET status = $1, updated_at = now() \
+            WHERE l1_batch_number = $2",
+            ProofCompressionJobStatus::SentToServer.to_string(),
+            block_number.0 as i64
+        )
+        .execute(self.storage.conn())
+        .await
+        .unwrap();
+    }
+
+    pub async fn get_jobs_stats(&mut self) -> JobCountStatistics {
+        let mut results: HashMap<String, i64> = sqlx::query(
+            "SELECT COUNT(*) as \"count\", status as \"status\" \
+                 FROM proof_compression_jobs_fri \
+                 GROUP BY status",
+        )
+        .fetch_all(self.storage.conn())
+        .await
+        .unwrap()
+        .into_iter()
+        .map(|row| (row.get("status"), row.get::<i64, &str>("count")))
+        .collect::<HashMap<String, i64>>();
+
+        JobCountStatistics {
+            queued: results.remove("queued").unwrap_or(0i64) as usize,
+            in_progress: results.remove("in_progress").unwrap_or(0i64) as usize,
+            failed: results.remove("failed").unwrap_or(0i64) as usize,
+            successful: results.remove("successful").unwrap_or(0i64) as usize,
+        }
+    }
+
+    pub async fn requeue_stuck_jobs(
+        &mut self,
+        processing_timeout: Duration,
+        max_attempts: u32,
+    ) -> Vec<StuckJobs> {
+        let processing_timeout = pg_interval_from_duration(processing_timeout);
+        {
+            sqlx::query!(
+                "UPDATE proof_compression_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 = 'failed' AND attempts < $2) \
+                RETURNING l1_batch_number, status, attempts",
+                &processing_timeout,
+                max_attempts as i32,
+            )
+                .fetch_all(self.storage.conn())
+                .await
+                .unwrap()
+                .into_iter()
+                .map(|row| StuckJobs { id: row.l1_batch_number as u64, status: row.status, attempts: row.attempts as u64 })
+                .collect()
+        }
+    }
+}
diff --git a/core/lib/dal/src/fri_protocol_versions_dal.rs b/core/lib/dal/src/fri_protocol_versions_dal.rs
new file mode 100644
index 000000000000..8fbcf922d8bb
--- /dev/null
+++ b/core/lib/dal/src/fri_protocol_versions_dal.rs
@@ -0,0 +1,80 @@
+use std::convert::TryFrom;
+
+use zksync_types::protocol_version::FriProtocolVersionId;
+use zksync_types::protocol_version::L1VerifierConfig;
+
+use crate::StorageProcessor;
+
+#[derive(Debug)]
+pub struct FriProtocolVersionsDal<'a, 'c> {
+    pub storage: &'a mut StorageProcessor<'c>,
+}
+
+impl FriProtocolVersionsDal<'_, '_> {
+    pub async fn save_prover_protocol_version(
+        &mut self,
+        id: FriProtocolVersionId,
+        l1_verifier_config: L1VerifierConfig,
+    ) {
+        sqlx::query!(
+            "INSERT INTO prover_fri_protocol_versions \
+                    (id, recursion_scheduler_level_vk_hash, recursion_node_level_vk_hash, \
+                        recursion_leaf_level_vk_hash, recursion_circuits_set_vks_hash, created_at) \
+                VALUES ($1, $2, $3, $4, $5, now()) \
+                ON CONFLICT(id) DO NOTHING",
+            id as i32,
+            l1_verifier_config
+                .recursion_scheduler_level_vk_hash
+                .as_bytes(),
+            l1_verifier_config
+                .params
+                .recursion_node_level_vk_hash
+                .as_bytes(),
+            l1_verifier_config
+                .params
+                .recursion_leaf_level_vk_hash
+                .as_bytes(),
+            l1_verifier_config
+                .params
+                .recursion_circuits_set_vks_hash
+                .as_bytes(),
+        )
+        .execute(self.storage.conn())
+        .await
+        .unwrap();
+    }
+
+    pub async fn protocol_version_for(
+        &mut self,
+        vk_commitments: &L1VerifierConfig,
+    ) -> Vec<FriProtocolVersionId> {
+        sqlx::query!(
+            "SELECT id \
+             FROM prover_fri_protocol_versions \
+             WHERE recursion_circuits_set_vks_hash = $1 \
+             AND recursion_leaf_level_vk_hash = $2 \
+             AND recursion_node_level_vk_hash = $3 \
+             AND recursion_scheduler_level_vk_hash = $4 \
+               ",
+            vk_commitments
+                .params
+                .recursion_circuits_set_vks_hash
+                .as_bytes(),
+            vk_commitments
+                .params
+                .recursion_leaf_level_vk_hash
+                .as_bytes(),
+            vk_commitments
+                .params
+                .recursion_node_level_vk_hash
+                .as_bytes(),
+            vk_commitments.recursion_scheduler_level_vk_hash.as_bytes(),
+        )
+        .fetch_all(self.storage.conn())
+        .await
+        .unwrap()
+        .into_iter()
+        .map(|row| FriProtocolVersionId::try_from(row.id as u16).unwrap())
+        .collect()
+    }
+}
diff --git a/core/lib/dal/src/fri_prover_dal.rs b/core/lib/dal/src/fri_prover_dal.rs
index 761a128407fc..a6cfd2680d3b 100644
--- a/core/lib/dal/src/fri_prover_dal.rs
+++ b/core/lib/dal/src/fri_prover_dal.rs
@@ -1,6 +1,7 @@
 use std::{collections::HashMap, convert::TryFrom, time::Duration};
 
 use zksync_config::configs::fri_prover_group::CircuitIdRoundTuple;
+use zksync_types::protocol_version::FriProtocolVersionId;
 use zksync_types::{
     proofs::{AggregationRound, FriProverJobMetadata, JobCountStatistics, StuckJobs},
     L1BatchNumber,
@@ -25,6 +26,7 @@ impl FriProverDal<'_, '_> {
         circuit_ids_and_urls: Vec<(u8, String)>,
         aggregation_round: AggregationRound,
         depth: u16,
+        protocol_version_id: FriProtocolVersionId,
     ) {
         let latency = MethodLatency::new("save_fri_prover_jobs");
         for (sequence_number, (circuit_id, circuit_blob_url)) in
@@ -38,22 +40,30 @@ impl FriProverDal<'_, '_> {
                 aggregation_round,
                 circuit_blob_url,
                 false,
+                protocol_version_id,
             )
             .await;
         }
         drop(latency);
     }
 
-    pub async fn get_next_job(&mut self) -> Option<FriProverJobMetadata> {
+    pub async fn get_next_job(
+        &mut self,
+        protocol_versions: &[FriProtocolVersionId],
+        picked_by: &str,
+    ) -> Option<FriProverJobMetadata> {
+        let protocol_versions: Vec<i32> = protocol_versions.iter().map(|&id| id as i32).collect();
         sqlx::query!(
             "
                 UPDATE prover_jobs_fri
                 SET status = 'in_progress', attempts = attempts + 1,
-                    updated_at = now(), processing_started_at = now()
+                    updated_at = now(), processing_started_at = now(),
+                    picked_by = $2
                 WHERE id = (
                     SELECT id
                     FROM prover_jobs_fri
                     WHERE status = 'queued'
+                    AND protocol_version = ANY($1)
                     ORDER BY aggregation_round DESC, l1_batch_number ASC, id ASC
                     LIMIT 1
                     FOR UPDATE
@@ -63,6 +73,8 @@ impl FriProverDal<'_, '_> {
                 prover_jobs_fri.aggregation_round, prover_jobs_fri.sequence_number, prover_jobs_fri.depth,
                 prover_jobs_fri.is_node_final_proof
                 ",
+            &protocol_versions[..],
+            picked_by,
         )
             .fetch_optional(self.storage.conn())
             .await
@@ -81,11 +93,14 @@ impl FriProverDal<'_, '_> {
     pub async fn get_next_job_for_circuit_id_round(
         &mut self,
         circuits_to_pick: &[CircuitIdRoundTuple],
+        protocol_versions: &[FriProtocolVersionId],
+        picked_by: &str,
     ) -> Option<FriProverJobMetadata> {
         let circuit_ids: Vec<_> = circuits_to_pick
             .iter()
             .map(|tuple| tuple.circuit_id as i16)
             .collect();
+        let protocol_versions: Vec<i32> = protocol_versions.iter().map(|&id| id as i32).collect();
         let aggregation_rounds: Vec<_> = circuits_to_pick
             .iter()
             .map(|tuple| tuple.aggregation_round as i16)
@@ -94,7 +109,8 @@ impl FriProverDal<'_, '_> {
             "
                 UPDATE prover_jobs_fri
                 SET status = 'in_progress', attempts = attempts + 1,
-                    updated_at = now(), processing_started_at = now()
+                    updated_at = now(), processing_started_at = now(),
+                    picked_by = $4
                 WHERE id = (
                     SELECT id
                     FROM prover_jobs_fri
@@ -102,6 +118,7 @@ impl FriProverDal<'_, '_> {
                     AND (circuit_id, aggregation_round) IN (
                         SELECT * FROM UNNEST($1::smallint[], $2::smallint[])
                     )
+                    AND protocol_version = ANY($3)
                     ORDER BY aggregation_round DESC, l1_batch_number ASC, id ASC
                     LIMIT 1
                     FOR UPDATE
@@ -113,6 +130,8 @@ impl FriProverDal<'_, '_> {
                 ",
             &circuit_ids[..],
             &aggregation_rounds[..],
+            &protocol_versions[..],
+            picked_by,
         )
             .fetch_optional(self.storage.conn())
             .await
@@ -219,11 +238,12 @@ impl FriProverDal<'_, '_> {
         aggregation_round: AggregationRound,
         circuit_blob_url: &str,
         is_node_final_proof: bool,
+        protocol_version_id: FriProtocolVersionId,
     ) {
         sqlx::query!(
                     "
-                    INSERT INTO prover_jobs_fri (l1_batch_number, circuit_id, circuit_blob_url, aggregation_round, sequence_number, depth, is_node_final_proof, status, created_at, updated_at)
-                    VALUES ($1, $2, $3, $4, $5, $6, $7, 'queued', now(), now())
+                    INSERT INTO prover_jobs_fri (l1_batch_number, circuit_id, circuit_blob_url, aggregation_round, sequence_number, depth, is_node_final_proof, protocol_version, status, created_at, updated_at)
+                    VALUES ($1, $2, $3, $4, $5, $6, $7, $8, 'queued', now(), now())
                     ON CONFLICT(l1_batch_number, aggregation_round, circuit_id, depth, sequence_number)
                     DO UPDATE SET updated_at=now()
                     ",
@@ -234,6 +254,7 @@ impl FriProverDal<'_, '_> {
             sequence_number as i64,
             depth as i32,
             is_node_final_proof,
+            protocol_version_id as i32,
         )
             .execute(self.storage.conn())
             .await
@@ -309,4 +330,34 @@ impl FriProverDal<'_, '_> {
         .await
         .unwrap();
     }
+
+    pub async fn save_successful_sent_proof(&mut self, l1_batch_number: L1BatchNumber) {
+        sqlx::query!(
+            "UPDATE prover_jobs_fri \
+                SET status = 'sent_to_server', updated_at = now() \
+                WHERE l1_batch_number = $1",
+            l1_batch_number.0 as i64,
+        )
+        .execute(self.storage.conn())
+        .await
+        .unwrap();
+    }
+
+    pub async fn get_scheduler_proof_job_id(
+        &mut self,
+        l1_batch_number: L1BatchNumber,
+    ) -> Option<u32> {
+        sqlx::query!(
+            "SELECT id from prover_jobs_fri \
+             WHERE l1_batch_number = $1 \
+             AND status = 'successful' \
+             AND aggregation_round = $2",
+            l1_batch_number.0 as i64,
+            AggregationRound::Scheduler as i16,
+        )
+        .fetch_optional(self.storage.conn())
+        .await
+        .ok()?
+        .map(|row| row.id as u32)
+    }
 }
diff --git a/core/lib/dal/src/fri_witness_generator_dal.rs b/core/lib/dal/src/fri_witness_generator_dal.rs
index 801d66f8d4ed..2f5433f0ddb1 100644
--- a/core/lib/dal/src/fri_witness_generator_dal.rs
+++ b/core/lib/dal/src/fri_witness_generator_dal.rs
@@ -1,7 +1,9 @@
 use sqlx::Row;
 
+use std::convert::TryFrom;
 use std::{collections::HashMap, time::Duration};
 
+use zksync_types::protocol_version::FriProtocolVersionId;
 use zksync_types::{
     proofs::{
         AggregationRound, JobCountStatistics, LeafAggregationJobMetadata,
@@ -36,35 +38,44 @@ pub enum FriWitnessJobStatus {
 }
 
 impl FriWitnessGeneratorDal<'_, '_> {
-    pub async fn save_witness_inputs(&mut self, block_number: L1BatchNumber, object_key: &str) {
-        {
-            sqlx::query!(
-                "INSERT INTO witness_inputs_fri(l1_batch_number, merkle_tree_paths_blob_url, status, created_at, updated_at) \
-                 VALUES ($1, $2, 'queued', now(), now())
+    pub async fn save_witness_inputs(
+        &mut self,
+        block_number: L1BatchNumber,
+        object_key: &str,
+        protocol_version_id: FriProtocolVersionId,
+    ) {
+        sqlx::query!(
+                "INSERT INTO witness_inputs_fri(l1_batch_number, merkle_tree_paths_blob_url, protocol_version, status, created_at, updated_at) \
+                 VALUES ($1, $2, $3, 'queued', now(), now()) \
                  ON CONFLICT (l1_batch_number) DO NOTHING",
                 block_number.0 as i64,
                 object_key,
+                protocol_version_id as i32,
             )
                 .fetch_optional(self.storage.conn())
                 .await
                 .unwrap();
-        }
     }
 
     pub async fn get_next_basic_circuit_witness_job(
         &mut self,
         last_l1_batch_to_process: u32,
+        protocol_versions: &[FriProtocolVersionId],
+        picked_by: &str,
     ) -> Option<L1BatchNumber> {
+        let protocol_versions: Vec<i32> = protocol_versions.iter().map(|&id| id as i32).collect();
         let result: Option<L1BatchNumber> = sqlx::query!(
             "
                 UPDATE witness_inputs_fri
                 SET status = 'in_progress', attempts = attempts + 1,
-                    updated_at = now(), processing_started_at = now()
+                    updated_at = now(), processing_started_at = now(),
+                    picked_by = $3
                 WHERE l1_batch_number = (
                     SELECT l1_batch_number
                     FROM witness_inputs_fri
                     WHERE l1_batch_number <= $1
                     AND status = 'queued'
+                    AND protocol_version = ANY($2)
                     ORDER BY l1_batch_number ASC
                     LIMIT 1
                     FOR UPDATE
@@ -72,7 +83,9 @@ impl FriWitnessGeneratorDal<'_, '_> {
                 )
                 RETURNING witness_inputs_fri.*
                ",
-            last_l1_batch_to_process as i64
+            last_l1_batch_to_process as i64,
+            &protocol_versions[..],
+            picked_by,
         )
         .fetch_optional(self.storage.conn())
         .await
@@ -194,6 +207,7 @@ impl FriWitnessGeneratorDal<'_, '_> {
         closed_form_inputs_and_urls: &Vec<(u8, String, usize)>,
         scheduler_partial_input_blob_url: &str,
         base_layer_to_recursive_layer_circuit_id: fn(u8) -> u8,
+        protocol_version_id: FriProtocolVersionId,
     ) {
         {
             let latency = MethodLatency::new("create_aggregation_jobs_fri");
@@ -203,8 +217,8 @@ impl FriWitnessGeneratorDal<'_, '_> {
                 sqlx::query!(
                     "
                     INSERT INTO leaf_aggregation_witness_jobs_fri
-                        (l1_batch_number, circuit_id, closed_form_inputs_blob_url, number_of_basic_circuits, status, created_at, updated_at)
-                    VALUES ($1, $2, $3, $4, 'waiting_for_proofs', now(), now())
+                        (l1_batch_number, circuit_id, closed_form_inputs_blob_url, number_of_basic_circuits, protocol_version, status, created_at, updated_at)
+                    VALUES ($1, $2, $3, $4, $5, 'waiting_for_proofs', now(), now())
                     ON CONFLICT(l1_batch_number, circuit_id)
                     DO UPDATE SET updated_at=now()
                     ",
@@ -212,6 +226,7 @@ impl FriWitnessGeneratorDal<'_, '_> {
                     *circuit_id as i16,
                     closed_form_inputs_url,
                     *number_of_basic_circuits as i32,
+                    protocol_version_id as i32,
                 )
                 .execute(self.storage.conn())
                 .await
@@ -223,6 +238,7 @@ impl FriWitnessGeneratorDal<'_, '_> {
                     None,
                     0,
                     "",
+                    protocol_version_id,
                 )
                 .await;
             }
@@ -230,13 +246,14 @@ impl FriWitnessGeneratorDal<'_, '_> {
             sqlx::query!(
                     "
                     INSERT INTO scheduler_witness_jobs_fri
-                        (l1_batch_number, scheduler_partial_input_blob_url, status, created_at, updated_at)
-                    VALUES ($1, $2, 'waiting_for_proofs', now(), now())
+                        (l1_batch_number, scheduler_partial_input_blob_url, protocol_version, status, created_at, updated_at)
+                    VALUES ($1, $2, $3, 'waiting_for_proofs', now(), now())
                     ON CONFLICT(l1_batch_number)
                     DO UPDATE SET updated_at=now()
                     ",
                 block_number.0 as i64,
                 scheduler_partial_input_blob_url,
+                protocol_version_id as i32,
             )
             .execute(self.storage.conn())
             .await
@@ -260,16 +277,23 @@ impl FriWitnessGeneratorDal<'_, '_> {
         }
     }
 
-    pub async fn get_next_leaf_aggregation_job(&mut self) -> Option<LeafAggregationJobMetadata> {
+    pub async fn get_next_leaf_aggregation_job(
+        &mut self,
+        protocol_versions: &[FriProtocolVersionId],
+        picked_by: &str,
+    ) -> Option<LeafAggregationJobMetadata> {
+        let protocol_versions: Vec<i32> = protocol_versions.iter().map(|&id| id as i32).collect();
         let row = sqlx::query!(
             "
                 UPDATE leaf_aggregation_witness_jobs_fri
                 SET status = 'in_progress', attempts = attempts + 1,
-                    updated_at = now(), processing_started_at = now()
+                    updated_at = now(), processing_started_at = now(),
+                    picked_by = $2
                 WHERE id = (
                     SELECT id
                     FROM leaf_aggregation_witness_jobs_fri
                     WHERE status = 'queued'
+                    AND protocol_version = ANY($1)
                     ORDER BY l1_batch_number ASC, id ASC
                     LIMIT 1
                     FOR UPDATE
@@ -277,6 +301,8 @@ impl FriWitnessGeneratorDal<'_, '_> {
                 )
                 RETURNING leaf_aggregation_witness_jobs_fri.*
                 ",
+            &protocol_versions[..],
+            picked_by,
         )
         .fetch_optional(self.storage.conn())
         .await
@@ -383,16 +409,23 @@ impl FriWitnessGeneratorDal<'_, '_> {
         .unwrap();
     }
 
-    pub async fn get_next_node_aggregation_job(&mut self) -> Option<NodeAggregationJobMetadata> {
+    pub async fn get_next_node_aggregation_job(
+        &mut self,
+        protocol_versions: &[FriProtocolVersionId],
+        picked_by: &str,
+    ) -> Option<NodeAggregationJobMetadata> {
+        let protocol_versions: Vec<i32> = protocol_versions.iter().map(|&id| id as i32).collect();
         let row = sqlx::query!(
             "
                 UPDATE node_aggregation_witness_jobs_fri
                 SET status = 'in_progress', attempts = attempts + 1,
-                    updated_at = now(), processing_started_at = now()
+                    updated_at = now(), processing_started_at = now(),
+                    picked_by = $2
                 WHERE id = (
                     SELECT id
                     FROM node_aggregation_witness_jobs_fri
                     WHERE status = 'queued'
+                    AND protocol_version = ANY($1)
                     ORDER BY l1_batch_number ASC, depth ASC, id ASC
                     LIMIT 1
                     FOR UPDATE
@@ -400,6 +433,8 @@ impl FriWitnessGeneratorDal<'_, '_> {
                 )
                 RETURNING node_aggregation_witness_jobs_fri.*
                 ",
+            &protocol_versions[..],
+            picked_by,
         )
         .fetch_optional(self.storage.conn())
         .await
@@ -463,17 +498,19 @@ impl FriWitnessGeneratorDal<'_, '_> {
         number_of_dependent_jobs: Option<i32>,
         depth: u16,
         aggregations_url: &str,
+        protocol_version_id: FriProtocolVersionId,
     ) {
         sqlx::query!(
-                "INSERT INTO node_aggregation_witness_jobs_fri (l1_batch_number, circuit_id, depth, aggregations_url, number_of_dependent_jobs, status, created_at, updated_at)
-                    VALUES ($1, $2, $3, $4, $5, 'waiting_for_proofs', now(), now())
+                "INSERT INTO node_aggregation_witness_jobs_fri (l1_batch_number, circuit_id, depth, aggregations_url, number_of_dependent_jobs, protocol_version, status, created_at, updated_at)
+                    VALUES ($1, $2, $3, $4, $5, $6, 'waiting_for_proofs', now(), now())
                     ON CONFLICT(l1_batch_number, circuit_id, depth)
                     DO UPDATE SET updated_at=now()",
                 block_number.0 as i64,
                 circuit_id as i16,
                 depth as i32,
                 aggregations_url,
-                number_of_dependent_jobs
+                number_of_dependent_jobs,
+                protocol_version_id as i32,
             )
             .fetch_optional(self.storage.conn())
             .await
@@ -628,16 +665,23 @@ impl FriWitnessGeneratorDal<'_, '_> {
         .collect()
     }
 
-    pub async fn get_next_scheduler_witness_job(&mut self) -> Option<L1BatchNumber> {
+    pub async fn get_next_scheduler_witness_job(
+        &mut self,
+        protocol_versions: &[FriProtocolVersionId],
+        picked_by: &str,
+    ) -> Option<L1BatchNumber> {
+        let protocol_versions: Vec<i32> = protocol_versions.iter().map(|&id| id as i32).collect();
         let result: Option<L1BatchNumber> = sqlx::query!(
             "
                 UPDATE scheduler_witness_jobs_fri
                 SET status = 'in_progress', attempts = attempts + 1,
-                    updated_at = now(), processing_started_at = now()
+                    updated_at = now(), processing_started_at = now(),
+                    picked_by = $2
                 WHERE l1_batch_number = (
                     SELECT l1_batch_number
                     FROM scheduler_witness_jobs_fri
                     WHERE status = 'queued'
+                    AND protocol_version = ANY($1)
                     ORDER BY l1_batch_number ASC
                     LIMIT 1
                     FOR UPDATE
@@ -645,6 +689,8 @@ impl FriWitnessGeneratorDal<'_, '_> {
                 )
                 RETURNING scheduler_witness_jobs_fri.*
                ",
+            &protocol_versions[..],
+            picked_by,
         )
         .fetch_optional(self.storage.conn())
         .await
@@ -724,4 +770,22 @@ impl FriWitnessGeneratorDal<'_, '_> {
             AggregationRound::Scheduler => "scheduler_witness_jobs_fri",
         }
     }
+
+    pub async fn protocol_version_for_l1_batch(
+        &mut self,
+        l1_batch_number: L1BatchNumber,
+    ) -> FriProtocolVersionId {
+        sqlx::query!(
+            "SELECT protocol_version \
+             FROM witness_inputs_fri \
+             WHERE l1_batch_number = $1",
+            l1_batch_number.0 as i64,
+        )
+        .fetch_one(self.storage.conn())
+        .await
+        .unwrap()
+        .protocol_version
+        .map(|id| FriProtocolVersionId::try_from(id as u16).unwrap())
+        .unwrap()
+    }
 }
diff --git a/core/lib/dal/src/instrument.rs b/core/lib/dal/src/instrument.rs
index f5b33f2977a1..8599ed0911f2 100644
--- a/core/lib/dal/src/instrument.rs
+++ b/core/lib/dal/src/instrument.rs
@@ -148,7 +148,7 @@ impl<'a> InstrumentedData<'a> {
         let output = match output {
             Ok(output) => output,
             Err(_) => {
-                vlog::warn!(
+                tracing::warn!(
                     "Query {name}{args} called at {file}:{line} is executing for more than {SLOW_QUERY_TIMEOUT:?}",
                     file = location.file(),
                     line = location.line()
@@ -165,14 +165,14 @@ impl<'a> InstrumentedData<'a> {
         }
 
         if let Err(err) = &output {
-            vlog::warn!(
+            tracing::warn!(
                 "Query {name}{args} called at {file}:{line} has resulted in error: {err}",
                 file = location.file(),
                 line = location.line()
             );
             metrics::increment_counter!("dal.request.error", "method" => name);
         } else if is_slow {
-            vlog::info!(
+            tracing::info!(
                 "Slow query {name}{args} called at {file}:{line} has finished after {elapsed:?}",
                 file = location.file(),
                 line = location.line()
diff --git a/core/lib/dal/src/lib.rs b/core/lib/dal/src/lib.rs
index 556850ee4a44..59ab4a1daa1a 100644
--- a/core/lib/dal/src/lib.rs
+++ b/core/lib/dal/src/lib.rs
@@ -6,6 +6,7 @@ use std::env;
 pub use sqlx::Error as SqlxError;
 use sqlx::{postgres::Postgres, Connection, PgConnection, Transaction};
 // External imports
+use anyhow::Context as _;
 use sqlx::pool::PoolConnection;
 pub use sqlx::types::BigDecimal;
 
@@ -20,6 +21,8 @@ use crate::eth_sender_dal::EthSenderDal;
 use crate::events_dal::EventsDal;
 use crate::events_web3_dal::EventsWeb3Dal;
 use crate::fri_gpu_prover_queue_dal::FriGpuProverQueueDal;
+use crate::fri_proof_compressor_dal::FriProofCompressorDal;
+use crate::fri_protocol_versions_dal::FriProtocolVersionsDal;
 use crate::fri_prover_dal::FriProverDal;
 use crate::fri_scheduler_dependency_tracker_dal::FriSchedulerDependencyTrackerDal;
 use crate::fri_witness_generator_dal::FriWitnessGeneratorDal;
@@ -50,6 +53,8 @@ pub mod eth_sender_dal;
 pub mod events_dal;
 pub mod events_web3_dal;
 pub mod fri_gpu_prover_queue_dal;
+pub mod fri_proof_compressor_dal;
+pub mod fri_protocol_versions_dal;
 pub mod fri_prover_dal;
 pub mod fri_scheduler_dependency_tracker_dal;
 pub mod fri_witness_generator_dal;
@@ -77,23 +82,29 @@ pub mod witness_generator_dal;
 mod tests;
 
 /// Obtains the master database URL from the environment variable.
-pub fn get_master_database_url() -> String {
-    env::var("DATABASE_URL").expect("DATABASE_URL must be set")
+pub fn get_master_database_url() -> anyhow::Result<String> {
+    env::var("DATABASE_URL").context("DATABASE_URL must be set")
 }
 
 /// Obtains the master prover database URL from the environment variable.
-pub fn get_prover_database_url() -> String {
-    env::var("DATABASE_PROVER_URL").unwrap_or_else(|_| get_master_database_url())
+pub fn get_prover_database_url() -> anyhow::Result<String> {
+    match env::var("DATABASE_PROVER_URL") {
+        Ok(url) => Ok(url),
+        Err(_) => get_master_database_url(),
+    }
 }
 
 /// Obtains the replica database URL from the environment variable.
-pub fn get_replica_database_url() -> String {
-    env::var("DATABASE_REPLICA_URL").unwrap_or_else(|_| get_master_database_url())
+pub fn get_replica_database_url() -> anyhow::Result<String> {
+    match env::var("DATABASE_REPLICA_URL") {
+        Ok(url) => Ok(url),
+        Err(_) => get_master_database_url(),
+    }
 }
 
 /// Obtains the test database URL from the environment variable.
-pub fn get_test_database_url() -> String {
-    env::var("TEST_DATABASE_URL").expect("TEST_DATABASE_URL must be set")
+pub fn get_test_database_url() -> anyhow::Result<String> {
+    env::var("TEST_DATABASE_URL").context("TEST_DATABASE_URL must be set")
 }
 
 /// Storage processor is the main storage interaction point.
@@ -106,17 +117,21 @@ pub struct StorageProcessor<'a> {
 }
 
 impl<'a> StorageProcessor<'a> {
-    pub async fn establish_connection(connect_to_master: bool) -> StorageProcessor<'static> {
+    pub async fn establish_connection(
+        connect_to_master: bool,
+    ) -> anyhow::Result<StorageProcessor<'static>> {
         let database_url = if connect_to_master {
-            get_master_database_url()
+            get_master_database_url()?
         } else {
-            get_replica_database_url()
+            get_replica_database_url()?
         };
-        let connection = PgConnection::connect(&database_url).await.unwrap();
-        StorageProcessor {
+        let connection = PgConnection::connect(&database_url)
+            .await
+            .context("PgConnectio::connect()")?;
+        Ok(StorageProcessor {
             conn: ConnectionHolder::Direct(connection),
             in_transaction: false,
-        }
+        })
     }
 
     pub async fn start_transaction<'c: 'b, 'b>(&'c mut self) -> StorageProcessor<'b> {
@@ -279,4 +294,12 @@ impl<'a> StorageProcessor<'a> {
     pub fn fri_gpu_prover_queue_dal(&mut self) -> FriGpuProverQueueDal<'_, 'a> {
         FriGpuProverQueueDal { storage: self }
     }
+
+    pub fn fri_protocol_versions_dal(&mut self) -> FriProtocolVersionsDal<'_, 'a> {
+        FriProtocolVersionsDal { storage: self }
+    }
+
+    pub fn fri_proof_compressor_dal(&mut self) -> FriProofCompressorDal<'_, 'a> {
+        FriProofCompressorDal { storage: self }
+    }
 }
diff --git a/core/lib/dal/src/models/storage_block.rs b/core/lib/dal/src/models/storage_block.rs
index 2dcef11ce85a..0b48c11756c9 100644
--- a/core/lib/dal/src/models/storage_block.rs
+++ b/core/lib/dal/src/models/storage_block.rs
@@ -91,6 +91,7 @@ fn convert_l2_to_l1_logs(raw_logs: Vec<Vec<u8>>) -> Vec<L2ToL1Log> {
         .collect()
 }
 
+// TODO (SMA-1635): Make these fields non optional in database
 fn convert_base_system_contracts_hashes(
     bootloader_code_hash: Option<Vec<u8>>,
     default_aa_code_hash: Option<Vec<u8>>,
@@ -106,6 +107,7 @@ fn convert_base_system_contracts_hashes(
 }
 
 /// Projection of the `l1_batches` table corresponding to [`L1BatchHeader`] + [`L1BatchMetadata`].
+// TODO(PLA-369): use `#[sqlx(flatten)]` once upgraded to newer `sqlx`
 #[derive(Debug, Clone, sqlx::FromRow)]
 pub struct StorageL1Batch {
     pub number: i64,
@@ -480,6 +482,12 @@ pub struct StorageMiniblockHeader {
     pub bootloader_code_hash: Option<Vec<u8>>,
     pub default_aa_code_hash: Option<Vec<u8>>,
     pub protocol_version: Option<i32>,
+
+    // The maximal number of virtual blocks that can be created with this miniblock.
+    // If this value is greater than zero, then at least 1 will be created, but no more than
+    // min(virtual_blocks, miniblock_number - virtual_block_number), i.e. making sure that virtual blocks
+    // never go beyond the miniblock they are based on.
+    pub virtual_blocks: i64,
 }
 
 impl From<StorageMiniblockHeader> for MiniblockHeader {
@@ -498,6 +506,7 @@ impl From<StorageMiniblockHeader> for MiniblockHeader {
                 row.default_aa_code_hash,
             ),
             protocol_version: row.protocol_version.map(|v| (v as u16).try_into().unwrap()),
+            virtual_blocks: row.virtual_blocks as u32,
         }
     }
 }
diff --git a/core/lib/dal/src/models/storage_eth_tx.rs b/core/lib/dal/src/models/storage_eth_tx.rs
index e37d5c7d5376..ed5a732ff792 100644
--- a/core/lib/dal/src/models/storage_eth_tx.rs
+++ b/core/lib/dal/src/models/storage_eth_tx.rs
@@ -17,6 +17,7 @@ pub struct StorageEthTx {
     pub predicted_gas_cost: i64,
     pub created_at: NaiveDateTime,
     pub updated_at: NaiveDateTime,
+    // TODO (SMA-1614): remove the field
     pub sent_at_block: Option<i32>,
 }
 
diff --git a/core/lib/dal/src/models/storage_sync.rs b/core/lib/dal/src/models/storage_sync.rs
index 4cec6bdce815..127d6442c4ac 100644
--- a/core/lib/dal/src/models/storage_sync.rs
+++ b/core/lib/dal/src/models/storage_sync.rs
@@ -1,4 +1,4 @@
-use std::str::FromStr;
+use std::{convert::TryInto, str::FromStr};
 
 use sqlx::types::chrono::{DateTime, NaiveDateTime, Utc};
 
@@ -27,6 +27,9 @@ pub struct StorageSyncBlock {
     pub bootloader_code_hash: Option<Vec<u8>>,
     pub default_aa_code_hash: Option<Vec<u8>>,
     pub fee_account_address: Option<Vec<u8>>, // May be None if the block is not yet sealed
+    pub protocol_version: i32,
+    pub virtual_blocks: i64,
+    pub hash: Vec<u8>,
 }
 
 impl StorageSyncBlock {
@@ -67,6 +70,7 @@ impl StorageSyncBlock {
                 .map(|executed_at| DateTime::<Utc>::from_utc(executed_at, Utc)),
             l1_gas_price: self.l1_gas_price as u64,
             l2_fair_gas_price: self.l2_fair_gas_price as u64,
+            // TODO (SMA-1635): Make these filed non optional in database
             base_system_contracts_hashes: BaseSystemContractsHashes {
                 bootloader: self
                     .bootloader_code_hash
@@ -82,6 +86,9 @@ impl StorageSyncBlock {
                 .map(|fee_account_address| Address::from_slice(&fee_account_address))
                 .unwrap_or(current_operator_address),
             transactions,
+            virtual_blocks: Some(self.virtual_blocks as u32),
+            hash: Some(H256::from_slice(&self.hash)),
+            protocol_version: (self.protocol_version as u16).try_into().unwrap(),
         }
     }
 }
diff --git a/core/lib/dal/src/models/storage_token.rs b/core/lib/dal/src/models/storage_token.rs
index 92eeff39e187..8b9779577d44 100644
--- a/core/lib/dal/src/models/storage_token.rs
+++ b/core/lib/dal/src/models/storage_token.rs
@@ -38,7 +38,7 @@ impl From<StorageTokenPrice> for Option<TokenPrice> {
             }),
             (None, None) => None,
             _ => {
-                vlog::warn!(
+                tracing::warn!(
                     "Found storage token with {:?} `usd_price` and {:?} `usd_price_updated_at`",
                     price.usd_price,
                     price.usd_price_updated_at
diff --git a/core/lib/dal/src/models/storage_transaction.rs b/core/lib/dal/src/models/storage_transaction.rs
index 65db0e05918a..1cf20a7dc19f 100644
--- a/core/lib/dal/src/models/storage_transaction.rs
+++ b/core/lib/dal/src/models/storage_transaction.rs
@@ -2,25 +2,25 @@ use std::{convert::TryInto, str::FromStr};
 
 use crate::BigDecimal;
 use bigdecimal::Zero;
-use serde::{Deserialize, Serialize};
-use sqlx::{
-    postgres::PgRow,
-    types::chrono::{DateTime, NaiveDateTime, Utc},
-    Error, FromRow, Row,
-};
 
+use serde::{Deserialize, Serialize};
+use sqlx::postgres::PgRow;
+use sqlx::types::chrono::{DateTime, NaiveDateTime, Utc};
+use sqlx::{Error, FromRow, Row};
+
+use zksync_types::l2::TransactionType;
+use zksync_types::protocol_version::ProtocolUpgradeTxCommonData;
+use zksync_types::transaction_request::PaymasterParams;
+use zksync_types::vm_trace::Call;
+use zksync_types::web3::types::U64;
+use zksync_types::{api, Bytes, ExecuteTransactionCommon};
 use zksync_types::{
-    api::{self, TransactionDetails, TransactionStatus},
+    api::{TransactionDetails, TransactionStatus},
     fee::Fee,
     l1::{OpProcessingType, PriorityQueueType},
-    l2::TransactionType,
-    protocol_version::ProtocolUpgradeTxCommonData,
-    transaction_request::PaymasterParams,
-    vm_trace::Call,
-    web3::types::U64,
-    Address, Execute, ExecuteTransactionCommon, L1TxCommonData, L2ChainId, L2TxCommonData, Nonce,
-    PackedEthSignature, PriorityOpId, Transaction, EIP_1559_TX_TYPE, EIP_2930_TX_TYPE,
-    EIP_712_TX_TYPE, H160, H256, PRIORITY_OPERATION_L2_TX_TYPE, PROTOCOL_UPGRADE_TX_TYPE, U256,
+    Address, Execute, L1TxCommonData, L2ChainId, L2TxCommonData, Nonce, PackedEthSignature,
+    PriorityOpId, Transaction, EIP_1559_TX_TYPE, EIP_2930_TX_TYPE, EIP_712_TX_TYPE, H160, H256,
+    PRIORITY_OPERATION_L2_TX_TYPE, PROTOCOL_UPGRADE_TX_TYPE, U256,
 };
 use zksync_utils::bigdecimal_to_u256;
 
@@ -303,13 +303,16 @@ impl From<StorageTransaction> for Transaction {
                 common_data: ExecuteTransactionCommon::L1(tx.into()),
                 execute,
                 received_timestamp_ms,
+                raw_bytes: None,
             },
             Some(t) if t == PROTOCOL_UPGRADE_TX_TYPE as i32 => Transaction {
                 common_data: ExecuteTransactionCommon::ProtocolUpgrade(tx.into()),
                 execute,
                 received_timestamp_ms,
+                raw_bytes: None,
             },
             _ => Transaction {
+                raw_bytes: tx.input.clone().map(Bytes::from),
                 common_data: ExecuteTransactionCommon::L2(tx.into()),
                 execute,
                 received_timestamp_ms,
@@ -465,7 +468,7 @@ impl From<StorageTransactionDetails> for TransactionDetails {
             is_l1_originated: tx_details.is_priority,
             status,
             fee,
-            gas_per_pubdata: Some(gas_per_pubdata),
+            gas_per_pubdata,
             initiator_address,
             received_at,
             eth_commit_tx_hash,
diff --git a/core/lib/dal/src/models/storage_witness_job_info.rs b/core/lib/dal/src/models/storage_witness_job_info.rs
index 376325f2e910..1f551fd47614 100644
--- a/core/lib/dal/src/models/storage_witness_job_info.rs
+++ b/core/lib/dal/src/models/storage_witness_job_info.rs
@@ -1,7 +1,6 @@
-use sqlx::types::chrono::{DateTime, Utc};
+use sqlx::types::chrono::{DateTime, NaiveDateTime, NaiveTime, Utc};
 use std::convert::TryFrom;
 use std::str::FromStr;
-use vlog::__chrono::{NaiveDateTime, NaiveTime};
 use zksync_types::proofs::{
     AggregationRound, JobPosition, WitnessJobInfo, WitnessJobStatus, WitnessJobStatusFailed,
     WitnessJobStatusSuccessful,
diff --git a/core/lib/dal/src/proof_generation_dal.rs b/core/lib/dal/src/proof_generation_dal.rs
index 66d9c532a5d0..d5fd3079dc18 100644
--- a/core/lib/dal/src/proof_generation_dal.rs
+++ b/core/lib/dal/src/proof_generation_dal.rs
@@ -4,12 +4,25 @@ use zksync_types::L1BatchNumber;
 
 use crate::time_utils::pg_interval_from_duration;
 use crate::{SqlxError, StorageProcessor};
+use strum::{Display, EnumString};
 
 #[derive(Debug)]
 pub struct ProofGenerationDal<'a, 'c> {
     pub(crate) storage: &'a mut StorageProcessor<'c>,
 }
 
+#[derive(Debug, EnumString, Display)]
+enum ProofGenerationJobStatus {
+    #[strum(serialize = "ready_to_be_proven")]
+    ReadyToBeProven,
+    #[strum(serialize = "picked_by_prover")]
+    PickedByProver,
+    #[strum(serialize = "generated")]
+    Generated,
+    #[strum(serialize = "skipped")]
+    Skipped,
+}
+
 impl ProofGenerationDal<'_, '_> {
     pub async fn get_next_block_to_be_proven(
         &mut self,
@@ -59,4 +72,41 @@ impl ProofGenerationDal<'_, '_> {
         .then_some(())
         .ok_or(sqlx::Error::RowNotFound)
     }
+
+    pub async fn insert_proof_generation_details(
+        &mut self,
+        block_number: L1BatchNumber,
+        proof_gen_data_blob_url: &str,
+    ) {
+        sqlx::query!(
+            "INSERT INTO proof_generation_details \
+             (l1_batch_number, status, proof_gen_data_blob_url, created_at, updated_at) \
+             VALUES ($1, 'ready_to_be_proven', $2, now(), now()) \
+             ON CONFLICT (l1_batch_number) DO NOTHING",
+            block_number.0 as i64,
+            proof_gen_data_blob_url,
+        )
+        .execute(self.storage.conn())
+        .await
+        .unwrap();
+    }
+
+    pub async fn mark_proof_generation_job_as_skipped(
+        &mut self,
+        block_number: L1BatchNumber,
+    ) -> Result<(), SqlxError> {
+        sqlx::query!(
+            "UPDATE proof_generation_details \
+             SET status=$1, updated_at = now() \
+             WHERE l1_batch_number = $2",
+            ProofGenerationJobStatus::Skipped.to_string(),
+            block_number.0 as i64,
+        )
+        .execute(self.storage.conn())
+        .await?
+        .rows_affected()
+        .eq(&1)
+        .then_some(())
+        .ok_or(sqlx::Error::RowNotFound)
+    }
 }
diff --git a/core/lib/dal/src/protocol_versions_dal.rs b/core/lib/dal/src/protocol_versions_dal.rs
index 65994f82c3b2..7495a98f60d6 100644
--- a/core/lib/dal/src/protocol_versions_dal.rs
+++ b/core/lib/dal/src/protocol_versions_dal.rs
@@ -1,8 +1,8 @@
 use std::convert::{TryFrom, TryInto};
-use zksync_contracts::BaseSystemContracts;
+use zksync_contracts::{BaseSystemContracts, BaseSystemContractsHashes};
 use zksync_types::{
     protocol_version::{L1VerifierConfig, ProtocolUpgradeTx, ProtocolVersion, VerifierParams},
-    ProtocolVersionId, H256,
+    Address, ProtocolVersionId, H256,
 };
 
 use crate::models::storage_protocol_version::{
@@ -16,11 +16,39 @@ pub struct ProtocolVersionsDal<'a, 'c> {
 }
 
 impl ProtocolVersionsDal<'_, '_> {
-    pub async fn save_protocol_version(&mut self, version: ProtocolVersion) {
-        let tx_hash = version
-            .tx
-            .as_ref()
-            .map(|tx| tx.common_data.hash().0.to_vec());
+    pub async fn save_protocol_version(
+        &mut self,
+        id: ProtocolVersionId,
+        timestamp: u64,
+        l1_verifier_config: L1VerifierConfig,
+        base_system_contracts_hashes: BaseSystemContractsHashes,
+        verifier_address: Address,
+        tx_hash: Option<H256>,
+    ) {
+        sqlx::query!(
+                "INSERT INTO protocol_versions \
+                    (id, timestamp, recursion_scheduler_level_vk_hash, recursion_node_level_vk_hash, \
+                        recursion_leaf_level_vk_hash, recursion_circuits_set_vks_hash, bootloader_code_hash, \
+                        default_account_code_hash, verifier_address, upgrade_tx_hash, created_at) \
+                VALUES ($1, $2, $3, $4, $5, $6, $7, $8, $9, $10, now())",
+                id as i32,
+                timestamp as i64,
+                l1_verifier_config.recursion_scheduler_level_vk_hash.as_bytes(),
+                l1_verifier_config.params.recursion_node_level_vk_hash.as_bytes(),
+                l1_verifier_config.params.recursion_leaf_level_vk_hash.as_bytes(),
+                l1_verifier_config.params.recursion_circuits_set_vks_hash.as_bytes(),
+                base_system_contracts_hashes.bootloader.as_bytes(),
+                base_system_contracts_hashes.default_aa.as_bytes(),
+                verifier_address.as_bytes(),
+                tx_hash.map(|tx_hash| tx_hash.0.to_vec()),
+            )
+            .execute(self.storage.conn())
+            .await
+            .unwrap();
+    }
+
+    pub async fn save_protocol_version_with_tx(&mut self, version: ProtocolVersion) {
+        let tx_hash = version.tx.as_ref().map(|tx| tx.common_data.hash());
 
         let mut db_transaction = self.storage.start_transaction().await;
         if let Some(tx) = version.tx {
@@ -30,12 +58,27 @@ impl ProtocolVersionsDal<'_, '_> {
                 .await;
         }
 
+        db_transaction
+            .protocol_versions_dal()
+            .save_protocol_version(
+                version.id,
+                version.timestamp,
+                version.l1_verifier_config,
+                version.base_system_contracts_hashes,
+                version.verifier_address,
+                tx_hash,
+            )
+            .await;
+
+        db_transaction.commit().await;
+    }
+
+    pub async fn save_prover_protocol_version(&mut self, version: ProtocolVersion) {
         sqlx::query!(
-                "INSERT INTO protocol_versions
+                "INSERT INTO prover_protocol_versions
                     (id, timestamp, recursion_scheduler_level_vk_hash, recursion_node_level_vk_hash,
-                        recursion_leaf_level_vk_hash, recursion_circuits_set_vks_hash, bootloader_code_hash,
-                        default_account_code_hash, verifier_address, upgrade_tx_hash, created_at)
-                VALUES ($1, $2, $3, $4, $5, $6, $7, $8, $9, $10, now())
+                        recursion_leaf_level_vk_hash, recursion_circuits_set_vks_hash, verifier_address, created_at)
+                VALUES ($1, $2, $3, $4, $5, $6, $7, now())
                 ",
                 version.id as i32,
                 version.timestamp as i64,
@@ -43,16 +86,11 @@ impl ProtocolVersionsDal<'_, '_> {
                 version.l1_verifier_config.params.recursion_node_level_vk_hash.as_bytes(),
                 version.l1_verifier_config.params.recursion_leaf_level_vk_hash.as_bytes(),
                 version.l1_verifier_config.params.recursion_circuits_set_vks_hash.as_bytes(),
-                version.base_system_contracts_hashes.bootloader.as_bytes(),
-                version.base_system_contracts_hashes.default_aa.as_bytes(),
                 version.verifier_address.as_bytes(),
-                tx_hash
             )
-                .execute(db_transaction.conn())
-                .await
-                .unwrap();
-
-        db_transaction.commit().await;
+            .execute(self.storage.conn())
+            .await
+            .unwrap();
     }
 
     pub async fn base_system_contracts_by_timestamp(
@@ -125,23 +163,26 @@ impl ProtocolVersionsDal<'_, '_> {
         .fetch_optional(self.storage.conn())
         .await
         .unwrap()?;
-        let tx = match storage_protocol_version.upgrade_tx_hash.as_ref() {
-            Some(hash) => Some(
-                self.storage
-                    .transactions_dal()
-                    .get_tx_by_hash(H256::from_slice(hash.as_slice()))
-                    .await
-                    .unwrap_or_else(|| {
-                        panic!(
-                            "Missing upgrade tx for protocol version {}",
-                            version_id as u16
-                        );
-                    })
-                    .try_into()
-                    .unwrap(),
-            ),
-            None => None,
-        };
+        let tx = self
+            .get_protocol_upgrade_tx((storage_protocol_version.id as u16).try_into().unwrap())
+            .await;
+
+        Some(protocol_version_from_storage(storage_protocol_version, tx))
+    }
+
+    pub async fn get_protocol_version(
+        &mut self,
+        version_id: ProtocolVersionId,
+    ) -> Option<ProtocolVersion> {
+        let storage_protocol_version: StorageProtocolVersion = sqlx::query_as!(
+            StorageProtocolVersion,
+            "SELECT * FROM protocol_versions WHERE id = $1",
+            version_id as i32
+        )
+        .fetch_optional(self.storage.conn())
+        .await
+        .unwrap()?;
+        let tx = self.get_protocol_upgrade_tx(version_id).await;
 
         Some(protocol_version_from_storage(storage_protocol_version, tx))
     }
@@ -234,7 +275,7 @@ impl ProtocolVersionsDal<'_, '_> {
         sqlx::query!(
             r#"
                 SELECT id
-                FROM protocol_versions
+                FROM prover_protocol_versions
                 WHERE recursion_circuits_set_vks_hash = $1
                 AND recursion_leaf_level_vk_hash = $2
                 AND recursion_node_level_vk_hash = $3
@@ -261,4 +302,17 @@ impl ProtocolVersionsDal<'_, '_> {
         .map(|row| ProtocolVersionId::try_from(row.id as u16).unwrap())
         .collect()
     }
+
+    pub async fn prover_protocol_version_exists(&mut self, id: ProtocolVersionId) -> bool {
+        sqlx::query!(
+            "SELECT COUNT(*) as \"count!\" FROM prover_protocol_versions \
+            WHERE id = $1",
+            id as i32
+        )
+        .fetch_one(self.storage.conn())
+        .await
+        .unwrap()
+        .count
+            > 0
+    }
 }
diff --git a/core/lib/dal/src/prover_dal.rs b/core/lib/dal/src/prover_dal.rs
index 29bef1db6ae9..fff52cd26feb 100644
--- a/core/lib/dal/src/prover_dal.rs
+++ b/core/lib/dal/src/prover_dal.rs
@@ -456,7 +456,7 @@ impl ProverDal<'_, '_> {
             .map(|ss| {
                 {
                     // Until statuses are enums
-                    let whitelist = vec!["queued", "in_progress", "successful", "failed"];
+                    let whitelist = ["queued", "in_progress", "successful", "failed"];
                     if !ss.iter().all(|x| whitelist.contains(&x.as_str())) {
                         panic!("Forbidden value in statuses list.")
                     }
diff --git a/core/lib/dal/src/storage_logs_dal.rs b/core/lib/dal/src/storage_logs_dal.rs
index 90e05106b794..ad9a6f401f47 100644
--- a/core/lib/dal/src/storage_logs_dal.rs
+++ b/core/lib/dal/src/storage_logs_dal.rs
@@ -1,4 +1,5 @@
 use sqlx::types::chrono::Utc;
+use sqlx::Row;
 
 use std::{collections::HashMap, time::Instant};
 
@@ -73,13 +74,15 @@ impl StorageLogsDal<'_, '_> {
         logs: &[(H256, Vec<StorageLog>)],
     ) {
         let operation_number = sqlx::query!(
-            "SELECT COUNT(*) as \"count!\" FROM storage_logs WHERE miniblock_number = $1",
+            "SELECT MAX(operation_number) as \"max?\" FROM storage_logs WHERE miniblock_number = $1",
             block_number.0 as i64
         )
         .fetch_one(self.storage.conn())
         .await
         .unwrap()
-        .count as u32;
+        .max
+        .map(|max| max as u32 + 1)
+        .unwrap_or(0);
 
         self.insert_storage_logs_inner(block_number, logs, operation_number)
             .await;
@@ -91,7 +94,7 @@ impl StorageLogsDal<'_, '_> {
         let modified_keys = self
             .modified_keys_since_miniblock(last_miniblock_to_keep)
             .await;
-        vlog::info!(
+        tracing::info!(
             "Loaded {} keys changed after miniblock #{last_miniblock_to_keep} in {:?}",
             modified_keys.len(),
             stage_start.elapsed()
@@ -101,7 +104,7 @@ impl StorageLogsDal<'_, '_> {
         let prev_values = self
             .get_storage_values(&modified_keys, last_miniblock_to_keep)
             .await;
-        vlog::info!(
+        tracing::info!(
             "Loaded previous storage values for modified keys in {:?}",
             stage_start.elapsed()
         );
@@ -118,7 +121,7 @@ impl StorageLogsDal<'_, '_> {
                 keys_to_delete.push(key.as_bytes());
             }
         }
-        vlog::info!(
+        tracing::info!(
             "Created revert plan (keys to update: {}, to delete: {}) in {:?}",
             keys_to_update.len(),
             keys_to_delete.len(),
@@ -133,7 +136,7 @@ impl StorageLogsDal<'_, '_> {
         .execute(self.storage.conn())
         .await
         .unwrap();
-        vlog::info!(
+        tracing::info!(
             "Removed {} keys in {:?}",
             keys_to_delete.len(),
             stage_start.elapsed()
@@ -150,7 +153,7 @@ impl StorageLogsDal<'_, '_> {
         .execute(self.storage.conn())
         .await
         .unwrap();
-        vlog::info!(
+        tracing::info!(
             "Updated {} keys to previous values in {:?}",
             keys_to_update.len(),
             stage_start.elapsed()
@@ -254,7 +257,7 @@ impl StorageLogsDal<'_, '_> {
         let stage_start = Instant::now();
         let mut modified_keys = self.modified_keys_since_miniblock(last_miniblock).await;
         let modified_keys_count = modified_keys.len();
-        vlog::info!(
+        tracing::info!(
             "Fetched {modified_keys_count} keys changed after miniblock #{last_miniblock} in {:?}",
             stage_start.elapsed()
         );
@@ -265,7 +268,7 @@ impl StorageLogsDal<'_, '_> {
         // the incorrect state after revert.
         let stage_start = Instant::now();
         let l1_batch_by_key = self.get_l1_batches_for_initial_writes(&modified_keys).await;
-        vlog::info!(
+        tracing::info!(
             "Loaded initial write info for modified keys in {:?}",
             stage_start.elapsed()
         );
@@ -286,13 +289,13 @@ impl StorageLogsDal<'_, '_> {
                 Some(_) => true,
             }
         });
-        vlog::info!(
+        tracing::info!(
             "Filtered modified keys per initial writes in {:?}",
             stage_start.elapsed()
         );
 
         let deduped_count = modified_keys_count - l1_batch_by_key.len();
-        vlog::info!(
+        tracing::info!(
             "Keys to update: {update_count}, to delete: {delete_count}; {deduped_count} modified keys \
              are deduped and will be ignored",
             update_count = modified_keys.len(),
@@ -303,7 +306,7 @@ impl StorageLogsDal<'_, '_> {
         let prev_values_for_updated_keys = self
             .get_storage_values(&modified_keys, last_miniblock)
             .await;
-        vlog::info!(
+        tracing::info!(
             "Loaded previous values for {} keys in {:?}",
             prev_values_for_updated_keys.len(),
             stage_start.elapsed()
@@ -371,7 +374,7 @@ impl StorageLogsDal<'_, '_> {
     }
 
     /// Returns current values for the specified keys at the specified `miniblock_number`.
-    async fn get_storage_values(
+    pub async fn get_storage_values(
         &mut self,
         hashed_keys: &[H256],
         miniblock_number: MiniblockNumber,
@@ -426,6 +429,90 @@ impl StorageLogsDal<'_, '_> {
         })
         .collect()
     }
+
+    pub async fn get_miniblock_storage_logs(
+        &mut self,
+        miniblock_number: MiniblockNumber,
+    ) -> Vec<(H256, H256, u32)> {
+        self.get_miniblock_storage_logs_from_table(miniblock_number, "storage_logs")
+            .await
+    }
+
+    pub async fn retain_storage_logs(
+        &mut self,
+        miniblock_number: MiniblockNumber,
+        operation_numbers: &[i32],
+    ) {
+        sqlx::query!(
+            "DELETE FROM storage_logs \
+            WHERE miniblock_number = $1 AND operation_number != ALL($2)",
+            miniblock_number.0 as i64,
+            &operation_numbers
+        )
+        .execute(self.storage.conn())
+        .await
+        .unwrap();
+    }
+
+    /// Loads (hashed_key, value, operation_number) tuples for given miniblock_number.
+    /// Uses provided DB table.
+    /// Shouldn't be used in production.
+    pub async fn get_miniblock_storage_logs_from_table(
+        &mut self,
+        miniblock_number: MiniblockNumber,
+        table_name: &str,
+    ) -> Vec<(H256, H256, u32)> {
+        sqlx::query(&format!(
+            "SELECT hashed_key, value, operation_number FROM {table_name} \
+            WHERE miniblock_number = $1 \
+            ORDER BY operation_number"
+        ))
+        .bind(miniblock_number.0 as i64)
+        .fetch_all(self.storage.conn())
+        .await
+        .unwrap()
+        .into_iter()
+        .map(|row| {
+            let hashed_key = H256::from_slice(row.get("hashed_key"));
+            let value = H256::from_slice(row.get("value"));
+            let operation_number: u32 = row.get::<i32, &str>("operation_number") as u32;
+            (hashed_key, value, operation_number)
+        })
+        .collect()
+    }
+
+    /// Loads value for given hashed_key at given miniblock_number.
+    /// Uses provided DB table.
+    /// Shouldn't be used in production.
+    pub async fn get_storage_value_from_table(
+        &mut self,
+        hashed_key: H256,
+        miniblock_number: MiniblockNumber,
+        table_name: &str,
+    ) -> H256 {
+        let query_str = format!(
+            "SELECT value FROM {table_name} \
+                WHERE hashed_key = $1 AND miniblock_number <= $2 \
+                ORDER BY miniblock_number DESC, operation_number DESC LIMIT 1",
+        );
+        sqlx::query(&query_str)
+            .bind(hashed_key.as_bytes())
+            .bind(miniblock_number.0 as i64)
+            .fetch_optional(self.storage.conn())
+            .await
+            .unwrap()
+            .map(|row| H256::from_slice(row.get("value")))
+            .unwrap_or_else(H256::zero)
+    }
+
+    /// Vacuums `storage_logs` table.
+    /// Shouldn't be used in production.
+    pub async fn vacuum_storage_logs(&mut self) {
+        sqlx::query!("VACUUM storage_logs")
+            .execute(self.storage.conn())
+            .await
+            .unwrap();
+    }
 }
 
 #[cfg(test)]
@@ -474,7 +561,7 @@ mod tests {
             .await;
         conn.blocks_dal().delete_l1_batches(L1BatchNumber(0)).await;
         conn.protocol_versions_dal()
-            .save_protocol_version(ProtocolVersion::default())
+            .save_protocol_version_with_tx(ProtocolVersion::default())
             .await;
 
         let account = AccountTreeId::new(Address::repeat_byte(1));
@@ -562,7 +649,7 @@ mod tests {
             .await;
         conn.blocks_dal().delete_l1_batches(L1BatchNumber(0)).await;
         conn.protocol_versions_dal()
-            .save_protocol_version(ProtocolVersion::default())
+            .save_protocol_version_with_tx(ProtocolVersion::default())
             .await;
 
         let account = AccountTreeId::new(Address::repeat_byte(1));
@@ -613,7 +700,7 @@ mod tests {
             .await;
         conn.blocks_dal().delete_l1_batches(L1BatchNumber(0)).await;
         conn.protocol_versions_dal()
-            .save_protocol_version(ProtocolVersion::default())
+            .save_protocol_version_with_tx(ProtocolVersion::default())
             .await;
 
         let account = AccountTreeId::new(Address::repeat_byte(1));
diff --git a/core/lib/dal/src/storage_logs_dedup_dal.rs b/core/lib/dal/src/storage_logs_dedup_dal.rs
index 88cf9308cdf1..2b99000a48ae 100644
--- a/core/lib/dal/src/storage_logs_dedup_dal.rs
+++ b/core/lib/dal/src/storage_logs_dedup_dal.rs
@@ -1,9 +1,7 @@
 use crate::StorageProcessor;
 use sqlx::types::chrono::Utc;
 use std::collections::HashSet;
-use zksync_types::{
-    zk_evm::aux_structures::LogQuery, AccountTreeId, Address, L1BatchNumber, StorageKey, H256,
-};
+use zksync_types::{AccountTreeId, Address, L1BatchNumber, LogQuery, StorageKey, H256};
 use zksync_utils::u256_to_h256;
 
 #[derive(Debug)]
@@ -54,11 +52,7 @@ impl StorageLogsDedupDal<'_, '_> {
             .map(|key| StorageKey::raw_hashed_key(key.address(), key.key()).to_vec())
             .collect();
 
-        let last_index = self
-            .max_set_enumeration_index()
-            .await
-            .map(|(last_index, _)| last_index)
-            .unwrap_or(0);
+        let last_index = self.max_enumeration_index().await.unwrap_or(0);
         let indices: Vec<_> = ((last_index + 1)..=(last_index + hashed_keys.len() as u64))
             .map(|x| x as i64)
             .collect();
@@ -97,27 +91,19 @@ impl StorageLogsDedupDal<'_, '_> {
         .collect()
     }
 
-    pub async fn max_set_enumeration_index(&mut self) -> Option<(u64, L1BatchNumber)> {
-        sqlx::query!(
-            "SELECT index, l1_batch_number FROM initial_writes \
-            WHERE index IS NOT NULL \
-            ORDER BY index DESC LIMIT 1",
-        )
-        .fetch_optional(self.storage.conn())
-        .await
-        .unwrap()
-        .map(|row| {
-            (
-                row.index.unwrap() as u64,
-                L1BatchNumber(row.l1_batch_number as u32),
-            )
-        })
+    pub async fn max_enumeration_index(&mut self) -> Option<u64> {
+        sqlx::query!("SELECT MAX(index) as \"max?\" FROM initial_writes",)
+            .fetch_one(self.storage.conn())
+            .await
+            .unwrap()
+            .max
+            .map(|max| max as u64)
     }
 
     pub async fn initial_writes_for_batch(
         &mut self,
         l1_batch_number: L1BatchNumber,
-    ) -> Vec<(H256, Option<u64>)> {
+    ) -> Vec<(H256, u64)> {
         sqlx::query!(
             "SELECT hashed_key, index FROM initial_writes \
             WHERE l1_batch_number = $1 \
@@ -128,36 +114,10 @@ impl StorageLogsDedupDal<'_, '_> {
         .await
         .unwrap()
         .into_iter()
-        .map(|row| {
-            (
-                H256::from_slice(&row.hashed_key),
-                row.index.map(|i| i as u64),
-            )
-        })
+        .map(|row| (H256::from_slice(&row.hashed_key), row.index as u64))
         .collect()
     }
 
-    pub async fn set_indices_for_initial_writes(&mut self, indexed_keys: &[(H256, u64)]) {
-        let (hashed_keys, indices): (Vec<_>, Vec<_>) = indexed_keys
-            .iter()
-            .map(|(hashed_key, index)| (hashed_key.as_bytes(), *index as i64))
-            .unzip();
-        sqlx::query!(
-            "UPDATE initial_writes \
-                SET index = data_table.index \
-            FROM ( \
-                SELECT UNNEST($1::bytea[]) as hashed_key, \
-                    UNNEST($2::bigint[]) as index \
-            ) as data_table \
-            WHERE initial_writes.hashed_key = data_table.hashed_key",
-            &hashed_keys as &[&[u8]],
-            &indices,
-        )
-        .execute(self.storage.conn())
-        .await
-        .unwrap();
-    }
-
     /// Returns `hashed_keys` that are both present in the input and in `initial_writes` table.
     pub async fn filter_written_slots(&mut self, hashed_keys: &[H256]) -> HashSet<H256> {
         let hashed_keys: Vec<_> = hashed_keys.iter().map(H256::as_bytes).collect();
@@ -173,15 +133,4 @@ impl StorageLogsDedupDal<'_, '_> {
         .map(|row| H256::from_slice(&row.hashed_key))
         .collect()
     }
-
-    // Used only for tests.
-    pub async fn reset_indices(&mut self) {
-        sqlx::query!(
-            "UPDATE initial_writes \
-            SET index = NULL",
-        )
-        .execute(self.storage.conn())
-        .await
-        .unwrap();
-    }
 }
diff --git a/core/lib/dal/src/sync_dal.rs b/core/lib/dal/src/sync_dal.rs
index 09dcf7d853cb..068e117e42ac 100644
--- a/core/lib/dal/src/sync_dal.rs
+++ b/core/lib/dal/src/sync_dal.rs
@@ -38,6 +38,9 @@ impl SyncDal<'_, '_> {
                     miniblocks.l2_fair_gas_price,
                     miniblocks.bootloader_code_hash,
                     miniblocks.default_aa_code_hash,
+                    miniblocks.virtual_blocks,
+                    miniblocks.hash,
+                    miniblocks.protocol_version as "protocol_version!",
                     l1_batches.fee_account_address as "fee_account_address?"
                 FROM miniblocks
                 LEFT JOIN l1_batches ON miniblocks.l1_batch_number = l1_batches.number
diff --git a/core/lib/dal/src/tests/mod.rs b/core/lib/dal/src/tests/mod.rs
index 69843c93382a..e0d84e408787 100644
--- a/core/lib/dal/src/tests/mod.rs
+++ b/core/lib/dal/src/tests/mod.rs
@@ -4,7 +4,7 @@ use std::time::Duration;
 use db_test_macro::db_test;
 use zksync_contracts::BaseSystemContractsHashes;
 use zksync_types::{
-    block::{L1BatchHeader, MiniblockHeader},
+    block::{miniblock_hash, L1BatchHeader, MiniblockHeader},
     fee::{Fee, TransactionExecutionMetrics},
     helpers::unix_timestamp_ms,
     l1::{L1Tx, OpProcessingType, PriorityQueueType},
@@ -14,7 +14,6 @@ use zksync_types::{
     Address, Execute, L1BatchNumber, L1BlockNumber, L1TxCommonData, L2ChainId, MiniblockNumber,
     PriorityOpId, ProtocolVersion, ProtocolVersionId, H160, H256, MAX_GAS_PER_PUBDATA_BYTE, U256,
 };
-use zksync_utils::miniblock_hash;
 
 use crate::blocks_dal::BlocksDal;
 use crate::connection::ConnectionPool;
@@ -35,7 +34,7 @@ pub(crate) fn create_miniblock_header(number: u32) -> MiniblockHeader {
     MiniblockHeader {
         number: MiniblockNumber(number),
         timestamp: 0,
-        hash: miniblock_hash(MiniblockNumber(number)),
+        hash: miniblock_hash(MiniblockNumber(number), 0, H256::zero(), H256::zero()),
         l1_tx_count: 0,
         l2_tx_count: 0,
         base_fee_per_gas: 100,
@@ -43,6 +42,7 @@ pub(crate) fn create_miniblock_header(number: u32) -> MiniblockHeader {
         l2_fair_gas_price: 100,
         base_system_contracts_hashes: BaseSystemContractsHashes::default(),
         protocol_version: Some(ProtocolVersionId::default()),
+        virtual_blocks: 1,
     }
 }
 
@@ -168,7 +168,7 @@ async fn remove_stuck_txs(connection_pool: ConnectionPool) {
     let storage = &mut connection_pool.access_test_storage().await;
     let mut protocol_versions_dal = ProtocolVersionsDal { storage };
     protocol_versions_dal
-        .save_protocol_version(Default::default())
+        .save_protocol_version_with_tx(Default::default())
         .await;
 
     let storage = protocol_versions_dal.storage;
@@ -273,7 +273,11 @@ async fn test_duplicate_insert_prover_jobs(connection_pool: ConnectionPool) {
     let storage = &mut connection_pool.access_test_storage().await;
     storage
         .protocol_versions_dal()
-        .save_protocol_version(Default::default())
+        .save_protocol_version_with_tx(Default::default())
+        .await;
+    storage
+        .protocol_versions_dal()
+        .save_prover_protocol_version(Default::default())
         .await;
     let block_number = 1;
     let header = L1BatchHeader::new(
@@ -330,7 +334,11 @@ async fn test_requeue_prover_jobs(connection_pool: ConnectionPool) {
     let protocol_version = ProtocolVersion::default();
     storage
         .protocol_versions_dal()
-        .save_protocol_version(protocol_version)
+        .save_protocol_version_with_tx(protocol_version)
+        .await;
+    storage
+        .protocol_versions_dal()
+        .save_prover_protocol_version(Default::default())
         .await;
     let block_number = 1;
     let header = L1BatchHeader::new(
@@ -388,7 +396,11 @@ async fn test_move_leaf_aggregation_jobs_from_waiting_to_queued(connection_pool:
     let protocol_version = ProtocolVersion::default();
     storage
         .protocol_versions_dal()
-        .save_protocol_version(protocol_version)
+        .save_protocol_version_with_tx(protocol_version)
+        .await;
+    storage
+        .protocol_versions_dal()
+        .save_prover_protocol_version(Default::default())
         .await;
     let block_number = 1;
     let header = L1BatchHeader::new(
@@ -463,7 +475,11 @@ async fn test_move_node_aggregation_jobs_from_waiting_to_queued(connection_pool:
     let protocol_version = ProtocolVersion::default();
     storage
         .protocol_versions_dal()
-        .save_protocol_version(protocol_version)
+        .save_protocol_version_with_tx(protocol_version)
+        .await;
+    storage
+        .protocol_versions_dal()
+        .save_prover_protocol_version(Default::default())
         .await;
     let block_number = 1;
     let header = L1BatchHeader::new(
@@ -545,7 +561,11 @@ async fn test_move_scheduler_jobs_from_waiting_to_queued(connection_pool: Connec
     let protocol_version = ProtocolVersion::default();
     storage
         .protocol_versions_dal()
-        .save_protocol_version(protocol_version)
+        .save_protocol_version_with_tx(protocol_version)
+        .await;
+    storage
+        .protocol_versions_dal()
+        .save_prover_protocol_version(Default::default())
         .await;
     let block_number = 1;
     let header = L1BatchHeader::new(
diff --git a/core/lib/dal/src/transactions_dal.rs b/core/lib/dal/src/transactions_dal.rs
index 5760c7b84f2c..51498d23f1e6 100644
--- a/core/lib/dal/src/transactions_dal.rs
+++ b/core/lib/dal/src/transactions_dal.rs
@@ -356,7 +356,7 @@ impl TransactionsDal<'_, '_> {
                     panic!("{}", err);
                 }
             };
-            vlog::debug!(
+            tracing::debug!(
                 "{:?} l2 transaction {:?} to DB. init_acc {:?} nonce {:?} returned option {:?}",
                 l2_tx_insertion_result,
                 tx_hash,
@@ -997,8 +997,8 @@ impl TransactionsDal<'_, '_> {
 
         let from_miniblock = transactions_by_miniblock.first().unwrap().0;
         let to_miniblock = transactions_by_miniblock.last().unwrap().0;
-        let timestamps = sqlx::query!(
-            "SELECT timestamp FROM miniblocks WHERE number BETWEEN $1 AND $2 ORDER BY number",
+        let miniblock_data = sqlx::query!(
+            "SELECT timestamp, virtual_blocks FROM miniblocks WHERE number BETWEEN $1 AND $2 ORDER BY number",
             from_miniblock.0 as i64,
             to_miniblock.0 as i64,
         )
@@ -1006,14 +1006,41 @@ impl TransactionsDal<'_, '_> {
         .await
         .unwrap();
 
+        let prev_hashes = sqlx::query!(
+            "SELECT hash FROM miniblocks \
+            WHERE number BETWEEN $1 AND $2 \
+            ORDER BY number",
+            from_miniblock.0 as i64 - 1,
+            to_miniblock.0 as i64 - 1,
+        )
+        .fetch_all(self.storage.conn())
+        .await
+        .unwrap();
+
+        assert_eq!(
+            miniblock_data.len(),
+            transactions_by_miniblock.len(),
+            "Not enough miniblock data retrieved"
+        );
+        assert_eq!(
+            prev_hashes.len(),
+            transactions_by_miniblock.len(),
+            "Not enough previous hashes retrieved"
+        );
+
         transactions_by_miniblock
             .into_iter()
-            .zip(timestamps)
-            .map(|((number, txs), row)| MiniblockReexecuteData {
-                number,
-                timestamp: row.timestamp as u64,
-                txs,
-            })
+            .zip(miniblock_data)
+            .zip(prev_hashes)
+            .map(
+                |(((number, txs), miniblock_data_row), prev_hash_row)| MiniblockReexecuteData {
+                    number,
+                    timestamp: miniblock_data_row.timestamp as u64,
+                    prev_block_hash: H256::from_slice(&prev_hash_row.hash),
+                    virtual_blocks: miniblock_data_row.virtual_blocks as u32,
+                    txs,
+                },
+            )
             .collect()
     }
 
diff --git a/core/lib/dal/src/transactions_web3_dal.rs b/core/lib/dal/src/transactions_web3_dal.rs
index a56f93d93653..776b9b57f37b 100644
--- a/core/lib/dal/src/transactions_web3_dal.rs
+++ b/core/lib/dal/src/transactions_web3_dal.rs
@@ -94,7 +94,7 @@ impl TransactionsWeb3Dal<'_, '_> {
                         })
                         // For better compatibility with various clients, we never return null.
                         .or_else(|| Some(Address::default())),
-                    cumulative_gas_used: Default::default(),
+                    cumulative_gas_used: Default::default(), // TODO: Should be actually calculated (SMA-1183).
                     gas_used: {
                         let refunded_gas: U256 = db_row.refunded_gas.into();
                         db_row.gas_limit.map(|val| {
@@ -354,8 +354,9 @@ impl TransactionsWeb3Dal<'_, '_> {
 #[cfg(test)]
 mod tests {
     use db_test_macro::db_test;
-    use zksync_types::{fee::TransactionExecutionMetrics, l2::L2Tx, ProtocolVersion};
-    use zksync_utils::miniblock_hash;
+    use zksync_types::{
+        block::miniblock_hash, fee::TransactionExecutionMetrics, l2::L2Tx, ProtocolVersion,
+    };
 
     use super::*;
     use crate::{
@@ -387,7 +388,7 @@ mod tests {
     async fn getting_transaction(connection_pool: ConnectionPool) {
         let mut conn = connection_pool.access_test_storage().await;
         conn.protocol_versions_dal()
-            .save_protocol_version(ProtocolVersion::default())
+            .save_protocol_version_with_tx(ProtocolVersion::default())
             .await;
         let tx = mock_l2_transaction();
         let tx_hash = tx.hash();
@@ -396,7 +397,12 @@ mod tests {
         let block_ids = [
             api::BlockId::Number(api::BlockNumber::Latest),
             api::BlockId::Number(api::BlockNumber::Number(1.into())),
-            api::BlockId::Hash(miniblock_hash(MiniblockNumber(1))),
+            api::BlockId::Hash(miniblock_hash(
+                MiniblockNumber(1),
+                0,
+                H256::zero(),
+                H256::zero(),
+            )),
         ];
         let transaction_ids = block_ids
             .iter()
@@ -447,7 +453,7 @@ mod tests {
     async fn getting_miniblock_transactions(connection_pool: ConnectionPool) {
         let mut conn = connection_pool.access_test_storage().await;
         conn.protocol_versions_dal()
-            .save_protocol_version(ProtocolVersion::default())
+            .save_protocol_version_with_tx(ProtocolVersion::default())
             .await;
         let tx = mock_l2_transaction();
         let tx_hash = tx.hash();
diff --git a/core/lib/dal/src/witness_generator_dal.rs b/core/lib/dal/src/witness_generator_dal.rs
index a672f8495511..02e1fec1ac09 100644
--- a/core/lib/dal/src/witness_generator_dal.rs
+++ b/core/lib/dal/src/witness_generator_dal.rs
@@ -478,6 +478,7 @@ impl WitnessGeneratorDal<'_, '_> {
                     VALUES ($1, $2, $3, $4, $5, $6, $7, 'waiting_for_proofs', now(), now())
                     ",
                     block_number.0 as i64,
+                // TODO(SMA-1476): remove the below columns once blob is migrated to GCS.
                     vec![],
                     vec![],
                     basic_circuits_blob_url,
@@ -509,6 +510,7 @@ impl WitnessGeneratorDal<'_, '_> {
                     VALUES ($1, $2, $3, $4, 'waiting_for_artifacts', now(), now())
                     ",
                 block_number.0 as i64,
+                // TODO(SMA-1476): remove the below column once blob is migrated to GCS.
                 vec![],
                 scheduler_witness_blob_url,
                 protocol_version,
@@ -716,15 +718,22 @@ impl WitnessGeneratorDal<'_, '_> {
             .collect())
     }
 
-    pub async fn save_witness_inputs(&mut self, block_number: L1BatchNumber, object_key: &str) {
+    pub async fn save_witness_inputs(
+        &mut self,
+        block_number: L1BatchNumber,
+        object_key: &str,
+        protocol_version: Option<ProtocolVersionId>,
+    ) {
         {
             sqlx::query!(
-                "INSERT INTO witness_inputs(l1_batch_number, merkle_tree_paths, merkel_tree_paths_blob_url, status, created_at, updated_at) \
-                 VALUES ($1, $2, $3, 'queued', now(), now())
+                "INSERT INTO witness_inputs(l1_batch_number, merkle_tree_paths, merkel_tree_paths_blob_url, status, protocol_version, created_at, updated_at) \
+                 VALUES ($1, $2, $3, 'queued', $4, now(), now())
                  ON CONFLICT (l1_batch_number) DO NOTHING",
                 block_number.0 as i64,
+                // TODO(SMA-1476): remove the below column once blob is migrated to GCS.
                 vec![],
                 object_key,
+                protocol_version.map(|v| v as i32),
             )
                 .fetch_optional(self.storage.conn())
                 .await
diff --git a/core/lib/eth_client/Cargo.toml b/core/lib/eth_client/Cargo.toml
index 58af159aeda2..68ce89d18fdf 100644
--- a/core/lib/eth_client/Cargo.toml
+++ b/core/lib/eth_client/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "zksync_eth_client"
-version = "1.0.0"
+version = "0.1.0"
 edition = "2018"
 authors = ["The Matter Labs Team <hello@matterlabs.dev>"]
 homepage = "https://zksync.io/"
@@ -10,18 +10,17 @@ keywords = ["blockchain", "zksync"]
 categories = ["cryptography"]
 
 [dependencies]
-zksync_types = { path = "../types", version = "1.0" }
-zksync_eth_signer = { path = "../eth_signer", version = "1.0" }
-zksync_config = { path = "../config", version = "1.0" }
-zksync_contracts = { path = "../contracts", version = "1.0" }
-vlog = { path = "../../lib/vlog", version = "1.0" }
+zksync_types = { path = "../types" }
+zksync_eth_signer = { path = "../eth_signer" }
+zksync_config = { path = "../config" }
+zksync_contracts = { path = "../contracts" }
 jsonrpc-core = "18"
 
 serde = "1.0.90"
 hex = "0.4"
-
 anyhow = "1.0"
-metrics = "0.20"
+metrics = "0.21"
 thiserror = "1"
 tokio = { version = "1", features = ["full"] }
 async-trait = "0.1"
+tracing = "0.1"
diff --git a/core/lib/eth_client/src/clients/http/query.rs b/core/lib/eth_client/src/clients/http/query.rs
index 4e137f3da063..3df467844a0e 100644
--- a/core/lib/eth_client/src/clients/http/query.rs
+++ b/core/lib/eth_client/src/clients/http/query.rs
@@ -289,6 +289,10 @@ impl EthInterface for QueryClient {
         Ok(logs)
     }
 
+    // TODO (PLA-333): at the moment the latest version of `web3` crate doesn't have `Finalized` variant in `BlockNumber`.
+    // However, it's already added in github repo and probably will be included in the next released version.
+    // Scope of PLA-333 includes forking/using crate directly from github, after that we will be able to change
+    // type of `block_id` from `String` to `BlockId` and use `self.web3.eth().block(block_id)`.
     async fn block(
         &self,
         block_id: String,
diff --git a/core/lib/eth_client/src/clients/http/signing.rs b/core/lib/eth_client/src/clients/http/signing.rs
index f014abd78655..f6256d0b8434 100644
--- a/core/lib/eth_client/src/clients/http/signing.rs
+++ b/core/lib/eth_client/src/clients/http/signing.rs
@@ -55,7 +55,7 @@ impl PKSigningClient {
         let operator_address = PackedEthSignature::address_from_private_key(&operator_private_key)
             .expect("Failed to get address from private key");
 
-        vlog::info!("Operator address: {:?}", operator_address);
+        tracing::info!("Operator address: {:?}", operator_address);
 
         SigningClient::new(
             transport,
@@ -281,7 +281,7 @@ impl<S: EthereumSigner> BoundEthInterface for SigningClient<S> {
             // Verbosity level is set to `error`, since we expect all the transactions to have
             // a set limit, but don't want to crаsh the application if for some reason in some
             // place limit was not set.
-            vlog::error!(
+            tracing::error!(
                 "No gas limit was set for transaction, using the default limit: {}",
                 FALLBACK_GAS_LIMIT
             );
diff --git a/core/lib/eth_signer/Cargo.toml b/core/lib/eth_signer/Cargo.toml
index 46722ed4ee7e..c4efb0a7ea82 100644
--- a/core/lib/eth_signer/Cargo.toml
+++ b/core/lib/eth_signer/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "zksync_eth_signer"
-version = "1.0.0"
+version = "0.1.0"
 edition = "2018"
 authors = ["The Matter Labs Team <hello@matterlabs.dev>"]
 homepage = "https://zksync.io/"
@@ -10,7 +10,7 @@ keywords = ["blockchain", "zksync"]
 categories = ["cryptography"]
 
 [dependencies]
-zksync_types = { path = "../types", version = "1.0" }
+zksync_types = { path = "../types" }
 
 serde = "1.0.90"
 serde_derive = "1.0.90"
@@ -18,6 +18,7 @@ serde_json = "1.0.0"
 hex = "0.4.2"
 secp256k1 = "0.27.0"
 
+# TODO (PLA-440): remove parity-crypto
 parity-crypto = { version = "0.9", features = ["publickey"] }
 rlp = "0.5"
 
@@ -32,4 +33,3 @@ actix-rt = "2"
 tokio = { version = "1", features = ["full"] }
 actix-web = "4.0.0-beta.8"
 futures = "0.3"
-
diff --git a/core/lib/health_check/Cargo.toml b/core/lib/health_check/Cargo.toml
index 7c74a7d53bcf..43c2491c1682 100644
--- a/core/lib/health_check/Cargo.toml
+++ b/core/lib/health_check/Cargo.toml
@@ -15,6 +15,7 @@ futures = "0.3"
 serde = { version = "1.0", features = ["derive"] }
 serde_json = "1.0"
 tokio = { version = "1", features = ["sync"] }
+tracing = "0.1"
 
 [dev-dependencies]
 assert_matches = "1.5.0"
diff --git a/core/lib/health_check/src/lib.rs b/core/lib/health_check/src/lib.rs
index d121b7a189b9..fac8ec46dbbb 100644
--- a/core/lib/health_check/src/lib.rs
+++ b/core/lib/health_check/src/lib.rs
@@ -39,7 +39,7 @@ impl HealthStatus {
 }
 
 /// Health of a single component.
-#[derive(Debug, Clone, Serialize)]
+#[derive(Debug, Clone, Serialize, PartialEq)]
 pub struct Health {
     status: HealthStatus,
     /// Component-specific details allowing to assess whether the component is healthy or not.
@@ -158,9 +158,16 @@ pub struct HealthUpdater {
 }
 
 impl HealthUpdater {
-    /// Updates the health check information.
-    pub fn update(&self, health: Health) {
-        self.health_sender.send_replace(health);
+    /// Updates the health check information, returning if a change occurred from previous state.
+    /// Note, description change on Health is counted as a change, even if status is the same.
+    /// I.E. `Health { Ready, None }` to `Health { Ready, Some(_) }` is considered a change.
+    pub fn update(&self, health: Health) -> bool {
+        let old_health = self.health_sender.send_replace(health.clone());
+        if old_health != health {
+            tracing::debug!("changed health from {:?} to {:?}", old_health, health);
+            return true;
+        }
+        false
     }
 
     /// Creates a [`ReactiveHealthCheck`] attached to this updater. This allows not retaining the initial health check
@@ -226,4 +233,28 @@ mod tests {
             HealthStatus::Panicked
         );
     }
+
+    #[tokio::test]
+    async fn updating_health_status_return_value() {
+        let (health_check, health_updater) = ReactiveHealthCheck::new("test");
+        assert_matches!(
+            health_check.check_health().await.status(),
+            HealthStatus::NotReady
+        );
+
+        let updated = health_updater.update(HealthStatus::Ready.into());
+        assert!(updated);
+        assert_matches!(
+            health_check.check_health().await.status(),
+            HealthStatus::Ready
+        );
+
+        let updated = health_updater.update(HealthStatus::Ready.into());
+        assert!(!updated);
+
+        let health: Health = HealthStatus::Ready.into();
+        let health = health.with_details("new details are treated as status change");
+        let updated = health_updater.update(health);
+        assert!(updated);
+    }
 }
diff --git a/core/lib/mempool/Cargo.toml b/core/lib/mempool/Cargo.toml
index 89a16c794978..a8fca9705568 100644
--- a/core/lib/mempool/Cargo.toml
+++ b/core/lib/mempool/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "zksync_mempool"
-version = "1.0.0"
+version = "0.1.0"
 edition = "2018"
 authors = ["The Matter Labs Team <hello@matterlabs.dev>"]
 homepage = "https://zksync.io/"
@@ -10,6 +10,6 @@ keywords = ["blockchain", "zksync"]
 categories = ["cryptography"]
 
 [dependencies]
-zksync_types = { path = "../types", version = "1.0" }
-vlog = { path = "../../lib/vlog", version = "1.0" }
-metrics = "0.20"
+zksync_types = { path = "../types" }
+tracing = "0.1"
+metrics = "0.21"
diff --git a/core/lib/mempool/src/mempool_store.rs b/core/lib/mempool/src/mempool_store.rs
index b14e90c72eb2..00b552ed5284 100644
--- a/core/lib/mempool/src/mempool_store.rs
+++ b/core/lib/mempool/src/mempool_store.rs
@@ -55,10 +55,11 @@ impl MempoolStore {
                 common_data,
                 execute,
                 received_timestamp_ms,
+                raw_bytes,
             } = transaction;
             match common_data {
                 ExecuteTransactionCommon::L1(data) => {
-                    vlog::trace!("inserting L1 transaction {}", data.serial_id);
+                    tracing::trace!("inserting L1 transaction {}", data.serial_id);
                     self.l1_transactions.insert(
                         data.serial_id,
                         L1Tx {
@@ -69,12 +70,13 @@ impl MempoolStore {
                     );
                 }
                 ExecuteTransactionCommon::L2(data) => {
-                    vlog::trace!("inserting L2 transaction {}", data.nonce);
+                    tracing::trace!("inserting L2 transaction {}", data.nonce);
                     self.insert_l2_transaction(
                         L2Tx {
                             execute,
                             common_data: data,
                             received_timestamp_ms,
+                            raw_bytes,
                         },
                         &initial_nonces,
                     );
diff --git a/core/lib/mempool/src/tests.rs b/core/lib/mempool/src/tests.rs
index ddb5ae6bc323..70645a37bacf 100644
--- a/core/lib/mempool/src/tests.rs
+++ b/core/lib/mempool/src/tests.rs
@@ -407,6 +407,7 @@ fn gen_l1_tx(priority_id: PriorityOpId) -> Transaction {
         common_data: ExecuteTransactionCommon::L1(op_data),
         execute,
         received_timestamp_ms: 0,
+        raw_bytes: None,
     }
 }
 
diff --git a/core/lib/merkle_tree/Cargo.toml b/core/lib/merkle_tree/Cargo.toml
index 8f05a63c3de0..07f7b67f71e7 100644
--- a/core/lib/merkle_tree/Cargo.toml
+++ b/core/lib/merkle_tree/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "zksync_merkle_tree"
-version = "1.0.0"
+version = "0.1.0"
 edition = "2021"
 authors = ["The Matter Labs Team <hello@matterlabs.dev>"]
 homepage = "https://zksync.io/"
@@ -10,19 +10,19 @@ keywords = ["blockchain", "zksync"]
 categories = ["cryptography"]
 
 [dependencies]
-vlog = { path = "../vlog", version = "1.0" }
-zksync_types = { path = "../types", version = "1.0" }
-zksync_crypto = { path = "../crypto", version = "1.0" }
-zksync_storage = { path = "../storage", version = "1.0", default-features = false }
+vise = { git = "https://github.com/matter-labs/vise.git", version = "0.1.0", rev = "856eedd0a36a2ff2c8d965b0f0186d4bb8465d8c" }
+zksync_types = { path = "../types" }
+zksync_crypto = { path = "../crypto" }
+zksync_storage = { path = "../storage", default-features = false }
 
 leb128 = "0.2.5"
-metrics = "0.20.1"
 once_cell = "1.17.1"
 rayon = "1.3.1"
 thiserror = "1.0"
+tracing = "0.1"
 
 [dev-dependencies]
-zksync_config = { path = "../config", version = "1.0" }
+zksync_config = { path = "../config" }
 
 assert_matches = "1.5.0"
 clap = { version = "4.2.2", features = ["derive"] }
diff --git a/core/lib/merkle_tree/examples/loadtest/main.rs b/core/lib/merkle_tree/examples/loadtest/main.rs
index 10911229d8d9..5ee7358d6d36 100644
--- a/core/lib/merkle_tree/examples/loadtest/main.rs
+++ b/core/lib/merkle_tree/examples/loadtest/main.rs
@@ -8,10 +8,11 @@ use rand::{rngs::StdRng, seq::IteratorRandom, SeedableRng};
 use tempfile::TempDir;
 
 use std::{
-    thread,
+    io, thread,
     time::{Duration, Instant},
 };
 
+use vise::Registry;
 use zksync_crypto::hasher::blake2::Blake2Hasher;
 use zksync_merkle_tree::{
     Database, HashTree, MerkleTree, MerkleTreePruner, PatchSet, RocksDBWrapper, TreeInstruction,
@@ -20,9 +21,8 @@ use zksync_storage::RocksDB;
 use zksync_types::{AccountTreeId, Address, StorageKey, H256, U256};
 
 mod batch;
-mod recorder;
 
-use crate::{batch::WithBatching, recorder::PrintingRecorder};
+use crate::batch::WithBatching;
 
 /// CLI for load-testing for the Merkle tree implementation.
 #[derive(Debug, Parser)]
@@ -69,7 +69,7 @@ struct Cli {
 impl Cli {
     fn run(self) {
         println!("Launched with options: {self:?}");
-        PrintingRecorder::install();
+        let registry = Registry::collect();
 
         let (mut mock_db, mut rocksdb);
         let mut _temp_dir = None;
@@ -146,6 +146,8 @@ impl Cli {
             };
             let elapsed = start.elapsed();
             println!("Processed block #{version} in {elapsed:?}, root hash = {root_hash:?}");
+
+            registry.encode(&mut io::stdout().lock()).unwrap();
         }
 
         println!("Verifying tree consistency...");
diff --git a/core/lib/merkle_tree/examples/loadtest/recorder.rs b/core/lib/merkle_tree/examples/loadtest/recorder.rs
deleted file mode 100644
index 1c86fac6e1fc..000000000000
--- a/core/lib/merkle_tree/examples/loadtest/recorder.rs
+++ /dev/null
@@ -1,161 +0,0 @@
-//! Simple `metrics::Recorder` implementation that prints information to stdout.
-
-use metrics::{
-    Counter, Gauge, GaugeFn, Histogram, HistogramFn, Key, KeyName, Label, Recorder, SharedString,
-    Unit,
-};
-
-use std::{
-    collections::HashMap,
-    fmt::{self, Write as _},
-    sync::{
-        atomic::{AtomicU64, Ordering},
-        Arc, Mutex,
-    },
-};
-
-type SharedMetadata = Mutex<HashMap<KeyName, MetricMetadata>>;
-
-#[derive(Debug, Clone, Copy)]
-enum MetricKind {
-    Gauge,
-    Histogram,
-}
-
-impl fmt::Display for MetricKind {
-    fn fmt(&self, formatter: &mut fmt::Formatter<'_>) -> fmt::Result {
-        formatter.write_str(match self {
-            Self::Gauge => "gauge",
-            Self::Histogram => "histogram",
-        })
-    }
-}
-
-#[derive(Debug)]
-struct PrintingMetric {
-    kind: MetricKind,
-    key: KeyName,
-    labels: Vec<Label>,
-    value: AtomicU64,
-    unit: Option<Unit>,
-}
-
-impl PrintingMetric {
-    fn new(kind: MetricKind, key: KeyName, labels: Vec<Label>, unit: Option<Unit>) -> Self {
-        Self {
-            kind,
-            key,
-            labels,
-            value: AtomicU64::new(0),
-            unit,
-        }
-    }
-
-    fn report_value(&self) {
-        let value = f64::from_bits(self.value.load(Ordering::Relaxed));
-        let labels = if self.labels.is_empty() {
-            String::new()
-        } else {
-            let mut labels = "{".to_string();
-            for (i, label) in self.labels.iter().enumerate() {
-                write!(labels, "{}={}", label.key(), label.value()).unwrap();
-                if i + 1 < self.labels.len() {
-                    labels.push_str(", ");
-                }
-            }
-            labels.push('}');
-            labels
-        };
-
-        let unit = match &self.unit {
-            None | Some(Unit::Count) => "",
-            Some(other) => other.as_str(),
-        };
-        let space = if unit.is_empty() { "" } else { " " };
-        println!(
-            "[{kind}] {key}{labels} = {value}{space}{unit}",
-            kind = self.kind,
-            labels = labels,
-            key = self.key.as_str()
-        );
-    }
-}
-
-impl GaugeFn for PrintingMetric {
-    fn increment(&self, value: f64) {
-        self.value.increment(value);
-        self.report_value();
-        // ^ These calls are non-atomic, but in practice values are updated infrequently,
-        // so we're OK with it.
-    }
-
-    fn decrement(&self, value: f64) {
-        self.value.decrement(value);
-        self.report_value();
-    }
-
-    fn set(&self, value: f64) {
-        self.value.set(value);
-        self.report_value();
-    }
-}
-
-impl HistogramFn for PrintingMetric {
-    fn record(&self, value: f64) {
-        self.set(value);
-    }
-}
-
-#[derive(Debug, Default)]
-struct MetricMetadata {
-    unit: Option<Unit>,
-}
-
-#[derive(Debug, Default)]
-pub struct PrintingRecorder {
-    metadata: SharedMetadata,
-}
-
-impl PrintingRecorder {
-    pub fn install() {
-        let this = Self::default();
-        metrics::set_boxed_recorder(Box::new(this))
-            .expect("failed setting printing metrics recorder")
-    }
-
-    fn create_metric(&self, kind: MetricKind, key: &Key) -> Arc<PrintingMetric> {
-        let (key_name, labels) = key.clone().into_parts();
-        let mut metadata = self.metadata.lock().unwrap();
-        let metadata = metadata.entry(key_name.clone()).or_default();
-        let gauge = PrintingMetric::new(kind, key_name, labels, metadata.unit);
-        Arc::new(gauge)
-    }
-}
-
-impl Recorder for PrintingRecorder {
-    fn describe_counter(&self, key: KeyName, unit: Option<Unit>, _description: SharedString) {
-        let mut metadata = self.metadata.lock().unwrap();
-        let metadata = metadata.entry(key).or_default();
-        metadata.unit = unit.or(metadata.unit);
-    }
-
-    fn describe_gauge(&self, key: KeyName, unit: Option<Unit>, description: SharedString) {
-        self.describe_counter(key, unit, description);
-    }
-
-    fn describe_histogram(&self, key: KeyName, unit: Option<Unit>, description: SharedString) {
-        self.describe_counter(key, unit, description);
-    }
-
-    fn register_counter(&self, _key: &Key) -> Counter {
-        Counter::noop() // counters are not used
-    }
-
-    fn register_gauge(&self, key: &Key) -> Gauge {
-        Gauge::from_arc(self.create_metric(MetricKind::Gauge, key))
-    }
-
-    fn register_histogram(&self, key: &Key) -> Histogram {
-        Histogram::from_arc(self.create_metric(MetricKind::Histogram, key))
-    }
-}
diff --git a/core/lib/merkle_tree/src/domain.rs b/core/lib/merkle_tree/src/domain.rs
index 24e6ce4d57b5..97e2c951e72e 100644
--- a/core/lib/merkle_tree/src/domain.rs
+++ b/core/lib/merkle_tree/src/domain.rs
@@ -63,7 +63,7 @@ impl ZkSyncTree {
     /// create a persistent tree.
     pub fn process_genesis_batch(storage_logs: &[StorageLog]) -> BlockOutput {
         let kvs = Self::filter_write_logs(storage_logs);
-        vlog::info!(
+        tracing::info!(
             "Creating Merkle tree for genesis batch with {instr_count} writes",
             instr_count = kvs.len()
         );
@@ -71,7 +71,7 @@ impl ZkSyncTree {
         let mut in_memory_tree = MerkleTree::new(PatchSet::default());
         let output = in_memory_tree.extend(kvs);
 
-        vlog::info!(
+        tracing::info!(
             "Processed genesis batch; root hash is {root_hash}, {leaf_count} leaves in total",
             root_hash = output.root_hash,
             leaf_count = output.leaf_count
@@ -183,7 +183,7 @@ impl ZkSyncTree {
         let starting_leaf_count = self.tree.latest_root().leaf_count();
         let starting_root_hash = self.tree.latest_root_hash();
 
-        vlog::info!(
+        tracing::info!(
             "Extending Merkle tree with batch #{l1_batch_number} with {instr_count} ops in full mode",
             instr_count = instructions.len()
         );
@@ -251,7 +251,7 @@ impl ZkSyncTree {
         });
         let (initial_writes, repeated_writes) = Self::extract_writes(logs, kvs);
 
-        vlog::info!(
+        tracing::info!(
             "Processed batch #{l1_batch_number}; root hash is {root_hash}, \
              {leaf_count} leaves in total, \
              {initial_writes} initial writes, {repeated_writes} repeated writes",
@@ -317,7 +317,7 @@ impl ZkSyncTree {
     fn process_l1_batch_lightweight(&mut self, storage_logs: &[StorageLog]) -> TreeMetadata {
         let kvs = Self::filter_write_logs(storage_logs);
         let l1_batch_number = self.next_l1_batch_number();
-        vlog::info!(
+        tracing::info!(
             "Extending Merkle tree with batch #{l1_batch_number} with {kv_count} writes \
              in lightweight mode",
             kv_count = kvs.len()
@@ -331,7 +331,7 @@ impl ZkSyncTree {
         let (initial_writes, repeated_writes) =
             Self::extract_writes(output.logs.into_iter(), kvs.into_iter());
 
-        vlog::info!(
+        tracing::info!(
             "Processed batch #{l1_batch_number}; root hash is {root_hash}, \
              {leaf_count} leaves in total, \
              {initial_writes} initial writes, {repeated_writes} repeated writes",
@@ -374,7 +374,7 @@ impl ZkSyncTree {
     pub fn save(&mut self) {
         let mut l1_batch_numbers = self.tree.db.patched_versions();
         l1_batch_numbers.sort_unstable();
-        vlog::info!("Flushing L1 batches #{l1_batch_numbers:?} to RocksDB");
+        tracing::info!("Flushing L1 batches #{l1_batch_numbers:?} to RocksDB");
         self.tree.db.flush();
     }
 
diff --git a/core/lib/merkle_tree/src/hasher.rs b/core/lib/merkle_tree/src/hasher.rs
index 832c2a5e7d28..5c06f2e35610 100644
--- a/core/lib/merkle_tree/src/hasher.rs
+++ b/core/lib/merkle_tree/src/hasher.rs
@@ -5,7 +5,7 @@ use once_cell::sync::Lazy;
 use std::{fmt, iter, slice};
 
 use crate::{
-    metrics::HashingMetrics,
+    metrics::HashingStats,
     types::{
         BlockOutputWithProofs, ChildRef, InternalNode, Key, LeafNode, Node, TreeInstruction,
         TreeLogEntry, ValueHash, TREE_DEPTH,
@@ -55,7 +55,7 @@ impl dyn HashTree + '_ {
         hash
     }
 
-    pub(crate) fn with_stats<'a>(&'a self, stats: &'a HashingMetrics) -> HasherWithStats<'a> {
+    pub(crate) fn with_stats<'a>(&'a self, stats: &'a HashingStats) -> HasherWithStats<'a> {
         HasherWithStats {
             shared_metrics: Some(stats),
             ..HasherWithStats::from(self)
@@ -129,7 +129,7 @@ fn compute_empty_tree_hashes() -> Vec<ValueHash> {
 #[derive(Debug)]
 pub(crate) struct HasherWithStats<'a> {
     inner: &'a dyn HashTree,
-    shared_metrics: Option<&'a HashingMetrics>,
+    shared_metrics: Option<&'a HashingStats>,
     local_hashed_bytes: u64,
 }
 
@@ -524,7 +524,7 @@ mod tests {
         let key = key.hashed_key_u256();
         let leaf = LeafNode::new(key, H256([1; 32]), 1);
 
-        let stats = HashingMetrics::default();
+        let stats = HashingStats::default();
         let mut hasher = (&Blake2Hasher as &dyn HashTree).with_stats(&stats);
         let leaf_hash = leaf.hash(&mut hasher, 0);
         assert_eq!(leaf_hash, EXPECTED_HASH);
diff --git a/core/lib/merkle_tree/src/lib.rs b/core/lib/merkle_tree/src/lib.rs
index 4a2a16b841c4..8296e1598ff4 100644
--- a/core/lib/merkle_tree/src/lib.rs
+++ b/core/lib/merkle_tree/src/lib.rs
@@ -76,7 +76,7 @@ pub use crate::{
     },
 };
 
-use crate::{metrics::describe_metrics, storage::Storage, types::Root};
+use crate::{storage::Storage, types::Root};
 use zksync_crypto::hasher::blake2::Blake2Hasher;
 
 /// Binary Merkle tree implemented using AR16MT from Diem [Jellyfish Merkle tree] white paper.
@@ -143,8 +143,6 @@ impl<'a, DB: Database> MerkleTree<'a, DB> {
     /// Panics if the hasher or basic tree parameters (e.g., the tree depth)
     /// do not match those of the tree loaded from the database.
     pub fn with_hasher(db: DB, hasher: &'a dyn HashTree) -> Self {
-        describe_metrics();
-
         let tags = db.manifest().and_then(|manifest| manifest.tags);
         if let Some(tags) = tags {
             tags.assert_consistency(hasher);
diff --git a/core/lib/merkle_tree/src/metrics.rs b/core/lib/merkle_tree/src/metrics.rs
index 6050df2d123a..1bbe66e2ca42 100644
--- a/core/lib/merkle_tree/src/metrics.rs
+++ b/core/lib/merkle_tree/src/metrics.rs
@@ -1,165 +1,128 @@
 //! Storage-related Merkle tree metrics. All metrics code in the crate should be in this module.
 
-#![allow(clippy::cast_precision_loss)]
-// ^ Casting `u64` to `f64` shouldn't practically result in precision loss in most cases,
-// and we're OK with precision loss for metrics in general.
-
-use metrics::Unit;
-
 use std::{
-    ops,
-    sync::{
-        atomic::{AtomicU64, Ordering},
-        Once,
-    },
-    time::Instant,
+    fmt, ops,
+    sync::atomic::{AtomicU64, Ordering},
+    time::Duration,
 };
 
 use crate::types::Nibbles;
+use vise::{Buckets, EncodeLabelSet, EncodeLabelValue, Family, Gauge, Global, Histogram, Metrics};
+
+#[derive(Debug, Metrics)]
+#[metrics(prefix = "merkle_tree")]
+pub(crate) struct GeneralMetrics {
+    /// Current number of leaves in the tree.
+    pub leaf_count: Gauge<u64>,
+}
 
-/// Describes all metrics in the crate once.
-pub(crate) fn describe_metrics() {
-    static INITIALIZER: Once = Once::new();
-
-    INITIALIZER.call_once(|| {
-        HashingMetrics::describe();
-        TreeUpdaterMetrics::describe();
-        BlockTimings::describe();
-        LeafCountMetric::describe();
-        ApplyPatchMetrics::describe();
-        PruningStats::describe();
-        PruningTimings::describe();
-    });
+pub(crate) static GENERAL_METRICS: Global<GeneralMetrics> = Global::new();
+
+const BYTE_SIZE_BUCKETS: Buckets = Buckets::exponential(65_536.0..=16.0 * 1_024.0 * 1_024.0, 2.0);
+
+#[derive(Debug, Metrics)]
+#[metrics(prefix = "merkle_tree_finalize_patch")]
+struct HashingMetrics {
+    /// Total amount of hashing input performed while processing a single block.
+    #[metrics(buckets = BYTE_SIZE_BUCKETS)]
+    hashed_bytes: Histogram<u64>,
 }
 
+#[vise::register]
+static HASHING_METRICS: Global<HashingMetrics> = Global::new();
+
 /// Hashing-related statistics reported as metrics for each block of operations.
 #[derive(Debug, Default)]
-#[must_use = "hashing metrics should be `report()`ed"]
-pub(crate) struct HashingMetrics {
+#[must_use = "hashing stats should be `report()`ed"]
+pub(crate) struct HashingStats {
     pub hashed_bytes: AtomicU64,
 }
 
-impl HashingMetrics {
-    const HASHED_BYTES: &'static str = "merkle_tree.finalize_patch.hashed_bytes";
-
-    fn describe() {
-        metrics::describe_histogram!(
-            Self::HASHED_BYTES,
-            Unit::Bytes,
-            "Total amount of hashing input performed while processing a single block"
-        );
-    }
-
+impl HashingStats {
     pub fn add_hashed_bytes(&self, bytes: u64) {
         self.hashed_bytes.fetch_add(bytes, Ordering::Relaxed);
     }
 
     pub fn report(self) {
         let hashed_bytes = self.hashed_bytes.into_inner();
-        metrics::histogram!(Self::HASHED_BYTES, hashed_bytes as f64);
+        HASHING_METRICS.hashed_bytes.observe(hashed_bytes);
     }
 }
 
-#[must_use = "tree updater metrics should be `report()`ed"]
-#[derive(Debug, Clone, Copy, Default)]
-pub(crate) struct TreeUpdaterMetrics {
+const NODE_COUNT_BUCKETS: Buckets = Buckets::linear(1_000.0..=10_000.0, 1_000.0);
+const LEAF_LEVEL_BUCKETS: Buckets = Buckets::linear(20.0..=40.0, 4.0);
+
+#[derive(Debug, Metrics)]
+#[metrics(prefix = "merkle_tree_extend_patch")]
+struct TreeUpdateMetrics {
     // Metrics related to the AR16MT tree architecture
+    /// Number of new leaves inserted during tree traversal while processing a single block.
+    #[metrics(buckets = NODE_COUNT_BUCKETS)]
+    new_leaves: Histogram<u64>,
+    /// Number of new internal nodes inserted during tree traversal while processing a single block.
+    #[metrics(buckets = NODE_COUNT_BUCKETS)]
+    new_internal_nodes: Histogram<u64>,
+    /// Number of existing leaves moved to a new location while processing a single block.
+    #[metrics(buckets = NODE_COUNT_BUCKETS)]
+    moved_leaves: Histogram<u64>,
+    /// Number of existing leaves updated while processing a single block.
+    #[metrics(buckets = NODE_COUNT_BUCKETS)]
+    updated_leaves: Histogram<u64>,
+    /// Average level of leaves moved or created while processing a single block.
+    #[metrics(buckets = LEAF_LEVEL_BUCKETS)]
+    avg_leaf_level: Histogram<f64>,
+    /// Maximum level of leaves moved or created while processing a single block.
+    #[metrics(buckets = LEAF_LEVEL_BUCKETS)]
+    max_leaf_level: Histogram<u64>,
+
+    // Metrics related to input instructions
+    /// Number of keys read while processing a single block (only applicable to the full operation mode).
+    #[metrics(buckets = NODE_COUNT_BUCKETS)]
+    key_reads: Histogram<u64>,
+    /// Number of missing keys read while processing a single block (only applicable to the full
+    /// operation mode).
+    #[metrics(buckets = NODE_COUNT_BUCKETS)]
+    missing_key_reads: Histogram<u64>,
+    /// Number of nodes of previous versions read from the DB while processing a single block.
+    #[metrics(buckets = NODE_COUNT_BUCKETS)]
+    db_reads: Histogram<u64>,
+    /// Number of nodes of the current version re-read from the patch set while processing a single block.
+    #[metrics(buckets = NODE_COUNT_BUCKETS)]
+    patch_reads: Histogram<u64>,
+}
+
+#[vise::register]
+static TREE_UPDATE_METRICS: Global<TreeUpdateMetrics> = Global::new();
+
+#[must_use = "tree updater stats should be `report()`ed"]
+#[derive(Debug, Clone, Copy, Default)]
+pub(crate) struct TreeUpdaterStats {
     pub new_leaves: u64,
     pub new_internal_nodes: u64,
     pub moved_leaves: u64,
     pub updated_leaves: u64,
     pub leaf_level_sum: u64,
     pub max_leaf_level: u64,
-    // Metrics related to input instructions
     pub key_reads: u64,
     pub missing_key_reads: u64,
     pub db_reads: u64,
     pub patch_reads: u64,
 }
 
-impl TreeUpdaterMetrics {
-    const NEW_LEAVES: &'static str = "merkle_tree.extend_patch.new_leaves";
-    const NEW_INTERNAL_NODES: &'static str = "merkle_tree.extend_patch.new_internal_nodes";
-    const MOVED_LEAVES: &'static str = "merkle_tree.extend_patch.moved_leaves";
-    const UPDATED_LEAVES: &'static str = "merkle_tree.extend_patch.updated_leaves";
-    const AVG_LEAF_LEVEL: &'static str = "merkle_tree.extend_patch.avg_leaf_level";
-    const MAX_LEAF_LEVEL: &'static str = "merkle_tree.extend_patch.max_leaf_level";
-    const KEY_READS: &'static str = "merkle_tree.extend_patch.key_reads";
-    const MISSING_KEY_READS: &'static str = "merkle_tree.extend_patch.missing_key_reads";
-    const DB_READS: &'static str = "merkle_tree.extend_patch.db_reads";
-    const PATCH_READS: &'static str = "merkle_tree.extend_patch.patch_reads";
-
-    fn describe() {
-        metrics::describe_histogram!(
-            Self::NEW_LEAVES,
-            Unit::Count,
-            "Number of new leaves inserted during tree traversal while processing a single block"
-        );
-        metrics::describe_histogram!(
-            Self::NEW_INTERNAL_NODES,
-            Unit::Count,
-            "Number of new internal nodes inserted during tree traversal while processing \
-             a single block"
-        );
-        metrics::describe_histogram!(
-            Self::MOVED_LEAVES,
-            Unit::Count,
-            "Number of existing leaves moved to a new location while processing \
-             a single block"
-        );
-        metrics::describe_histogram!(
-            Self::UPDATED_LEAVES,
-            Unit::Count,
-            "Number of existing leaves updated while processing a single block"
-        );
-        metrics::describe_histogram!(
-            Self::AVG_LEAF_LEVEL,
-            Unit::Count,
-            "Average level of leaves moved or created while processing a single block"
-        );
-        metrics::describe_histogram!(
-            Self::MAX_LEAF_LEVEL,
-            Unit::Count,
-            "Maximum level of leaves moved or created while processing a single block"
-        );
-
-        metrics::describe_histogram!(
-            Self::KEY_READS,
-            Unit::Count,
-            "Number of keys read while processing a single block (only applicable \
-             to the full operation mode)"
-        );
-        metrics::describe_histogram!(
-            Self::MISSING_KEY_READS,
-            Unit::Count,
-            "Number of missing keys read while processing a single block (only applicable \
-             to the full operation mode)"
-        );
-        metrics::describe_histogram!(
-            Self::DB_READS,
-            Unit::Count,
-            "Number of nodes of previous versions read from the DB while processing \
-             a single block"
-        );
-        metrics::describe_histogram!(
-            Self::PATCH_READS,
-            Unit::Count,
-            "Number of nodes of the current version re-read from the patch set while processing \
-             a single block"
-        );
-    }
-
+impl TreeUpdaterStats {
     pub(crate) fn update_leaf_levels(&mut self, nibble_count: usize) {
         let leaf_level = nibble_count as u64 * 4;
         self.leaf_level_sum += leaf_level;
         self.max_leaf_level = self.max_leaf_level.max(leaf_level);
     }
 
+    #[allow(clippy::cast_precision_loss)] // Acceptable for metrics
     pub(crate) fn report(self) {
-        metrics::histogram!(Self::NEW_LEAVES, self.new_leaves as f64);
-        metrics::histogram!(Self::NEW_INTERNAL_NODES, self.new_internal_nodes as f64);
-        metrics::histogram!(Self::MOVED_LEAVES, self.moved_leaves as f64);
-        metrics::histogram!(Self::UPDATED_LEAVES, self.updated_leaves as f64);
+        let metrics = &TREE_UPDATE_METRICS;
+        metrics.new_leaves.observe(self.new_leaves);
+        metrics.new_internal_nodes.observe(self.new_internal_nodes);
+        metrics.moved_leaves.observe(self.moved_leaves);
+        metrics.updated_leaves.observe(self.updated_leaves);
 
         let touched_leaves = self.new_leaves + self.moved_leaves;
         let avg_leaf_level = if touched_leaves > 0 {
@@ -167,21 +130,21 @@ impl TreeUpdaterMetrics {
         } else {
             0.0
         };
-        metrics::histogram!(Self::AVG_LEAF_LEVEL, avg_leaf_level);
-        metrics::histogram!(Self::MAX_LEAF_LEVEL, self.max_leaf_level as f64);
+        metrics.avg_leaf_level.observe(avg_leaf_level);
+        metrics.max_leaf_level.observe(self.max_leaf_level);
 
         if self.key_reads > 0 {
-            metrics::histogram!(Self::KEY_READS, self.key_reads as f64);
+            metrics.key_reads.observe(self.key_reads);
         }
         if self.missing_key_reads > 0 {
-            metrics::histogram!(Self::MISSING_KEY_READS, self.missing_key_reads as f64);
+            metrics.key_reads.observe(self.missing_key_reads);
         }
-        metrics::histogram!(Self::DB_READS, self.db_reads as f64);
-        metrics::histogram!(Self::PATCH_READS, self.patch_reads as f64);
+        metrics.db_reads.observe(self.db_reads);
+        metrics.patch_reads.observe(self.patch_reads);
     }
 }
 
-impl ops::AddAssign for TreeUpdaterMetrics {
+impl ops::AddAssign for TreeUpdaterStats {
     fn add_assign(&mut self, rhs: Self) {
         self.new_leaves += rhs.new_leaves;
         self.new_internal_nodes += rhs.new_internal_nodes;
@@ -197,90 +160,65 @@ impl ops::AddAssign for TreeUpdaterMetrics {
     }
 }
 
-pub(crate) trait Timing: Copy {
-    fn as_str(self) -> &'static str;
-
-    fn start(self) -> TimingGuard<Self> {
-        TimingGuard {
-            metric: self,
-            start: Instant::now(),
-        }
-    }
+#[derive(Debug, Metrics)]
+#[metrics(prefix = "merkle_tree")]
+pub(crate) struct BlockTimings {
+    /// Time spent loading tree nodes from DB per block.
+    #[metrics(buckets = Buckets::LATENCIES)]
+    pub load_nodes: Histogram<Duration>,
+    /// Time spent traversing the tree and creating new nodes per block.
+    #[metrics(buckets = Buckets::LATENCIES)]
+    pub extend_patch: Histogram<Duration>,
+    /// Time spent finalizing the block (mainly hash computations).
+    #[metrics(buckets = Buckets::LATENCIES)]
+    pub finalize_patch: Histogram<Duration>,
 }
 
-#[derive(Debug, Clone, Copy)]
-pub(crate) enum BlockTimings {
-    LoadNodes,
-    ExtendPatch,
-    FinalizePatch,
-}
+#[vise::register]
+pub(crate) static BLOCK_TIMINGS: Global<BlockTimings> = Global::new();
+
+#[derive(Debug, Clone, Copy, PartialEq, Eq, Hash, EncodeLabelValue, EncodeLabelSet)]
+#[metrics(label = "nibbles")]
+struct NibbleCount(usize);
 
-impl BlockTimings {
-    const LOAD_NODES: &'static str = "merkle_tree.load_nodes";
-    const EXTEND_PATCH: &'static str = "merkle_tree.extend_patch";
-    const FINALIZE_PATCH: &'static str = "merkle_tree.finalize_patch";
-
-    fn describe() {
-        metrics::describe_histogram!(
-            Self::LOAD_NODES,
-            Unit::Seconds,
-            "Time spent loading tree nodes from DB per block"
-        );
-        metrics::describe_histogram!(
-            Self::EXTEND_PATCH,
-            Unit::Seconds,
-            "Time spent traversing the tree and creating new nodes per block"
-        );
-        metrics::describe_histogram!(
-            Self::FINALIZE_PATCH,
-            Unit::Seconds,
-            "Time spent finalizing the block (mainly hash computations)"
-        );
+const MAX_TRACKED_NIBBLE_COUNT: usize = 6;
+
+impl NibbleCount {
+    fn new(raw_count: usize) -> Self {
+        Self(raw_count.min(MAX_TRACKED_NIBBLE_COUNT))
     }
 }
 
-impl Timing for BlockTimings {
-    fn as_str(self) -> &'static str {
-        match self {
-            Self::LoadNodes => Self::LOAD_NODES,
-            Self::ExtendPatch => Self::EXTEND_PATCH,
-            Self::FinalizePatch => Self::FINALIZE_PATCH,
+impl fmt::Display for NibbleCount {
+    fn fmt(&self, formatter: &mut fmt::Formatter<'_>) -> fmt::Result {
+        if self.0 == MAX_TRACKED_NIBBLE_COUNT {
+            write!(formatter, "{MAX_TRACKED_NIBBLE_COUNT}..")
+        } else {
+            write!(formatter, "{}", self.0)
         }
     }
 }
 
-#[must_use = "timings should be `report()`ed"]
-#[derive(Debug)]
-pub(crate) struct TimingGuard<T> {
-    metric: T,
-    start: Instant,
+#[derive(Debug, Metrics)]
+#[metrics(prefix = "merkle_tree_apply_patch")]
+struct ApplyPatchMetrics {
+    /// Total number of nodes included into a RocksDB patch per block.
+    #[metrics(buckets = NODE_COUNT_BUCKETS)]
+    nodes: Histogram<u64>,
+    /// Number of nodes included into a RocksDB patch per block, grouped by the key nibble count.
+    #[metrics(buckets = NODE_COUNT_BUCKETS)]
+    nodes_by_nibble_count: Family<NibbleCount, Histogram<u64>>,
+    /// Total byte size of nodes included into a RocksDB patch per block, grouped by the key nibble count.
+    #[metrics(buckets = BYTE_SIZE_BUCKETS)]
+    node_bytes: Family<NibbleCount, Histogram<u64>>,
+    /// Number of hashes in child references copied from previous tree versions. Allows to estimate
+    /// the level of redundancy of the tree.
+    #[metrics(buckets = NODE_COUNT_BUCKETS)]
+    copied_hashes: Histogram<u64>,
 }
 
-impl<T: Timing> TimingGuard<T> {
-    pub fn report(self) {
-        metrics::histogram!(self.metric.as_str(), self.start.elapsed());
-    }
-}
-
-#[must_use = "leaf count should be `report()`ed"]
-#[derive(Debug)]
-pub(crate) struct LeafCountMetric(pub u64);
-
-impl LeafCountMetric {
-    const LEAF_COUNT: &'static str = "merkle_tree.leaf_count";
-
-    fn describe() {
-        metrics::describe_gauge!(
-            Self::LEAF_COUNT,
-            Unit::Count,
-            "Current number of leaves in the tree"
-        );
-    }
-
-    pub fn report(self) {
-        metrics::gauge!(Self::LEAF_COUNT, self.0 as f64);
-    }
-}
+#[vise::register]
+static APPLY_PATCH_METRICS: Global<ApplyPatchMetrics> = Global::new();
 
 #[derive(Debug, Default, Clone, Copy)]
 struct PatchNodeStats {
@@ -292,93 +230,80 @@ struct PatchNodeStats {
 
 #[must_use = "patch metrics should be `report()`ed"]
 #[derive(Debug)]
-pub(crate) struct ApplyPatchMetrics {
-    node_stats_by_nibble_count: [PatchNodeStats; Self::MAX_TRACKED_NIBBLE_COUNT + 1],
+pub(crate) struct ApplyPatchStats {
+    node_stats_by_nibble_count: [PatchNodeStats; MAX_TRACKED_NIBBLE_COUNT + 1],
     copied_hashes: u64,
 }
 
-impl ApplyPatchMetrics {
-    const MAX_TRACKED_NIBBLE_COUNT: usize = 6;
-
-    const NODES: &'static str = "merkle_tree.apply_patch.nodes";
-    const NODES_BY_NIBBLE_COUNT: &'static str = "merkle_tree.apply_patch.nodes_by_nibble_count";
-    const NODE_BYTES: &'static str = "merkle_tree.apply_patch.node_bytes";
-    const COPIED_HASHES: &'static str = "merkle_tree.apply_patch.copied_hashes";
-
-    fn describe() {
-        metrics::describe_histogram!(
-            Self::NODES,
-            Unit::Count,
-            "Total number of nodes included into a RocksDB patch per block"
-        );
-        metrics::describe_histogram!(
-            Self::NODES_BY_NIBBLE_COUNT,
-            Unit::Count,
-            "Number of nodes included into a RocksDB patch per block, grouped by \
-             the key nibble count"
-        );
-        metrics::describe_histogram!(
-            Self::NODE_BYTES,
-            Unit::Bytes,
-            "Total byte size of nodes included into a RocksDB patch per block, grouped by \
-             the key nibble count"
-        );
-        metrics::describe_histogram!(
-            Self::COPIED_HASHES,
-            Unit::Count,
-            "Number of hashes in child references copied from previous tree versions. \
-             Allows to estimate the level of redundancy of the tree"
-        );
-    }
-
+impl ApplyPatchStats {
     pub fn new(copied_hashes: u64) -> Self {
         Self {
-            node_stats_by_nibble_count: [PatchNodeStats::default();
-                Self::MAX_TRACKED_NIBBLE_COUNT + 1],
+            node_stats_by_nibble_count: [PatchNodeStats::default(); MAX_TRACKED_NIBBLE_COUNT + 1],
             copied_hashes,
         }
     }
 
     pub fn update_node_bytes(&mut self, key_nibbles: &Nibbles, node_bytes: &[u8]) {
         let nibble_count = key_nibbles.nibble_count();
-        let idx = nibble_count.min(Self::MAX_TRACKED_NIBBLE_COUNT);
+        let idx = nibble_count.min(MAX_TRACKED_NIBBLE_COUNT);
         let stats = &mut self.node_stats_by_nibble_count[idx];
         stats.count += 1;
         stats.bytes += node_bytes.len() as u64;
     }
 
     pub fn report(self) {
+        let metrics = &APPLY_PATCH_METRICS;
         let total_node_count = self
             .node_stats_by_nibble_count
             .iter()
             .map(|stats| stats.count)
             .sum::<u64>();
-        metrics::histogram!(Self::NODES, total_node_count as f64);
+        metrics.nodes.observe(total_node_count);
 
         let node_bytes = self.node_stats_by_nibble_count.iter().enumerate();
         for (nibble_count, stats) in node_bytes {
-            let nibbles_tag = if nibble_count == Self::MAX_TRACKED_NIBBLE_COUNT {
-                format!("{nibble_count}..")
-            } else {
-                nibble_count.to_string()
-            };
-
-            metrics::histogram!(
-                Self::NODES_BY_NIBBLE_COUNT,
-                stats.count as f64,
-                "nibbles" => nibbles_tag.clone()
-            );
-            metrics::histogram!(
-                Self::NODE_BYTES,
-                stats.bytes as f64,
-                "nibbles" => nibbles_tag
-            );
+            let label = NibbleCount::new(nibble_count);
+            metrics.nodes_by_nibble_count[&label].observe(stats.count);
+            metrics.nodes_by_nibble_count[&label].observe(stats.bytes);
         }
 
-        metrics::histogram!(Self::COPIED_HASHES, self.copied_hashes as f64);
+        metrics.copied_hashes.observe(self.copied_hashes);
+    }
+}
+
+#[derive(Debug, Clone, Copy, PartialEq, Eq, Hash, EncodeLabelValue, EncodeLabelSet)]
+#[metrics(label = "bound")]
+enum Bound {
+    Start,
+    End,
+}
+
+impl fmt::Display for Bound {
+    fn fmt(&self, formatter: &mut fmt::Formatter<'_>) -> fmt::Result {
+        formatter.write_str(match self {
+            Self::Start => "start",
+            Self::End => "end",
+        })
     }
 }
 
+#[derive(Debug, Metrics)]
+#[metrics(prefix = "merkle_tree_pruning")]
+struct PruningMetrics {
+    /// Minimum Merkle tree version targeted after a single pruning iteration. The iteration
+    /// may not remove all stale keys to this version if there are too many.
+    target_retained_version: Gauge<u64>,
+    /// Number of pruned node keys on a specific pruning iteration.
+    #[metrics(buckets = NODE_COUNT_BUCKETS)]
+    key_count: Histogram<usize>,
+    /// Lower and upper boundaries on the new stale key versions deleted
+    /// during a pruning iteration. The lower boundary is inclusive, the upper one is exclusive.
+    deleted_stale_key_versions: Family<Bound, Gauge<u64>>,
+}
+
+#[vise::register]
+static PRUNING_METRICS: Global<PruningMetrics> = Global::new();
+
 #[derive(Debug)]
 pub(crate) struct PruningStats {
     pub target_retained_version: u64,
@@ -387,79 +312,28 @@ pub(crate) struct PruningStats {
 }
 
 impl PruningStats {
-    const TARGET_RETAINED_VERSION: &'static str = "merkle_tree.pruning.target_retained_version";
-    const PRUNED_KEY_COUNT: &'static str = "merkle_tree.pruning.key_count";
-    const DELETED_STALE_KEY_VERSIONS: &'static str =
-        "merkle_tree.pruning.deleted_stale_key_versions";
-
-    fn describe() {
-        metrics::describe_gauge!(
-            Self::TARGET_RETAINED_VERSION,
-            Unit::Count,
-            "Minimum Merkle tree version targeted after a single pruning iteration. The iteration \
-             may not remove all stale keys to this version if there are too many"
-        );
-        metrics::describe_histogram!(
-            Self::PRUNED_KEY_COUNT,
-            Unit::Count,
-            "Number of pruned node keys on a specific pruning iteration"
-        );
-        metrics::describe_gauge!(
-            Self::DELETED_STALE_KEY_VERSIONS,
-            Unit::Count,
-            "Lower and upper boundaries on the new stale key versions deleted \
-             during a pruning iteration. The lower boundary is inclusive, the upper one is exclusive"
-        );
-    }
-
-    pub(crate) fn report(self) {
-        metrics::gauge!(
-            Self::TARGET_RETAINED_VERSION,
-            self.target_retained_version as f64
-        );
-        metrics::histogram!(Self::PRUNED_KEY_COUNT, self.pruned_key_count as f64);
-        metrics::gauge!(
-            Self::DELETED_STALE_KEY_VERSIONS,
-            self.deleted_stale_key_versions.start as f64,
-            "bound" => "start"
-        );
-        metrics::gauge!(
-            Self::DELETED_STALE_KEY_VERSIONS,
-            self.deleted_stale_key_versions.end as f64,
-            "bound" => "end"
-        );
+    pub fn report(self) {
+        PRUNING_METRICS
+            .target_retained_version
+            .set(self.target_retained_version);
+        PRUNING_METRICS.key_count.observe(self.pruned_key_count);
+        PRUNING_METRICS.deleted_stale_key_versions[&Bound::Start]
+            .set(self.deleted_stale_key_versions.start);
+        PRUNING_METRICS.deleted_stale_key_versions[&Bound::End]
+            .set(self.deleted_stale_key_versions.end);
     }
 }
 
-#[derive(Debug, Clone, Copy)]
-pub(crate) enum PruningTimings {
-    LoadStaleKeys,
-    ApplyPatch,
-}
-
-impl PruningTimings {
-    const LOAD_STALE_KEYS: &'static str = "merkle_tree.pruning.load_stale_keys";
-    const APPLY_PATCH: &'static str = "merkle_tree.pruning.apply_patch";
-
-    fn describe() {
-        metrics::describe_histogram!(
-            Self::LOAD_STALE_KEYS,
-            Unit::Seconds,
-            "Time spent loading stale keys per pruning iteration"
-        );
-        metrics::describe_histogram!(
-            Self::APPLY_PATCH,
-            Unit::Seconds,
-            "Time spent removing stale keys from RocksDB per pruning iteration"
-        );
-    }
+#[derive(Debug, Metrics)]
+#[metrics(prefix = "merkle_tree_pruning")]
+pub(crate) struct PruningTimings {
+    /// Time spent loading stale keys per pruning iteration.
+    #[metrics(buckets = Buckets::LATENCIES)]
+    pub load_stale_keys: Histogram<Duration>,
+    /// Time spent removing stale keys from RocksDB per pruning iteration.
+    #[metrics(buckets = Buckets::LATENCIES)]
+    pub apply_patch: Histogram<Duration>,
 }
 
-impl Timing for PruningTimings {
-    fn as_str(self) -> &'static str {
-        match self {
-            Self::LoadStaleKeys => Self::LOAD_STALE_KEYS,
-            Self::ApplyPatch => Self::APPLY_PATCH,
-        }
-    }
-}
+#[vise::register]
+pub(crate) static PRUNING_TIMINGS: Global<PruningTimings> = Global::new();
diff --git a/core/lib/merkle_tree/src/pruning.rs b/core/lib/merkle_tree/src/pruning.rs
index c0b88bfbe979..21836b581ba8 100644
--- a/core/lib/merkle_tree/src/pruning.rs
+++ b/core/lib/merkle_tree/src/pruning.rs
@@ -3,7 +3,7 @@
 use std::{fmt, sync::mpsc, time::Duration};
 
 use crate::{
-    metrics::{PruningStats, PruningTimings, Timing},
+    metrics::{PruningStats, PRUNING_TIMINGS},
     storage::{PruneDatabase, PrunePatchSet},
 };
 
@@ -105,9 +105,9 @@ impl<DB: PruneDatabase> MerkleTreePruner<DB> {
         let target_retained_version = self.target_retained_version()?;
         let min_stale_key_version = self.db.min_stale_key_version()?;
         let stale_key_new_versions = min_stale_key_version..=target_retained_version;
-        vlog::info!("Collecting stale keys with new versions in {stale_key_new_versions:?}");
+        tracing::info!("Collecting stale keys with new versions in {stale_key_new_versions:?}");
 
-        let load_stale_keys = PruningTimings::LoadStaleKeys.start();
+        let load_stale_keys_latency = PRUNING_TIMINGS.load_stale_keys.start();
         let mut pruned_keys = vec![];
         let mut max_stale_key_version = min_stale_key_version;
         for version in stale_key_new_versions {
@@ -117,14 +117,14 @@ impl<DB: PruneDatabase> MerkleTreePruner<DB> {
                 break;
             }
         }
-        load_stale_keys.report();
+        load_stale_keys_latency.observe();
 
         if pruned_keys.is_empty() {
-            vlog::info!("No stale keys to remove; skipping");
+            tracing::info!("No stale keys to remove; skipping");
             return None;
         }
         let deleted_stale_key_versions = min_stale_key_version..(max_stale_key_version + 1);
-        vlog::info!(
+        tracing::info!(
             "Collected {} stale keys with new versions in {deleted_stale_key_versions:?}",
             pruned_keys.len()
         );
@@ -135,15 +135,15 @@ impl<DB: PruneDatabase> MerkleTreePruner<DB> {
             deleted_stale_key_versions: deleted_stale_key_versions.clone(),
         };
         let patch = PrunePatchSet::new(pruned_keys, deleted_stale_key_versions);
-        let apply_patch = PruningTimings::ApplyPatch.start();
+        let apply_patch_latency = PRUNING_TIMINGS.apply_patch.start();
         self.db.prune(patch);
-        apply_patch.report();
+        apply_patch_latency.observe();
         Some(stats)
     }
 
     /// Runs this pruner indefinitely until it is aborted by dropping its handle.
     pub fn run(mut self) {
-        vlog::info!("Started Merkle tree pruner {self:?}");
+        tracing::info!("Started Merkle tree pruner {self:?}");
         loop {
             let timeout = if let Some(stats) = self.run_once() {
                 let has_more_work = stats.has_more_work();
@@ -154,14 +154,14 @@ impl<DB: PruneDatabase> MerkleTreePruner<DB> {
                     self.poll_interval
                 }
             } else {
-                vlog::debug!("No pruning required per specified policies; waiting");
+                tracing::debug!("No pruning required per specified policies; waiting");
                 self.poll_interval
             };
 
             match self.aborted_receiver.recv_timeout(timeout) {
                 Ok(()) => break, // Abort was requested
                 Err(mpsc::RecvTimeoutError::Disconnected) => {
-                    vlog::warn!("Pruner handle is dropped without calling `abort()`; exiting");
+                    tracing::warn!("Pruner handle is dropped without calling `abort()`; exiting");
                     break;
                 }
                 Err(mpsc::RecvTimeoutError::Timeout) => {
diff --git a/core/lib/merkle_tree/src/storage/mod.rs b/core/lib/merkle_tree/src/storage/mod.rs
index 9da0d30f3f9c..3c653d161769 100644
--- a/core/lib/merkle_tree/src/storage/mod.rs
+++ b/core/lib/merkle_tree/src/storage/mod.rs
@@ -17,7 +17,7 @@ pub use self::{
 
 use crate::{
     hasher::HashTree,
-    metrics::{BlockTimings, LeafCountMetric, Timing, TreeUpdaterMetrics},
+    metrics::{TreeUpdaterStats, BLOCK_TIMINGS, GENERAL_METRICS},
     types::{
         BlockOutput, ChildRef, InternalNode, Key, LeafNode, Manifest, Nibbles, Node, Root,
         TreeLogEntry, TreeTags, ValueHash,
@@ -28,14 +28,14 @@ use crate::{
 /// Mutable storage encapsulating AR16MT update logic.
 #[derive(Debug)]
 struct TreeUpdater {
-    metrics: TreeUpdaterMetrics,
+    metrics: TreeUpdaterStats,
     patch_set: WorkingPatchSet,
 }
 
 impl TreeUpdater {
     fn new(version: u64, root: Root) -> Self {
         Self {
-            metrics: TreeUpdaterMetrics::default(),
+            metrics: TreeUpdaterStats::default(),
             patch_set: WorkingPatchSet::new(version, root),
         }
     }
@@ -268,12 +268,12 @@ impl<'a, DB: Database + ?Sized> Storage<'a, DB> {
     /// Extends the Merkle tree in the lightweight operation mode, without intermediate hash
     /// computations.
     pub fn extend(mut self, key_value_pairs: Vec<(Key, ValueHash)>) -> (BlockOutput, PatchSet) {
-        let load_nodes = BlockTimings::LoadNodes.start();
+        let load_nodes_latency = BLOCK_TIMINGS.load_nodes.start();
         let sorted_keys = SortedKeys::new(key_value_pairs.iter().map(|(key, _)| *key));
         let parent_nibbles = self.updater.load_ancestors(&sorted_keys, self.db);
-        load_nodes.report();
+        load_nodes_latency.observe();
 
-        let extend_patch = BlockTimings::ExtendPatch.start();
+        let extend_patch_latency = BLOCK_TIMINGS.extend_patch.start();
         let mut logs = Vec::with_capacity(key_value_pairs.len());
         for ((key, value_hash), parent_nibbles) in key_value_pairs.into_iter().zip(parent_nibbles) {
             let (log, _) = self.updater.insert(key, value_hash, &parent_nibbles, || {
@@ -281,7 +281,7 @@ impl<'a, DB: Database + ?Sized> Storage<'a, DB> {
             });
             logs.push(log);
         }
-        extend_patch.report();
+        extend_patch_latency.observe();
 
         let leaf_count = self.leaf_count;
         let (root_hash, patch) = self.finalize();
@@ -296,13 +296,13 @@ impl<'a, DB: Database + ?Sized> Storage<'a, DB> {
     fn finalize(self) -> (ValueHash, PatchSet) {
         self.updater.metrics.report();
 
-        let finalize_patch = BlockTimings::FinalizePatch.start();
+        let finalize_patch = BLOCK_TIMINGS.finalize_patch.start();
         let (root_hash, patch, stats) =
             self.updater
                 .patch_set
                 .finalize(self.manifest, self.leaf_count, self.hasher);
-        finalize_patch.report();
-        LeafCountMetric(self.leaf_count).report();
+        GENERAL_METRICS.leaf_count.set(self.leaf_count);
+        finalize_patch.observe();
         stats.report();
 
         (root_hash, patch)
diff --git a/core/lib/merkle_tree/src/storage/patch.rs b/core/lib/merkle_tree/src/storage/patch.rs
index f8eb9a3747c5..2cfe2c9375b1 100644
--- a/core/lib/merkle_tree/src/storage/patch.rs
+++ b/core/lib/merkle_tree/src/storage/patch.rs
@@ -6,7 +6,7 @@ use std::collections::{hash_map::Entry, HashMap};
 
 use crate::{
     hasher::HashTree,
-    metrics::HashingMetrics,
+    metrics::HashingStats,
     storage::{proofs::SUBTREE_COUNT, SortedKeys},
     types::{
         ChildRef, InternalNode, Manifest, Nibbles, NibblesBytes, Node, NodeKey, Root, ValueHash,
@@ -21,6 +21,9 @@ use crate::{
 pub struct PatchSet {
     pub(super) manifest: Manifest,
     pub(super) roots: HashMap<u64, Root>,
+    // TODO (BFT-130): investigate most efficient ways to store key-value pairs:
+    //   - `HashMap`s indexed by version
+    //   - Full upper levels (i.e., `Vec<Option<Node>>`)
     pub(super) nodes_by_version: HashMap<u64, HashMap<NodeKey, Node>>,
     pub(super) stale_keys_by_version: HashMap<u64, Vec<NodeKey>>,
 }
@@ -341,10 +344,10 @@ impl WorkingPatchSet {
         manifest: Manifest,
         leaf_count: u64,
         hasher: &dyn HashTree,
-    ) -> (ValueHash, PatchSet, HashingMetrics) {
+    ) -> (ValueHash, PatchSet, HashingStats) {
         self.remove_unchanged_nodes();
         let stale_keys = self.stale_keys();
-        let metrics = HashingMetrics::default();
+        let metrics = HashingStats::default();
 
         let mut changes_by_nibble_count = self.changes_by_nibble_count;
         if changes_by_nibble_count.is_empty() {
diff --git a/core/lib/merkle_tree/src/storage/proofs.rs b/core/lib/merkle_tree/src/storage/proofs.rs
index 230ca68f270e..a854ee5e6277 100644
--- a/core/lib/merkle_tree/src/storage/proofs.rs
+++ b/core/lib/merkle_tree/src/storage/proofs.rs
@@ -62,7 +62,7 @@ use rayon::prelude::*;
 
 use crate::{
     hasher::{HasherWithStats, MerklePath},
-    metrics::{BlockTimings, HashingMetrics, LeafCountMetric, Timing, TreeUpdaterMetrics},
+    metrics::{HashingStats, TreeUpdaterStats, BLOCK_TIMINGS, GENERAL_METRICS},
     storage::{Database, NewLeafData, PatchSet, SortedKeys, Storage, TraverseOutcome, TreeUpdater},
     types::{
         BlockOutputWithProofs, InternalNode, Key, Nibbles, Node, TreeInstruction, TreeLogEntry,
@@ -239,7 +239,7 @@ impl TreeUpdater {
 
     fn split(self) -> [Self; SUBTREE_COUNT] {
         self.patch_set.split().map(|patch_set| Self {
-            metrics: TreeUpdaterMetrics::default(),
+            metrics: TreeUpdaterStats::default(),
             patch_set,
         })
     }
@@ -304,10 +304,10 @@ impl<'a, DB: Database + ?Sized> Storage<'a, DB> {
         mut self,
         instructions: Vec<(Key, TreeInstruction)>,
     ) -> (BlockOutputWithProofs, PatchSet) {
-        let load_nodes = BlockTimings::LoadNodes.start();
+        let load_nodes_latency = BLOCK_TIMINGS.load_nodes.start();
         let sorted_keys = SortedKeys::new(instructions.iter().map(|(key, _)| *key));
         let parent_nibbles = self.updater.load_ancestors(&sorted_keys, self.db);
-        load_nodes.report();
+        load_nodes_latency.observe();
 
         let leaf_indices = self.compute_leaf_indices(&instructions, sorted_keys, &parent_nibbles);
         let instruction_parts =
@@ -316,9 +316,9 @@ impl<'a, DB: Database + ?Sized> Storage<'a, DB> {
         let initial_metrics = self.updater.metrics;
         let storage_parts = self.updater.split();
 
-        let hashing_stats = HashingMetrics::default();
+        let hashing_stats = HashingStats::default();
 
-        let extend_patch = BlockTimings::ExtendPatch.start();
+        let extend_patch_latency = BLOCK_TIMINGS.extend_patch.start();
         // `into_par_iter()` below uses `rayon` to parallelize tree traversal and proof generation.
         let (storage_parts, logs): (Vec<_>, Vec<_>) = storage_parts
             .into_par_iter()
@@ -333,9 +333,9 @@ impl<'a, DB: Database + ?Sized> Storage<'a, DB> {
                 },
             )
             .unzip();
-        extend_patch.report();
+        extend_patch_latency.observe();
 
-        let finalize_patch = BlockTimings::FinalizePatch.start();
+        let finalize_patch_latency = BLOCK_TIMINGS.finalize_patch.start();
         self.updater = storage_parts
             .into_iter()
             .reduce(TreeUpdater::merge)
@@ -346,7 +346,7 @@ impl<'a, DB: Database + ?Sized> Storage<'a, DB> {
         let logs = merge_by_index(logs);
         let mut hasher = self.hasher.with_stats(&hashing_stats);
         let output_with_proofs = self.finalize_with_proofs(&mut hasher, initial_root, logs);
-        finalize_patch.report();
+        finalize_patch_latency.observe();
         drop(hasher);
         hashing_stats.report();
 
@@ -402,7 +402,7 @@ impl<'a, DB: Database + ?Sized> Storage<'a, DB> {
             logs,
             leaf_count: self.leaf_count,
         };
-        LeafCountMetric(self.leaf_count).report();
+        GENERAL_METRICS.leaf_count.set(self.leaf_count);
 
         (block_output, patch)
     }
diff --git a/core/lib/merkle_tree/src/storage/rocksdb.rs b/core/lib/merkle_tree/src/storage/rocksdb.rs
index 3aadf97f3739..23fb81ebb02e 100644
--- a/core/lib/merkle_tree/src/storage/rocksdb.rs
+++ b/core/lib/merkle_tree/src/storage/rocksdb.rs
@@ -6,7 +6,7 @@ use std::{path::Path, sync::Arc};
 
 use crate::{
     errors::{DeserializeError, ErrorContext},
-    metrics::ApplyPatchMetrics,
+    metrics::ApplyPatchStats,
     storage::{
         database::{PruneDatabase, PrunePatchSet},
         Database, NodeKeys, PatchSet,
@@ -77,6 +77,9 @@ impl RocksDBWrapper {
     /// the `io-uring` feature of `rocksdb` crate and is only available on Linux.
     /// Thus, setting this value to around `100..1_000` can still lead to substantial
     /// performance boost (order of 2x) in some environments.
+    ///
+    /// [RocksDB docs]: https://github.com/facebook/rocksdb/wiki/MultiGet-Performance
+    // TODO (BFT-153): Benchmark multi-get performance to find out optimal value
     pub fn set_multi_get_chunk_size(&mut self, chunk_size: usize) {
         self.multi_get_chunk_size = chunk_size;
     }
@@ -187,7 +190,7 @@ impl Database for RocksDBWrapper {
         let mut node_bytes = Vec::with_capacity(128);
         // ^ 128 looks somewhat reasonable as node capacity
 
-        let mut metrics = ApplyPatchMetrics::new(patch.copied_hashes_count());
+        let mut metrics = ApplyPatchStats::new(patch.copied_hashes_count());
 
         patch.manifest.serialize(&mut node_bytes);
         write_batch.put_cf(tree_cf, Self::MANIFEST_KEY, &node_bytes);
diff --git a/core/lib/merkle_tree/src/types.rs b/core/lib/merkle_tree/src/types.rs
index 5ee36dc6ef94..7aa0c1d023e3 100644
--- a/core/lib/merkle_tree/src/types.rs
+++ b/core/lib/merkle_tree/src/types.rs
@@ -256,6 +256,7 @@ impl NodeKey {
         }
     }
 
+    // TODO (BFT-239): Add a fallible version for verifying consistency
     pub(crate) fn from_db_key(bytes: &[u8]) -> Self {
         assert!(bytes.len() >= 9, "`NodeKey` is too short");
 
diff --git a/core/lib/mini_merkle_tree/Cargo.toml b/core/lib/mini_merkle_tree/Cargo.toml
index e9691aacfcde..ac59b0cc9e2b 100644
--- a/core/lib/mini_merkle_tree/Cargo.toml
+++ b/core/lib/mini_merkle_tree/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "zksync_mini_merkle_tree"
-version = "1.0.0"
+version = "0.1.0"
 edition = "2021"
 authors = ["The Matter Labs Team <hello@matterlabs.dev>"]
 homepage = "https://zksync.io/"
@@ -10,8 +10,8 @@ keywords = ["blockchain", "zksync"]
 categories = ["cryptography"]
 
 [dependencies]
-zksync_crypto = { path = "../../lib/crypto", version = "1.0" }
-zksync_basic_types = { path = "../basic_types", version = "1.0" }
+zksync_crypto = { path = "../../lib/crypto" }
+zksync_basic_types = { path = "../basic_types" }
 
 once_cell = "1.7"
 
diff --git a/core/lib/mini_merkle_tree/src/lib.rs b/core/lib/mini_merkle_tree/src/lib.rs
index 2f9f5436bde8..a4e9552aad6f 100644
--- a/core/lib/mini_merkle_tree/src/lib.rs
+++ b/core/lib/mini_merkle_tree/src/lib.rs
@@ -88,6 +88,7 @@ impl<'a, const LEAF_SIZE: usize> MiniMerkleTree<'a, LEAF_SIZE> {
     /// Returns the root hash of this tree.
     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()
         } else {
             self.compute_merkle_root_and_path(0, None)
diff --git a/core/lib/multivm/Cargo.toml b/core/lib/multivm/Cargo.toml
index 7cfdc2ee69e8..4abef1cc50b8 100644
--- a/core/lib/multivm/Cargo.toml
+++ b/core/lib/multivm/Cargo.toml
@@ -10,13 +10,14 @@ keywords = ["blockchain", "zksync"]
 categories = ["cryptography"]
 
 [dependencies]
-vm_m5 = { path = "../../multivm_deps/vm_m5", version = "0.1.0" }
-vm_m6 = { path = "../../multivm_deps/vm_m6", version = "0.1.0" }
-vm_vm1_3_2 = { path = "../vm", package = "vm", version = "0.1.0" }
+vm_m5 = { path = "../../multivm_deps/vm_m5" }
+vm_m6 = { path = "../../multivm_deps/vm_m6" }
+vm_1_3_2 = { path = "../../multivm_deps/vm_1_3_2" }
+vm_latest = { path = "../vm", package = "vm" }
 
-zksync_types = { path = "../types", version = "1.0.0" }
-zksync_state = { path = "../state", version = "1.0.0" }
-zksync_contracts = { path = "../contracts", version = "1.0.0" }
-zksync_utils = { path = "../utils", version = "1.0.0" }
+zksync_types = { path = "../types" }
+zksync_state = { path = "../state" }
+zksync_contracts = { path = "../contracts" }
+zksync_utils = { path = "../utils" }
 
-vlog = { path = "../../lib/vlog", version = "1.0" }
+vlog = { path = "../../lib/vlog" }
diff --git a/core/lib/multivm/src/glue/block_properties.rs b/core/lib/multivm/src/glue/block_properties.rs
index 0e8f4d45ed4a..e37dbfd895b4 100644
--- a/core/lib/multivm/src/glue/block_properties.rs
+++ b/core/lib/multivm/src/glue/block_properties.rs
@@ -1,6 +1,4 @@
-use zksync_types::U256;
-
-use crate::VmVersion;
+use zksync_types::{VmVersion, U256};
 
 /// Wrapper for block properties.
 /// We have to have it as a public type, since VM requires it to be passed via reference with the same lifetime as other
@@ -12,7 +10,7 @@ use crate::VmVersion;
 pub enum BlockProperties {
     // M5 & M6 are covered by this variant.
     Vm1_3_1(vm_m6::zk_evm::block_properties::BlockProperties),
-    Vm1_3_2(vm_vm1_3_2::zk_evm::block_properties::BlockProperties),
+    Vm1_3_2(vm_1_3_2::zk_evm::block_properties::BlockProperties),
 }
 
 impl BlockProperties {
@@ -29,12 +27,18 @@ impl BlockProperties {
                 Self::Vm1_3_1(inner)
             }
             VmVersion::Vm1_3_2 => {
-                let inner = vm_vm1_3_2::zk_evm::block_properties::BlockProperties {
+                let inner = vm_1_3_2::zk_evm::block_properties::BlockProperties {
                     zkporter_is_available: false,
                     default_aa_code_hash,
                 };
                 Self::Vm1_3_2(inner)
             }
+            VmVersion::VmVirtualBlocks => {
+                unreachable!(
+                    "Vm with virtual blocks has another initialization logic, \
+                     so it's not required to have BlockProperties for it"
+                )
+            }
         }
     }
 
@@ -56,7 +60,7 @@ impl BlockProperties {
         }
     }
 
-    pub fn vm1_3_2(&self) -> &vm_vm1_3_2::zk_evm::block_properties::BlockProperties {
+    pub fn vm1_3_2(&self) -> &vm_1_3_2::zk_evm::block_properties::BlockProperties {
         if let BlockProperties::Vm1_3_2(inner) = self {
             inner
         } else {
diff --git a/core/lib/multivm/src/glue/history_mode.rs b/core/lib/multivm/src/glue/history_mode.rs
new file mode 100644
index 000000000000..2055e963ffe8
--- /dev/null
+++ b/core/lib/multivm/src/glue/history_mode.rs
@@ -0,0 +1,48 @@
+use crate::glue::{GlueFrom, GlueInto};
+
+pub trait HistoryMode:
+    Default
+    + GlueInto<Self::VmM6Mode>
+    + GlueInto<Self::Vm1_3_2Mode>
+    + GlueInto<Self::VmVirtualBlocksMode>
+{
+    type VmM6Mode: vm_m6::HistoryMode;
+    type Vm1_3_2Mode: vm_1_3_2::HistoryMode;
+    type VmVirtualBlocksMode: vm_latest::HistoryMode;
+}
+
+impl GlueFrom<vm_latest::HistoryEnabled> for vm_m6::HistoryEnabled {
+    fn glue_from(_: vm_latest::HistoryEnabled) -> Self {
+        Self
+    }
+}
+
+impl GlueFrom<vm_latest::HistoryEnabled> for vm_1_3_2::HistoryEnabled {
+    fn glue_from(_: vm_latest::HistoryEnabled) -> Self {
+        Self
+    }
+}
+
+impl GlueFrom<vm_latest::HistoryDisabled> for vm_m6::HistoryDisabled {
+    fn glue_from(_: vm_latest::HistoryDisabled) -> Self {
+        Self
+    }
+}
+
+impl GlueFrom<vm_latest::HistoryDisabled> for vm_1_3_2::HistoryDisabled {
+    fn glue_from(_: vm_latest::HistoryDisabled) -> Self {
+        Self
+    }
+}
+
+impl HistoryMode for vm_latest::HistoryEnabled {
+    type VmM6Mode = vm_m6::HistoryEnabled;
+    type Vm1_3_2Mode = vm_1_3_2::HistoryEnabled;
+    type VmVirtualBlocksMode = vm_latest::HistoryEnabled;
+}
+
+impl HistoryMode for vm_latest::HistoryDisabled {
+    type VmM6Mode = vm_m6::HistoryDisabled;
+    type Vm1_3_2Mode = vm_1_3_2::HistoryDisabled;
+    type VmVirtualBlocksMode = vm_latest::HistoryDisabled;
+}
diff --git a/core/lib/multivm/src/glue/init_vm.rs b/core/lib/multivm/src/glue/init_vm.rs
index 43e64e4a1508..a2f251394036 100644
--- a/core/lib/multivm/src/glue/init_vm.rs
+++ b/core/lib/multivm/src/glue/init_vm.rs
@@ -1,101 +1,87 @@
 use super::GlueInto;
-use crate::VmVersion;
+use crate::glue::history_mode::HistoryMode;
+use crate::vm_instance::{VmInstanceData, VmInstanceVersion};
+use crate::VmInstance;
+use vm_latest::{L1BatchEnv, SystemEnv};
+use zksync_state::ReadStorage;
+use zksync_utils::h256_to_u256;
 
-pub fn init_vm<'a>(
-    version: VmVersion,
-    oracle_tools: &'a mut crate::glue::oracle_tools::OracleTools<'a>,
-    block_context: vm_vm1_3_2::vm_with_bootloader::BlockContextMode,
-    block_properties: &'a crate::glue::block_properties::BlockProperties,
-    execution_mode: vm_vm1_3_2::vm_with_bootloader::TxExecutionMode,
-    base_system_contracts: &zksync_contracts::BaseSystemContracts,
-) -> crate::VmInstance<'a> {
-    let gas_limit = match version {
-        VmVersion::M5WithoutRefunds => vm_m5::utils::BLOCK_GAS_LIMIT,
-        VmVersion::M5WithRefunds => vm_m5::utils::BLOCK_GAS_LIMIT,
-        VmVersion::M6Initial => vm_m6::utils::BLOCK_GAS_LIMIT,
-        VmVersion::M6BugWithCompressionFixed => vm_m6::utils::BLOCK_GAS_LIMIT,
-        VmVersion::Vm1_3_2 => vm_vm1_3_2::utils::BLOCK_GAS_LIMIT,
-    };
+impl<'a, S: ReadStorage, H: HistoryMode> VmInstance<'a, S, H> {
+    pub fn new(
+        l1_batch_env: L1BatchEnv,
+        system_env: SystemEnv,
+        initial_version: &'a mut VmInstanceData<S, H>,
+    ) -> Self {
+        match initial_version {
+            VmInstanceData::M5(data) => {
+                let inner_vm = vm_m5::vm_with_bootloader::init_vm_with_gas_limit(
+                    data.sub_version,
+                    data.oracle_tools.m5(),
+                    l1_batch_env.glue_into(),
+                    data.block_properties.m5(),
+                    system_env.execution_mode.glue_into(),
+                    &system_env.base_system_smart_contracts.clone().glue_into(),
+                    system_env.gas_limit,
+                );
+                VmInstance {
+                    vm: VmInstanceVersion::VmM5(inner_vm),
+                    system_env,
+                    last_tx_compressed_bytecodes: vec![],
+                }
+            }
+            VmInstanceData::M6(data) => {
+                let inner_vm = vm_m6::vm_with_bootloader::init_vm_with_gas_limit(
+                    data.sub_version,
+                    data.oracle_tools.m6(),
+                    l1_batch_env.glue_into(),
+                    data.block_properties.m6(),
+                    system_env.execution_mode.glue_into(),
+                    &system_env.base_system_smart_contracts.clone().glue_into(),
+                    system_env.gas_limit,
+                );
+                VmInstance {
+                    vm: VmInstanceVersion::VmM6(inner_vm),
+                    system_env,
+                    last_tx_compressed_bytecodes: vec![],
+                }
+            }
 
-    init_vm_with_gas_limit(
-        version,
-        oracle_tools,
-        block_context,
-        block_properties,
-        execution_mode,
-        base_system_contracts,
-        gas_limit,
-    )
-}
-
-pub fn init_vm_with_gas_limit<'a>(
-    version: VmVersion,
-    oracle_tools: &'a mut crate::glue::oracle_tools::OracleTools<'a>,
-    block_context: vm_vm1_3_2::vm_with_bootloader::BlockContextMode,
-    block_properties: &'a crate::glue::block_properties::BlockProperties,
-    execution_mode: vm_vm1_3_2::vm_with_bootloader::TxExecutionMode,
-    base_system_contracts: &zksync_contracts::BaseSystemContracts,
-    gas_limit: u32,
-) -> crate::VmInstance<'a> {
-    match version {
-        VmVersion::M5WithoutRefunds => {
-            let inner_vm = vm_m5::vm_with_bootloader::init_vm_with_gas_limit(
-                vm_m5::vm::MultiVMSubversion::V1,
-                oracle_tools.m5(),
-                block_context.glue_into(),
-                block_properties.m5(),
-                execution_mode.glue_into(),
-                &base_system_contracts.clone().glue_into(),
-                gas_limit,
-            );
-            crate::VmInstance::VmM5(inner_vm)
-        }
-        VmVersion::M5WithRefunds => {
-            let inner_vm = vm_m5::vm_with_bootloader::init_vm_with_gas_limit(
-                vm_m5::vm::MultiVMSubversion::V2,
-                oracle_tools.m5(),
-                block_context.glue_into(),
-                block_properties.m5(),
-                execution_mode.glue_into(),
-                &base_system_contracts.clone().glue_into(),
-                gas_limit,
-            );
-            crate::VmInstance::VmM5(inner_vm)
-        }
-        VmVersion::M6Initial => {
-            let inner_vm = vm_m6::vm_with_bootloader::init_vm_with_gas_limit(
-                vm_m6::vm::MultiVMSubversion::V1,
-                oracle_tools.m6(),
-                block_context.glue_into(),
-                block_properties.m6(),
-                execution_mode.glue_into(),
-                &base_system_contracts.clone().glue_into(),
-                gas_limit,
-            );
-            crate::VmInstance::VmM6(inner_vm)
-        }
-        VmVersion::M6BugWithCompressionFixed => {
-            let inner_vm = vm_m6::vm_with_bootloader::init_vm_with_gas_limit(
-                vm_m6::vm::MultiVMSubversion::V2,
-                oracle_tools.m6(),
-                block_context.glue_into(),
-                block_properties.m6(),
-                execution_mode.glue_into(),
-                &base_system_contracts.clone().glue_into(),
-                gas_limit,
-            );
-            crate::VmInstance::VmM6(inner_vm)
-        }
-        VmVersion::Vm1_3_2 => {
-            let inner_vm = vm_vm1_3_2::vm_with_bootloader::init_vm_with_gas_limit(
-                oracle_tools.vm1_3_2(),
-                block_context.glue_into(),
-                block_properties.vm1_3_2(),
-                execution_mode.glue_into(),
-                &base_system_contracts.clone().glue_into(),
-                gas_limit,
-            );
-            crate::VmInstance::Vm1_3_2(inner_vm)
+            VmInstanceData::Vm1_3_2(data) => {
+                let oracle_tools = vm_1_3_2::OracleTools::new(data.storage_view.clone());
+                let block_properties = vm_1_3_2::BlockProperties {
+                    default_aa_code_hash: h256_to_u256(
+                        system_env.base_system_smart_contracts.default_aa.hash,
+                    ),
+                    zkporter_is_available: false,
+                };
+                let inner_vm = vm_1_3_2::vm_with_bootloader::init_vm_with_gas_limit(
+                    oracle_tools,
+                    l1_batch_env.glue_into(),
+                    block_properties,
+                    system_env.execution_mode.glue_into(),
+                    &system_env.base_system_smart_contracts.clone().glue_into(),
+                    system_env.gas_limit,
+                );
+                VmInstance {
+                    vm: VmInstanceVersion::Vm1_3_2(inner_vm),
+                    system_env,
+                    last_tx_compressed_bytecodes: vec![],
+                }
+            }
+            VmInstanceData::VmVirtualBlocks(data) => {
+                let vm = vm_latest::Vm::new(
+                    l1_batch_env.glue_into(),
+                    system_env.clone(),
+                    data.storage_view.clone(),
+                    H::VmVirtualBlocksMode::default(),
+                );
+                let vm = VmInstanceVersion::VmVirtualBlocks(Box::new(vm));
+                Self {
+                    vm,
+                    system_env,
+                    last_tx_compressed_bytecodes: vec![],
+                }
+            }
         }
     }
 }
diff --git a/core/lib/multivm/src/glue/mod.rs b/core/lib/multivm/src/glue/mod.rs
index 8954089b1714..8b27fc39cd5b 100644
--- a/core/lib/multivm/src/glue/mod.rs
+++ b/core/lib/multivm/src/glue/mod.rs
@@ -8,8 +8,10 @@
 //! The "private glue" lies in the `types` module.
 
 pub(crate) mod block_properties;
+pub(crate) mod history_mode;
 pub(crate) mod init_vm;
 pub(crate) mod oracle_tools;
+pub(crate) mod tracer;
 mod types;
 
 /// This trait is a workaround on the Rust'c [orphan rule](orphan_rule).
diff --git a/core/lib/multivm/src/glue/oracle_tools.rs b/core/lib/multivm/src/glue/oracle_tools.rs
index 49cf552f1ce2..b13c15af168f 100644
--- a/core/lib/multivm/src/glue/oracle_tools.rs
+++ b/core/lib/multivm/src/glue/oracle_tools.rs
@@ -1,66 +1,49 @@
-use crate::VmVersion;
-
-use zksync_state::{ReadStorage, StorageView};
+use crate::glue::history_mode::HistoryMode;
+use zksync_state::{ReadStorage, StoragePtr, StorageView};
+use zksync_types::VmVersion;
 
 #[allow(clippy::large_enum_variant)]
 #[derive(Debug)]
-pub enum OracleTools<'a> {
-    M5(vm_m5::OracleTools<'a, false>),
-    M6(vm_m6::OracleTools<'a, false, vm_m6::HistoryEnabled>),
-    Vm1_3_2(vm_vm1_3_2::OracleTools<'a, false, vm_vm1_3_2::HistoryEnabled>),
+pub enum OracleTools<S: ReadStorage, H: HistoryMode> {
+    M5(vm_m5::OracleTools<false, StorageView<S>>),
+    M6(vm_m6::OracleTools<false, StorageView<S>, H::VmM6Mode>),
 }
 
-impl<'a> OracleTools<'a> {
-    pub fn new<S>(version: VmVersion, state: &'a mut StorageView<S>) -> Self
-    where
-        S: ReadStorage + std::fmt::Debug + Send + Sync,
-    {
+impl<S, H: HistoryMode> OracleTools<S, H>
+where
+    S: ReadStorage + std::fmt::Debug,
+{
+    pub fn new(version: VmVersion, state: StoragePtr<StorageView<S>>, history: H) -> Self {
         match version {
             VmVersion::M5WithoutRefunds => {
-                let oracle_tools = vm_m5::OracleTools::new(
-                    state as &mut dyn vm_m5::storage::Storage,
-                    vm_m5::vm::MultiVMSubversion::V1,
-                );
+                let oracle_tools = vm_m5::OracleTools::new(state, vm_m5::vm::MultiVMSubversion::V1);
                 OracleTools::M5(oracle_tools)
             }
             VmVersion::M5WithRefunds => {
-                let oracle_tools = vm_m5::OracleTools::new(
-                    state as &mut dyn vm_m5::storage::Storage,
-                    vm_m5::vm::MultiVMSubversion::V2,
-                );
+                let oracle_tools = vm_m5::OracleTools::new(state, vm_m5::vm::MultiVMSubversion::V2);
                 OracleTools::M5(oracle_tools)
             }
             VmVersion::M6Initial | VmVersion::M6BugWithCompressionFixed => {
-                let oracle_tools = vm_m6::OracleTools::new(
-                    state as &mut dyn vm_m6::storage::Storage,
-                    vm_m6::HistoryEnabled,
-                );
+                let oracle_tools = vm_m6::OracleTools::new(state, history.glue_into());
                 OracleTools::M6(oracle_tools)
             }
             VmVersion::Vm1_3_2 => {
-                let oracle_tools = vm_vm1_3_2::OracleTools::new(state, vm_vm1_3_2::HistoryEnabled);
-                OracleTools::Vm1_3_2(oracle_tools)
+                panic!("oracle tools for vm1.3.2 do not exist")
+            }
+            VmVersion::VmVirtualBlocks => {
+                panic!("oracle tools for VmVirtualBlocks do not exist")
             }
         }
     }
 
-    pub fn vm1_3_2(
-        &mut self,
-    ) -> &mut vm_vm1_3_2::OracleTools<'a, false, vm_vm1_3_2::HistoryEnabled> {
-        let OracleTools::Vm1_3_2(oracle_tools) = self else {
-            panic!("OracleTools::latest() called on non-latest version")
-        };
-        oracle_tools
-    }
-
-    pub fn m6(&mut self) -> &mut vm_m6::OracleTools<'a, false, vm_m6::HistoryEnabled> {
+    pub fn m6(&mut self) -> &mut vm_m6::OracleTools<false, StorageView<S>, H::VmM6Mode> {
         let OracleTools::M6(oracle_tools) = self else {
             panic!("OracleTools::m6() called on non-m6 version")
         };
         oracle_tools
     }
 
-    pub fn m5(&mut self) -> &mut vm_m5::OracleTools<'a, false> {
+    pub fn m5(&mut self) -> &mut vm_m5::OracleTools<false, StorageView<S>> {
         let OracleTools::M5(oracle_tools) = self else {
             panic!("OracleTools::m5() called on non-m5 version")
         };
diff --git a/core/lib/multivm/src/glue/tracer.rs b/core/lib/multivm/src/glue/tracer.rs
new file mode 100644
index 000000000000..d80a1585084e
--- /dev/null
+++ b/core/lib/multivm/src/glue/tracer.rs
@@ -0,0 +1,68 @@
+//! # Multivm Tracing
+//!
+//! The MultiVM tracing module enables Tracers support for different versions of virtual machines
+//!
+//! ## Overview
+//!
+//! Different VM versions may have distinct requirements and types for Tracers. To accommodate these differences,
+//! this module defines one primary trait:
+//!
+//! - `MultivmTracer<S, H>`: This trait represents a tracer that can be converted into a tracer for
+//! specific VM version.
+//!
+//! Specific traits for each VM version, which supports Custom Tracers
+//! - `IntoLatestTracer<S, H>`: This trait is responsible for converting a tracer
+//! into a form compatible with the latest VM version.
+//! It defines a method `latest` for obtaining a boxed tracer.
+//!
+//! For `MultivmTracer` to be implemented, Tracer must implement all N currently
+//! existing sub-traits.
+//!
+//! Any tracer compatible with the current VM automatically
+//! supports conversion into the latest VM,
+//! but the remaining traits required by the MultivmTracer should be implemented manually.
+//! If a certain tracer is not intended to be used with VMs other than the latest one,
+//! these traits should still be implemented, but one may just write a panicking implementation.
+//!
+//! ## Adding a new VM version
+//!
+//! To add support for one more VM version to MultivmTracer, one needs to:
+//! - Create a new trait performing conversion to the specified VM tracer, e.g. `Into<VmVersion>Tracer`.
+//! - Provide implementations of this trait for all the structures that currently implement `MultivmTracer`.
+//! - Add this trait as a trait bound to the `MultivmTracer`.
+//! - Integrate the newly added method to the MultiVM itself (e.g. add required tracer conversions where applicable).
+use zksync_state::WriteStorage;
+
+pub trait MultivmTracer<S: WriteStorage, H: vm_latest::HistoryMode>:
+    IntoLatestTracer<S, H>
+{
+    fn into_boxed(self) -> Box<dyn MultivmTracer<S, H>>
+    where
+        Self: Sized + 'static,
+    {
+        Box::new(self)
+    }
+}
+
+pub trait IntoLatestTracer<S: WriteStorage, H: vm_latest::HistoryMode> {
+    fn latest(&self) -> Box<dyn vm_latest::VmTracer<S, H>>;
+}
+
+impl<S, H, T> IntoLatestTracer<S, H> for T
+where
+    S: WriteStorage,
+    H: vm_latest::HistoryMode,
+    T: vm_latest::VmTracer<S, H> + Clone + 'static,
+{
+    fn latest(&self) -> Box<dyn vm_latest::VmTracer<S, H>> {
+        Box::new(self.clone())
+    }
+}
+
+impl<S, H, T> MultivmTracer<S, H> for T
+where
+    S: WriteStorage,
+    H: vm_latest::HistoryMode,
+    T: vm_latest::VmTracer<S, H> + Clone + 'static,
+{
+}
diff --git a/core/lib/multivm/src/glue/types/vm/block_context.rs b/core/lib/multivm/src/glue/types/vm/block_context.rs
deleted file mode 100644
index 702f7f08fcd5..000000000000
--- a/core/lib/multivm/src/glue/types/vm/block_context.rs
+++ /dev/null
@@ -1,29 +0,0 @@
-use crate::glue::GlueFrom;
-
-impl GlueFrom<vm_vm1_3_2::vm_with_bootloader::BlockContext>
-    for vm_m5::vm_with_bootloader::BlockContext
-{
-    fn glue_from(value: vm_vm1_3_2::vm_with_bootloader::BlockContext) -> Self {
-        Self {
-            block_number: value.block_number,
-            block_timestamp: value.block_timestamp,
-            operator_address: value.operator_address,
-            l1_gas_price: value.l1_gas_price,
-            fair_l2_gas_price: value.fair_l2_gas_price,
-        }
-    }
-}
-
-impl GlueFrom<vm_vm1_3_2::vm_with_bootloader::BlockContext>
-    for vm_m6::vm_with_bootloader::BlockContext
-{
-    fn glue_from(value: vm_vm1_3_2::vm_with_bootloader::BlockContext) -> Self {
-        Self {
-            block_number: value.block_number,
-            block_timestamp: value.block_timestamp,
-            operator_address: value.operator_address,
-            l1_gas_price: value.l1_gas_price,
-            fair_l2_gas_price: value.fair_l2_gas_price,
-        }
-    }
-}
diff --git a/core/lib/multivm/src/glue/types/vm/block_context_mode.rs b/core/lib/multivm/src/glue/types/vm/block_context_mode.rs
index 70830947c928..739b4886478b 100644
--- a/core/lib/multivm/src/glue/types/vm/block_context_mode.rs
+++ b/core/lib/multivm/src/glue/types/vm/block_context_mode.rs
@@ -1,41 +1,59 @@
-use crate::glue::{GlueFrom, GlueInto};
+use crate::glue::GlueFrom;
+use zksync_utils::h256_to_u256;
 
-impl GlueFrom<vm_vm1_3_2::vm_with_bootloader::BlockContextMode>
-    for vm_m5::vm_with_bootloader::BlockContextMode
-{
-    fn glue_from(value: vm_vm1_3_2::vm_with_bootloader::BlockContextMode) -> Self {
-        match value {
-            vm_vm1_3_2::vm_with_bootloader::BlockContextMode::NewBlock(
-                derived,
-                prev_block_hash,
-            ) => {
-                let derived = derived.glue_into();
-                Self::NewBlock(derived, prev_block_hash)
-            }
-            vm_vm1_3_2::vm_with_bootloader::BlockContextMode::OverrideCurrent(derived) => {
-                let derived = derived.glue_into();
-                Self::OverrideCurrent(derived)
-            }
+impl GlueFrom<vm_latest::L1BatchEnv> for vm_m5::vm_with_bootloader::BlockContextMode {
+    fn glue_from(value: vm_latest::L1BatchEnv) -> Self {
+        let derived = vm_m5::vm_with_bootloader::DerivedBlockContext {
+            context: vm_m5::vm_with_bootloader::BlockContext {
+                block_number: value.number.0,
+                block_timestamp: value.timestamp,
+                operator_address: value.fee_account,
+                l1_gas_price: value.l1_gas_price,
+                fair_l2_gas_price: value.fair_l2_gas_price,
+            },
+            base_fee: value.base_fee(),
+        };
+        match value.previous_batch_hash {
+            Some(hash) => Self::NewBlock(derived, h256_to_u256(hash)),
+            None => Self::OverrideCurrent(derived),
         }
     }
 }
 
-impl GlueFrom<vm_vm1_3_2::vm_with_bootloader::BlockContextMode>
-    for vm_m6::vm_with_bootloader::BlockContextMode
-{
-    fn glue_from(value: vm_vm1_3_2::vm_with_bootloader::BlockContextMode) -> Self {
-        match value {
-            vm_vm1_3_2::vm_with_bootloader::BlockContextMode::NewBlock(
-                derived,
-                prev_block_hash,
-            ) => {
-                let derived = derived.glue_into();
-                Self::NewBlock(derived, prev_block_hash)
-            }
-            vm_vm1_3_2::vm_with_bootloader::BlockContextMode::OverrideCurrent(derived) => {
-                let derived = derived.glue_into();
-                Self::OverrideCurrent(derived)
-            }
+impl GlueFrom<vm_latest::L1BatchEnv> for vm_m6::vm_with_bootloader::BlockContextMode {
+    fn glue_from(value: vm_latest::L1BatchEnv) -> Self {
+        let derived = vm_m6::vm_with_bootloader::DerivedBlockContext {
+            context: vm_m6::vm_with_bootloader::BlockContext {
+                block_number: value.number.0,
+                block_timestamp: value.timestamp,
+                operator_address: value.fee_account,
+                l1_gas_price: value.l1_gas_price,
+                fair_l2_gas_price: value.fair_l2_gas_price,
+            },
+            base_fee: value.base_fee(),
+        };
+        match value.previous_batch_hash {
+            Some(hash) => Self::NewBlock(derived, h256_to_u256(hash)),
+            None => Self::OverrideCurrent(derived),
+        }
+    }
+}
+
+impl GlueFrom<vm_latest::L1BatchEnv> for vm_1_3_2::vm_with_bootloader::BlockContextMode {
+    fn glue_from(value: vm_latest::L1BatchEnv) -> Self {
+        let derived = vm_1_3_2::vm_with_bootloader::DerivedBlockContext {
+            context: vm_1_3_2::vm_with_bootloader::BlockContext {
+                block_number: value.number.0,
+                block_timestamp: value.timestamp,
+                operator_address: value.fee_account,
+                l1_gas_price: value.l1_gas_price,
+                fair_l2_gas_price: value.fair_l2_gas_price,
+            },
+            base_fee: value.base_fee(),
+        };
+        match value.previous_batch_hash {
+            Some(hash) => Self::NewBlock(derived, h256_to_u256(hash)),
+            None => Self::OverrideCurrent(derived),
         }
     }
 }
diff --git a/core/lib/multivm/src/glue/types/vm/bootloader_job_type.rs b/core/lib/multivm/src/glue/types/vm/bootloader_job_type.rs
deleted file mode 100644
index f19891d2f949..000000000000
--- a/core/lib/multivm/src/glue/types/vm/bootloader_job_type.rs
+++ /dev/null
@@ -1,31 +0,0 @@
-use crate::glue::GlueFrom;
-
-impl GlueFrom<vm_vm1_3_2::vm_with_bootloader::BootloaderJobType>
-    for vm_m5::vm_with_bootloader::BootloaderJobType
-{
-    fn glue_from(value: vm_vm1_3_2::vm_with_bootloader::BootloaderJobType) -> Self {
-        match value {
-            vm_vm1_3_2::vm_with_bootloader::BootloaderJobType::TransactionExecution => {
-                Self::TransactionExecution
-            }
-            vm_vm1_3_2::vm_with_bootloader::BootloaderJobType::BlockPostprocessing => {
-                Self::BlockPostprocessing
-            }
-        }
-    }
-}
-
-impl GlueFrom<vm_vm1_3_2::vm_with_bootloader::BootloaderJobType>
-    for vm_m6::vm_with_bootloader::BootloaderJobType
-{
-    fn glue_from(value: vm_vm1_3_2::vm_with_bootloader::BootloaderJobType) -> Self {
-        match value {
-            vm_vm1_3_2::vm_with_bootloader::BootloaderJobType::TransactionExecution => {
-                Self::TransactionExecution
-            }
-            vm_vm1_3_2::vm_with_bootloader::BootloaderJobType::BlockPostprocessing => {
-                Self::BlockPostprocessing
-            }
-        }
-    }
-}
diff --git a/core/lib/multivm/src/glue/types/vm/derived_block_context.rs b/core/lib/multivm/src/glue/types/vm/derived_block_context.rs
deleted file mode 100644
index 146db6f3af1a..000000000000
--- a/core/lib/multivm/src/glue/types/vm/derived_block_context.rs
+++ /dev/null
@@ -1,23 +0,0 @@
-use crate::glue::{GlueFrom, GlueInto};
-
-impl GlueFrom<vm_vm1_3_2::vm_with_bootloader::DerivedBlockContext>
-    for vm_m5::vm_with_bootloader::DerivedBlockContext
-{
-    fn glue_from(value: vm_vm1_3_2::vm_with_bootloader::DerivedBlockContext) -> Self {
-        Self {
-            context: value.context.glue_into(),
-            base_fee: value.base_fee,
-        }
-    }
-}
-
-impl GlueFrom<vm_vm1_3_2::vm_with_bootloader::DerivedBlockContext>
-    for vm_m6::vm_with_bootloader::DerivedBlockContext
-{
-    fn glue_from(value: vm_vm1_3_2::vm_with_bootloader::DerivedBlockContext) -> Self {
-        Self {
-            context: value.context.glue_into(),
-            base_fee: value.base_fee,
-        }
-    }
-}
diff --git a/core/lib/multivm/src/glue/types/vm/mod.rs b/core/lib/multivm/src/glue/types/vm/mod.rs
index a6f6aa3c526c..a9e8d84ad702 100644
--- a/core/lib/multivm/src/glue/types/vm/mod.rs
+++ b/core/lib/multivm/src/glue/types/vm/mod.rs
@@ -1,12 +1,8 @@
-mod block_context;
 mod block_context_mode;
-mod bootloader_job_type;
-mod derived_block_context;
 mod tx_execution_mode;
 mod tx_revert_reason;
 mod vm_block_result;
 mod vm_execution_result;
 mod vm_partial_execution_result;
 mod vm_revert_reason;
-mod vm_revert_reason_parsing_result;
 mod vm_tx_execution_result;
diff --git a/core/lib/multivm/src/glue/types/vm/tx_execution_mode.rs b/core/lib/multivm/src/glue/types/vm/tx_execution_mode.rs
index 7095e60463f8..e9b901ff9906 100644
--- a/core/lib/multivm/src/glue/types/vm/tx_execution_mode.rs
+++ b/core/lib/multivm/src/glue/types/vm/tx_execution_mode.rs
@@ -1,34 +1,46 @@
 use crate::glue::GlueFrom;
 
-impl GlueFrom<vm_vm1_3_2::vm_with_bootloader::TxExecutionMode>
-    for vm_m5::vm_with_bootloader::TxExecutionMode
-{
-    fn glue_from(value: vm_vm1_3_2::vm_with_bootloader::TxExecutionMode) -> Self {
+impl GlueFrom<vm_latest::TxExecutionMode> for vm_m5::vm_with_bootloader::TxExecutionMode {
+    fn glue_from(value: vm_latest::TxExecutionMode) -> Self {
         match value {
-            vm_vm1_3_2::vm_with_bootloader::TxExecutionMode::VerifyExecute => Self::VerifyExecute,
-            vm_vm1_3_2::vm_with_bootloader::TxExecutionMode::EstimateFee { .. } => {
-                Self::EstimateFee
-            }
-            vm_vm1_3_2::vm_with_bootloader::TxExecutionMode::EthCall { .. } => Self::EthCall,
+            vm_latest::TxExecutionMode::VerifyExecute => Self::VerifyExecute,
+            vm_latest::TxExecutionMode::EstimateFee => Self::EstimateFee,
+            vm_latest::TxExecutionMode::EthCall => Self::EthCall,
         }
     }
 }
 
-impl GlueFrom<vm_vm1_3_2::vm_with_bootloader::TxExecutionMode>
-    for vm_m6::vm_with_bootloader::TxExecutionMode
-{
-    fn glue_from(value: vm_vm1_3_2::vm_with_bootloader::TxExecutionMode) -> Self {
+impl GlueFrom<vm_latest::TxExecutionMode> for vm_m6::vm_with_bootloader::TxExecutionMode {
+    fn glue_from(value: vm_latest::TxExecutionMode) -> Self {
         match value {
-            vm_vm1_3_2::vm_with_bootloader::TxExecutionMode::VerifyExecute => Self::VerifyExecute,
-            vm_vm1_3_2::vm_with_bootloader::TxExecutionMode::EstimateFee {
-                missed_storage_invocation_limit,
-            } => Self::EstimateFee {
-                missed_storage_invocation_limit,
+            vm_latest::TxExecutionMode::VerifyExecute => Self::VerifyExecute,
+            vm_latest::TxExecutionMode::EstimateFee => Self::EstimateFee {
+                // We used it only for api services we don't have limit for storage invocation inside statekeeper
+                // It's impossible to recover this value for the vm integration after virtual blocks
+                missed_storage_invocation_limit: usize::MAX,
             },
-            vm_vm1_3_2::vm_with_bootloader::TxExecutionMode::EthCall {
-                missed_storage_invocation_limit,
-            } => Self::EthCall {
-                missed_storage_invocation_limit,
+            vm_latest::TxExecutionMode::EthCall => Self::EthCall {
+                // We used it only for api services we don't have limit for storage invocation inside statekeeper
+                // It's impossible to recover this value for the vm integration after virtual blocks
+                missed_storage_invocation_limit: usize::MAX,
+            },
+        }
+    }
+}
+
+impl GlueFrom<vm_latest::TxExecutionMode> for vm_1_3_2::vm_with_bootloader::TxExecutionMode {
+    fn glue_from(value: vm_latest::TxExecutionMode) -> Self {
+        match value {
+            vm_latest::TxExecutionMode::VerifyExecute => Self::VerifyExecute,
+            vm_latest::TxExecutionMode::EstimateFee => Self::EstimateFee {
+                // We used it only for api services we don't have limit for storage invocation inside statekeeper
+                // It's impossible to recover this value for the vm integration after virtual blocks
+                missed_storage_invocation_limit: usize::MAX,
+            },
+            vm_latest::TxExecutionMode::EthCall => Self::EthCall {
+                // We used it only for api services we don't have limit for storage invocation inside statekeeper
+                // It's impossible to recover this value for the vm integration after virtual blocks
+                missed_storage_invocation_limit: usize::MAX,
             },
         }
     }
diff --git a/core/lib/multivm/src/glue/types/vm/tx_revert_reason.rs b/core/lib/multivm/src/glue/types/vm/tx_revert_reason.rs
index 7751eed3588d..854575ae2dc6 100644
--- a/core/lib/multivm/src/glue/types/vm/tx_revert_reason.rs
+++ b/core/lib/multivm/src/glue/types/vm/tx_revert_reason.rs
@@ -1,63 +1,138 @@
 use crate::glue::{GlueFrom, GlueInto};
 
-impl GlueFrom<vm_m5::TxRevertReason> for vm_vm1_3_2::TxRevertReason {
+impl GlueFrom<vm_m5::TxRevertReason> for vm_latest::TxRevertReason {
     fn glue_from(value: vm_m5::TxRevertReason) -> Self {
         match value {
-            vm_m5::TxRevertReason::EthCall(err) => Self::EthCall(err.glue_into()),
+            vm_m5::TxRevertReason::EthCall(err) => Self::TxReverted(err.glue_into()),
             vm_m5::TxRevertReason::TxReverted(err) => Self::TxReverted(err.glue_into()),
-            vm_m5::TxRevertReason::ValidationFailed(err) => Self::ValidationFailed(err.glue_into()),
-            vm_m5::TxRevertReason::PaymasterValidationFailed(err) => {
-                Self::PaymasterValidationFailed(err.glue_into())
+            vm_m5::TxRevertReason::ValidationFailed(err) => {
+                Self::Halt(vm_latest::Halt::ValidationFailed(err.glue_into()))
             }
-            vm_m5::TxRevertReason::PrePaymasterPreparationFailed(err) => {
-                Self::PrePaymasterPreparationFailed(err.glue_into())
+            vm_m5::TxRevertReason::PaymasterValidationFailed(err) => {
+                Self::Halt(vm_latest::Halt::PaymasterValidationFailed(err.glue_into()))
             }
-            vm_m5::TxRevertReason::PayForTxFailed(err) => Self::PayForTxFailed(err.glue_into()),
-            vm_m5::TxRevertReason::FailedToMarkFactoryDependencies(err) => {
-                Self::FailedToMarkFactoryDependencies(err.glue_into())
+            vm_m5::TxRevertReason::PrePaymasterPreparationFailed(err) => Self::Halt(
+                vm_latest::Halt::PrePaymasterPreparationFailed(err.glue_into()),
+            ),
+            vm_m5::TxRevertReason::PayForTxFailed(err) => {
+                Self::Halt(vm_latest::Halt::PayForTxFailed(err.glue_into()))
             }
+            vm_m5::TxRevertReason::FailedToMarkFactoryDependencies(err) => Self::Halt(
+                vm_latest::Halt::FailedToMarkFactoryDependencies(err.glue_into()),
+            ),
             vm_m5::TxRevertReason::FailedToChargeFee(err) => {
-                Self::FailedToChargeFee(err.glue_into())
-            }
-            vm_m5::TxRevertReason::FromIsNotAnAccount => Self::FromIsNotAnAccount,
-            vm_m5::TxRevertReason::InnerTxError => Self::InnerTxError,
-            vm_m5::TxRevertReason::Unknown(err) => Self::Unknown(err.glue_into()),
-            vm_m5::TxRevertReason::UnexpectedVMBehavior(err) => Self::UnexpectedVMBehavior(err),
-            vm_m5::TxRevertReason::BootloaderOutOfGas => Self::BootloaderOutOfGas,
-            vm_m5::TxRevertReason::TooBigGasLimit => Self::TooBigGasLimit,
-            vm_m5::TxRevertReason::NotEnoughGasProvided => Self::NotEnoughGasProvided,
+                Self::Halt(vm_latest::Halt::FailedToChargeFee(err.glue_into()))
+            }
+            vm_m5::TxRevertReason::FromIsNotAnAccount => {
+                Self::Halt(vm_latest::Halt::FromIsNotAnAccount)
+            }
+            vm_m5::TxRevertReason::InnerTxError => Self::Halt(vm_latest::Halt::InnerTxError),
+            vm_m5::TxRevertReason::Unknown(err) => {
+                Self::Halt(vm_latest::Halt::Unknown(err.glue_into()))
+            }
+            vm_m5::TxRevertReason::UnexpectedVMBehavior(err) => {
+                Self::Halt(vm_latest::Halt::UnexpectedVMBehavior(err))
+            }
+            vm_m5::TxRevertReason::BootloaderOutOfGas => {
+                Self::Halt(vm_latest::Halt::BootloaderOutOfGas)
+            }
+            vm_m5::TxRevertReason::TooBigGasLimit => Self::Halt(vm_latest::Halt::TooBigGasLimit),
+            vm_m5::TxRevertReason::NotEnoughGasProvided => {
+                Self::Halt(vm_latest::Halt::NotEnoughGasProvided)
+            }
         }
     }
 }
 
-impl GlueFrom<vm_m6::TxRevertReason> for vm_vm1_3_2::TxRevertReason {
+impl GlueFrom<vm_m6::TxRevertReason> for vm_latest::TxRevertReason {
     fn glue_from(value: vm_m6::TxRevertReason) -> Self {
         match value {
-            vm_m6::TxRevertReason::EthCall(err) => Self::EthCall(err.glue_into()),
+            vm_m6::TxRevertReason::EthCall(err) => Self::TxReverted(err.glue_into()),
             vm_m6::TxRevertReason::TxReverted(err) => Self::TxReverted(err.glue_into()),
-            vm_m6::TxRevertReason::ValidationFailed(err) => Self::ValidationFailed(err.glue_into()),
-            vm_m6::TxRevertReason::PaymasterValidationFailed(err) => {
-                Self::PaymasterValidationFailed(err.glue_into())
+            vm_m6::TxRevertReason::ValidationFailed(err) => {
+                Self::Halt(vm_latest::Halt::ValidationFailed(err.glue_into()))
             }
-            vm_m6::TxRevertReason::PrePaymasterPreparationFailed(err) => {
-                Self::PrePaymasterPreparationFailed(err.glue_into())
+            vm_m6::TxRevertReason::PaymasterValidationFailed(err) => {
+                Self::Halt(vm_latest::Halt::PaymasterValidationFailed(err.glue_into()))
             }
-            vm_m6::TxRevertReason::PayForTxFailed(err) => Self::PayForTxFailed(err.glue_into()),
-            vm_m6::TxRevertReason::FailedToMarkFactoryDependencies(err) => {
-                Self::FailedToMarkFactoryDependencies(err.glue_into())
+            vm_m6::TxRevertReason::PrePaymasterPreparationFailed(err) => Self::Halt(
+                vm_latest::Halt::PrePaymasterPreparationFailed(err.glue_into()),
+            ),
+            vm_m6::TxRevertReason::PayForTxFailed(err) => {
+                Self::Halt(vm_latest::Halt::PayForTxFailed(err.glue_into()))
             }
+            vm_m6::TxRevertReason::FailedToMarkFactoryDependencies(err) => Self::Halt(
+                vm_latest::Halt::FailedToMarkFactoryDependencies(err.glue_into()),
+            ),
             vm_m6::TxRevertReason::FailedToChargeFee(err) => {
-                Self::FailedToChargeFee(err.glue_into())
-            }
-            vm_m6::TxRevertReason::FromIsNotAnAccount => Self::FromIsNotAnAccount,
-            vm_m6::TxRevertReason::InnerTxError => Self::InnerTxError,
-            vm_m6::TxRevertReason::Unknown(err) => Self::Unknown(err.glue_into()),
-            vm_m6::TxRevertReason::UnexpectedVMBehavior(err) => Self::UnexpectedVMBehavior(err),
-            vm_m6::TxRevertReason::BootloaderOutOfGas => Self::BootloaderOutOfGas,
-            vm_m6::TxRevertReason::TooBigGasLimit => Self::TooBigGasLimit,
-            vm_m6::TxRevertReason::NotEnoughGasProvided => Self::NotEnoughGasProvided,
+                Self::Halt(vm_latest::Halt::FailedToChargeFee(err.glue_into()))
+            }
+            vm_m6::TxRevertReason::FromIsNotAnAccount => {
+                Self::Halt(vm_latest::Halt::FromIsNotAnAccount)
+            }
+            vm_m6::TxRevertReason::InnerTxError => Self::Halt(vm_latest::Halt::InnerTxError),
+            vm_m6::TxRevertReason::Unknown(err) => {
+                Self::Halt(vm_latest::Halt::Unknown(err.glue_into()))
+            }
+            vm_m6::TxRevertReason::UnexpectedVMBehavior(err) => {
+                Self::Halt(vm_latest::Halt::UnexpectedVMBehavior(err))
+            }
+            vm_m6::TxRevertReason::BootloaderOutOfGas => {
+                Self::Halt(vm_latest::Halt::BootloaderOutOfGas)
+            }
+            vm_m6::TxRevertReason::TooBigGasLimit => Self::Halt(vm_latest::Halt::TooBigGasLimit),
+            vm_m6::TxRevertReason::NotEnoughGasProvided => {
+                Self::Halt(vm_latest::Halt::NotEnoughGasProvided)
+            }
             vm_m6::TxRevertReason::MissingInvocationLimitReached => {
-                Self::MissingInvocationLimitReached
+                Self::Halt(vm_latest::Halt::MissingInvocationLimitReached)
+            }
+        }
+    }
+}
+
+impl GlueFrom<vm_1_3_2::TxRevertReason> for vm_latest::TxRevertReason {
+    fn glue_from(value: vm_1_3_2::TxRevertReason) -> Self {
+        match value {
+            vm_1_3_2::TxRevertReason::EthCall(err) => Self::TxReverted(err.glue_into()),
+            vm_1_3_2::TxRevertReason::TxReverted(err) => Self::TxReverted(err.glue_into()),
+            vm_1_3_2::TxRevertReason::ValidationFailed(err) => {
+                Self::Halt(vm_latest::Halt::ValidationFailed(err.glue_into()))
+            }
+            vm_1_3_2::TxRevertReason::PaymasterValidationFailed(err) => {
+                Self::Halt(vm_latest::Halt::PaymasterValidationFailed(err.glue_into()))
+            }
+            vm_1_3_2::TxRevertReason::PrePaymasterPreparationFailed(err) => Self::Halt(
+                vm_latest::Halt::PrePaymasterPreparationFailed(err.glue_into()),
+            ),
+            vm_1_3_2::TxRevertReason::PayForTxFailed(err) => {
+                Self::Halt(vm_latest::Halt::PayForTxFailed(err.glue_into()))
+            }
+            vm_1_3_2::TxRevertReason::FailedToMarkFactoryDependencies(err) => Self::Halt(
+                vm_latest::Halt::FailedToMarkFactoryDependencies(err.glue_into()),
+            ),
+            vm_1_3_2::TxRevertReason::FailedToChargeFee(err) => {
+                Self::Halt(vm_latest::Halt::FailedToChargeFee(err.glue_into()))
+            }
+            vm_1_3_2::TxRevertReason::FromIsNotAnAccount => {
+                Self::Halt(vm_latest::Halt::FromIsNotAnAccount)
+            }
+            vm_1_3_2::TxRevertReason::InnerTxError => Self::Halt(vm_latest::Halt::InnerTxError),
+            vm_1_3_2::TxRevertReason::Unknown(err) => {
+                Self::Halt(vm_latest::Halt::Unknown(err.glue_into()))
+            }
+            vm_1_3_2::TxRevertReason::UnexpectedVMBehavior(err) => {
+                Self::Halt(vm_latest::Halt::UnexpectedVMBehavior(err))
+            }
+            vm_1_3_2::TxRevertReason::BootloaderOutOfGas => {
+                Self::Halt(vm_latest::Halt::BootloaderOutOfGas)
+            }
+            vm_1_3_2::TxRevertReason::TooBigGasLimit => Self::Halt(vm_latest::Halt::TooBigGasLimit),
+            vm_1_3_2::TxRevertReason::NotEnoughGasProvided => {
+                Self::Halt(vm_latest::Halt::NotEnoughGasProvided)
+            }
+            vm_1_3_2::TxRevertReason::MissingInvocationLimitReached => {
+                Self::Halt(vm_latest::Halt::MissingInvocationLimitReached)
             }
         }
     }
diff --git a/core/lib/multivm/src/glue/types/vm/validation_error.rs b/core/lib/multivm/src/glue/types/vm/validation_error.rs
new file mode 100644
index 000000000000..7c06ac8e0c6f
--- /dev/null
+++ b/core/lib/multivm/src/glue/types/vm/validation_error.rs
@@ -0,0 +1,74 @@
+use crate::glue::{GlueFrom, GlueInto};
+
+impl GlueFrom<vm_m5::oracles::tracer::ValidationError>
+    for vm_latest::oracles::tracer::ValidationError
+{
+    fn glue_from(value: vm_m5::oracles::tracer::ValidationError) -> Self {
+        match value {
+            vm_m5::oracles::tracer::ValidationError::FailedTx(value) => {
+                Self::FailedTx(value.glue_into())
+            }
+            vm_m5::oracles::tracer::ValidationError::VioalatedRule(value) => {
+                let rule = match value {
+                    vm_m5::oracles::tracer::ViolatedValidationRule::TouchedUnallowedStorageSlots(a, b) =>
+                        vm_latest::oracles::tracer::ViolatedValidationRule::TouchedUnallowedStorageSlots(a, b),
+                    vm_m5::oracles::tracer::ViolatedValidationRule::CalledContractWithNoCode(a) =>
+                        vm_latest::oracles::tracer::ViolatedValidationRule::CalledContractWithNoCode(a),
+                    vm_m5::oracles::tracer::ViolatedValidationRule::TouchedUnallowedContext =>
+                        vm_latest::oracles::tracer::ViolatedValidationRule::TouchedUnallowedContext,
+                };
+                Self::ViolatedRule(rule)
+            }
+        }
+    }
+}
+
+impl GlueFrom<vm_m6::oracles::tracer::ValidationError>
+    for vm_latest::oracles::tracer::ValidationError
+{
+    fn glue_from(value: vm_m6::oracles::tracer::ValidationError) -> Self {
+        match value {
+            vm_m6::oracles::tracer::ValidationError::FailedTx(value) => {
+                Self::FailedTx(value.glue_into())
+            }
+            vm_m6::oracles::tracer::ValidationError::VioalatedRule(value) => {
+                let rule = match value {
+                    vm_m6::oracles::tracer::ViolatedValidationRule::TouchedUnallowedStorageSlots(a, b) =>
+                        vm_latest::oracles::tracer::ViolatedValidationRule::TouchedUnallowedStorageSlots(a, b),
+                    vm_m6::oracles::tracer::ViolatedValidationRule::CalledContractWithNoCode(a) =>
+                        vm_latest::oracles::tracer::ViolatedValidationRule::CalledContractWithNoCode(a),
+                    vm_m6::oracles::tracer::ViolatedValidationRule::TouchedUnallowedContext =>
+                        vm_latest::oracles::tracer::ViolatedValidationRule::TouchedUnallowedContext,
+                    vm_m6::oracles::tracer::ViolatedValidationRule::TookTooManyComputationalGas(a) =>
+                        vm_latest::oracles::tracer::ViolatedValidationRule::TookTooManyComputationalGas(a),
+                };
+                Self::ViolatedRule(rule)
+            }
+        }
+    }
+}
+
+impl GlueFrom<vm_1_3_2::oracles::tracer::ValidationError>
+    for vm_latest::oracles::tracer::ValidationError
+{
+    fn glue_from(value: vm_1_3_2::oracles::tracer::ValidationError) -> Self {
+        match value {
+            vm_1_3_2::oracles::tracer::ValidationError::FailedTx(value) => {
+                Self::FailedTx(value.glue_into())
+            }
+            vm_1_3_2::oracles::tracer::ValidationError::ViolatedRule(value) => {
+                let rule = match value {
+                    vm_1_3_2::oracles::tracer::ViolatedValidationRule::TouchedUnallowedStorageSlots(a, b) =>
+                        vm_latest::oracles::tracer::ViolatedValidationRule::TouchedUnallowedStorageSlots(a, b),
+                    vm_1_3_2::oracles::tracer::ViolatedValidationRule::CalledContractWithNoCode(a) =>
+                        vm_latest::oracles::tracer::ViolatedValidationRule::CalledContractWithNoCode(a),
+                    vm_1_3_2::oracles::tracer::ViolatedValidationRule::TouchedUnallowedContext =>
+                        vm_latest::oracles::tracer::ViolatedValidationRule::TouchedUnallowedContext,
+                    vm_1_3_2::oracles::tracer::ViolatedValidationRule::TookTooManyComputationalGas(a) =>
+                        vm_latest::oracles::tracer::ViolatedValidationRule::TookTooManyComputationalGas(a),
+                };
+                Self::ViolatedRule(rule)
+            }
+        }
+    }
+}
diff --git a/core/lib/multivm/src/glue/types/vm/validation_tracer_params.rs b/core/lib/multivm/src/glue/types/vm/validation_tracer_params.rs
new file mode 100644
index 000000000000..5e5fa77f2cde
--- /dev/null
+++ b/core/lib/multivm/src/glue/types/vm/validation_tracer_params.rs
@@ -0,0 +1,45 @@
+use crate::glue::GlueFrom;
+
+impl GlueFrom<vm_latest::oracles::tracer::ValidationTracerParams>
+    for vm_m5::oracles::tracer::ValidationTracerParams
+{
+    fn glue_from(value: vm_latest::oracles::tracer::ValidationTracerParams) -> Self {
+        Self {
+            user_address: value.user_address,
+            paymaster_address: value.paymaster_address,
+            trusted_slots: value.trusted_slots,
+            trusted_addresses: value.trusted_addresses,
+            trusted_address_slots: value.trusted_address_slots,
+        }
+    }
+}
+
+impl GlueFrom<vm_latest::oracles::tracer::ValidationTracerParams>
+    for vm_m6::oracles::tracer::ValidationTracerParams
+{
+    fn glue_from(value: vm_latest::oracles::tracer::ValidationTracerParams) -> Self {
+        Self {
+            user_address: value.user_address,
+            paymaster_address: value.paymaster_address,
+            trusted_slots: value.trusted_slots,
+            trusted_addresses: value.trusted_addresses,
+            trusted_address_slots: value.trusted_address_slots,
+            computational_gas_limit: value.computational_gas_limit,
+        }
+    }
+}
+
+impl GlueFrom<vm_latest::oracles::tracer::ValidationTracerParams>
+    for vm_1_3_2::oracles::tracer::ValidationTracerParams
+{
+    fn glue_from(value: vm_latest::oracles::tracer::ValidationTracerParams) -> Self {
+        Self {
+            user_address: value.user_address,
+            paymaster_address: value.paymaster_address,
+            trusted_slots: value.trusted_slots,
+            trusted_addresses: value.trusted_addresses,
+            trusted_address_slots: value.trusted_address_slots,
+            computational_gas_limit: value.computational_gas_limit,
+        }
+    }
+}
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 8b6225d2cfe5..1c0465855b66 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,19 +1,206 @@
 use crate::glue::{GlueFrom, GlueInto};
+use vm_latest::{
+    CurrentExecutionState, ExecutionResult, Refunds, VmExecutionResultAndLogs,
+    VmExecutionStatistics,
+};
+use zksync_types::tx::tx_execution_info::VmExecutionLogs;
 
-impl GlueFrom<vm_m5::VmBlockResult> for vm_vm1_3_2::VmBlockResult {
-    fn glue_from(value: vm_m5::VmBlockResult) -> Self {
-        Self {
-            full_result: value.full_result.glue_into(),
-            block_tip_result: value.block_tip_result.glue_into(),
+// 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.
+// Bootloader memory required only for producing witnesses,
+// and server doesn't need to generate witnesses for old blocks
+
+impl GlueFrom<vm_m5::vm::VmBlockResult> for vm_latest::FinishedL1Batch {
+    fn glue_from(value: vm_m5::vm::VmBlockResult) -> Self {
+        vm_latest::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,
+                },
+                statistics: VmExecutionStatistics {
+                    contracts_used: value.block_tip_result.contracts_used,
+                    cycles_used: value.block_tip_result.cycles_used,
+                    total_log_queries: value.block_tip_result.logs.total_log_queries_count,
+                    computational_gas_used: value.full_result.gas_used,
+                    gas_used: value.full_result.gas_used,
+                },
+                refunds: Refunds::default(),
+            },
+            final_execution_state: CurrentExecutionState {
+                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,
+                total_log_queries: value.full_result.total_log_queries,
+                cycles_used: value.full_result.cycles_used,
+            },
+            final_bootloader_memory: None,
+        }
+    }
+}
+
+impl GlueFrom<vm_m6::vm::VmBlockResult> for vm_latest::FinishedL1Batch {
+    fn glue_from(value: vm_m6::vm::VmBlockResult) -> Self {
+        vm_latest::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,
+                },
+                statistics: VmExecutionStatistics {
+                    contracts_used: value.block_tip_result.contracts_used,
+                    cycles_used: value.block_tip_result.cycles_used,
+                    total_log_queries: value.block_tip_result.logs.total_log_queries_count,
+                    computational_gas_used: value.full_result.computational_gas_used,
+                    gas_used: value.full_result.gas_used,
+                },
+                refunds: Refunds::default(),
+            },
+            final_execution_state: CurrentExecutionState {
+                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,
+                total_log_queries: value.full_result.total_log_queries,
+                cycles_used: value.full_result.cycles_used,
+            },
+            final_bootloader_memory: None,
+        }
+    }
+}
+
+impl GlueFrom<vm_1_3_2::vm::VmBlockResult> for vm_latest::FinishedL1Batch {
+    fn glue_from(value: vm_1_3_2::vm::VmBlockResult) -> Self {
+        vm_latest::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,
+                },
+                statistics: VmExecutionStatistics {
+                    contracts_used: value.block_tip_result.contracts_used,
+                    cycles_used: value.block_tip_result.cycles_used,
+                    total_log_queries: value.block_tip_result.logs.total_log_queries_count,
+                    computational_gas_used: value.full_result.computational_gas_used,
+                    gas_used: value.full_result.gas_used,
+                },
+                refunds: Refunds::default(),
+            },
+            final_execution_state: CurrentExecutionState {
+                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,
+                total_log_queries: value.full_result.total_log_queries,
+                cycles_used: value.full_result.cycles_used,
+            },
+            final_bootloader_memory: None,
+        }
+    }
+}
+
+impl GlueFrom<vm_1_3_2::vm::VmBlockResult> for vm_latest::VmExecutionResultAndLogs {
+    fn glue_from(value: vm_1_3_2::vm::VmBlockResult) -> Self {
+        let mut result = value
+            .full_result
+            .revert_reason
+            .map(|a| a.revert_reason)
+            .glue_into();
+
+        if let ExecutionResult::Success { output } = &mut result {
+            *output = value.full_result.return_data;
+        }
+
+        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,
+            },
+            statistics: VmExecutionStatistics {
+                contracts_used: value.full_result.contracts_used,
+                cycles_used: value.full_result.cycles_used,
+                total_log_queries: value.full_result.total_log_queries,
+                computational_gas_used: value.full_result.computational_gas_used,
+                gas_used: value.full_result.gas_used,
+            },
+            refunds: Refunds::default(),
         }
     }
 }
 
-impl GlueFrom<vm_m6::VmBlockResult> for vm_vm1_3_2::VmBlockResult {
-    fn glue_from(value: vm_m6::VmBlockResult) -> Self {
-        Self {
-            full_result: value.full_result.glue_into(),
-            block_tip_result: value.block_tip_result.glue_into(),
+impl GlueFrom<vm_m5::vm::VmBlockResult> for vm_latest::VmExecutionResultAndLogs {
+    fn glue_from(value: vm_m5::vm::VmBlockResult) -> Self {
+        let mut result = value
+            .full_result
+            .revert_reason
+            .map(|a| a.revert_reason)
+            .glue_into();
+
+        if let ExecutionResult::Success { output } = &mut result {
+            *output = value.full_result.return_data;
+        }
+
+        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,
+            },
+            statistics: VmExecutionStatistics {
+                contracts_used: value.full_result.contracts_used,
+                cycles_used: value.full_result.cycles_used,
+                total_log_queries: value.full_result.total_log_queries,
+                computational_gas_used: 0,
+                gas_used: value.full_result.gas_used,
+            },
+            refunds: Refunds::default(),
+        }
+    }
+}
+
+impl GlueFrom<vm_m6::vm::VmBlockResult> for vm_latest::VmExecutionResultAndLogs {
+    fn glue_from(value: vm_m6::vm::VmBlockResult) -> Self {
+        let mut result = value
+            .full_result
+            .revert_reason
+            .map(|a| a.revert_reason)
+            .glue_into();
+
+        if let ExecutionResult::Success { output } = &mut result {
+            *output = value.full_result.return_data;
+        }
+
+        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,
+            },
+            statistics: VmExecutionStatistics {
+                contracts_used: value.full_result.contracts_used,
+                cycles_used: value.full_result.cycles_used,
+                total_log_queries: value.full_result.total_log_queries,
+                computational_gas_used: value.full_result.computational_gas_used,
+                gas_used: value.full_result.gas_used,
+            },
+            refunds: Refunds::default(),
         }
     }
 }
diff --git a/core/lib/multivm/src/glue/types/vm/vm_execution_result.rs b/core/lib/multivm/src/glue/types/vm/vm_execution_result.rs
index c80c2ea526da..ce405df7217f 100644
--- a/core/lib/multivm/src/glue/types/vm/vm_execution_result.rs
+++ b/core/lib/multivm/src/glue/types/vm/vm_execution_result.rs
@@ -1,53 +1,38 @@
-use crate::glue::{GlueFrom, GlueInto};
+use crate::glue::GlueFrom;
 
-impl GlueFrom<vm_m5::VmExecutionResult> for vm_vm1_3_2::VmExecutionResult {
-    fn glue_from(value: vm_m5::VmExecutionResult) -> Self {
+impl GlueFrom<vm_m5::vm::VmExecutionResult> for vm_latest::CurrentExecutionState {
+    fn glue_from(value: vm_m5::vm::VmExecutionResult) -> Self {
         Self {
-            events: value.events.into_iter().map(GlueInto::glue_into).collect(),
-            storage_log_queries: value
-                .storage_log_queries
-                .into_iter()
-                .map(GlueInto::glue_into)
-                .collect(),
+            events: value.events,
+            storage_log_queries: value.storage_log_queries,
             used_contract_hashes: value.used_contract_hashes,
-            l2_to_l1_logs: value
-                .l2_to_l1_logs
-                .into_iter()
-                .map(GlueInto::glue_into)
-                .collect(),
-            return_data: value.return_data,
-            gas_used: value.gas_used,
-            computational_gas_used: value.gas_used, // Substitute due to lack of such field
-            contracts_used: value.contracts_used,
-            revert_reason: value.revert_reason.map(GlueFrom::glue_from),
-            trace: zksync_types::vm_trace::VmTrace::ExecutionTrace(value.trace.glue_into()),
+            l2_to_l1_logs: value.l2_to_l1_logs,
             total_log_queries: value.total_log_queries,
             cycles_used: value.cycles_used,
         }
     }
 }
 
-impl GlueFrom<vm_m6::VmExecutionResult> for vm_vm1_3_2::VmExecutionResult {
-    fn glue_from(value: vm_m6::VmExecutionResult) -> Self {
+impl GlueFrom<vm_m6::vm::VmExecutionResult> for vm_latest::CurrentExecutionState {
+    fn glue_from(value: vm_m6::vm::VmExecutionResult) -> Self {
         Self {
-            events: value.events.into_iter().map(GlueInto::glue_into).collect(),
-            storage_log_queries: value
-                .storage_log_queries
-                .into_iter()
-                .map(GlueInto::glue_into)
-                .collect(),
+            events: value.events,
+            storage_log_queries: value.storage_log_queries,
             used_contract_hashes: value.used_contract_hashes,
-            l2_to_l1_logs: value
-                .l2_to_l1_logs
-                .into_iter()
-                .map(GlueInto::glue_into)
-                .collect(),
-            return_data: value.return_data,
-            gas_used: value.gas_used,
-            computational_gas_used: value.gas_used, // Substitute due to lack of such field
-            contracts_used: value.contracts_used,
-            revert_reason: value.revert_reason.map(GlueFrom::glue_from),
-            trace: value.trace.glue_into(),
+            l2_to_l1_logs: value.l2_to_l1_logs,
+            total_log_queries: value.total_log_queries,
+            cycles_used: value.cycles_used,
+        }
+    }
+}
+
+impl GlueFrom<vm_1_3_2::VmExecutionResult> for vm_latest::CurrentExecutionState {
+    fn glue_from(value: vm_1_3_2::VmExecutionResult) -> Self {
+        Self {
+            events: value.events,
+            storage_log_queries: value.storage_log_queries,
+            used_contract_hashes: value.used_contract_hashes,
+            l2_to_l1_logs: value.l2_to_l1_logs,
             total_log_queries: value.total_log_queries,
             cycles_used: value.cycles_used,
         }
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 31ebacacb401..bdce90777d29 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,25 +1,121 @@
 use crate::glue::{GlueFrom, GlueInto};
+use zksync_types::tx::tx_execution_info::VmExecutionLogs;
 
-impl GlueFrom<vm_m5::vm::VmPartialExecutionResult> for vm_vm1_3_2::vm::VmPartialExecutionResult {
+impl GlueFrom<vm_m5::vm::VmPartialExecutionResult> for vm_latest::VmExecutionResultAndLogs {
     fn glue_from(value: vm_m5::vm::VmPartialExecutionResult) -> Self {
         Self {
-            logs: value.logs.glue_into(),
-            revert_reason: value.revert_reason.map(GlueInto::glue_into),
-            contracts_used: value.contracts_used,
-            cycles_used: value.cycles_used,
-            computational_gas_used: 0,
+            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,
+            },
+            statistics: vm_latest::VmExecutionStatistics {
+                contracts_used: value.contracts_used,
+                cycles_used: value.cycles_used,
+                total_log_queries: value.logs.total_log_queries_count,
+                // There are no such fields in m5
+                gas_used: 0,
+                // There are no such fields in m5
+                computational_gas_used: 0,
+            },
+            refunds: vm_latest::Refunds {
+                gas_refunded: 0,
+                operator_suggested_refund: 0,
+            },
         }
     }
 }
 
-impl GlueFrom<vm_m6::vm::VmPartialExecutionResult> for vm_vm1_3_2::vm::VmPartialExecutionResult {
+impl GlueFrom<vm_m6::vm::VmPartialExecutionResult> for vm_latest::VmExecutionResultAndLogs {
     fn glue_from(value: vm_m6::vm::VmPartialExecutionResult) -> Self {
         Self {
-            logs: value.logs.glue_into(),
-            revert_reason: value.revert_reason.map(GlueInto::glue_into),
-            contracts_used: value.contracts_used,
-            cycles_used: value.cycles_used,
-            computational_gas_used: 0,
+            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,
+            },
+            statistics: vm_latest::VmExecutionStatistics {
+                contracts_used: value.contracts_used,
+                cycles_used: value.cycles_used,
+                gas_used: value.computational_gas_used,
+                computational_gas_used: value.computational_gas_used,
+                total_log_queries: value.logs.total_log_queries_count,
+            },
+            refunds: vm_latest::Refunds {
+                gas_refunded: 0,
+                operator_suggested_refund: 0,
+            },
+        }
+    }
+}
+
+impl GlueFrom<vm_1_3_2::vm::VmPartialExecutionResult> for vm_latest::VmExecutionResultAndLogs {
+    fn glue_from(value: vm_1_3_2::vm::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,
+            },
+            statistics: vm_latest::VmExecutionStatistics {
+                contracts_used: value.contracts_used,
+                cycles_used: value.cycles_used,
+                gas_used: value.computational_gas_used,
+                computational_gas_used: value.computational_gas_used,
+                total_log_queries: value.logs.total_log_queries_count,
+            },
+            refunds: vm_latest::Refunds {
+                gas_refunded: 0,
+                operator_suggested_refund: 0,
+            },
+        }
+    }
+}
+
+impl GlueFrom<Option<vm_m5::TxRevertReason>> for vm_latest::ExecutionResult {
+    fn glue_from(value: Option<vm_m5::TxRevertReason>) -> Self {
+        if let Some(error) = value {
+            let error_reason: vm_latest::TxRevertReason = error.glue_into();
+            match error_reason {
+                vm_latest::TxRevertReason::TxReverted(reason) => Self::Revert { output: reason },
+                vm_latest::TxRevertReason::Halt(halt) => Self::Halt { reason: halt },
+            }
+        } else {
+            Self::Success { output: vec![] }
+        }
+    }
+}
+
+impl GlueFrom<Option<vm_m6::TxRevertReason>> for vm_latest::ExecutionResult {
+    fn glue_from(value: Option<vm_m6::TxRevertReason>) -> Self {
+        if let Some(error) = value {
+            let error_reason: vm_latest::TxRevertReason = error.glue_into();
+            match error_reason {
+                vm_latest::TxRevertReason::TxReverted(reason) => Self::Revert { output: reason },
+                vm_latest::TxRevertReason::Halt(halt) => Self::Halt { reason: halt },
+            }
+        } else {
+            Self::Success { output: vec![] }
+        }
+    }
+}
+
+impl GlueFrom<Option<vm_1_3_2::TxRevertReason>> for vm_latest::ExecutionResult {
+    fn glue_from(value: Option<vm_1_3_2::TxRevertReason>) -> Self {
+        if let Some(error) = value {
+            let error_reason: vm_latest::TxRevertReason = error.glue_into();
+            match error_reason {
+                vm_latest::TxRevertReason::TxReverted(reason) => Self::Revert { output: reason },
+                vm_latest::TxRevertReason::Halt(halt) => Self::Halt { reason: halt },
+            }
+        } else {
+            Self::Success { output: vec![] }
         }
     }
 }
diff --git a/core/lib/multivm/src/glue/types/vm/vm_revert_reason.rs b/core/lib/multivm/src/glue/types/vm/vm_revert_reason.rs
index 57bd97a21985..ec38027d1147 100644
--- a/core/lib/multivm/src/glue/types/vm/vm_revert_reason.rs
+++ b/core/lib/multivm/src/glue/types/vm/vm_revert_reason.rs
@@ -1,6 +1,6 @@
 use crate::glue::GlueFrom;
 
-impl GlueFrom<vm_m5::errors::VmRevertReason> for vm_vm1_3_2::errors::VmRevertReason {
+impl GlueFrom<vm_m5::errors::VmRevertReason> for vm_latest::VmRevertReason {
     fn glue_from(value: vm_m5::errors::VmRevertReason) -> Self {
         match value {
             vm_m5::errors::VmRevertReason::General { msg } => Self::General {
@@ -20,7 +20,7 @@ impl GlueFrom<vm_m5::errors::VmRevertReason> for vm_vm1_3_2::errors::VmRevertRea
     }
 }
 
-impl GlueFrom<vm_m6::errors::VmRevertReason> for vm_vm1_3_2::errors::VmRevertReason {
+impl GlueFrom<vm_m6::errors::VmRevertReason> for vm_latest::VmRevertReason {
     fn glue_from(value: vm_m6::errors::VmRevertReason) -> Self {
         match value {
             vm_m6::errors::VmRevertReason::General { msg, data } => Self::General { msg, data },
@@ -36,3 +36,20 @@ impl GlueFrom<vm_m6::errors::VmRevertReason> for vm_vm1_3_2::errors::VmRevertRea
         }
     }
 }
+
+impl GlueFrom<vm_1_3_2::errors::VmRevertReason> for vm_latest::VmRevertReason {
+    fn glue_from(value: vm_1_3_2::errors::VmRevertReason) -> Self {
+        match value {
+            vm_1_3_2::errors::VmRevertReason::General { msg, data } => Self::General { msg, data },
+            vm_1_3_2::errors::VmRevertReason::InnerTxError => Self::InnerTxError,
+            vm_1_3_2::errors::VmRevertReason::VmError => Self::VmError,
+            vm_1_3_2::errors::VmRevertReason::Unknown {
+                function_selector,
+                data,
+            } => Self::Unknown {
+                function_selector,
+                data,
+            },
+        }
+    }
+}
diff --git a/core/lib/multivm/src/glue/types/vm/vm_revert_reason_parsing_result.rs b/core/lib/multivm/src/glue/types/vm/vm_revert_reason_parsing_result.rs
deleted file mode 100644
index a88bd76c77bc..000000000000
--- a/core/lib/multivm/src/glue/types/vm/vm_revert_reason_parsing_result.rs
+++ /dev/null
@@ -1,23 +0,0 @@
-use crate::glue::{GlueFrom, GlueInto};
-
-impl GlueFrom<vm_m5::errors::VmRevertReasonParsingResult>
-    for vm_vm1_3_2::errors::VmRevertReasonParsingResult
-{
-    fn glue_from(value: vm_m5::errors::VmRevertReasonParsingResult) -> Self {
-        Self {
-            revert_reason: value.revert_reason.glue_into(),
-            original_data: value.original_data,
-        }
-    }
-}
-
-impl GlueFrom<vm_m6::errors::VmRevertReasonParsingResult>
-    for vm_vm1_3_2::errors::VmRevertReasonParsingResult
-{
-    fn glue_from(value: vm_m6::errors::VmRevertReasonParsingResult) -> Self {
-        Self {
-            revert_reason: value.revert_reason.glue_into(),
-            original_data: value.original_data,
-        }
-    }
-}
diff --git a/core/lib/multivm/src/glue/types/vm/vm_tx_execution_result.rs b/core/lib/multivm/src/glue/types/vm/vm_tx_execution_result.rs
index 417bb98adc47..456f7b46125d 100644
--- a/core/lib/multivm/src/glue/types/vm/vm_tx_execution_result.rs
+++ b/core/lib/multivm/src/glue/types/vm/vm_tx_execution_result.rs
@@ -1,25 +1,128 @@
 use crate::glue::{GlueFrom, GlueInto};
+use vm_latest::{ExecutionResult, Refunds, TxRevertReason, VmExecutionResultAndLogs};
+use zksync_types::tx::tx_execution_info::TxExecutionStatus;
 
-impl GlueFrom<vm_m5::vm::VmTxExecutionResult> for vm_vm1_3_2::vm::VmTxExecutionResult {
+impl GlueFrom<vm_m5::vm::VmTxExecutionResult> for VmExecutionResultAndLogs {
     fn glue_from(value: vm_m5::vm::VmTxExecutionResult) -> Self {
-        Self {
-            status: value.status.glue_into(),
-            result: value.result.glue_into(),
-            call_traces: vec![], // Substitute due to lack of fields.
+        let mut result: VmExecutionResultAndLogs = value.result.glue_into();
+        if result.result.is_failed() {
+            assert_eq!(value.status, TxExecutionStatus::Failure);
+        }
+
+        result.refunds = Refunds {
             gas_refunded: value.gas_refunded,
             operator_suggested_refund: value.operator_suggested_refund,
-        }
+        };
+        result
     }
 }
 
-impl GlueFrom<vm_m6::vm::VmTxExecutionResult> for vm_vm1_3_2::vm::VmTxExecutionResult {
+impl GlueFrom<vm_m6::vm::VmTxExecutionResult> for VmExecutionResultAndLogs {
     fn glue_from(value: vm_m6::vm::VmTxExecutionResult) -> Self {
-        Self {
-            status: value.status.glue_into(),
-            result: value.result.glue_into(),
-            call_traces: vec![], // Substitute due to lack of fields.
+        let mut result: VmExecutionResultAndLogs = value.result.glue_into();
+        if result.result.is_failed() {
+            assert_eq!(value.status, TxExecutionStatus::Failure);
+        }
+
+        result.refunds = Refunds {
+            gas_refunded: value.gas_refunded,
+            operator_suggested_refund: value.operator_suggested_refund,
+        };
+        result
+    }
+}
+
+impl GlueFrom<vm_1_3_2::vm::VmTxExecutionResult> for VmExecutionResultAndLogs {
+    fn glue_from(value: vm_1_3_2::vm::VmTxExecutionResult) -> Self {
+        let mut result: VmExecutionResultAndLogs = value.result.glue_into();
+        if result.result.is_failed() {
+            assert_eq!(value.status, TxExecutionStatus::Failure);
+        }
+
+        result.refunds = Refunds {
             gas_refunded: value.gas_refunded,
             operator_suggested_refund: value.operator_suggested_refund,
+        };
+        result
+    }
+}
+
+impl GlueFrom<Result<vm_m6::vm::VmTxExecutionResult, vm_m6::TxRevertReason>>
+    for VmExecutionResultAndLogs
+{
+    fn glue_from(value: Result<vm_m6::vm::VmTxExecutionResult, vm_m6::TxRevertReason>) -> Self {
+        match value {
+            Ok(result) => result.glue_into(),
+            Err(err) => {
+                let revert: vm_latest::TxRevertReason = err.glue_into();
+                match revert {
+                    TxRevertReason::TxReverted(err) => VmExecutionResultAndLogs {
+                        result: ExecutionResult::Revert { output: err },
+                        logs: Default::default(),
+                        statistics: Default::default(),
+                        refunds: Default::default(),
+                    },
+                    TxRevertReason::Halt(halt) => VmExecutionResultAndLogs {
+                        result: ExecutionResult::Halt { reason: halt },
+                        logs: Default::default(),
+                        statistics: Default::default(),
+                        refunds: Default::default(),
+                    },
+                }
+            }
+        }
+    }
+}
+
+impl GlueFrom<Result<vm_1_3_2::vm::VmTxExecutionResult, vm_1_3_2::TxRevertReason>>
+    for VmExecutionResultAndLogs
+{
+    fn glue_from(
+        value: Result<vm_1_3_2::vm::VmTxExecutionResult, vm_1_3_2::TxRevertReason>,
+    ) -> Self {
+        match value {
+            Ok(result) => result.glue_into(),
+            Err(err) => {
+                let revert: vm_latest::TxRevertReason = err.glue_into();
+                match revert {
+                    TxRevertReason::TxReverted(err) => VmExecutionResultAndLogs {
+                        result: ExecutionResult::Revert { output: err },
+                        logs: Default::default(),
+                        statistics: Default::default(),
+                        refunds: Default::default(),
+                    },
+                    TxRevertReason::Halt(halt) => VmExecutionResultAndLogs {
+                        result: ExecutionResult::Halt { reason: halt },
+                        logs: Default::default(),
+                        statistics: Default::default(),
+                        refunds: Default::default(),
+                    },
+                }
+            }
+        }
+    }
+}
+
+impl GlueFrom<Result<vm_m5::vm::VmTxExecutionResult, vm_m5::TxRevertReason>>
+    for VmExecutionResultAndLogs
+{
+    fn glue_from(value: Result<vm_m5::vm::VmTxExecutionResult, vm_m5::TxRevertReason>) -> Self {
+        match value {
+            Ok(result) => result.glue_into(),
+            Err(err) => {
+                let revert: vm_latest::TxRevertReason = err.glue_into();
+                match revert {
+                    TxRevertReason::Halt(halt) => VmExecutionResultAndLogs {
+                        result: ExecutionResult::Halt { reason: halt },
+                        logs: Default::default(),
+                        statistics: Default::default(),
+                        refunds: Default::default(),
+                    },
+                    _ => {
+                        unreachable!("Halt is the only revert reason for VM 5")
+                    }
+                }
+            }
         }
     }
 }
diff --git a/core/lib/multivm/src/lib.rs b/core/lib/multivm/src/lib.rs
index deffe7d63464..a45eacecfa31 100644
--- a/core/lib/multivm/src/lib.rs
+++ b/core/lib/multivm/src/lib.rs
@@ -1,28 +1,8 @@
 pub use crate::{
-    glue::{
-        block_properties::BlockProperties,
-        init_vm::{init_vm, init_vm_with_gas_limit},
-        oracle_tools::OracleTools,
-    },
-    vm_instance::VmInstance,
+    glue::{block_properties::BlockProperties, oracle_tools::OracleTools, tracer::MultivmTracer},
+    vm_instance::{VmInstance, VmInstanceData},
 };
+pub use zksync_types::vm_version::VmVersion;
 
 mod glue;
 mod vm_instance;
-
-/// Marker of the VM version to be used by the MultiVM.
-#[derive(Debug, Clone, Copy)]
-pub enum VmVersion {
-    M5WithoutRefunds,
-    M5WithRefunds,
-    M6Initial,
-    M6BugWithCompressionFixed,
-    Vm1_3_2,
-}
-
-impl VmVersion {
-    /// Returns the latest supported VM version.
-    pub const fn latest() -> VmVersion {
-        Self::Vm1_3_2
-    }
-}
diff --git a/core/lib/multivm/src/vm_instance.rs b/core/lib/multivm/src/vm_instance.rs
index f8c9d5301549..dcc4d393c536 100644
--- a/core/lib/multivm/src/vm_instance.rs
+++ b/core/lib/multivm/src/vm_instance.rs
@@ -1,141 +1,555 @@
-use zksync_utils::bytecode::CompressedBytecodeInfo;
+use std::collections::HashSet;
+use vm_latest::{
+    FinishedL1Batch, L2BlockEnv, SystemEnv, TxExecutionMode, VmExecutionMode, VmMemoryMetrics,
+};
 
+use zksync_state::{ReadStorage, StoragePtr, StorageView};
+use zksync_types::VmVersion;
+use zksync_utils::bytecode::{hash_bytecode, CompressedBytecodeInfo};
+use zksync_utils::h256_to_u256;
+
+use crate::glue::history_mode::HistoryMode;
+use crate::glue::tracer::MultivmTracer;
 use crate::glue::GlueInto;
+use crate::{BlockProperties, OracleTools};
+
+pub struct VmInstance<'a, S: ReadStorage, H: HistoryMode> {
+    pub(crate) vm: VmInstanceVersion<'a, S, H>,
+    pub(crate) system_env: SystemEnv,
+    pub(crate) last_tx_compressed_bytecodes: Vec<CompressedBytecodeInfo>,
+}
 
 #[derive(Debug)]
-pub enum VmInstance<'a> {
-    VmM5(Box<vm_m5::VmInstance<'a>>),
-    VmM6(Box<vm_m6::VmInstance<'a, vm_m6::HistoryEnabled>>),
-    Vm1_3_2(Box<vm_vm1_3_2::VmInstance<'a, vm_vm1_3_2::HistoryEnabled>>),
+pub(crate) enum VmInstanceVersion<'a, S: ReadStorage, H: HistoryMode> {
+    VmM5(Box<vm_m5::VmInstance<'a, StorageView<S>>>),
+    VmM6(Box<vm_m6::VmInstance<'a, StorageView<S>, H::VmM6Mode>>),
+    Vm1_3_2(Box<vm_1_3_2::VmInstance<StorageView<S>, H::Vm1_3_2Mode>>),
+    VmVirtualBlocks(Box<vm_latest::Vm<StorageView<S>, H::VmVirtualBlocksMode>>),
 }
 
-impl<'a> VmInstance<'a> {
-    pub fn gas_consumed(&self) -> u32 {
-        match self {
-            VmInstance::VmM5(vm) => vm.gas_consumed(),
-            VmInstance::VmM6(vm) => vm.gas_consumed(),
-            VmInstance::Vm1_3_2(vm) => vm.gas_consumed(),
+impl<'a, S: ReadStorage, H: HistoryMode> VmInstance<'a, S, H> {
+    /// Push tx into memory for the future execution
+    pub fn push_transaction(&mut self, tx: &zksync_types::Transaction) {
+        match &mut self.vm {
+            VmInstanceVersion::VmM5(vm) => {
+                vm_m5::vm_with_bootloader::push_transaction_to_bootloader_memory(
+                    vm,
+                    tx,
+                    self.system_env.execution_mode.glue_into(),
+                )
+            }
+            VmInstanceVersion::VmM6(vm) => {
+                vm_m6::vm_with_bootloader::push_transaction_to_bootloader_memory(
+                    vm,
+                    tx,
+                    self.system_env.execution_mode.glue_into(),
+                    None,
+                )
+            }
+            VmInstanceVersion::Vm1_3_2(vm) => {
+                vm_1_3_2::vm_with_bootloader::push_transaction_to_bootloader_memory(
+                    vm,
+                    tx,
+                    self.system_env.execution_mode.glue_into(),
+                    None,
+                )
+            }
+            VmInstanceVersion::VmVirtualBlocks(vm) => {
+                vm.push_transaction(tx.clone());
+            }
         }
     }
 
-    pub fn save_current_vm_as_snapshot(&mut self) {
-        match self {
-            VmInstance::VmM5(vm) => vm.save_current_vm_as_snapshot(),
-            VmInstance::VmM6(vm) => vm.save_current_vm_as_snapshot(),
-            VmInstance::Vm1_3_2(vm) => vm.save_current_vm_as_snapshot(),
+    /// Return the results of execution of all batch
+    pub fn finish_batch(&mut self) -> FinishedL1Batch {
+        match &mut self.vm {
+            VmInstanceVersion::VmM5(vm) => vm
+                .execute_till_block_end(
+                    vm_m5::vm_with_bootloader::BootloaderJobType::BlockPostprocessing,
+                )
+                .glue_into(),
+            VmInstanceVersion::VmM6(vm) => vm
+                .execute_till_block_end(
+                    vm_m6::vm_with_bootloader::BootloaderJobType::BlockPostprocessing,
+                )
+                .glue_into(),
+            VmInstanceVersion::Vm1_3_2(vm) => vm
+                .execute_till_block_end(
+                    vm_1_3_2::vm_with_bootloader::BootloaderJobType::BlockPostprocessing,
+                )
+                .glue_into(),
+            VmInstanceVersion::VmVirtualBlocks(vm) => {
+                let result = vm.execute(VmExecutionMode::Batch);
+                let execution_state = vm.get_current_execution_state();
+                let bootloader_memory = vm.get_bootloader_memory();
+                FinishedL1Batch {
+                    block_tip_execution_result: result,
+                    final_execution_state: execution_state,
+                    final_bootloader_memory: Some(bootloader_memory),
+                }
+            }
         }
     }
 
-    pub fn rollback_to_snapshot_popping(&mut self) {
-        match self {
-            VmInstance::VmM5(vm) => vm.rollback_to_latest_snapshot_popping(),
-            VmInstance::VmM6(vm) => vm.rollback_to_latest_snapshot_popping(),
-            VmInstance::Vm1_3_2(vm) => vm.rollback_to_latest_snapshot_popping(),
+    /// Execute the batch without stops after each tx.
+    /// This method allows to execute the part  of the VM cycle after executing all txs.
+    pub fn execute_block_tip(&mut self) -> vm_latest::VmExecutionResultAndLogs {
+        match &mut self.vm {
+            VmInstanceVersion::VmM5(vm) => vm.execute_block_tip().glue_into(),
+            VmInstanceVersion::VmM6(vm) => vm.execute_block_tip().glue_into(),
+            VmInstanceVersion::Vm1_3_2(vm) => vm.execute_block_tip().glue_into(),
+            VmInstanceVersion::VmVirtualBlocks(vm) => vm.execute(VmExecutionMode::Bootloader),
         }
     }
 
-    pub fn pop_snapshot_no_rollback(&mut self) {
-        match self {
-            VmInstance::VmM5(vm) => {
-                // A dedicated method was added later.
-                vm.snapshots.pop().unwrap();
+    /// Execute next transaction and stop vm right after next transaction execution
+    pub fn execute_next_transaction(&mut self) -> vm_latest::VmExecutionResultAndLogs {
+        match &mut self.vm {
+            VmInstanceVersion::VmM5(vm) => match self.system_env.execution_mode {
+                TxExecutionMode::VerifyExecute => vm.execute_next_tx().glue_into(),
+                TxExecutionMode::EstimateFee | TxExecutionMode::EthCall => vm
+                    .execute_till_block_end(
+                        vm_m5::vm_with_bootloader::BootloaderJobType::TransactionExecution,
+                    )
+                    .glue_into(),
+            },
+            VmInstanceVersion::VmM6(vm) => {
+                match self.system_env.execution_mode {
+                    TxExecutionMode::VerifyExecute => {
+                        // Even that call tracer is supported by vm vm1.3.2, we don't use it for multivm
+                        vm.execute_next_tx(
+                            self.system_env.default_validation_computational_gas_limit,
+                            false,
+                        )
+                        .glue_into()
+                    }
+                    TxExecutionMode::EstimateFee | TxExecutionMode::EthCall => vm
+                        .execute_till_block_end(
+                            vm_m6::vm_with_bootloader::BootloaderJobType::TransactionExecution,
+                        )
+                        .glue_into(),
+                }
             }
-            VmInstance::VmM6(vm) => vm.pop_snapshot_no_rollback(),
-            VmInstance::Vm1_3_2(vm) => vm.pop_snapshot_no_rollback(),
+            VmInstanceVersion::Vm1_3_2(vm) => {
+                match self.system_env.execution_mode {
+                    TxExecutionMode::VerifyExecute => {
+                        // Even that call tracer is supported by vm vm1.3.2, we don't use it for multivm
+                        vm.execute_next_tx(
+                            self.system_env.default_validation_computational_gas_limit,
+                            false,
+                        )
+                        .glue_into()
+                    }
+                    TxExecutionMode::EstimateFee | TxExecutionMode::EthCall => vm
+                        .execute_till_block_end(
+                            vm_1_3_2::vm_with_bootloader::BootloaderJobType::TransactionExecution,
+                        )
+                        .glue_into(),
+                }
+            }
+            VmInstanceVersion::VmVirtualBlocks(vm) => vm.execute(VmExecutionMode::OneTx),
         }
     }
 
-    pub fn execute_till_block_end(
-        &mut self,
-        job_type: vm_vm1_3_2::vm_with_bootloader::BootloaderJobType,
-    ) -> vm_vm1_3_2::VmBlockResult {
-        match self {
-            VmInstance::VmM5(vm) => vm.execute_till_block_end(job_type.glue_into()).glue_into(),
-            VmInstance::VmM6(vm) => vm.execute_till_block_end(job_type.glue_into()).glue_into(),
-            VmInstance::Vm1_3_2(vm) => vm.execute_till_block_end(job_type).glue_into(),
+    /// Get compressed bytecodes of the last executed transaction
+    pub fn get_last_tx_compressed_bytecodes(&self) -> Vec<CompressedBytecodeInfo> {
+        match &self.vm {
+            VmInstanceVersion::VmVirtualBlocks(vm) => vm.get_last_tx_compressed_bytecodes(),
+            _ => self.last_tx_compressed_bytecodes.clone(),
         }
     }
 
-    pub fn is_bytecode_known(&self, bytecode_hash: &zksync_types::H256) -> bool {
-        match self {
-            VmInstance::VmM5(_) => {
-                false
-            }
-            VmInstance::VmM6(vm) => vm
-                .state
-                .storage
-                .storage
-                .get_ptr()
-                .borrow_mut()
-                .is_bytecode_known(bytecode_hash),
-            VmInstance::Vm1_3_2(vm) => vm
-                .state
-                .storage
-                .storage
-                .get_ptr()
-                .borrow_mut()
-                .is_bytecode_known(bytecode_hash),
+    /// Execute next transaction with custom tracers
+    pub fn inspect_next_transaction(
+        &mut self,
+        tracers: Vec<Box<dyn MultivmTracer<StorageView<S>, H::VmVirtualBlocksMode>>>,
+    ) -> vm_latest::VmExecutionResultAndLogs {
+        match &mut self.vm {
+            VmInstanceVersion::VmVirtualBlocks(vm) => vm.inspect(
+                tracers.into_iter().map(|tracer| tracer.latest()).collect(),
+                VmExecutionMode::OneTx,
+            ),
+            _ => self.execute_next_transaction(),
         }
     }
 
-    pub fn push_transaction_to_bootloader_memory(
+    /// Execute transaction with optional bytecode compression.
+    fn execute_transaction_with_bytecode_compression(
         &mut self,
-        tx: &zksync_types::Transaction,
-        execution_mode: vm_vm1_3_2::vm_with_bootloader::TxExecutionMode,
-        explicit_compressed_bytecodes: Option<Vec<CompressedBytecodeInfo>>,
-    ) {
-        match self {
-            VmInstance::VmM5(vm) => {
+        tx: zksync_types::Transaction,
+        with_compression: bool,
+    ) -> Result<vm_latest::VmExecutionResultAndLogs, vm_latest::BytecodeCompressionError> {
+        match &mut self.vm {
+            VmInstanceVersion::VmM5(vm) => {
                 vm_m5::vm_with_bootloader::push_transaction_to_bootloader_memory(
                     vm,
-                    tx,
-                    execution_mode.glue_into(),
+                    &tx,
+                    self.system_env.execution_mode.glue_into(),
+                );
+                Ok(vm.execute_next_tx().glue_into())
+            }
+            VmInstanceVersion::VmM6(vm) => {
+                use vm_m6::storage::Storage;
+                let bytecodes = if with_compression {
+                    let deps = tx.execute.factory_deps.as_deref().unwrap_or_default();
+                    let mut deps_hashes = HashSet::with_capacity(deps.len());
+                    let mut bytecode_hashes = vec![];
+                    let filtered_deps = deps.iter().filter_map(|bytecode| {
+                        let bytecode_hash = hash_bytecode(bytecode);
+                        let is_known = !deps_hashes.insert(bytecode_hash)
+                            || vm
+                                .state
+                                .storage
+                                .storage
+                                .get_ptr()
+                                .borrow_mut()
+                                .is_bytecode_exists(&bytecode_hash);
+
+                        if is_known {
+                            None
+                        } else {
+                            bytecode_hashes.push(bytecode_hash);
+                            CompressedBytecodeInfo::from_original(bytecode.clone()).ok()
+                        }
+                    });
+                    let compressed_bytecodes: Vec<_> = filtered_deps.collect();
+
+                    self.last_tx_compressed_bytecodes = compressed_bytecodes.clone();
+                    vm_m6::vm_with_bootloader::push_transaction_to_bootloader_memory(
+                        vm,
+                        &tx,
+                        self.system_env.execution_mode.glue_into(),
+                        Some(compressed_bytecodes),
+                    );
+                    bytecode_hashes
+                } else {
+                    vm_m6::vm_with_bootloader::push_transaction_to_bootloader_memory(
+                        vm,
+                        &tx,
+                        self.system_env.execution_mode.glue_into(),
+                        Some(vec![]),
+                    );
+                    vec![]
+                };
+
+                // Even that call tracer is supported by vm m6, we don't use it for multivm
+                let result = vm
+                    .execute_next_tx(
+                        self.system_env.default_validation_computational_gas_limit,
+                        false,
+                    )
+                    .glue_into();
+                if bytecodes.iter().any(|info| {
+                    !vm.state
+                        .storage
+                        .storage
+                        .get_ptr()
+                        .borrow_mut()
+                        .is_bytecode_exists(info)
+                }) {
+                    Err(vm_latest::BytecodeCompressionError::BytecodeCompressionFailed)
+                } else {
+                    Ok(result)
+                }
+            }
+            VmInstanceVersion::Vm1_3_2(vm) => {
+                use vm_m6::storage::Storage;
+                let bytecodes = if with_compression {
+                    let deps = tx.execute.factory_deps.as_deref().unwrap_or_default();
+                    let mut deps_hashes = HashSet::with_capacity(deps.len());
+                    let mut bytecode_hashes = vec![];
+                    let filtered_deps = deps.iter().filter_map(|bytecode| {
+                        let bytecode_hash = hash_bytecode(bytecode);
+                        let is_known = !deps_hashes.insert(bytecode_hash)
+                            || vm
+                                .state
+                                .storage
+                                .storage
+                                .get_ptr()
+                                .borrow_mut()
+                                .is_bytecode_exists(&bytecode_hash);
+
+                        if is_known {
+                            None
+                        } else {
+                            bytecode_hashes.push(bytecode_hash);
+                            CompressedBytecodeInfo::from_original(bytecode.clone()).ok()
+                        }
+                    });
+                    let compressed_bytecodes: Vec<_> = filtered_deps.collect();
+
+                    self.last_tx_compressed_bytecodes = compressed_bytecodes.clone();
+                    vm_1_3_2::vm_with_bootloader::push_transaction_to_bootloader_memory(
+                        vm,
+                        &tx,
+                        self.system_env.execution_mode.glue_into(),
+                        Some(compressed_bytecodes),
+                    );
+                    bytecode_hashes
+                } else {
+                    vm_1_3_2::vm_with_bootloader::push_transaction_to_bootloader_memory(
+                        vm,
+                        &tx,
+                        self.system_env.execution_mode.glue_into(),
+                        Some(vec![]),
+                    );
+                    vec![]
+                };
+
+                // Even that call tracer is supported by vm m6, we don't use it for multivm
+                let result = vm
+                    .execute_next_tx(
+                        self.system_env.default_validation_computational_gas_limit,
+                        false,
+                    )
+                    .glue_into();
+                if bytecodes.iter().any(|info| {
+                    !vm.state
+                        .storage
+                        .storage
+                        .get_ptr()
+                        .borrow_mut()
+                        .is_bytecode_exists(info)
+                }) {
+                    Err(vm_latest::BytecodeCompressionError::BytecodeCompressionFailed)
+                } else {
+                    Ok(result)
+                }
+            }
+            VmInstanceVersion::VmVirtualBlocks(vm) => {
+                vm.execute_transaction_with_bytecode_compression(tx, with_compression)
+            }
+        }
+    }
+
+    /// Inspect transaction with optional bytecode compression.
+    pub fn inspect_transaction_with_bytecode_compression(
+        &mut self,
+        tracers: Vec<Box<dyn MultivmTracer<StorageView<S>, H::VmVirtualBlocksMode>>>,
+        tx: zksync_types::Transaction,
+        with_compression: bool,
+    ) -> Result<vm_latest::VmExecutionResultAndLogs, vm_latest::BytecodeCompressionError> {
+        if let VmInstanceVersion::VmVirtualBlocks(vm) = &mut self.vm {
+            vm.inspect_transaction_with_bytecode_compression(
+                tracers.into_iter().map(|tracer| tracer.latest()).collect(),
+                tx,
+                with_compression,
+            )
+        } else {
+            self.last_tx_compressed_bytecodes = vec![];
+            self.execute_transaction_with_bytecode_compression(tx, with_compression)
+        }
+    }
+
+    pub fn start_new_l2_block(&mut self, l2_block_env: L2BlockEnv) {
+        if let VmInstanceVersion::VmVirtualBlocks(vm) = &mut self.vm {
+            vm.start_new_l2_block(l2_block_env);
+        }
+    }
+
+    pub fn record_vm_memory_metrics(&self) -> Option<VmMemoryMetrics> {
+        match &self.vm {
+            VmInstanceVersion::VmM5(_) => None,
+            VmInstanceVersion::VmM6(vm) => Some(VmMemoryMetrics {
+                event_sink_inner: vm.state.event_sink.get_size(),
+                event_sink_history: vm.state.event_sink.get_history_size(),
+                memory_inner: vm.state.memory.get_size(),
+                memory_history: vm.state.memory.get_history_size(),
+                decommittment_processor_inner: vm.state.decommittment_processor.get_size(),
+                decommittment_processor_history: vm
+                    .state
+                    .decommittment_processor
+                    .get_history_size(),
+                storage_inner: vm.state.storage.get_size(),
+                storage_history: vm.state.storage.get_history_size(),
+            }),
+            VmInstanceVersion::Vm1_3_2(vm) => Some(VmMemoryMetrics {
+                event_sink_inner: vm.state.event_sink.get_size(),
+                event_sink_history: vm.state.event_sink.get_history_size(),
+                memory_inner: vm.state.memory.get_size(),
+                memory_history: vm.state.memory.get_history_size(),
+                decommittment_processor_inner: vm.state.decommittment_processor.get_size(),
+                decommittment_processor_history: vm
+                    .state
+                    .decommittment_processor
+                    .get_history_size(),
+                storage_inner: vm.state.storage.get_size(),
+                storage_history: vm.state.storage.get_history_size(),
+            }),
+            VmInstanceVersion::VmVirtualBlocks(vm) => Some(vm.record_vm_memory_metrics()),
+        }
+    }
+}
+
+pub struct M5NecessaryData<S: ReadStorage, H: HistoryMode> {
+    pub oracle_tools: OracleTools<S, H>,
+    pub block_properties: BlockProperties,
+    pub sub_version: vm_m5::vm::MultiVMSubversion,
+}
+
+pub struct M6NecessaryData<S: ReadStorage, H: HistoryMode> {
+    pub oracle_tools: OracleTools<S, H>,
+    pub block_properties: BlockProperties,
+    pub sub_version: vm_m6::vm::MultiVMSubversion,
+}
+
+pub struct Vm1_3_2NecessaryData<S: ReadStorage, H: HistoryMode> {
+    pub storage_view: StoragePtr<StorageView<S>>,
+    pub history_mode: H,
+}
+
+pub struct VmVirtualBlocksNecessaryData<S: ReadStorage, H: HistoryMode> {
+    pub storage_view: zksync_state::StoragePtr<StorageView<S>>,
+    pub history_mode: H,
+}
+
+pub enum VmInstanceData<S: ReadStorage, H: HistoryMode> {
+    M5(M5NecessaryData<S, H>),
+    M6(M6NecessaryData<S, H>),
+    Vm1_3_2(Vm1_3_2NecessaryData<S, H>),
+    VmVirtualBlocks(VmVirtualBlocksNecessaryData<S, H>),
+}
+
+impl<S: ReadStorage, H: HistoryMode> VmInstanceData<S, H> {
+    fn m5(
+        oracle_tools: OracleTools<S, H>,
+        block_properties: BlockProperties,
+        sub_version: vm_m5::vm::MultiVMSubversion,
+    ) -> Self {
+        Self::M5(M5NecessaryData {
+            oracle_tools,
+            block_properties,
+            sub_version,
+        })
+    }
+    fn m6(
+        oracle_tools: OracleTools<S, H>,
+        block_properties: BlockProperties,
+        sub_version: vm_m6::vm::MultiVMSubversion,
+    ) -> Self {
+        Self::M6(M6NecessaryData {
+            oracle_tools,
+            block_properties,
+            sub_version,
+        })
+    }
+
+    fn latest(storage_view: StoragePtr<StorageView<S>>, history_mode: H) -> Self {
+        Self::VmVirtualBlocks(VmVirtualBlocksNecessaryData {
+            storage_view,
+            history_mode,
+        })
+    }
+
+    fn vm1_3_2(storage_view: StoragePtr<StorageView<S>>, history_mode: H) -> Self {
+        Self::Vm1_3_2(Vm1_3_2NecessaryData {
+            storage_view,
+            history_mode,
+        })
+    }
+
+    pub fn new(
+        storage_view: StoragePtr<StorageView<S>>,
+        system_env: &SystemEnv,
+        history: H,
+    ) -> Self {
+        let protocol_version = system_env.version;
+        let vm_version: VmVersion = protocol_version.into();
+        Self::new_for_specific_vm_version(storage_view, system_env, history, vm_version)
+    }
+
+    // In api we support only subset of vm versions, so we need to create vm instance for specific version
+    pub fn new_for_specific_vm_version(
+        storage_view: StoragePtr<StorageView<S>>,
+        system_env: &SystemEnv,
+        history: H,
+        vm_version: VmVersion,
+    ) -> Self {
+        match vm_version {
+            VmVersion::M5WithoutRefunds => {
+                let oracle_tools = OracleTools::new(vm_version, storage_view, history);
+                let block_properties = BlockProperties::new(
+                    vm_version,
+                    h256_to_u256(system_env.base_system_smart_contracts.default_aa.hash),
+                );
+                VmInstanceData::m5(
+                    oracle_tools,
+                    block_properties,
+                    vm_m5::vm::MultiVMSubversion::V1,
                 )
             }
-            VmInstance::VmM6(vm) => {
-                vm_m6::vm_with_bootloader::push_transaction_to_bootloader_memory(
-                    vm,
-                    tx,
-                    execution_mode.glue_into(),
-                    explicit_compressed_bytecodes,
+            VmVersion::M5WithRefunds => {
+                let oracle_tools = OracleTools::new(vm_version, storage_view, history);
+                let block_properties = BlockProperties::new(
+                    vm_version,
+                    h256_to_u256(system_env.base_system_smart_contracts.default_aa.hash),
+                );
+                VmInstanceData::m5(
+                    oracle_tools,
+                    block_properties,
+                    vm_m5::vm::MultiVMSubversion::V2,
                 )
             }
-            VmInstance::Vm1_3_2(vm) => {
-                vm_vm1_3_2::vm_with_bootloader::push_transaction_to_bootloader_memory(
-                    vm,
-                    tx,
-                    execution_mode,
-                    explicit_compressed_bytecodes,
+            VmVersion::M6Initial => {
+                let oracle_tools = OracleTools::new(vm_version, storage_view, history);
+                let block_properties = BlockProperties::new(
+                    vm_version,
+                    h256_to_u256(system_env.base_system_smart_contracts.default_aa.hash),
+                );
+                VmInstanceData::m6(
+                    oracle_tools,
+                    block_properties,
+                    vm_m6::vm::MultiVMSubversion::V1,
                 )
             }
+            VmVersion::M6BugWithCompressionFixed => {
+                let oracle_tools = OracleTools::new(vm_version, storage_view, history);
+                let block_properties = BlockProperties::new(
+                    vm_version,
+                    h256_to_u256(system_env.base_system_smart_contracts.default_aa.hash),
+                );
+                VmInstanceData::m6(
+                    oracle_tools,
+                    block_properties,
+                    vm_m6::vm::MultiVMSubversion::V2,
+                )
+            }
+            VmVersion::Vm1_3_2 => VmInstanceData::vm1_3_2(storage_view, history),
+            VmVersion::VmVirtualBlocks => VmInstanceData::latest(storage_view, history),
         }
     }
+}
 
-    pub fn execute_next_tx(
-        &mut self,
-        validation_computational_gas_limit: u32,
-        with_call_tracer: bool,
-    ) -> Result<vm_vm1_3_2::vm::VmTxExecutionResult, vm_vm1_3_2::TxRevertReason> {
-        match self {
-            VmInstance::VmM5(vm) => vm
-                .execute_next_tx()
-                .map(GlueInto::glue_into)
-                .map_err(GlueInto::glue_into),
-            VmInstance::VmM6(vm) => vm
-                .execute_next_tx(validation_computational_gas_limit, with_call_tracer)
-                .map(GlueInto::glue_into)
-                .map_err(GlueInto::glue_into),
-            VmInstance::Vm1_3_2(vm) => {
-                vm.execute_next_tx(validation_computational_gas_limit, with_call_tracer)
+impl<S: ReadStorage> VmInstance<'_, S, vm_latest::HistoryEnabled> {
+    pub fn make_snapshot(&mut self) {
+        match &mut self.vm {
+            VmInstanceVersion::VmM5(vm) => vm.save_current_vm_as_snapshot(),
+            VmInstanceVersion::VmM6(vm) => vm.save_current_vm_as_snapshot(),
+            VmInstanceVersion::Vm1_3_2(vm) => vm.save_current_vm_as_snapshot(),
+            VmInstanceVersion::VmVirtualBlocks(vm) => vm.make_snapshot(),
+        }
+    }
+
+    pub fn rollback_to_the_latest_snapshot(&mut self) {
+        match &mut self.vm {
+            VmInstanceVersion::VmM5(vm) => vm.rollback_to_latest_snapshot_popping(),
+            VmInstanceVersion::VmM6(vm) => vm.rollback_to_latest_snapshot_popping(),
+            VmInstanceVersion::Vm1_3_2(vm) => vm.rollback_to_latest_snapshot_popping(),
+            VmInstanceVersion::VmVirtualBlocks(vm) => {
+                vm.rollback_to_the_latest_snapshot();
             }
         }
     }
 
-    pub fn execute_block_tip(&mut self) -> vm_vm1_3_2::vm::VmPartialExecutionResult {
-        match self {
-            VmInstance::VmM5(vm) => vm.execute_block_tip().glue_into(),
-            VmInstance::VmM6(vm) => vm.execute_block_tip().glue_into(),
-            VmInstance::Vm1_3_2(vm) => vm.execute_block_tip(),
+    pub fn pop_snapshot_no_rollback(&mut self) {
+        match &mut self.vm {
+            VmInstanceVersion::VmM5(vm) => {
+                // A dedicated method was added later.
+                vm.snapshots.pop().unwrap();
+            }
+            VmInstanceVersion::VmM6(vm) => vm.pop_snapshot_no_rollback(),
+            VmInstanceVersion::Vm1_3_2(vm) => vm.pop_snapshot_no_rollback(),
+            VmInstanceVersion::VmVirtualBlocks(vm) => vm.pop_snapshot_no_rollback(),
         }
     }
 }
diff --git a/core/lib/object_store/Cargo.toml b/core/lib/object_store/Cargo.toml
index 4f2f0623d838..81f01c3b785d 100644
--- a/core/lib/object_store/Cargo.toml
+++ b/core/lib/object_store/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "zksync_object_store"
-version = "1.0.0"
+version = "0.1.0"
 edition = "2021"
 authors = ["The Matter Labs Team <hello@matterlabs.dev>"]
 homepage = "https://zksync.io/"
@@ -10,17 +10,17 @@ keywords = ["blockchain", "zksync"]
 categories = ["cryptography"]
 
 [dependencies]
-zksync_config = { path = "../../lib/config", version = "1.0" }
-zksync_types = { path = "../types", version = "1.0" }
+zksync_config = { path = "../config" }
+zksync_types = { path = "../types" }
 
 async-trait = "0.1"
 bincode = "1"
 google-cloud-storage = "0.12.0"
 google-cloud-auth = "0.11.0"
 http = "0.2.9"
-metrics = "0.20"
+metrics = "0.21"
 tokio = { version = "1.21.2", features = ["full"] }
-vlog = { path = "../vlog", version = "1.0" }
+tracing = "0.1"
 
 [dev-dependencies]
 tempdir = "0.3.7"
diff --git a/core/lib/object_store/src/gcs.rs b/core/lib/object_store/src/gcs.rs
index bebe6f44b535..7e8ca2bf4066 100644
--- a/core/lib/object_store/src/gcs.rs
+++ b/core/lib/object_store/src/gcs.rs
@@ -33,7 +33,7 @@ where
         match f().await {
             Ok(result) => return Ok(result),
             Err(err) => {
-                vlog::warn!("Failed gcs request {retries}/{max_retries}, retrying.");
+                tracing::warn!("Failed gcs request {retries}/{max_retries}, retrying.");
                 if retries > max_retries {
                     return Err(err);
                 }
@@ -107,7 +107,7 @@ impl GoogleCloudStorage {
         key: &str,
     ) -> impl Future<Output = Result<(), ObjectStoreError>> + '_ {
         let filename = Self::filename(bucket, key);
-        vlog::trace!(
+        tracing::trace!(
             "Removing data from GCS for key {filename} from bucket {}",
             self.bucket_prefix
         );
@@ -148,7 +148,7 @@ impl ObjectStore for GoogleCloudStorage {
     async fn get_raw(&self, bucket: Bucket, key: &str) -> Result<Vec<u8>, ObjectStoreError> {
         let started_at = Instant::now();
         let filename = Self::filename(bucket.as_str(), key);
-        vlog::trace!(
+        tracing::trace!(
             "Fetching data from GCS for key {filename} from bucket {}",
             self.bucket_prefix
         );
@@ -164,7 +164,7 @@ impl ObjectStore for GoogleCloudStorage {
         })
         .await;
 
-        vlog::trace!(
+        tracing::trace!(
             "Fetched data from GCS for key {key} from bucket {bucket} and it took: {:?}",
             started_at.elapsed()
         );
@@ -184,7 +184,7 @@ impl ObjectStore for GoogleCloudStorage {
     ) -> Result<(), ObjectStoreError> {
         let started_at = Instant::now();
         let filename = Self::filename(bucket.as_str(), key);
-        vlog::trace!(
+        tracing::trace!(
             "Storing data to GCS for key {filename} from bucket {}",
             self.bucket_prefix
         );
@@ -200,7 +200,7 @@ impl ObjectStore for GoogleCloudStorage {
         })
         .await;
 
-        vlog::trace!(
+        tracing::trace!(
             "Stored data to GCS for key {key} from bucket {bucket} and it took: {:?}",
             started_at.elapsed()
         );
diff --git a/core/lib/object_store/src/objects.rs b/core/lib/object_store/src/objects.rs
index d6858d683d96..e5ee186676eb 100644
--- a/core/lib/object_store/src/objects.rs
+++ b/core/lib/object_store/src/objects.rs
@@ -1,8 +1,9 @@
 //! Stored objects.
 
+use zksync_types::aggregated_operations::L1BatchProofForL1;
 use zksync_types::{
     proofs::{AggregationRound, PrepareBasicCircuitsJob},
-    prover_server_api::RawProof,
+    storage::witness_block_state::WitnessBlockState,
     zkevm_test_harness::{
         abstract_zksync_circuit::concrete_circuits::ZkSyncCircuit,
         bellman::bn256::Bn256,
@@ -62,6 +63,17 @@ macro_rules! serialize_using_bincode {
     };
 }
 
+impl StoredObject for WitnessBlockState {
+    const BUCKET: Bucket = Bucket::WitnessInput;
+    type Key<'a> = L1BatchNumber;
+
+    fn encode_key(key: Self::Key<'_>) -> String {
+        format!("witness_block_state_for_l1_batch_{key}.bin")
+    }
+
+    serialize_using_bincode!();
+}
+
 impl StoredObject for PrepareBasicCircuitsJob {
     const BUCKET: Bucket = Bucket::WitnessInput;
     type Key<'a> = L1BatchNumber;
@@ -190,12 +202,12 @@ impl StoredObject for ZkSyncCircuit<Bn256, VmWitnessOracle<Bn256>> {
     serialize_using_bincode!();
 }
 
-impl StoredObject for RawProof {
+impl StoredObject for L1BatchProofForL1 {
     const BUCKET: Bucket = Bucket::ProofsFri;
     type Key<'a> = L1BatchNumber;
 
     fn encode_key(key: Self::Key<'_>) -> String {
-        format!("proof_fri_{key}.bin")
+        format!("l1_batch_proof_{key}.bin")
     }
 
     serialize_using_bincode!();
diff --git a/core/lib/object_store/src/raw.rs b/core/lib/object_store/src/raw.rs
index 127d6124e07b..c8306f99c0ff 100644
--- a/core/lib/object_store/src/raw.rs
+++ b/core/lib/object_store/src/raw.rs
@@ -167,6 +167,12 @@ impl ObjectStoreFactory {
         Self::new(config)
     }
 
+    /// Creates an object store factory with the prover configuration taken from the environment.
+    pub fn prover_from_env() -> Self {
+        let config = ObjectStoreConfig::prover_from_env();
+        Self::new(config)
+    }
+
     /// Creates an object store factory with a mock in-memory store.
     /// All calls to [`Self::create_store()`] will return the same store; thus, the testing code
     /// can use [`ObjectStore`] methods for assertions.
@@ -191,7 +197,9 @@ impl ObjectStoreFactory {
         };
         match config.mode {
             ObjectStoreMode::GCS => {
-                vlog::trace!("Initialized GoogleCloudStorage Object store without credential file");
+                tracing::trace!(
+                    "Initialized GoogleCloudStorage Object store without credential file"
+                );
                 let store = GoogleCloudStorage::new(
                     gcs_credential_file_path,
                     config.bucket_base_url.clone(),
@@ -201,7 +209,7 @@ impl ObjectStoreFactory {
                 Box::new(store)
             }
             ObjectStoreMode::GCSWithCredentialFile => {
-                vlog::trace!("Initialized GoogleCloudStorage Object store with credential file");
+                tracing::trace!("Initialized GoogleCloudStorage Object store with credential file");
                 let store = GoogleCloudStorage::new(
                     gcs_credential_file_path,
                     config.bucket_base_url.clone(),
@@ -211,7 +219,7 @@ impl ObjectStoreFactory {
                 Box::new(store)
             }
             ObjectStoreMode::FileBacked => {
-                vlog::trace!("Initialized FileBacked Object store");
+                tracing::trace!("Initialized FileBacked Object store");
                 let store = FileBackedObjectStore::new(config.file_backed_base_path.clone()).await;
                 Box::new(store)
             }
diff --git a/core/lib/prometheus_exporter/Cargo.toml b/core/lib/prometheus_exporter/Cargo.toml
index 4a5446de11b9..8ce3afee4379 100644
--- a/core/lib/prometheus_exporter/Cargo.toml
+++ b/core/lib/prometheus_exporter/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "prometheus_exporter"
-version = "1.0.0"
+version = "0.1.0"
 edition = "2018"
 authors = ["The Matter Labs Team <hello@matterlabs.dev>"]
 homepage = "https://zksync.io/"
@@ -10,7 +10,7 @@ keywords = ["blockchain", "zksync"]
 categories = ["cryptography"]
 
 [dependencies]
+anyhow = "1.0"
+metrics = "0.21"
 tokio = "1"
-metrics = "0.20"
-metrics-exporter-prometheus = "0.11"
-vlog = { path = "../vlog", version = "1.0" }
+vise-exporter = { git = "https://github.com/matter-labs/vise.git", version = "0.1.0", rev = "856eedd0a36a2ff2c8d965b0f0186d4bb8465d8c" }
diff --git a/core/lib/prometheus_exporter/src/lib.rs b/core/lib/prometheus_exporter/src/lib.rs
index d3d73de6a74c..a08328c68828 100644
--- a/core/lib/prometheus_exporter/src/lib.rs
+++ b/core/lib/prometheus_exporter/src/lib.rs
@@ -1,11 +1,13 @@
-use metrics_exporter_prometheus::{Matcher, PrometheusBuilder};
-use std::time::Duration;
-use tokio::task::JoinHandle;
+use anyhow::Context as _;
+use tokio::sync::watch;
+use vise_exporter::{
+    metrics_exporter_prometheus::{Matcher, PrometheusBuilder},
+    MetricsExporter,
+};
 
-pub fn run_prometheus_exporter(
-    port: u16,
-    pushgateway_config: Option<(String, Duration)>,
-) -> JoinHandle<()> {
+use std::{net::Ipv4Addr, time::Duration};
+
+fn configure_legacy_exporter(builder: PrometheusBuilder) -> PrometheusBuilder {
     // in seconds
     let default_latency_buckets = [0.001, 0.005, 0.025, 0.1, 0.25, 1.0, 5.0, 30.0, 120.0];
     let slow_latency_buckets = [
@@ -40,29 +42,10 @@ pub fn run_prometheus_exporter(
         0.01, 0.03, 0.1, 0.3, 0.5, 0.75, 1., 1.5, 3., 5., 10., 20., 50.,
     ];
 
-    let builder = if let Some((pushgateway_url, push_interval)) = pushgateway_config {
-        let job_id = "zksync-pushgateway";
-        let namespace = std::env::var("POD_NAMESPACE").unwrap_or_else(|_| {
-            vlog::warn!("Missing POD_NAMESPACE env");
-            "UNKNOWN_NAMESPACE".to_string()
-        });
-        let pod = std::env::var("POD_NAME").unwrap_or_else(|_| {
-            vlog::warn!("Missing POD_NAME env");
-            "UNKNOWN_POD".to_string()
-        });
-        let endpoint = format!(
-            "{}/metrics/job/{}/namespace/{}/pod/{}",
-            pushgateway_url, job_id, namespace, pod
-        );
-        PrometheusBuilder::new()
-            .with_push_gateway(endpoint.as_str(), push_interval)
-            .unwrap()
-    } else {
-        let addr = ([0, 0, 0, 0], port);
-        PrometheusBuilder::new().with_http_listener(addr)
-    };
+    // Buckets for a metric reporting the sizes of the JSON RPC batches sent to the server.
+    let batch_size_buckets = [1.0, 2.0, 4.0, 8.0, 16.0, 32.0, 64.0, 128.0, 256.0, 512.0];
 
-    let (recorder, exporter) = builder
+    builder
         .set_buckets(&default_latency_buckets)
         .unwrap()
         .set_buckets_for_metric(
@@ -94,17 +77,118 @@ pub fn run_prometheus_exporter(
             &around_one_buckets,
         )
         .unwrap()
-        .build()
-        .expect("failed to install Prometheus recorder");
+        .set_buckets_for_metric(
+            Matcher::Full("api.jsonrpc_backend.batch.size".to_owned()),
+            &batch_size_buckets,
+        )
+        .unwrap()
+}
+
+#[derive(Debug)]
+enum PrometheusTransport {
+    Pull {
+        port: u16,
+    },
+    Push {
+        gateway_uri: String,
+        interval: Duration,
+    },
+}
+
+/// Configuration of a Prometheus exporter.
+#[derive(Debug)]
+pub struct PrometheusExporterConfig {
+    transport: PrometheusTransport,
+    use_new_facade: bool,
+}
+
+impl PrometheusExporterConfig {
+    /// Creates an exporter that will run an HTTP server on the specified `port`.
+    pub const fn pull(port: u16) -> Self {
+        Self {
+            transport: PrometheusTransport::Pull { port },
+            use_new_facade: false,
+        }
+    }
+
+    /// Creates an exporter that will push metrics to the specified Prometheus gateway endpoint.
+    pub const fn push(gateway_uri: String, interval: Duration) -> Self {
+        Self {
+            transport: PrometheusTransport::Push {
+                gateway_uri,
+                interval,
+            },
+            use_new_facade: false,
+        }
+    }
+
+    /// Enables the new metrics façade (`vise`), which is off by default.
+    #[must_use]
+    pub fn with_new_facade(self) -> Self {
+        Self {
+            use_new_facade: true,
+            transport: self.transport,
+        }
+    }
 
-    metrics::set_boxed_recorder(Box::new(recorder)).expect("failed to set metrics recorder");
+    /// Runs the exporter. This future should be spawned in a separate Tokio task.
+    pub async fn run(self, stop_receiver: watch::Receiver<bool>) -> anyhow::Result<()> {
+        if self.use_new_facade {
+            self.run_with_new_facade(stop_receiver)
+                .await
+                .context("run_with_new_facade()")
+        } else {
+            self.run_without_new_facade()
+                .await
+                .context("run_without_new_facade()")
+        }
+    }
+
+    async fn run_with_new_facade(
+        self,
+        mut stop_receiver: watch::Receiver<bool>,
+    ) -> anyhow::Result<()> {
+        let metrics_exporter = MetricsExporter::default()
+            .with_legacy_exporter(configure_legacy_exporter)
+            .with_graceful_shutdown(async move {
+                stop_receiver.changed().await.ok();
+            });
 
-    tokio::spawn(async move {
-        tokio::pin!(exporter);
-        loop {
-            tokio::select! {
-                _ = &mut exporter => {}
+        match self.transport {
+            PrometheusTransport::Pull { port } => {
+                let prom_bind_address = (Ipv4Addr::UNSPECIFIED, port).into();
+                metrics_exporter.start(prom_bind_address).await
+            }
+            PrometheusTransport::Push {
+                gateway_uri,
+                interval,
+            } => {
+                let endpoint = gateway_uri
+                    .parse()
+                    .context("Failed parsing Prometheus push gateway endpoint")?;
+                metrics_exporter.push_to_gateway(endpoint, interval).await
             }
         }
-    })
+        Ok(())
+    }
+
+    async fn run_without_new_facade(self) -> anyhow::Result<()> {
+        let builder = match self.transport {
+            PrometheusTransport::Pull { port } => {
+                let prom_bind_address = (Ipv4Addr::UNSPECIFIED, port);
+                PrometheusBuilder::new().with_http_listener(prom_bind_address)
+            }
+            PrometheusTransport::Push {
+                gateway_uri,
+                interval,
+            } => PrometheusBuilder::new()
+                .with_push_gateway(gateway_uri, interval, None, None)
+                .context("PrometheusBuilder::with_push_gateway()")?,
+        };
+        let builder = configure_legacy_exporter(builder);
+        let (recorder, exporter) = builder.build().context("PrometheusBuilder::build()")?;
+        metrics::set_boxed_recorder(Box::new(recorder))
+            .context("failed to set metrics recorder")?;
+        exporter.await.context("Prometheus exporter failed")
+    }
 }
diff --git a/core/lib/prover_utils/Cargo.toml b/core/lib/prover_utils/Cargo.toml
index c1939867af82..ccea14ea7496 100644
--- a/core/lib/prover_utils/Cargo.toml
+++ b/core/lib/prover_utils/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "zksync_prover_utils"
-version = "1.0.0"
+version = "0.1.0"
 edition = "2018"
 authors = ["The Matter Labs Team <hello@matterlabs.dev>"]
 homepage = "https://zksync.io/"
@@ -10,11 +10,13 @@ keywords = ["blockchain", "zksync"]
 categories = ["cryptography"]
 
 [dependencies]
-zksync_config = { path = "../../lib/config", version = "1.0" }
-zksync_utils = { path = "../../lib/utils", version = "1.0" }
+zksync_config = { path = "../../lib/config" }
+zksync_utils = { path = "../../lib/utils" }
+zksync_types = { path = "../../lib/types" }
+zksync_object_store = { path = "../../lib/object_store" }
 
-vlog = { path = "../../lib/vlog", version = "1.0" }
-metrics = "0.20"
+anyhow = "1.0"
+metrics = "0.21"
 reqwest = { version = "0.11", features = ["blocking"] }
 regex = "1.7.2"
 tokio = "1.27.0"
@@ -22,3 +24,4 @@ futures = { version = "0.3", features = ["compat"] }
 ctrlc = { version = "3.1", features = ["termination"] }
 toml_edit = "0.14.4"
 async-trait = "0.1"
+tracing = "0.1"
diff --git a/core/lib/prover_utils/src/gcs_proof_fetcher.rs b/core/lib/prover_utils/src/gcs_proof_fetcher.rs
new file mode 100644
index 000000000000..25a29b52fe95
--- /dev/null
+++ b/core/lib/prover_utils/src/gcs_proof_fetcher.rs
@@ -0,0 +1,20 @@
+use zksync_object_store::ObjectStore;
+use zksync_types::aggregated_operations::L1BatchProofForL1;
+use zksync_types::L1BatchNumber;
+
+pub async fn load_wrapped_fri_proofs_for_range(
+    from: L1BatchNumber,
+    to: L1BatchNumber,
+    blob_store: &dyn ObjectStore,
+) -> Vec<L1BatchProofForL1> {
+    let mut proofs = Vec::new();
+    for l1_batch_number in from.0..=to.0 {
+        let l1_batch_number = L1BatchNumber(l1_batch_number);
+        let proof = blob_store
+            .get(l1_batch_number)
+            .await
+            .expect("Failed to load proof");
+        proofs.push(proof);
+    }
+    proofs
+}
diff --git a/core/lib/prover_utils/src/lib.rs b/core/lib/prover_utils/src/lib.rs
index e010afc30004..8b5c1a82a80b 100644
--- a/core/lib/prover_utils/src/lib.rs
+++ b/core/lib/prover_utils/src/lib.rs
@@ -6,12 +6,13 @@ use std::{fs::create_dir_all, io::Cursor, path::Path, time::Duration, time::Inst
 
 use futures::{channel::mpsc, executor::block_on, SinkExt};
 
+pub mod gcs_proof_fetcher;
 pub mod periodic_job;
 pub mod region_fetcher;
 pub mod vk_commitment_helper;
 
 fn download_bytes(key_download_url: &str) -> reqwest::Result<Vec<u8>> {
-    vlog::info!("Downloading initial setup from {:?}", key_download_url);
+    tracing::info!("Downloading initial setup from {:?}", key_download_url);
 
     const DOWNLOAD_TIMEOUT: Duration = Duration::from_secs(120);
     let client = reqwest::blocking::Client::builder()
@@ -32,7 +33,7 @@ fn download_bytes(key_download_url: &str) -> reqwest::Result<Vec<u8>> {
             Err(_) => retry_count += 1,
         }
 
-        vlog::warn!("Failed to download keys. Backing off for 5 second");
+        tracing::warn!("Failed to download keys. Backing off for 5 second");
         std::thread::sleep(Duration::from_secs(5));
     }
 
@@ -44,7 +45,7 @@ fn download_bytes(key_download_url: &str) -> reqwest::Result<Vec<u8>> {
 
 pub fn ensure_initial_setup_keys_present(initial_setup_key_path: &str, key_download_url: &str) {
     if Path::new(initial_setup_key_path).exists() {
-        vlog::info!(
+        tracing::info!(
             "Initial setup already present at {:?}",
             initial_setup_key_path
         );
diff --git a/core/lib/prover_utils/src/periodic_job.rs b/core/lib/prover_utils/src/periodic_job.rs
index 2558dd450b41..a323aeddf99d 100644
--- a/core/lib/prover_utils/src/periodic_job.rs
+++ b/core/lib/prover_utils/src/periodic_job.rs
@@ -10,11 +10,11 @@ pub trait PeriodicJob: Sync + Send {
     /// Runs the routine task periodically in [`Self::polling_interval_ms()`] frequency.
     async fn run_routine_task(&mut self);
 
-    async fn run(mut self)
+    async fn run(mut self) -> anyhow::Result<()>
     where
         Self: Sized,
     {
-        vlog::info!(
+        tracing::info!(
             "Starting periodic job: {} with frequency: {} ms",
             Self::SERVICE_NAME,
             self.polling_interval_ms()
diff --git a/core/lib/queued_job_processor/Cargo.toml b/core/lib/queued_job_processor/Cargo.toml
index bbcfc5f15f0e..913a6934c0c3 100644
--- a/core/lib/queued_job_processor/Cargo.toml
+++ b/core/lib/queued_job_processor/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "zksync_queued_job_processor"
-version = "1.0.0"
+version = "0.1.0"
 edition = "2018"
 authors = ["The Matter Labs Team <hello@matterlabs.dev>"]
 homepage = "https://zksync.io/"
@@ -11,8 +11,9 @@ categories = ["cryptography"]
 
 
 [dependencies]
+anyhow = "1.0"
 async-trait = "0.1"
 tokio = { version = "1", features = ["time"] }
+tracing = "0.1"
 
-zksync_utils = { path = "../../lib/utils", version = "1.0" }
-vlog = { path = "../../lib/vlog", version = "1.0" }
+zksync_utils = { path = "../../lib/utils" }
diff --git a/core/lib/queued_job_processor/src/lib.rs b/core/lib/queued_job_processor/src/lib.rs
index 7b24e444852b..83196a1fa807 100644
--- a/core/lib/queued_job_processor/src/lib.rs
+++ b/core/lib/queued_job_processor/src/lib.rs
@@ -39,25 +39,29 @@ pub trait JobProcessor: Sync + Send {
     /// To run indefinitely, pass `None`,
     /// To process one job, pass `Some(1)`,
     /// To process a batch, pass `Some(batch_size)`.
-    async fn run(self, stop_receiver: watch::Receiver<bool>, mut iterations_left: Option<usize>)
+    async fn run(
+        self,
+        stop_receiver: watch::Receiver<bool>,
+        mut iterations_left: Option<usize>,
+    ) -> anyhow::Result<()>
     where
         Self: Sized,
     {
         let mut backoff: u64 = Self::POLLING_INTERVAL_MS;
         while iterations_left.map_or(true, |i| i > 0) {
             if *stop_receiver.borrow() {
-                vlog::warn!(
+                tracing::warn!(
                     "Stop signal received, shutting down {} component while waiting for a new job",
                     Self::SERVICE_NAME
                 );
-                return;
+                return Ok(());
             }
             if let Some((job_id, job)) = Self::get_next_job(&self).await {
                 let started_at = Instant::now();
                 backoff = Self::POLLING_INTERVAL_MS;
                 iterations_left = iterations_left.map(|i| i - 1);
 
-                vlog::debug!(
+                tracing::debug!(
                     "Spawning thread processing {:?} job with id {:?}",
                     Self::SERVICE_NAME,
                     job_id
@@ -66,15 +70,16 @@ pub trait JobProcessor: Sync + Send {
 
                 self.wait_for_task(job_id, started_at, task).await
             } else if iterations_left.is_some() {
-                vlog::info!("No more jobs to process. Server can stop now.");
-                return;
+                tracing::info!("No more jobs to process. Server can stop now.");
+                return Ok(());
             } else {
-                vlog::trace!("Backing off for {} ms", backoff);
+                tracing::trace!("Backing off for {} ms", backoff);
                 sleep(Duration::from_millis(backoff)).await;
                 backoff = (backoff * Self::BACKOFF_MULTIPLIER).min(Self::MAX_BACKOFF_MS);
             }
         }
-        vlog::info!("Requested number of jobs is processed. Server can stop now.")
+        tracing::info!("Requested number of jobs is processed. Server can stop now.");
+        Ok(())
     }
 
     /// Polls task handle, saving its outcome.
@@ -85,7 +90,7 @@ pub trait JobProcessor: Sync + Send {
         task: JoinHandle<Self::JobArtifacts>,
     ) {
         loop {
-            vlog::trace!(
+            tracing::trace!(
                 "Polling {} task with id {:?}. Is finished: {}",
                 Self::SERVICE_NAME,
                 job_id,
@@ -95,7 +100,7 @@ pub trait JobProcessor: Sync + Send {
                 let result = task.await;
                 match result {
                     Ok(data) => {
-                        vlog::debug!(
+                        tracing::debug!(
                             "{} Job {:?} finished successfully",
                             Self::SERVICE_NAME,
                             job_id
@@ -104,7 +109,7 @@ pub trait JobProcessor: Sync + Send {
                     }
                     Err(error) => {
                         let error_message = try_extract_panic_message(error);
-                        vlog::error!(
+                        tracing::error!(
                             "Error occurred while processing {} job {:?}: {:?}",
                             Self::SERVICE_NAME,
                             job_id,
diff --git a/core/lib/state/Cargo.toml b/core/lib/state/Cargo.toml
index 37df40e181bb..f717968ec256 100644
--- a/core/lib/state/Cargo.toml
+++ b/core/lib/state/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "zksync_state"
-version = "1.0.0"
+version = "0.1.0"
 edition = "2021"
 authors = ["The Matter Labs Team <hello@matterlabs.dev>"]
 homepage = "https://zksync.io/"
@@ -10,16 +10,19 @@ keywords = ["blockchain", "zksync"]
 categories = ["cryptography"]
 
 [dependencies]
-zksync_dal = { path = "../dal", version = "1.0" }
-zksync_types = { path = "../types", version = "1.0" }
-zksync_storage = { path = "../storage", version = "1.0" }
-vlog = { path = "../../lib/vlog", version = "1.0" }
+zksync_dal = { path = "../dal" }
+zksync_types = { path = "../types" }
+zksync_utils = { path = "../utils" }
+zksync_storage = { path = "../storage" }
 
-metrics = "0.20"
+anyhow = "1.0"
+metrics = "0.21"
 mini-moka = "0.10.0"
 tokio = { version = "1", features = ["rt"] }
+tracing = "0.1"
 
 [dev-dependencies]
 db_test_macro = { path = "../db_test_macro" }
 
+rand = "0.8.5"
 tempfile = "3.0.2"
diff --git a/core/lib/state/src/in_memory.rs b/core/lib/state/src/in_memory.rs
index 57679ff38e10..3ae72a9f4e9f 100644
--- a/core/lib/state/src/in_memory.rs
+++ b/core/lib/state/src/in_memory.rs
@@ -2,9 +2,11 @@ use std::collections::HashMap;
 
 use crate::ReadStorage;
 use zksync_types::{
-    get_code_key, get_system_context_init_logs, system_contracts::get_system_smart_contracts,
-    L2ChainId, StorageKey, StorageLog, StorageLogKind, StorageValue, H256,
+    block::DeployedContract, get_code_key, get_known_code_key, get_system_context_init_logs,
+    system_contracts::get_system_smart_contracts, L2ChainId, StorageKey, StorageLog,
+    StorageLogKind, StorageValue, H256, U256,
 };
+use zksync_utils::u256_to_h256;
 
 /// Network ID we use by defailt for in memory storage.
 pub const IN_MEMORY_STORAGE_DEFAULT_NETWORK_ID: u16 = 270;
@@ -30,14 +32,33 @@ impl InMemoryStorage {
         chain_id: L2ChainId,
         bytecode_hasher: impl Fn(&[u8]) -> H256,
     ) -> Self {
-        let contracts = get_system_smart_contracts();
+        Self::with_custom_system_contracts_and_chain_id(
+            chain_id,
+            bytecode_hasher,
+            get_system_smart_contracts(),
+        )
+    }
+
+    /// Constructs a storage that contains custom system contracts (provided in a vector).
+    pub fn with_custom_system_contracts_and_chain_id(
+        chain_id: L2ChainId,
+        bytecode_hasher: impl Fn(&[u8]) -> H256,
+        contracts: Vec<DeployedContract>,
+    ) -> Self {
         let system_context_init_log = get_system_context_init_logs(chain_id);
 
         let state = contracts
             .iter()
-            .map(|contract| {
+            .flat_map(|contract| {
+                let bytecode_hash = bytecode_hasher(&contract.bytecode);
+
                 let deployer_code_key = get_code_key(contract.account_id.address());
-                StorageLog::new_write_log(deployer_code_key, bytecode_hasher(&contract.bytecode))
+                let is_known_code_key = get_known_code_key(&bytecode_hash);
+
+                vec![
+                    StorageLog::new_write_log(deployer_code_key, bytecode_hash),
+                    StorageLog::new_write_log(is_known_code_key, u256_to_h256(U256::one())),
+                ]
             })
             .chain(system_context_init_log)
             .filter_map(|log| (log.kind == StorageLogKind::Write).then_some((log.key, log.value)))
diff --git a/core/lib/state/src/lib.rs b/core/lib/state/src/lib.rs
index 8f9b8ff4c190..33376b601436 100644
--- a/core/lib/state/src/lib.rs
+++ b/core/lib/state/src/lib.rs
@@ -25,13 +25,15 @@ mod shadow_storage;
 mod storage_view;
 #[cfg(test)]
 mod test_utils;
+mod witness;
 
 pub use self::{
-    in_memory::InMemoryStorage,
+    in_memory::{InMemoryStorage, IN_MEMORY_STORAGE_DEFAULT_NETWORK_ID},
     postgres::{PostgresStorage, PostgresStorageCaches},
     rocksdb::RocksdbStorage,
     shadow_storage::ShadowStorage,
     storage_view::{StorageView, StorageViewMetrics},
+    witness::WitnessStorage,
 };
 
 /// Functionality to read from the VM storage.
@@ -70,5 +72,5 @@ pub trait WriteStorage: ReadStorage {
     fn missed_storage_invocations(&self) -> usize;
 }
 
-/// Smart pointer to a dynamically typed [`WriteStorage`].
-pub type StoragePtr<'a> = Rc<RefCell<&'a mut dyn WriteStorage>>;
+/// Smart pointer to [`WriteStorage`].
+pub type StoragePtr<S> = Rc<RefCell<S>>;
diff --git a/core/lib/state/src/postgres.rs b/core/lib/state/src/postgres/mod.rs
similarity index 52%
rename from core/lib/state/src/postgres.rs
rename to core/lib/state/src/postgres/mod.rs
index bbacf1fd2002..3c09f9830f8e 100644
--- a/core/lib/state/src/postgres.rs
+++ b/core/lib/state/src/postgres/mod.rs
@@ -8,6 +8,9 @@ use std::{
 use zksync_dal::{ConnectionPool, StorageProcessor};
 use zksync_types::{L1BatchNumber, MiniblockNumber, StorageKey, StorageValue, H256};
 
+#[cfg(test)]
+mod tests;
+
 use crate::{
     cache::{Cache, CacheValue},
     ReadStorage,
@@ -35,10 +38,24 @@ impl CacheValue<StorageKey> for L1BatchNumber {
     }
 }
 
-impl CacheValue<H256> for StorageValue {
+/// [`StorageValue`] together with a miniblock "timestamp" starting from which it is known to be valid.
+///
+/// Using timestamped values in [`ValuesCache`] enables using it for past miniblock states. As long as
+/// a cached value has a "timestamp" older or equal than the requested miniblock, the value can be used.
+///
+/// Timestamp is assigned to equal the latest miniblock when a value is fetched from the storage.
+/// A value may be valid for earlier miniblocks, but fetching the actual modification "timestamp"
+/// would make the relevant Postgres query more complex.
+#[derive(Debug, Clone, Copy)]
+struct TimestampedStorageValue {
+    value: StorageValue,
+    loaded_at: MiniblockNumber,
+}
+
+impl CacheValue<H256> for TimestampedStorageValue {
     #[allow(clippy::cast_possible_truncation)] // doesn't happen in practice
     fn cache_weight(&self) -> u32 {
-        const WEIGHT: usize = mem::size_of::<StorageValue>() + mem::size_of::<H256>();
+        const WEIGHT: usize = mem::size_of::<TimestampedStorageValue>() + mem::size_of::<H256>();
         // ^ Since values are small in size, we want to account for key sizes as well
 
         WEIGHT as u32
@@ -47,11 +64,11 @@ impl CacheValue<H256> for StorageValue {
 
 #[derive(Debug)]
 struct ValuesCacheInner {
-    /// Miniblock for which `self.values` are valid. Has the same meaning as `miniblock_number`
+    /// Miniblock up to which `self.values` are valid. Has the same meaning as `miniblock_number`
     /// in `PostgresStorage` (i.e., the latest sealed miniblock for which storage logs should
     /// be taken into account).
     valid_for: MiniblockNumber,
-    values: Cache<H256, StorageValue>,
+    values: Cache<H256, TimestampedStorageValue>,
 }
 
 /// Cache for the VM storage. Only caches values for a single VM storage snapshot, which logically
@@ -91,11 +108,17 @@ impl ValuesCache {
     /// for `miniblock_number`.
     fn get(&self, miniblock_number: MiniblockNumber, key: &StorageKey) -> Option<StorageValue> {
         let lock = self.0.read().expect("values cache is poisoned");
-        if lock.valid_for == miniblock_number {
-            lock.values.get(&key.hashed_key())
+        if lock.valid_for < miniblock_number {
+            // The request is from the future; we cannot say which values in the cache remain valid,
+            // so we don't return *any* cached values.
+            return None;
+        }
+
+        let timestamped_value = lock.values.get(&key.hashed_key())?;
+        if timestamped_value.loaded_at <= miniblock_number {
+            Some(timestamped_value.value)
         } else {
-            metrics::increment_counter!("server.state_cache.stale_values", "method" => "get");
-            None
+            None // The value is from the future
         }
     }
 
@@ -103,7 +126,13 @@ impl ValuesCache {
     fn insert(&self, miniblock_number: MiniblockNumber, key: StorageKey, value: StorageValue) {
         let lock = self.0.read().expect("values cache is poisoned");
         if lock.valid_for == miniblock_number {
-            lock.values.insert(key.hashed_key(), value);
+            lock.values.insert(
+                key.hashed_key(),
+                TimestampedStorageValue {
+                    value,
+                    loaded_at: miniblock_number,
+                },
+            );
         } else {
             metrics::increment_counter!("server.state_cache.stale_values", "method" => "insert");
         }
@@ -119,14 +148,14 @@ impl ValuesCache {
     ) {
         const MAX_MINIBLOCKS_LAG: u32 = 5;
 
-        vlog::debug!(
+        tracing::debug!(
             "Updating storage values cache from miniblock {from_miniblock} to {to_miniblock}"
         );
 
         if to_miniblock.0 - from_miniblock.0 > MAX_MINIBLOCKS_LAG {
             // We can spend too much time loading data from Postgres, so we opt for an easier "update" route:
             // evict *everything* from cache and call it a day. This should not happen too often in practice.
-            vlog::info!(
+            tracing::info!(
                 "Storage values cache is too far behind (current miniblock is {from_miniblock}; \
                  requested update to {to_miniblock}); resetting the cache"
             );
@@ -155,7 +184,7 @@ impl ValuesCache {
                 "server.state_cache.values_update.modified_keys",
                 modified_keys.len() as f64
             );
-            vlog::debug!(
+            tracing::debug!(
                 "Loaded {modified_keys_len} modified storage keys from miniblocks {miniblocks:?}; \
                  took {elapsed:?}",
                 modified_keys_len = modified_keys.len()
@@ -221,7 +250,7 @@ impl PostgresStorageCaches {
 
     /// Creates caches with the specified capacities measured in bytes.
     pub fn new(factory_deps_capacity: u64, initial_writes_capacity: u64) -> Self {
-        vlog::debug!(
+        tracing::debug!(
             "Initialized VM execution cache with {factory_deps_capacity}B capacity for factory deps, \
              {initial_writes_capacity}B capacity for initial writes"
         );
@@ -253,12 +282,12 @@ impl PostgresStorageCaches {
         capacity: u64,
         connection_pool: ConnectionPool,
         rt_handle: Handle,
-    ) -> impl FnOnce() + Send {
+    ) -> impl FnOnce() -> anyhow::Result<()> + Send {
         assert!(
             capacity > 0,
             "Storage values cache capacity must be positive"
         );
-        vlog::debug!("Initializing VM storage values cache with {capacity}B capacity");
+        tracing::debug!("Initializing VM storage values cache with {capacity}B capacity");
 
         let (command_sender, mut command_receiver) = mpsc::unbounded_channel();
         let values_cache = ValuesCache::new(capacity);
@@ -282,6 +311,7 @@ impl PostgresStorageCaches {
                 values_cache.update(current_miniblock, to_miniblock, &rt_handle, &mut connection);
                 current_miniblock = to_miniblock;
             }
+            Ok(())
         }
     }
 
@@ -348,21 +378,7 @@ impl<'a> PostgresStorage<'a> {
 
     /// Sets the caches to use with the storage.
     #[must_use]
-    pub fn with_caches(self, mut caches: PostgresStorageCaches) -> Self {
-        let should_use_values_cache = caches.values.as_ref().map_or(false, |values| {
-            self.miniblock_number >= values.cache.valid_for()
-        });
-        // Since "valid for" only increases with time, if `self.miniblock_number < valid_for`,
-        // all cache calls are guaranteed to miss.
-
-        metrics::increment_counter!(
-            "server.state_cache.values_used",
-            "used" => if should_use_values_cache { "true" } else { "false" }
-        );
-        if !should_use_values_cache {
-            caches.values = None;
-        }
-
+    pub fn with_caches(self, caches: PostgresStorageCaches) -> Self {
         Self {
             caches: Some(caches),
             ..self
@@ -462,6 +478,7 @@ impl ReadStorage for PostgresStorage<'_> {
 
     fn load_factory_dep(&mut self, hash: H256) -> Option<Vec<u8>> {
         let started_at = Instant::now();
+
         let cached_value = self
             .caches
             .as_ref()
@@ -492,449 +509,3 @@ impl ReadStorage for PostgresStorage<'_> {
         result
     }
 }
-
-#[cfg(test)]
-mod tests {
-    use std::{collections::HashMap, mem};
-
-    use db_test_macro::db_test;
-    use zksync_dal::ConnectionPool;
-    use zksync_types::StorageLog;
-
-    use super::*;
-    use crate::test_utils::{
-        create_l1_batch, create_miniblock, gen_storage_logs, prepare_postgres,
-    };
-
-    fn test_postgres_storage_basics(
-        pool: &ConnectionPool,
-        rt_handle: Handle,
-        cache_initial_writes: bool,
-    ) {
-        let mut connection = rt_handle.block_on(pool.access_storage());
-        rt_handle.block_on(prepare_postgres(&mut connection));
-        let mut storage = PostgresStorage::new(rt_handle, connection, MiniblockNumber(0), true);
-        if cache_initial_writes {
-            let caches = PostgresStorageCaches::new(1_024, 1_024);
-            storage = storage.with_caches(caches);
-        }
-        assert_eq!(storage.l1_batch_number_for_miniblock, L1BatchNumber(0));
-
-        let existing_logs = gen_storage_logs(0..20);
-        for log in &existing_logs {
-            assert!(!storage.is_write_initial(&log.key));
-        }
-
-        let non_existing_logs = gen_storage_logs(20..30);
-        for log in &non_existing_logs {
-            assert!(storage.is_write_initial(&log.key));
-        }
-
-        if cache_initial_writes {
-            let caches = storage.caches.as_ref().unwrap();
-            assert!(caches.initial_writes.estimated_len() > 0);
-        }
-
-        // Add a new miniblock to the storage
-        storage.rt_handle.block_on(create_miniblock(
-            &mut storage.connection,
-            MiniblockNumber(1),
-            non_existing_logs.clone(),
-        ));
-
-        // Check that the miniblock is not seen by `PostgresStorage` (it's not a part of an L1 batch)
-        for log in &non_existing_logs {
-            assert!(storage.is_write_initial(&log.key));
-        }
-
-        let caches = mem::take(&mut storage.caches);
-        let mut storage = PostgresStorage::new(
-            storage.rt_handle,
-            storage.connection,
-            MiniblockNumber(1),
-            true,
-        );
-        storage.caches = caches;
-
-        assert_eq!(storage.l1_batch_number_for_miniblock, L1BatchNumber(1));
-        for log in &non_existing_logs {
-            assert!(storage.is_write_initial(&log.key));
-        }
-
-        // Create an L1 batch for miniblock #1
-        storage.rt_handle.block_on(create_l1_batch(
-            &mut storage.connection,
-            L1BatchNumber(1),
-            &non_existing_logs,
-        ));
-
-        // Miniblock #1 should not be seen by the "old" storage
-        let caches = mem::take(&mut storage.caches);
-        let mut storage = PostgresStorage::new(
-            storage.rt_handle,
-            storage.connection,
-            MiniblockNumber(0),
-            true,
-        );
-        storage.caches = caches;
-
-        assert_eq!(storage.l1_batch_number_for_miniblock, L1BatchNumber(0));
-        for log in &non_existing_logs {
-            assert!(storage.is_write_initial(&log.key));
-        }
-
-        // ...but should be seen by the new one
-        let caches = mem::take(&mut storage.caches);
-        let mut storage = PostgresStorage::new(
-            storage.rt_handle,
-            storage.connection,
-            MiniblockNumber(1),
-            true,
-        );
-        storage.caches = caches;
-
-        assert_eq!(storage.l1_batch_number_for_miniblock, L1BatchNumber(1));
-        for log in &non_existing_logs {
-            assert!(!storage.is_write_initial(&log.key));
-        }
-
-        // ...except if we set `consider_new_l1_batch` to `false`
-        let caches = mem::take(&mut storage.caches);
-        let mut storage = PostgresStorage::new(
-            storage.rt_handle,
-            storage.connection,
-            MiniblockNumber(1),
-            false,
-        );
-        storage.caches = caches;
-
-        assert_eq!(storage.l1_batch_number_for_miniblock, L1BatchNumber(1));
-        for log in &non_existing_logs {
-            assert!(storage.is_write_initial(&log.key));
-        }
-        for log in &existing_logs {
-            assert!(!storage.is_write_initial(&log.key));
-        }
-    }
-
-    #[db_test]
-    async fn postgres_storage_basics(pool: ConnectionPool) {
-        tokio::task::spawn_blocking(move || {
-            test_postgres_storage_basics(&pool, Handle::current(), false);
-        })
-        .await
-        .unwrap();
-    }
-
-    #[db_test]
-    async fn postgres_storage_with_initial_writes_cache(pool: ConnectionPool) {
-        tokio::task::spawn_blocking(move || {
-            test_postgres_storage_basics(&pool, Handle::current(), true);
-        })
-        .await
-        .unwrap();
-    }
-
-    fn test_postgres_storage_after_sealing_miniblock(
-        pool: &ConnectionPool,
-        rt_handle: Handle,
-        consider_new_l1_batch: bool,
-    ) {
-        let mut connection = rt_handle.block_on(pool.access_storage());
-        rt_handle.block_on(prepare_postgres(&mut connection));
-        let new_logs = gen_storage_logs(20..30);
-
-        rt_handle.block_on(create_miniblock(
-            &mut connection,
-            MiniblockNumber(1),
-            new_logs.clone(),
-        ));
-
-        let mut storage = PostgresStorage::new(
-            rt_handle,
-            connection,
-            MiniblockNumber(1),
-            consider_new_l1_batch,
-        );
-        assert_eq!(storage.l1_batch_number_for_miniblock, L1BatchNumber(1));
-
-        storage.rt_handle.block_on(create_l1_batch(
-            &mut storage.connection,
-            L1BatchNumber(1),
-            &new_logs,
-        ));
-
-        for log in &new_logs {
-            assert_eq!(storage.is_write_initial(&log.key), !consider_new_l1_batch);
-        }
-
-        // Cross-check with the newly instantiated store with the same params
-        let mut storage = PostgresStorage::new(
-            storage.rt_handle,
-            storage.connection,
-            MiniblockNumber(1),
-            consider_new_l1_batch,
-        );
-        assert_eq!(storage.l1_batch_number_for_miniblock, L1BatchNumber(1));
-        for log in &new_logs {
-            assert_eq!(storage.is_write_initial(&log.key), !consider_new_l1_batch);
-        }
-    }
-
-    #[db_test]
-    async fn postgres_storage_after_sealing_miniblock(pool: ConnectionPool) {
-        tokio::task::spawn_blocking(move || {
-            println!("Considering new L1 batch");
-            test_postgres_storage_after_sealing_miniblock(&pool, Handle::current(), true);
-            println!("Not considering new L1 batch");
-            test_postgres_storage_after_sealing_miniblock(&pool, Handle::current(), false);
-        })
-        .await
-        .unwrap();
-    }
-
-    fn test_factory_deps_cache(pool: &ConnectionPool, rt_handle: Handle) {
-        let mut connection = rt_handle.block_on(pool.access_storage());
-        rt_handle.block_on(prepare_postgres(&mut connection));
-
-        let caches = PostgresStorageCaches::new(128 * 1_024 * 1_024, 1_024);
-        let mut storage = PostgresStorage::new(rt_handle, connection, MiniblockNumber(1), true)
-            .with_caches(caches.clone());
-
-        let zero_addr = H256::zero();
-        // try load a non-existent contract
-        let dep = storage.load_factory_dep(zero_addr);
-
-        assert_eq!(dep, None);
-        assert_eq!(caches.factory_deps.get(&zero_addr), None);
-
-        // insert the contracts
-        let mut contracts = HashMap::new();
-        contracts.insert(H256::zero(), vec![1, 2, 3]);
-        storage.rt_handle.block_on(
-            storage
-                .connection
-                .storage_dal()
-                .insert_factory_deps(MiniblockNumber(0), &contracts),
-        );
-
-        // Create the storage that should have the cache filled.
-        let mut storage = PostgresStorage::new(
-            storage.rt_handle,
-            storage.connection,
-            MiniblockNumber(1),
-            true,
-        )
-        .with_caches(caches.clone());
-
-        // Fill the cache
-        let dep = storage.load_factory_dep(zero_addr);
-        assert_eq!(dep, Some(vec![1, 2, 3]));
-        assert_eq!(caches.factory_deps.get(&zero_addr), Some(vec![1, 2, 3]));
-    }
-
-    #[db_test]
-    async fn using_factory_deps_cache(pool: ConnectionPool) {
-        let handle = Handle::current();
-        tokio::task::spawn_blocking(move || test_factory_deps_cache(&pool, handle))
-            .await
-            .unwrap();
-    }
-
-    fn test_initial_writes_cache(pool: &ConnectionPool, rt_handle: Handle) {
-        let connection = rt_handle.block_on(pool.access_storage());
-        let caches = PostgresStorageCaches::new(1_024, 4 * 1_024 * 1_024);
-        let mut storage = PostgresStorage::new(rt_handle, connection, MiniblockNumber(0), false)
-            .with_caches(caches.clone());
-        assert_eq!(storage.pending_l1_batch_number, L1BatchNumber(0));
-
-        storage
-            .rt_handle
-            .block_on(prepare_postgres(&mut storage.connection));
-
-        let mut logs = gen_storage_logs(100..120);
-        let non_existing_key = logs[19].key;
-        logs.truncate(10);
-
-        assert!(storage.is_write_initial(&logs[0].key));
-        assert!(storage.is_write_initial(&non_existing_key));
-        assert_eq!(
-            caches.negative_initial_writes.get(&logs[0].key),
-            Some(L1BatchNumber(0))
-        );
-        assert_eq!(
-            caches.negative_initial_writes.get(&non_existing_key),
-            Some(L1BatchNumber(0))
-        );
-        assert!(storage.is_write_initial(&logs[0].key));
-        assert!(storage.is_write_initial(&non_existing_key));
-
-        storage.rt_handle.block_on(create_miniblock(
-            &mut storage.connection,
-            MiniblockNumber(1),
-            logs.clone(),
-        ));
-        storage.rt_handle.block_on(create_l1_batch(
-            &mut storage.connection,
-            L1BatchNumber(1),
-            &logs,
-        ));
-
-        let mut storage = PostgresStorage::new(
-            storage.rt_handle,
-            storage.connection,
-            MiniblockNumber(1),
-            false,
-        )
-        .with_caches(caches.clone());
-
-        assert!(storage.is_write_initial(&logs[0].key));
-        // ^ Since we don't consider the latest L1 batch
-        assert!(storage.is_write_initial(&non_existing_key));
-
-        // Check that the cache entries have been updated
-        assert_eq!(
-            caches.initial_writes.get(&logs[0].key),
-            Some(L1BatchNumber(1))
-        );
-        assert_eq!(caches.negative_initial_writes.get(&logs[0].key), None);
-        assert_eq!(
-            caches.negative_initial_writes.get(&non_existing_key),
-            Some(L1BatchNumber(2))
-        );
-        assert!(storage.is_write_initial(&logs[0].key));
-        assert!(storage.is_write_initial(&non_existing_key));
-
-        let mut storage = PostgresStorage::new(
-            storage.rt_handle,
-            storage.connection,
-            MiniblockNumber(1),
-            true,
-        )
-        .with_caches(caches.clone());
-        assert!(!storage.is_write_initial(&logs[0].key));
-        assert!(storage.is_write_initial(&non_existing_key));
-
-        // Check that the cache entries are still as expected.
-        assert_eq!(
-            caches.initial_writes.get(&logs[0].key),
-            Some(L1BatchNumber(1))
-        );
-        assert_eq!(
-            caches.negative_initial_writes.get(&non_existing_key),
-            Some(L1BatchNumber(2))
-        );
-
-        let mut storage = PostgresStorage::new(
-            storage.rt_handle,
-            storage.connection,
-            MiniblockNumber(2),
-            false,
-        )
-        .with_caches(caches);
-
-        // Check that the cached value has been used
-        assert!(!storage.is_write_initial(&logs[0].key));
-        assert!(storage.is_write_initial(&non_existing_key));
-    }
-
-    #[db_test]
-    async fn using_initial_writes_cache(pool: ConnectionPool) {
-        let handle = Handle::current();
-        tokio::task::spawn_blocking(move || test_initial_writes_cache(&pool, handle))
-            .await
-            .unwrap();
-    }
-
-    fn test_values_cache(pool: &ConnectionPool, rt_handle: Handle) {
-        let mut caches = PostgresStorageCaches::new(1_024, 1_024);
-        let _ =
-            caches.configure_storage_values_cache(1_024 * 1_024, pool.clone(), rt_handle.clone());
-        // We cannot use an update task since it requires having concurrent DB connections
-        // that don't work in tests. We'll update values cache manually instead.
-        let values_cache = caches.values.as_ref().unwrap().cache.clone();
-
-        let mut connection = rt_handle.block_on(pool.access_storage());
-        rt_handle.block_on(prepare_postgres(&mut connection));
-
-        let mut storage = PostgresStorage::new(rt_handle, connection, MiniblockNumber(0), false)
-            .with_caches(caches.clone());
-        let existing_key = gen_storage_logs(0..20)[1].key;
-        let value = storage.read_value(&existing_key);
-        assert!(!value.is_zero());
-
-        // Check that the value is now cached.
-        let cached_value = values_cache.get(MiniblockNumber(0), &existing_key).unwrap();
-        assert_eq!(cached_value, value);
-
-        let non_existing_key = gen_storage_logs(100..120)[0].key;
-        let value = storage.read_value(&non_existing_key);
-        assert_eq!(value, StorageValue::zero());
-
-        let cached_value = values_cache
-            .get(MiniblockNumber(0), &non_existing_key)
-            .unwrap();
-        assert_eq!(cached_value, StorageValue::zero());
-
-        let logs = vec![
-            StorageLog::new_write_log(existing_key, H256::repeat_byte(1)),
-            StorageLog::new_write_log(non_existing_key, H256::repeat_byte(2)),
-        ];
-        storage.rt_handle.block_on(create_miniblock(
-            &mut storage.connection,
-            MiniblockNumber(1),
-            logs,
-        ));
-
-        let mut storage = PostgresStorage::new(
-            storage.rt_handle,
-            storage.connection,
-            MiniblockNumber(1),
-            true,
-        )
-        .with_caches(caches);
-
-        // Cached values should not be updated so far, and they should not be used
-        assert_eq!(storage.read_value(&existing_key), H256::repeat_byte(1));
-        assert_eq!(storage.read_value(&non_existing_key), H256::repeat_byte(2));
-
-        assert!(values_cache
-            .get(MiniblockNumber(1), &existing_key)
-            .is_none());
-        let cached_value = values_cache.get(MiniblockNumber(0), &existing_key).unwrap();
-        assert_ne!(cached_value, H256::repeat_byte(1));
-        assert!(values_cache
-            .get(MiniblockNumber(1), &non_existing_key)
-            .is_none());
-        let cached_value = values_cache
-            .get(MiniblockNumber(0), &non_existing_key)
-            .unwrap();
-        assert_ne!(cached_value, H256::repeat_byte(2));
-
-        values_cache.update(
-            MiniblockNumber(0),
-            MiniblockNumber(1),
-            &storage.rt_handle,
-            &mut storage.connection,
-        );
-        assert_eq!(values_cache.0.read().unwrap().valid_for, MiniblockNumber(1));
-
-        assert_eq!(storage.read_value(&existing_key), H256::repeat_byte(1));
-        assert_eq!(storage.read_value(&non_existing_key), H256::repeat_byte(2));
-        // Check that the values are now cached.
-        let cached_value = values_cache.get(MiniblockNumber(1), &existing_key).unwrap();
-        assert_eq!(cached_value, H256::repeat_byte(1));
-        let cached_value = values_cache
-            .get(MiniblockNumber(1), &non_existing_key)
-            .unwrap();
-        assert_eq!(cached_value, H256::repeat_byte(2));
-    }
-
-    #[db_test]
-    async fn using_values_cache(pool: ConnectionPool) {
-        let handle = Handle::current();
-        tokio::task::spawn_blocking(move || test_values_cache(&pool, handle))
-            .await
-            .unwrap();
-    }
-}
diff --git a/core/lib/state/src/postgres/tests.rs b/core/lib/state/src/postgres/tests.rs
new file mode 100644
index 000000000000..723a41dc6e43
--- /dev/null
+++ b/core/lib/state/src/postgres/tests.rs
@@ -0,0 +1,591 @@
+//! Tests for `PostgresStorage`.
+
+use rand::{
+    seq::{IteratorRandom, SliceRandom},
+    Rng, SeedableRng,
+};
+
+use rand::rngs::StdRng;
+use std::{collections::HashMap, mem};
+
+use db_test_macro::db_test;
+use zksync_dal::ConnectionPool;
+use zksync_types::StorageLog;
+
+use super::*;
+use crate::test_utils::{create_l1_batch, create_miniblock, gen_storage_logs, prepare_postgres};
+
+fn test_postgres_storage_basics(
+    pool: &ConnectionPool,
+    rt_handle: Handle,
+    cache_initial_writes: bool,
+) {
+    let mut connection = rt_handle.block_on(pool.access_storage());
+    rt_handle.block_on(prepare_postgres(&mut connection));
+    let mut storage = PostgresStorage::new(rt_handle, connection, MiniblockNumber(0), true);
+    if cache_initial_writes {
+        let caches = PostgresStorageCaches::new(1_024, 1_024);
+        storage = storage.with_caches(caches);
+    }
+    assert_eq!(storage.l1_batch_number_for_miniblock, L1BatchNumber(0));
+
+    let existing_logs = gen_storage_logs(0..20);
+    for log in &existing_logs {
+        assert!(!storage.is_write_initial(&log.key));
+    }
+
+    let non_existing_logs = gen_storage_logs(20..30);
+    for log in &non_existing_logs {
+        assert!(storage.is_write_initial(&log.key));
+    }
+
+    if cache_initial_writes {
+        let caches = storage.caches.as_ref().unwrap();
+        assert!(caches.initial_writes.estimated_len() > 0);
+    }
+
+    // Add a new miniblock to the storage
+    storage.rt_handle.block_on(create_miniblock(
+        &mut storage.connection,
+        MiniblockNumber(1),
+        non_existing_logs.clone(),
+    ));
+
+    // Check that the miniblock is not seen by `PostgresStorage` (it's not a part of an L1 batch)
+    for log in &non_existing_logs {
+        assert!(storage.is_write_initial(&log.key));
+    }
+
+    let caches = mem::take(&mut storage.caches);
+    let mut storage = PostgresStorage::new(
+        storage.rt_handle,
+        storage.connection,
+        MiniblockNumber(1),
+        true,
+    );
+    storage.caches = caches;
+
+    assert_eq!(storage.l1_batch_number_for_miniblock, L1BatchNumber(1));
+    for log in &non_existing_logs {
+        assert!(storage.is_write_initial(&log.key));
+    }
+
+    // Create an L1 batch for miniblock #1
+    storage.rt_handle.block_on(create_l1_batch(
+        &mut storage.connection,
+        L1BatchNumber(1),
+        &non_existing_logs,
+    ));
+
+    // Miniblock #1 should not be seen by the "old" storage
+    let caches = mem::take(&mut storage.caches);
+    let mut storage = PostgresStorage::new(
+        storage.rt_handle,
+        storage.connection,
+        MiniblockNumber(0),
+        true,
+    );
+    storage.caches = caches;
+
+    assert_eq!(storage.l1_batch_number_for_miniblock, L1BatchNumber(0));
+    for log in &non_existing_logs {
+        assert!(storage.is_write_initial(&log.key));
+    }
+
+    // ...but should be seen by the new one
+    let caches = mem::take(&mut storage.caches);
+    let mut storage = PostgresStorage::new(
+        storage.rt_handle,
+        storage.connection,
+        MiniblockNumber(1),
+        true,
+    );
+    storage.caches = caches;
+
+    assert_eq!(storage.l1_batch_number_for_miniblock, L1BatchNumber(1));
+    for log in &non_existing_logs {
+        assert!(!storage.is_write_initial(&log.key));
+    }
+
+    // ...except if we set `consider_new_l1_batch` to `false`
+    let caches = mem::take(&mut storage.caches);
+    let mut storage = PostgresStorage::new(
+        storage.rt_handle,
+        storage.connection,
+        MiniblockNumber(1),
+        false,
+    );
+    storage.caches = caches;
+
+    assert_eq!(storage.l1_batch_number_for_miniblock, L1BatchNumber(1));
+    for log in &non_existing_logs {
+        assert!(storage.is_write_initial(&log.key));
+    }
+    for log in &existing_logs {
+        assert!(!storage.is_write_initial(&log.key));
+    }
+}
+
+#[db_test]
+async fn postgres_storage_basics(pool: ConnectionPool) {
+    tokio::task::spawn_blocking(move || {
+        test_postgres_storage_basics(&pool, Handle::current(), false);
+    })
+    .await
+    .unwrap();
+}
+
+#[db_test]
+async fn postgres_storage_with_initial_writes_cache(pool: ConnectionPool) {
+    tokio::task::spawn_blocking(move || {
+        test_postgres_storage_basics(&pool, Handle::current(), true);
+    })
+    .await
+    .unwrap();
+}
+
+fn test_postgres_storage_after_sealing_miniblock(
+    pool: &ConnectionPool,
+    rt_handle: Handle,
+    consider_new_l1_batch: bool,
+) {
+    let mut connection = rt_handle.block_on(pool.access_storage());
+    rt_handle.block_on(prepare_postgres(&mut connection));
+    let new_logs = gen_storage_logs(20..30);
+
+    rt_handle.block_on(create_miniblock(
+        &mut connection,
+        MiniblockNumber(1),
+        new_logs.clone(),
+    ));
+
+    let mut storage = PostgresStorage::new(
+        rt_handle,
+        connection,
+        MiniblockNumber(1),
+        consider_new_l1_batch,
+    );
+    assert_eq!(storage.l1_batch_number_for_miniblock, L1BatchNumber(1));
+
+    storage.rt_handle.block_on(create_l1_batch(
+        &mut storage.connection,
+        L1BatchNumber(1),
+        &new_logs,
+    ));
+
+    for log in &new_logs {
+        assert_eq!(storage.is_write_initial(&log.key), !consider_new_l1_batch);
+    }
+
+    // Cross-check with the newly instantiated store with the same params
+    let mut storage = PostgresStorage::new(
+        storage.rt_handle,
+        storage.connection,
+        MiniblockNumber(1),
+        consider_new_l1_batch,
+    );
+    assert_eq!(storage.l1_batch_number_for_miniblock, L1BatchNumber(1));
+    for log in &new_logs {
+        assert_eq!(storage.is_write_initial(&log.key), !consider_new_l1_batch);
+    }
+}
+
+#[db_test]
+async fn postgres_storage_after_sealing_miniblock(pool: ConnectionPool) {
+    tokio::task::spawn_blocking(move || {
+        println!("Considering new L1 batch");
+        test_postgres_storage_after_sealing_miniblock(&pool, Handle::current(), true);
+        println!("Not considering new L1 batch");
+        test_postgres_storage_after_sealing_miniblock(&pool, Handle::current(), false);
+    })
+    .await
+    .unwrap();
+}
+
+fn test_factory_deps_cache(pool: &ConnectionPool, rt_handle: Handle) {
+    let mut connection = rt_handle.block_on(pool.access_storage());
+    rt_handle.block_on(prepare_postgres(&mut connection));
+
+    let caches = PostgresStorageCaches::new(128 * 1_024 * 1_024, 1_024);
+    let mut storage = PostgresStorage::new(rt_handle, connection, MiniblockNumber(1), true)
+        .with_caches(caches.clone());
+
+    let zero_addr = H256::zero();
+    // try load a non-existent contract
+    let dep = storage.load_factory_dep(zero_addr);
+
+    assert_eq!(dep, None);
+    assert_eq!(caches.factory_deps.get(&zero_addr), None);
+
+    // insert the contracts
+    let mut contracts = HashMap::new();
+    contracts.insert(H256::zero(), vec![1, 2, 3]);
+    storage.rt_handle.block_on(
+        storage
+            .connection
+            .storage_dal()
+            .insert_factory_deps(MiniblockNumber(0), &contracts),
+    );
+
+    // Create the storage that should have the cache filled.
+    let mut storage = PostgresStorage::new(
+        storage.rt_handle,
+        storage.connection,
+        MiniblockNumber(1),
+        true,
+    )
+    .with_caches(caches.clone());
+
+    // Fill the cache
+    let dep = storage.load_factory_dep(zero_addr);
+    assert_eq!(dep, Some(vec![1, 2, 3]));
+    assert_eq!(caches.factory_deps.get(&zero_addr), Some(vec![1, 2, 3]));
+}
+
+#[db_test]
+async fn using_factory_deps_cache(pool: ConnectionPool) {
+    let handle = Handle::current();
+    tokio::task::spawn_blocking(move || test_factory_deps_cache(&pool, handle))
+        .await
+        .unwrap();
+}
+
+fn test_initial_writes_cache(pool: &ConnectionPool, rt_handle: Handle) {
+    let connection = rt_handle.block_on(pool.access_storage());
+    let caches = PostgresStorageCaches::new(1_024, 4 * 1_024 * 1_024);
+    let mut storage = PostgresStorage::new(rt_handle, connection, MiniblockNumber(0), false)
+        .with_caches(caches.clone());
+    assert_eq!(storage.pending_l1_batch_number, L1BatchNumber(0));
+
+    storage
+        .rt_handle
+        .block_on(prepare_postgres(&mut storage.connection));
+
+    let mut logs = gen_storage_logs(100..120);
+    let non_existing_key = logs[19].key;
+    logs.truncate(10);
+
+    assert!(storage.is_write_initial(&logs[0].key));
+    assert!(storage.is_write_initial(&non_existing_key));
+    assert_eq!(
+        caches.negative_initial_writes.get(&logs[0].key),
+        Some(L1BatchNumber(0))
+    );
+    assert_eq!(
+        caches.negative_initial_writes.get(&non_existing_key),
+        Some(L1BatchNumber(0))
+    );
+    assert!(storage.is_write_initial(&logs[0].key));
+    assert!(storage.is_write_initial(&non_existing_key));
+
+    storage.rt_handle.block_on(create_miniblock(
+        &mut storage.connection,
+        MiniblockNumber(1),
+        logs.clone(),
+    ));
+    storage.rt_handle.block_on(create_l1_batch(
+        &mut storage.connection,
+        L1BatchNumber(1),
+        &logs,
+    ));
+
+    let mut storage = PostgresStorage::new(
+        storage.rt_handle,
+        storage.connection,
+        MiniblockNumber(1),
+        false,
+    )
+    .with_caches(caches.clone());
+
+    assert!(storage.is_write_initial(&logs[0].key));
+    // ^ Since we don't consider the latest L1 batch
+    assert!(storage.is_write_initial(&non_existing_key));
+
+    // Check that the cache entries have been updated
+    assert_eq!(
+        caches.initial_writes.get(&logs[0].key),
+        Some(L1BatchNumber(1))
+    );
+    assert_eq!(caches.negative_initial_writes.get(&logs[0].key), None);
+    assert_eq!(
+        caches.negative_initial_writes.get(&non_existing_key),
+        Some(L1BatchNumber(2))
+    );
+    assert!(storage.is_write_initial(&logs[0].key));
+    assert!(storage.is_write_initial(&non_existing_key));
+
+    let mut storage = PostgresStorage::new(
+        storage.rt_handle,
+        storage.connection,
+        MiniblockNumber(1),
+        true,
+    )
+    .with_caches(caches.clone());
+    assert!(!storage.is_write_initial(&logs[0].key));
+    assert!(storage.is_write_initial(&non_existing_key));
+
+    // Check that the cache entries are still as expected.
+    assert_eq!(
+        caches.initial_writes.get(&logs[0].key),
+        Some(L1BatchNumber(1))
+    );
+    assert_eq!(
+        caches.negative_initial_writes.get(&non_existing_key),
+        Some(L1BatchNumber(2))
+    );
+
+    let mut storage = PostgresStorage::new(
+        storage.rt_handle,
+        storage.connection,
+        MiniblockNumber(2),
+        false,
+    )
+    .with_caches(caches);
+
+    // Check that the cached value has been used
+    assert!(!storage.is_write_initial(&logs[0].key));
+    assert!(storage.is_write_initial(&non_existing_key));
+}
+
+#[db_test]
+async fn using_initial_writes_cache(pool: ConnectionPool) {
+    let handle = Handle::current();
+    tokio::task::spawn_blocking(move || test_initial_writes_cache(&pool, handle))
+        .await
+        .unwrap();
+}
+
+#[derive(Debug)]
+struct ValueCacheAssertions<'a> {
+    cache: &'a ValuesCache,
+    miniblock_number: MiniblockNumber,
+}
+
+impl ValueCacheAssertions<'_> {
+    fn assert_entries(&self, expected_entries: &[(StorageKey, Option<StorageValue>)]) {
+        for (key, expected_value) in expected_entries {
+            assert_eq!(self.cache.get(self.miniblock_number, key), *expected_value);
+        }
+    }
+}
+
+impl ValuesCache {
+    fn assertions(&self, miniblock_number: MiniblockNumber) -> ValueCacheAssertions<'_> {
+        ValueCacheAssertions {
+            cache: self,
+            miniblock_number,
+        }
+    }
+}
+
+fn test_values_cache(pool: &ConnectionPool, rt_handle: Handle) {
+    let mut caches = PostgresStorageCaches::new(1_024, 1_024);
+    let _ = caches.configure_storage_values_cache(1_024 * 1_024, pool.clone(), rt_handle.clone());
+    // We cannot use an update task since it requires having concurrent DB connections
+    // that don't work in tests. We'll update values cache manually instead.
+    let values_cache = caches.values.as_ref().unwrap().cache.clone();
+    let old_miniblock_assertions = values_cache.assertions(MiniblockNumber(0));
+    let new_miniblock_assertions = values_cache.assertions(MiniblockNumber(1));
+
+    let mut connection = rt_handle.block_on(pool.access_storage());
+    rt_handle.block_on(prepare_postgres(&mut connection));
+
+    let mut storage = PostgresStorage::new(rt_handle, connection, MiniblockNumber(0), false)
+        .with_caches(caches.clone());
+
+    let initial_logs = gen_storage_logs(0..20);
+    let existing_key = initial_logs[1].key;
+    let unmodified_key = initial_logs[2].key;
+    let initial_value = storage.read_value(&existing_key);
+    assert!(!initial_value.is_zero());
+    let unmodified_value = storage.read_value(&unmodified_key);
+    assert!(!unmodified_value.is_zero());
+    let non_existing_key = gen_storage_logs(100..120)[0].key;
+    let value = storage.read_value(&non_existing_key);
+    assert_eq!(value, StorageValue::zero());
+
+    // Check that the read values are now cached.
+    old_miniblock_assertions.assert_entries(&[
+        (existing_key, Some(initial_value)),
+        (unmodified_key, Some(unmodified_value)),
+        (non_existing_key, Some(H256::zero())),
+    ]);
+
+    let logs = vec![
+        StorageLog::new_write_log(existing_key, H256::repeat_byte(1)),
+        StorageLog::new_write_log(non_existing_key, H256::repeat_byte(2)),
+    ];
+    storage.rt_handle.block_on(create_miniblock(
+        &mut storage.connection,
+        MiniblockNumber(1),
+        logs,
+    ));
+
+    let mut storage = PostgresStorage::new(
+        storage.rt_handle,
+        storage.connection,
+        MiniblockNumber(1),
+        true,
+    )
+    .with_caches(caches.clone());
+
+    // Cached values should not be updated so far, and they should not be used
+    assert_eq!(storage.read_value(&existing_key), H256::repeat_byte(1));
+    assert_eq!(storage.read_value(&non_existing_key), H256::repeat_byte(2));
+    assert_eq!(storage.read_value(&unmodified_key), unmodified_value);
+
+    new_miniblock_assertions.assert_entries(&[
+        (existing_key, None),
+        (unmodified_key, None),
+        (non_existing_key, None),
+    ]);
+    // ^ We don't know at this point whether any keys are updated or not for miniblock #1
+    old_miniblock_assertions.assert_entries(&[
+        (existing_key, Some(initial_value)),
+        (non_existing_key, Some(H256::zero())),
+    ]);
+
+    values_cache.update(
+        MiniblockNumber(0),
+        MiniblockNumber(1),
+        &storage.rt_handle,
+        &mut storage.connection,
+    );
+    assert_eq!(values_cache.0.read().unwrap().valid_for, MiniblockNumber(1));
+
+    assert_eq!(storage.read_value(&existing_key), H256::repeat_byte(1));
+    assert_eq!(storage.read_value(&non_existing_key), H256::repeat_byte(2));
+    assert_eq!(storage.read_value(&unmodified_key), unmodified_value);
+
+    let assert_final_cache = || {
+        // Check that the values are now cached.
+        new_miniblock_assertions.assert_entries(&[
+            (existing_key, Some(H256::repeat_byte(1))),
+            (non_existing_key, Some(H256::repeat_byte(2))),
+            (unmodified_key, Some(unmodified_value)),
+        ]);
+        // Check that the value for `unmodified_key` (and only for it) is used for `MiniblockNumber(0)`.
+        old_miniblock_assertions.assert_entries(&[
+            (existing_key, None),
+            (non_existing_key, None),
+            (unmodified_key, Some(unmodified_value)),
+        ]);
+    };
+    assert_final_cache();
+
+    let mut storage = PostgresStorage::new(
+        storage.rt_handle,
+        storage.connection,
+        MiniblockNumber(0),
+        true,
+    )
+    .with_caches(caches);
+
+    assert_eq!(storage.read_value(&existing_key), initial_value);
+    assert_eq!(storage.read_value(&non_existing_key), StorageValue::zero());
+    assert_eq!(storage.read_value(&unmodified_key), unmodified_value);
+
+    // None of the cache entries should be modified.
+    assert_final_cache();
+}
+
+#[db_test]
+async fn using_values_cache(pool: ConnectionPool) {
+    let handle = Handle::current();
+    tokio::task::spawn_blocking(move || test_values_cache(&pool, handle))
+        .await
+        .unwrap();
+}
+
+/// (Sort of) fuzzes [`ValuesCache`] by comparing outputs of [`PostgresStorage`] with and without caching
+/// on randomly generated `read_value()` queries.
+fn mini_fuzz_values_cache_inner(rng: &mut impl Rng, pool: &ConnectionPool, mut rt_handle: Handle) {
+    let mut caches = PostgresStorageCaches::new(1_024, 1_024);
+    let _ = caches.configure_storage_values_cache(1_024 * 1_024, pool.clone(), rt_handle.clone());
+    let values_cache = caches.values.as_ref().unwrap().cache.clone();
+
+    let mut connection = rt_handle.block_on(pool.access_storage());
+    rt_handle.block_on(prepare_postgres(&mut connection));
+
+    let queried_keys: Vec<_> = gen_storage_logs(0..100)
+        .into_iter()
+        .map(|log| log.key)
+        .collect();
+
+    for latest_block_number in 0..=10 {
+        let mut all_block_numbers: Vec<_> =
+            (0..=latest_block_number).map(MiniblockNumber).collect();
+        all_block_numbers.shuffle(rng);
+
+        let mut cache_updated = latest_block_number == 0;
+
+        // Check outputs for all possible `block_number` arguments in the random order.
+        for block_number in all_block_numbers {
+            // Emulate updating cache with a delay after a new miniblock is sealed. `PostgresStorage`
+            // must work both with and without the update.
+            if !cache_updated && rng.gen_range(0..3) == 0 {
+                let cache_valid_for = values_cache.valid_for();
+                assert!(cache_valid_for < MiniblockNumber(latest_block_number));
+
+                values_cache.update(
+                    cache_valid_for,
+                    MiniblockNumber(latest_block_number),
+                    &rt_handle,
+                    &mut connection,
+                );
+                cache_updated = true;
+            }
+
+            let mut queried_keys = queried_keys.clone();
+            queried_keys.shuffle(rng);
+
+            let mut uncached_storage =
+                PostgresStorage::new(rt_handle, connection, block_number, false);
+            let uncached_storage_output: Vec<_> = queried_keys
+                .iter()
+                .map(|key| uncached_storage.read_value(key))
+                .collect();
+            rt_handle = uncached_storage.rt_handle;
+            connection = uncached_storage.connection;
+
+            let mut cached_storage =
+                PostgresStorage::new(rt_handle, connection, block_number, false)
+                    .with_caches(caches.clone());
+            let cached_storage_output: Vec<_> = queried_keys
+                .iter()
+                .map(|key| cached_storage.read_value(key))
+                .collect();
+            rt_handle = cached_storage.rt_handle;
+            connection = cached_storage.connection;
+
+            assert_eq!(
+                uncached_storage_output, cached_storage_output,
+                "Outputs differ for {block_number:?} with latest {latest_block_number:?}"
+            );
+        }
+
+        let next_block_number = MiniblockNumber(latest_block_number) + 1;
+        // Choose logs so that there's a chance that some of them are new and some overwrite previous values.
+        let logs = queried_keys
+            .iter()
+            .choose_multiple(rng, 20)
+            .into_iter()
+            .map(|&key| {
+                let new_value = H256::from_low_u64_be(next_block_number.0.into());
+                StorageLog::new_write_log(key, new_value)
+            })
+            .collect();
+        rt_handle.block_on(create_miniblock(&mut connection, next_block_number, logs));
+    }
+}
+
+#[db_test]
+async fn mini_fuzz_values_cache(pool: ConnectionPool) {
+    const RNG_SEED: u64 = 123;
+
+    let handle = Handle::current();
+    let mut rng = StdRng::seed_from_u64(RNG_SEED);
+    tokio::task::spawn_blocking(move || mini_fuzz_values_cache_inner(&mut rng, &pool, handle))
+        .await
+        .unwrap();
+}
diff --git a/core/lib/state/src/rocksdb.rs b/core/lib/state/src/rocksdb.rs
index 09bdfa6a2f26..6e489b8b2836 100644
--- a/core/lib/state/src/rocksdb.rs
+++ b/core/lib/state/src/rocksdb.rs
@@ -79,7 +79,7 @@ impl RocksdbStorage {
     pub async fn update_from_postgres(&mut self, conn: &mut StorageProcessor<'_>) {
         let stage_started_at: Instant = Instant::now();
         let latest_l1_batch_number = conn.blocks_dal().get_sealed_l1_batch_number().await;
-        vlog::debug!(
+        tracing::debug!(
             "loading storage for l1 batch number {}",
             latest_l1_batch_number.0
         );
@@ -92,14 +92,14 @@ impl RocksdbStorage {
         );
 
         while current_l1_batch_number <= latest_l1_batch_number.0 {
-            vlog::debug!("loading state changes for l1 batch {current_l1_batch_number}");
+            tracing::debug!("loading state changes for l1 batch {current_l1_batch_number}");
             let storage_logs = conn
                 .storage_logs_dal()
                 .get_touched_slots_for_l1_batch(L1BatchNumber(current_l1_batch_number))
                 .await;
             self.process_transaction_logs(&storage_logs);
 
-            vlog::debug!("loading factory deps for l1 batch {current_l1_batch_number}");
+            tracing::debug!("loading factory deps for l1 batch {current_l1_batch_number}");
             let factory_deps = conn
                 .blocks_dal()
                 .get_l1_batch_factory_deps(L1BatchNumber(current_l1_batch_number))
@@ -136,7 +136,7 @@ impl RocksdbStorage {
     }
 
     /// Stores a factory dependency with the specified `hash` and `bytecode`.
-    pub fn store_factory_dep(&mut self, hash: H256, bytecode: Vec<u8>) {
+    fn store_factory_dep(&mut self, hash: H256, bytecode: Vec<u8>) {
         self.pending_patch.factory_deps.insert(hash, bytecode);
     }
 
@@ -150,35 +150,35 @@ impl RocksdbStorage {
         connection: &mut StorageProcessor<'_>,
         last_l1_batch_to_keep: L1BatchNumber,
     ) {
-        vlog::info!("Rolling back state keeper storage to L1 batch #{last_l1_batch_to_keep}...");
+        tracing::info!("Rolling back state keeper storage to L1 batch #{last_l1_batch_to_keep}...");
 
-        vlog::info!("Getting logs that should be applied to rollback state...");
+        tracing::info!("Getting logs that should be applied to rollback state...");
         let stage_start = Instant::now();
         let logs = connection
             .storage_logs_dal()
             .get_storage_logs_for_revert(last_l1_batch_to_keep)
             .await;
-        vlog::info!("Got {} logs, took {:?}", logs.len(), stage_start.elapsed());
+        tracing::info!("Got {} logs, took {:?}", logs.len(), stage_start.elapsed());
 
-        vlog::info!("Getting number of last miniblock for L1 batch #{last_l1_batch_to_keep}...");
+        tracing::info!("Getting number of last miniblock for L1 batch #{last_l1_batch_to_keep}...");
         let stage_start = Instant::now();
         let (_, last_miniblock_to_keep) = connection
             .blocks_dal()
             .get_miniblock_range_of_l1_batch(last_l1_batch_to_keep)
             .await
             .expect("L1 batch should contain at least one miniblock");
-        vlog::info!(
+        tracing::info!(
             "Got miniblock number {last_miniblock_to_keep}, took {:?}",
             stage_start.elapsed()
         );
 
-        vlog::info!("Getting factory deps that need to be removed...");
+        tracing::info!("Getting factory deps that need to be removed...");
         let stage_start = Instant::now();
         let factory_deps = connection
             .storage_dal()
             .get_factory_deps_for_revert(last_miniblock_to_keep)
             .await;
-        vlog::info!(
+        tracing::info!(
             "Got {} factory deps, took {:?}",
             factory_deps.len(),
             stage_start.elapsed()
@@ -263,7 +263,7 @@ impl RocksdbStorage {
     }
 }
 
-impl ReadStorage for &RocksdbStorage {
+impl ReadStorage for RocksdbStorage {
     fn read_value(&mut self, key: &StorageKey) -> StorageValue {
         self.read_value_inner(key).unwrap_or_else(H256::zero)
     }
@@ -273,9 +273,6 @@ impl ReadStorage for &RocksdbStorage {
     }
 
     fn load_factory_dep(&mut self, hash: H256) -> Option<Vec<u8>> {
-        if let Some(value) = self.pending_patch.factory_deps.get(&hash) {
-            return Some(value.clone());
-        }
         let cf = StateKeeperColumnFamily::FactoryDeps;
         self.db
             .get_cf(cf, hash.as_bytes())
@@ -306,7 +303,6 @@ mod tests {
         storage.process_transaction_logs(&storage_logs);
         storage.save(L1BatchNumber(0)).await;
         {
-            let mut storage = &storage;
             for (key, value) in &storage_logs {
                 assert!(!storage.is_write_initial(key));
                 assert_eq!(storage.read_value(key), *value);
@@ -320,7 +316,6 @@ mod tests {
         storage.process_transaction_logs(&storage_logs);
         storage.save(L1BatchNumber(1)).await;
 
-        let mut storage = &storage;
         for (key, value) in &storage_logs {
             assert!(!storage.is_write_initial(key));
             assert_eq!(storage.read_value(key), *value);
@@ -339,7 +334,6 @@ mod tests {
         let mut storage = RocksdbStorage::new(dir.path());
         storage.update_from_postgres(&mut conn).await;
 
-        let mut storage = &storage;
         assert_eq!(storage.l1_batch_number(), L1BatchNumber(2));
         for log in &storage_logs {
             assert_eq!(storage.read_value(&log.key), log.value);
@@ -393,7 +387,6 @@ mod tests {
         // Perform some sanity checks before the revert.
         assert_eq!(storage.l1_batch_number(), L1BatchNumber(3));
         {
-            let mut storage = &storage;
             for log in &inserted_storage_logs {
                 assert_eq!(storage.read_value(&log.key), log.value);
             }
@@ -412,7 +405,6 @@ mod tests {
         storage.rollback(&mut conn, L1BatchNumber(1)).await;
         assert_eq!(storage.l1_batch_number(), L1BatchNumber(2));
         {
-            let mut storage = &storage;
             for log in &inserted_storage_logs {
                 assert_eq!(storage.read_value(&log.key), H256::zero());
             }
diff --git a/core/lib/state/src/shadow_storage.rs b/core/lib/state/src/shadow_storage.rs
index 73f59beb6406..4796c7511a15 100644
--- a/core/lib/state/src/shadow_storage.rs
+++ b/core/lib/state/src/shadow_storage.rs
@@ -34,7 +34,7 @@ impl ReadStorage for ShadowStorage<'_, '_> {
         let mut metric_value = 0.0;
         if source_value != expected_value {
             metric_value = 1.0;
-            vlog::error!("read_value({:?}) -- l1_batch_number={:?} -- expected source={:?} to be equal to to_check={:?}", key, self.l1_batch_number, source_value, expected_value);
+            tracing::error!("read_value({:?}) -- l1_batch_number={:?} -- expected source={:?} to be equal to to_check={:?}", key, self.l1_batch_number, source_value, expected_value);
         }
         metrics::histogram!("shadow_storage.read_value_mismatch", metric_value);
         source_value
@@ -46,7 +46,7 @@ impl ReadStorage for ShadowStorage<'_, '_> {
         let mut metric_value = 0.0;
         if source_value != expected_value {
             metric_value = 1.0;
-            vlog::error!("is_write_initial({:?}) -- l1_batch_number={:?} -- expected source={:?} to be equal to to_check={:?}", key, self.l1_batch_number, source_value, expected_value);
+            tracing::error!("is_write_initial({:?}) -- l1_batch_number={:?} -- expected source={:?} to be equal to to_check={:?}", key, self.l1_batch_number, source_value, expected_value);
         }
         metrics::histogram!("shadow_storage.is_write_initial_mismatch", metric_value);
         source_value
@@ -58,9 +58,11 @@ impl ReadStorage for ShadowStorage<'_, '_> {
         let mut metric_value = 0.0;
         if source_value != expected_value {
             metric_value = 1.0;
-            vlog::error!("load_factory_dep({:?}) -- l1_batch_number={:?} -- expected source={:?} to be equal to to_check={:?}", hash, self.l1_batch_number, source_value, expected_value);
+            tracing::error!("load_factory_dep({:?}) -- l1_batch_number={:?} -- expected source={:?} to be equal to to_check={:?}", hash, self.l1_batch_number, source_value, expected_value);
         }
         metrics::histogram!("shadow_storage.load_factory_dep_mismatch", metric_value);
         source_value
     }
 }
+
+// TODO: Add unit tests when we swap metrics crate; blocked by: https://linear.app/matterlabs/issue/QIT-3/rework-metrics-approach
diff --git a/core/lib/state/src/storage_view.rs b/core/lib/state/src/storage_view.rs
index 37ccd700a476..c8054e520ad1 100644
--- a/core/lib/state/src/storage_view.rs
+++ b/core/lib/state/src/storage_view.rs
@@ -1,13 +1,13 @@
+use std::cell::RefCell;
+use std::rc::Rc;
 use std::{
-    cell::RefCell,
     collections::HashMap,
     fmt, mem,
-    rc::Rc,
     time::{Duration, Instant},
 };
 
-use crate::{ReadStorage, StoragePtr, WriteStorage};
-use zksync_types::{StorageKey, StorageValue, H256};
+use crate::{ReadStorage, WriteStorage};
+use zksync_types::{witness_block_state::WitnessBlockState, StorageKey, StorageValue, H256};
 
 /// Metrics for [`StorageView`].
 #[derive(Debug, Default, Clone, Copy)]
@@ -51,6 +51,37 @@ pub struct StorageView<S> {
     metrics: StorageViewMetrics,
 }
 
+impl<S> StorageView<S> {
+    /// Returns the block's start state using StorageView's in-memory cache for the run
+    pub fn witness_block_state(&self) -> WitnessBlockState {
+        WitnessBlockState {
+            read_storage_key: self.read_storage_keys.clone(),
+            is_write_initial: self.initial_writes_cache.clone(),
+        }
+    }
+}
+
+impl<S> ReadStorage for Box<S>
+where
+    S: ReadStorage + ?Sized,
+{
+    fn read_value(&mut self, key: &StorageKey) -> StorageValue {
+        (**self).read_value(key)
+    }
+
+    fn is_write_initial(&mut self, key: &StorageKey) -> bool {
+        (**self).is_write_initial(key)
+    }
+
+    fn load_factory_dep(&mut self, hash: H256) -> Option<Vec<u8>> {
+        (**self).load_factory_dep(hash)
+    }
+
+    fn is_bytecode_known(&mut self, bytecode_hash: &H256) -> bool {
+        (**self).is_bytecode_known(bytecode_hash)
+    }
+}
+
 impl<S: ReadStorage + fmt::Debug> StorageView<S> {
     /// Creates a new storage view based on the underlying storage.
     pub fn new(storage_handle: S) -> Self {
@@ -63,22 +94,6 @@ impl<S: ReadStorage + fmt::Debug> StorageView<S> {
         }
     }
 
-    /// Creates a storage view with the pre-filled cache of keys read from the storage.
-    pub fn new_with_read_keys(
-        storage_handle: S,
-        read_storage_keys: HashMap<StorageKey, StorageValue>,
-    ) -> Self {
-        Self {
-            read_storage_keys,
-            ..Self::new(storage_handle)
-        }
-    }
-
-    /// Returns a cloneable reference to this storage view.
-    pub fn as_ptr(&mut self) -> StoragePtr<'_> {
-        Rc::new(RefCell::new(self))
-    }
-
     fn get_value_no_log(&mut self, key: &StorageKey) -> StorageValue {
         let started_at = Instant::now();
 
@@ -109,10 +124,9 @@ impl<S: ReadStorage + fmt::Debug> StorageView<S> {
         }
     }
 
-    /// Unwraps this view, retrieving the read cache. This should be used in tandem with
-    /// [`Self::new_with_read_keys()`] to share the read cache across multiple views.
-    pub fn into_read_storage_keys(self) -> HashMap<StorageKey, StorageValue> {
-        self.read_storage_keys
+    /// Make a Rc RefCell ptr to the storage
+    pub fn to_rc_ptr(self) -> Rc<RefCell<Self>> {
+        Rc::new(RefCell::new(self))
     }
 }
 
@@ -122,7 +136,7 @@ impl<S: ReadStorage + fmt::Debug> ReadStorage for StorageView<S> {
         self.metrics.get_value_storage_invocations += 1;
         let value = self.get_value_no_log(key);
 
-        vlog::trace!(
+        tracing::trace!(
             "read value {:?} {:?} ({:?}/{:?})",
             key.hashed_key().0,
             value.0,
@@ -157,7 +171,7 @@ impl<S: ReadStorage + fmt::Debug> WriteStorage for StorageView<S> {
         self.metrics.set_value_storage_invocations += 1;
         let original = self.get_value_no_log(&key);
 
-        vlog::trace!(
+        tracing::trace!(
             "write value {:?} value: {:?} original value: {:?} ({:?}/{:?})",
             key.hashed_key().0,
             value,
diff --git a/core/lib/state/src/test_utils.rs b/core/lib/state/src/test_utils.rs
index 9e25cc51bbac..a51add1ae9e6 100644
--- a/core/lib/state/src/test_utils.rs
+++ b/core/lib/state/src/test_utils.rs
@@ -12,7 +12,7 @@ use std::ops;
 pub(crate) async fn prepare_postgres(conn: &mut StorageProcessor<'_>) {
     if conn.blocks_dal().is_genesis_needed().await {
         conn.protocol_versions_dal()
-            .save_protocol_version(ProtocolVersion::default())
+            .save_protocol_version_with_tx(ProtocolVersion::default())
             .await;
         // The created genesis block is likely to be invalid, but since it's not committed,
         // we don't really care.
@@ -74,6 +74,7 @@ pub(crate) async fn create_miniblock(
         l2_fair_gas_price: 0,
         base_system_contracts_hashes: Default::default(),
         protocol_version: Some(Default::default()),
+        virtual_blocks: 0,
     };
 
     conn.blocks_dal().insert_miniblock(&miniblock_header).await;
diff --git a/core/lib/state/src/witness.rs b/core/lib/state/src/witness.rs
new file mode 100644
index 000000000000..a918d1538813
--- /dev/null
+++ b/core/lib/state/src/witness.rs
@@ -0,0 +1,40 @@
+use crate::ReadStorage;
+
+use zksync_types::{witness_block_state::WitnessHashBlockState, StorageKey, StorageValue, H256};
+
+/// [`ReadStorage`] implementation backed by binary serialized [`WitnessHashBlockState`].
+/// Note that `load_factory_deps` is not used.
+/// FactoryDeps data is used straight inside witness generator, loaded with the blob.
+#[derive(Debug)]
+pub struct WitnessStorage {
+    block_state: WitnessHashBlockState,
+}
+
+impl WitnessStorage {
+    /// Creates a new storage with the provided witness's block state.
+    pub fn new(block_state: WitnessHashBlockState) -> Self {
+        Self { block_state }
+    }
+}
+
+impl ReadStorage for WitnessStorage {
+    fn read_value(&mut self, key: &StorageKey) -> StorageValue {
+        *self
+            .block_state
+            .read_storage_key
+            .get(&key.hashed_key_u256())
+            .unwrap_or(&H256::default())
+    }
+
+    fn is_write_initial(&mut self, key: &StorageKey) -> bool {
+        *self
+            .block_state
+            .is_write_initial
+            .get(&key.hashed_key_u256())
+            .unwrap_or(&false)
+    }
+
+    fn load_factory_dep(&mut self, _hash: H256) -> Option<Vec<u8>> {
+        None
+    }
+}
diff --git a/core/lib/storage/Cargo.toml b/core/lib/storage/Cargo.toml
index 6f0faebc2b6e..89ff141b8973 100644
--- a/core/lib/storage/Cargo.toml
+++ b/core/lib/storage/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "zksync_storage"
-version = "1.0.0"
+version = "0.1.0"
 edition = "2021"
 authors = ["The Matter Labs Team <hello@matterlabs.dev>"]
 homepage = "https://zksync.io/"
@@ -10,11 +10,12 @@ keywords = ["blockchain", "zksync"]
 categories = ["cryptography"]
 
 [dependencies]
-vlog = { path = "../../lib/vlog", version = "1.0" }
-
-metrics = "0.20"
+metrics = "0.21"
 num_cpus = "1.13"
-rocksdb = { version = "0.21.0", default-features = false, features = ["snappy"] }
+rocksdb = { version = "0.21.0", default-features = false, features = [
+    "snappy",
+] }
+tracing = "0.1"
 
 [dev-dependencies]
 tempfile = "3.0.2"
diff --git a/core/lib/storage/src/db.rs b/core/lib/storage/src/db.rs
index 5f34e8afb45f..e34a3eb93330 100644
--- a/core/lib/storage/src/db.rs
+++ b/core/lib/storage/src/db.rs
@@ -112,7 +112,7 @@ impl<CF: NamedColumnFamily> RocksDB<CF> {
         let caches = RocksDBCaches::new(block_cache_capacity);
         let options = Self::rocksdb_options(tune_options, None);
         let existing_cfs = DB::list_cf(&options, path.as_ref()).unwrap_or_else(|err| {
-            vlog::warn!(
+            tracing::warn!(
                 "Failed getting column families for RocksDB `{}` at `{}`, assuming CFs are empty; {err}",
                 CF::DB_NAME,
                 path.as_ref().display()
@@ -133,7 +133,7 @@ impl<CF: NamedColumnFamily> RocksDB<CF> {
             })
             .collect();
         if !obsolete_cfs.is_empty() {
-            vlog::warn!(
+            tracing::warn!(
                 "RocksDB `{}` at `{}` contains extra column families {obsolete_cfs:?} that are not used \
                  in code",
                 CF::DB_NAME,
@@ -335,13 +335,13 @@ impl RocksDB<()> {
         let (lock, cvar) = &ROCKSDB_INSTANCE_COUNTER;
         let mut num_instances = lock.lock().unwrap();
         while *num_instances != 0 {
-            vlog::info!(
+            tracing::info!(
                 "Waiting for all the RocksDB instances to be dropped, {} remaining",
                 *num_instances
             );
             num_instances = cvar.wait(num_instances).unwrap();
         }
-        vlog::info!("All the RocksDB instances are dropped");
+        tracing::info!("All the RocksDB instances are dropped");
     }
 }
 
diff --git a/core/lib/test_account/Cargo.toml b/core/lib/test_account/Cargo.toml
new file mode 100644
index 000000000000..3585410e6d18
--- /dev/null
+++ b/core/lib/test_account/Cargo.toml
@@ -0,0 +1,21 @@
+[package]
+name = "zksync_test_account"
+version = "0.1.0"
+edition = "2018"
+authors = ["The Matter Labs Team <hello@matterlabs.dev>"]
+homepage = "https://zksync.io/"
+repository = "https://github.com/matter-labs/zksync-era"
+license = "MIT OR Apache-2.0"
+keywords = ["blockchain", "zksync"]
+categories = ["cryptography"]
+readme = "README.md"
+
+[dependencies]
+zksync_types = { path = "../types" }
+zksync_config = { path = "../config" }
+zksync_utils = { path = "../utils" }
+zksync_eth_signer = { path = "../eth_signer" }
+zksync_contracts = { path = "../contracts" }
+
+hex = "0.4"
+ethabi = "18.0.0"
diff --git a/core/lib/test_account/src/lib.rs b/core/lib/test_account/src/lib.rs
new file mode 100644
index 000000000000..9c94e3f49cf7
--- /dev/null
+++ b/core/lib/test_account/src/lib.rs
@@ -0,0 +1,230 @@
+use ethabi::Token;
+use zksync_config::constants::{
+    CONTRACT_DEPLOYER_ADDRESS, MAX_GAS_PER_PUBDATA_BYTE, REQUIRED_L1_TO_L2_GAS_PER_PUBDATA_BYTE,
+};
+use zksync_contracts::{deployer_contract, load_contract};
+use zksync_types::fee::Fee;
+use zksync_types::l2::L2Tx;
+use zksync_types::utils::deployed_address_create;
+use zksync_types::{
+    Address, Execute, ExecuteTransactionCommon, L1TxCommonData, L2ChainId, Nonce,
+    PackedEthSignature, PriorityOpId, Transaction, H256, U256,
+};
+
+use zksync_eth_signer::{raw_ethereum_tx::TransactionParameters, EthereumSigner, PrivateKeySigner};
+use zksync_types::l1::{OpProcessingType, PriorityQueueType};
+
+use zksync_utils::bytecode::hash_bytecode;
+pub const L1_TEST_GAS_PER_PUBDATA_BYTE: u32 = 800;
+const BASE_FEE: u64 = 2_000_000_000;
+
+#[derive(Debug, Clone)]
+pub struct DeployContractsTx {
+    pub tx: Transaction,
+    pub bytecode_hash: H256,
+    pub address: Address,
+}
+
+#[derive(Debug)]
+pub enum TxType {
+    L2,
+    L1 { serial_id: u64 },
+}
+
+#[derive(Debug, Clone)]
+pub struct Account {
+    private_key: H256,
+    pub address: Address,
+    pub nonce: Nonce,
+}
+
+impl Account {
+    pub fn new(private_key: H256) -> Self {
+        let address = PackedEthSignature::address_from_private_key(&private_key).unwrap();
+        Self {
+            private_key,
+            address,
+            nonce: Nonce(0),
+        }
+    }
+
+    pub fn random() -> Self {
+        let pk = H256::random();
+        Self::new(pk)
+    }
+
+    pub fn get_l2_tx_for_execute(&mut self, execute: Execute, fee: Option<Fee>) -> Transaction {
+        let tx = self.get_l2_tx_for_execute_with_nonce(execute, fee, self.nonce);
+        self.nonce += 1;
+        tx
+    }
+
+    pub fn get_l2_tx_for_execute_with_nonce(
+        &mut self,
+        execute: Execute,
+        fee: Option<Fee>,
+        nonce: Nonce,
+    ) -> Transaction {
+        let Execute {
+            contract_address,
+            calldata,
+            value,
+            factory_deps,
+        } = execute;
+        let mut tx = L2Tx::new_signed(
+            contract_address,
+            calldata,
+            nonce,
+            fee.unwrap_or_else(|| self.default_fee()),
+            value,
+            L2ChainId(270),
+            &self.private_key,
+            factory_deps,
+            Default::default(),
+        )
+        .expect("should create a signed execute transaction");
+
+        tx.set_input(H256::random().0.to_vec(), H256::random());
+        tx.into()
+    }
+
+    fn default_fee(&self) -> Fee {
+        Fee {
+            gas_limit: U256::from(2000000000u32),
+            max_fee_per_gas: U256::from(BASE_FEE),
+            max_priority_fee_per_gas: U256::from(100),
+            gas_per_pubdata_limit: U256::from(MAX_GAS_PER_PUBDATA_BYTE),
+        }
+    }
+
+    pub fn get_deploy_tx(
+        &mut self,
+        code: &[u8],
+        calldata: Option<&[Token]>,
+        tx_type: TxType,
+    ) -> DeployContractsTx {
+        self.get_deploy_tx_with_factory_deps(code, calldata, vec![], tx_type)
+    }
+
+    pub fn get_deploy_tx_with_factory_deps(
+        &mut self,
+        code: &[u8],
+        calldata: Option<&[Token]>,
+        mut factory_deps: Vec<Vec<u8>>,
+        tx_type: TxType,
+    ) -> DeployContractsTx {
+        let deployer = deployer_contract();
+
+        let contract_function = deployer.function("create").unwrap();
+
+        let calldata = calldata.map(ethabi::encode);
+        let code_hash = hash_bytecode(code);
+        let params = [
+            Token::FixedBytes(vec![0u8; 32]),
+            Token::FixedBytes(code_hash.0.to_vec()),
+            Token::Bytes(calldata.unwrap_or_default().to_vec()),
+        ];
+        factory_deps.push(code.to_vec());
+        let calldata = contract_function
+            .encode_input(&params)
+            .expect("failed to encode parameters");
+
+        let execute = Execute {
+            contract_address: CONTRACT_DEPLOYER_ADDRESS,
+            calldata,
+            factory_deps: Some(factory_deps),
+            value: U256::zero(),
+        };
+
+        let tx = match tx_type {
+            TxType::L2 => self.get_l2_tx_for_execute(execute, None),
+            TxType::L1 { serial_id } => self.get_l1_tx(execute, serial_id),
+        };
+
+        let address =
+            // For L1Tx we usually use nonce 0
+            deployed_address_create(self.address, (tx.nonce().unwrap_or(Nonce(0)).0).into());
+        DeployContractsTx {
+            tx,
+            bytecode_hash: code_hash,
+            address,
+        }
+    }
+
+    pub fn get_l1_tx(&self, execute: Execute, serial_id: u64) -> Transaction {
+        let max_fee_per_gas = U256::from(0u32);
+        let gas_limit = U256::from(20_000_000);
+
+        Transaction {
+            common_data: ExecuteTransactionCommon::L1(L1TxCommonData {
+                sender: self.address,
+                gas_limit,
+                gas_per_pubdata_limit: REQUIRED_L1_TO_L2_GAS_PER_PUBDATA_BYTE.into(),
+                to_mint: gas_limit * max_fee_per_gas + execute.value,
+                serial_id: PriorityOpId(serial_id),
+                max_fee_per_gas,
+                canonical_tx_hash: H256::from_low_u64_be(serial_id),
+                deadline_block: 100000,
+                layer_2_tip_fee: Default::default(),
+                op_processing_type: OpProcessingType::Common,
+                priority_queue_type: PriorityQueueType::Deque,
+                eth_hash: H256::random(),
+                eth_block: 1,
+                refund_recipient: self.address,
+                full_fee: Default::default(),
+            }),
+            execute,
+            received_timestamp_ms: 0,
+            raw_bytes: None,
+        }
+    }
+
+    pub fn get_test_contract_transaction(
+        &mut self,
+        address: Address,
+        with_panic: bool,
+        value: Option<U256>,
+        payable: bool,
+        tx_type: TxType,
+    ) -> Transaction {
+        let test_contract = load_contract(
+            "etc/contracts-test-data/artifacts-zk/contracts/counter/counter.sol/Counter.json",
+        );
+
+        let function = if payable {
+            test_contract
+                .function("incrementWithRevertPayable")
+                .unwrap()
+        } else {
+            test_contract.function("incrementWithRevert").unwrap()
+        };
+
+        let calldata = function
+            .encode_input(&[Token::Uint(U256::from(1u8)), Token::Bool(with_panic)])
+            .expect("failed to encode parameters");
+
+        let execute = Execute {
+            contract_address: address,
+            calldata,
+            value: value.unwrap_or_default(),
+            factory_deps: None,
+        };
+        match tx_type {
+            TxType::L2 => self.get_l2_tx_for_execute(execute, None),
+            TxType::L1 { serial_id } => self.get_l1_tx(execute, serial_id),
+        }
+    }
+
+    pub fn address(&self) -> Address {
+        self.address
+    }
+
+    pub fn get_pk_signer(&self) -> PrivateKeySigner {
+        PrivateKeySigner::new(self.private_key)
+    }
+
+    pub async fn sign_legacy_tx(&self, tx: TransactionParameters) -> Vec<u8> {
+        let pk_signer = self.get_pk_signer();
+        pk_signer.sign_transaction(tx).await.unwrap()
+    }
+}
diff --git a/core/lib/types/Cargo.toml b/core/lib/types/Cargo.toml
index ed649dfba408..5f013e38952f 100644
--- a/core/lib/types/Cargo.toml
+++ b/core/lib/types/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "zksync_types"
-version = "1.0.0"
+version = "0.1.0"
 edition = "2018"
 authors = ["The Matter Labs Team <hello@matterlabs.dev>"]
 homepage = "https://zksync.io/"
@@ -11,18 +11,18 @@ categories = ["cryptography"]
 readme = "README.md"
 
 [dependencies]
-zksync_config = { path = "../config", version = "1.0" }
-zksync_utils = { path = "../utils", version = "1.0" }
-zksync_basic_types = { path = "../basic_types", version = "1.0" }
-zksync_contracts = { path = "../contracts", version = "1.0" }
-zksync_mini_merkle_tree = { path = "../mini_merkle_tree", version = "1.0" }
+zksync_config = { path = "../config" }
+zksync_utils = { path = "../utils" }
+zksync_basic_types = { path = "../basic_types" }
+zksync_contracts = { path = "../contracts" }
+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", tag = "v1.3.3-rc1" }
-zk_evm = { git = "https://github.com/matter-labs/era-zk_evm.git", tag = "v1.3.3-rc0" }
+zkevm_test_harness = { git = "https://github.com/matter-labs/era-zkevm_test_harness.git", branch = "v1.3.3" }
+zk_evm = { git = "https://github.com/matter-labs/era-zk_evm.git", branch = "v1.3.3" }
 
 chrono = { version = "0.4", features = ["serde", "rustc-serialize"] }
-metrics = "0.20"
+metrics = "0.21"
 num = { version = "0.3.1", features = ["serde"] }
 once_cell = "1.7"
 rlp = "0.5"
@@ -34,9 +34,11 @@ thiserror = "1.0"
 num_enum = "0.6"
 
 # Crypto stuff
+# TODO (PLA-440): remove parity-crypto
 parity-crypto = { version = "0.9", features = ["publickey"] }
 blake2 = "0.10"
 
+# TODO (PLA-440): remove parity-crypto
 # `ethereum-types` version used in `parity-crypto`
 ethereum_types_old = { package = "ethereum-types", version = "0.12.0" }
 
diff --git a/core/lib/types/src/aggregated_operations.rs b/core/lib/types/src/aggregated_operations.rs
index 18e2825b4cb7..e32968fb8eb8 100644
--- a/core/lib/types/src/aggregated_operations.rs
+++ b/core/lib/types/src/aggregated_operations.rs
@@ -2,6 +2,7 @@ use codegen::serialize_proof;
 
 use std::{fmt, ops, str::FromStr};
 
+use serde::{Deserialize, Serialize};
 use zkevm_test_harness::abstract_zksync_circuit::concrete_circuits::ZkSyncCircuit;
 use zkevm_test_harness::bellman::bn256::Bn256;
 use zkevm_test_harness::bellman::plonk::better_better_cs::proof::Proof;
@@ -53,7 +54,7 @@ pub struct L1BatchCreateProofOperation {
     pub proofs_to_pad: usize,
 }
 
-#[derive(Clone)]
+#[derive(Clone, Serialize, Deserialize)]
 pub struct L1BatchProofForL1 {
     pub aggregation_result_coords: [[u8; 32]; 4],
     pub scheduler_proof: Proof<Bn256, ZkSyncCircuit<Bn256, VmWitnessOracle<Bn256>>>,
diff --git a/core/lib/types/src/api/en.rs b/core/lib/types/src/api/en.rs
index 5456e95b7fb4..74c48df8349b 100644
--- a/core/lib/types/src/api/en.rs
+++ b/core/lib/types/src/api/en.rs
@@ -6,6 +6,8 @@ use zk_evm::ethereum_types::Address;
 use zksync_basic_types::{L1BatchNumber, MiniblockNumber, H256};
 use zksync_contracts::BaseSystemContractsHashes;
 
+use crate::ProtocolVersionId;
+
 /// Representation of the L2 block, as needed for the EN synchronization.
 /// This structure has several fields that describe *L1 batch* rather than
 /// *L2 block*, thus they are the same for all the L2 blocks in the batch.
@@ -52,4 +54,10 @@ pub struct SyncBlock {
     /// These are not the API representation of transactions, but rather the actual type used by the server.
     /// May be `None` if transactions were not requested (as opposed to the empty vector).
     pub transactions: Option<Vec<crate::Transaction>>,
+    /// Number of virtual blocks associated with this L2 block.
+    pub virtual_blocks: Option<u32>,
+    /// Hash of the L2 block.
+    pub hash: Option<H256>,
+    /// Version of the protocol used for this block.
+    pub protocol_version: ProtocolVersionId,
 }
diff --git a/core/lib/types/src/api/mod.rs b/core/lib/types/src/api/mod.rs
index dd4bec61708b..c9b157c6629d 100644
--- a/core/lib/types/src/api/mod.rs
+++ b/core/lib/types/src/api/mod.rs
@@ -537,7 +537,7 @@ pub struct TransactionDetails {
     pub is_l1_originated: bool,
     pub status: TransactionStatus,
     pub fee: U256,
-    pub gas_per_pubdata: Option<U256>,
+    pub gas_per_pubdata: U256,
     pub initiator_address: Address,
     pub received_at: DateTime<Utc>,
     pub eth_commit_tx_hash: Option<H256>,
diff --git a/core/lib/types/src/block.rs b/core/lib/types/src/block.rs
index 170bfdaee5a1..d37c97324bde 100644
--- a/core/lib/types/src/block.rs
+++ b/core/lib/types/src/block.rs
@@ -1,4 +1,5 @@
 use serde::{Deserialize, Serialize};
+use zksync_config::constants::SYSTEM_BLOCK_INFO_BLOCK_NUMBER_MULTIPLIER;
 
 use std::{fmt, ops};
 
@@ -77,6 +78,8 @@ pub struct MiniblockHeader {
     pub l2_fair_gas_price: u64, // L2 gas price assumed in the corresponding batch
     pub base_system_contracts_hashes: BaseSystemContractsHashes,
     pub protocol_version: Option<ProtocolVersionId>,
+    /// The maximal number of virtual blocks to be created in the miniblock.
+    pub virtual_blocks: u32,
 }
 
 /// Data needed to re-execute miniblock.
@@ -84,6 +87,8 @@ pub struct MiniblockHeader {
 pub struct MiniblockReexecuteData {
     pub number: MiniblockNumber,
     pub timestamp: u64,
+    pub prev_block_hash: H256,
+    pub virtual_blocks: u32,
     pub txs: Vec<Transaction>,
 }
 
@@ -178,3 +183,105 @@ impl ops::AddAssign for BlockGasCount {
         };
     }
 }
+
+/// Returns the hash of the miniblock.
+/// `txs_rolling_hash` of the miniblock is calculated the following way:
+/// If the miniblock has 0 transactions, then `txs_rolling_hash` is equal to `H256::zero()`.
+/// If the miniblock 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 fn miniblock_hash(
+    miniblock_number: MiniblockNumber,
+    miniblock_timestamp: u64,
+    prev_miniblock_hash: H256,
+    txs_rolling_hash: H256,
+) -> H256 {
+    let mut digest: [u8; 128] = [0u8; 128];
+    U256::from(miniblock_number.0).to_big_endian(&mut digest[0..32]);
+    U256::from(miniblock_timestamp).to_big_endian(&mut digest[32..64]);
+    digest[64..96].copy_from_slice(prev_miniblock_hash.as_bytes());
+    digest[96..128].copy_from_slice(txs_rolling_hash.as_bytes());
+
+    H256(keccak256(&digest))
+}
+
+/// At the beginning of the zkSync, the hashes of the blocks could be calculated as the hash of their number.
+/// This method returns the hash of such miniblocks.
+pub fn legacy_miniblock_hash(miniblock_number: MiniblockNumber) -> H256 {
+    H256(keccak256(&miniblock_number.0.to_be_bytes()))
+}
+
+/// Returns block.number/timestamp based on the block's information
+pub fn unpack_block_info(info: U256) -> (u64, u64) {
+    let block_number = (info / SYSTEM_BLOCK_INFO_BLOCK_NUMBER_MULTIPLIER).as_u64();
+    let block_timestamp = (info % SYSTEM_BLOCK_INFO_BLOCK_NUMBER_MULTIPLIER).as_u64();
+    (block_number, block_timestamp)
+}
+
+/// Transforms block number and timestamp into a packed 32-byte representation
+pub fn pack_block_info(block_number: u64, block_timestamp: u64) -> U256 {
+    U256::from(block_number) * SYSTEM_BLOCK_INFO_BLOCK_NUMBER_MULTIPLIER
+        + U256::from(block_timestamp)
+}
+
+/// Returns virtual_block_start_batch and virtual_block_finish_l2_block based on the virtual block upgrade information
+pub fn unpack_block_upgrade_info(info: U256) -> (u64, u64) {
+    // its safe to use SYSTEM_BLOCK_INFO_BLOCK_NUMBER_MULTIPLIER here, since VirtualBlockUpgradeInfo and BlockInfo are packed same way
+    let virtual_block_start_batch = (info / SYSTEM_BLOCK_INFO_BLOCK_NUMBER_MULTIPLIER).as_u64();
+    let virtual_block_finish_l2_block = (info % SYSTEM_BLOCK_INFO_BLOCK_NUMBER_MULTIPLIER).as_u64();
+    (virtual_block_start_batch, virtual_block_finish_l2_block)
+}
+
+#[cfg(test)]
+mod tests {
+    use zksync_basic_types::{MiniblockNumber, H256};
+
+    use crate::block::{legacy_miniblock_hash, miniblock_hash, pack_block_info, unpack_block_info};
+
+    #[test]
+    fn test_legacy_miniblock_hashes() {
+        // The comparing with the hash taken from explorer
+        let expected_hash = "6a13b75b5982035ebb28999fbf6f54e7d7fad9e290d5c5f99e7c7d75d42b6099"
+            .parse()
+            .unwrap();
+        assert_eq!(
+            legacy_miniblock_hash(MiniblockNumber(11470850)),
+            expected_hash
+        )
+    }
+
+    #[test]
+    fn test_miniblock_hash() {
+        // Comparing with a constant hash generated from a contract:
+        let expected_hash: H256 =
+            "c4e184fa9dde8d81aa085f3d1831b00be0a2f4e40218ff1b3456684e7eeccdfe"
+                .parse()
+                .unwrap();
+        let prev_miniblock_hash =
+            "9b14f83c434b860168ed4081f7b2a65f432f68bfea86ddf3351c02bc855dd721"
+                .parse()
+                .unwrap();
+        let txs_rolling_hash = "67506e289f13aee79b8de3bfd99f460f46135028b85eee9da760a17a4453fb64"
+            .parse()
+            .unwrap();
+        assert_eq!(
+            expected_hash,
+            miniblock_hash(
+                MiniblockNumber(1),
+                12,
+                prev_miniblock_hash,
+                txs_rolling_hash
+            )
+        )
+    }
+
+    #[test]
+    fn test_block_packing() {
+        let block_number = 101;
+        let block_timestamp = 102;
+        let block_info = pack_block_info(block_number, block_timestamp);
+
+        let (unpacked_block_number, unpacked_block_timestamp) = unpack_block_info(block_info);
+        assert_eq!(block_number, unpacked_block_number);
+        assert_eq!(block_timestamp, unpacked_block_timestamp);
+    }
+}
diff --git a/core/lib/types/src/l1/mod.rs b/core/lib/types/src/l1/mod.rs
index 5438dd7a767b..75d7f71a8833 100644
--- a/core/lib/types/src/l1/mod.rs
+++ b/core/lib/types/src/l1/mod.rs
@@ -151,6 +151,7 @@ impl From<L1Tx> for Transaction {
             common_data: ExecuteTransactionCommon::L1(common_data),
             execute,
             received_timestamp_ms,
+            raw_bytes: None,
         }
     }
 }
@@ -163,6 +164,7 @@ impl TryFrom<Transaction> for L1Tx {
             common_data,
             execute,
             received_timestamp_ms,
+            ..
         } = value;
         match common_data {
             ExecuteTransactionCommon::L1(common_data) => Ok(L1Tx {
@@ -196,6 +198,7 @@ impl TryFrom<Log> for L1Tx {
     type Error = L1TxParseError;
 
     fn try_from(event: Log) -> Result<Self, Self::Error> {
+        // TODO: refactor according to tx type
         let transaction_param_type = ParamType::Tuple(vec![
             ParamType::Uint(8),                                       // txType
             ParamType::Address,                                       // sender
@@ -300,6 +303,7 @@ impl TryFrom<Log> for L1Tx {
         let signature = transaction.remove(0).into_bytes().unwrap();
         assert_eq!(signature.len(), 0);
 
+        // TODO (SMA-1621): check that reservedDynamic are constructed correctly.
         let _factory_deps_hashes = transaction.remove(0).into_array().unwrap();
         let _paymaster_input = transaction.remove(0).into_bytes().unwrap();
         let _reserved_dynamic = transaction.remove(0).into_bytes().unwrap();
diff --git a/core/lib/types/src/l2/mod.rs b/core/lib/types/src/l2/mod.rs
index 5497a0fdc96b..973c5a30b106 100644
--- a/core/lib/types/src/l2/mod.rs
+++ b/core/lib/types/src/l2/mod.rs
@@ -1,13 +1,16 @@
 use std::convert::TryFrom;
 
+use num_enum::TryFromPrimitive;
 use rlp::{Rlp, RlpStream};
 
 use self::error::SignError;
 use crate::transaction_request::PaymasterParams;
+use crate::LEGACY_TX_TYPE;
+
 use crate::{
     api, tx::primitives::PackedEthSignature, tx::Execute, web3::types::U64, Address, Bytes,
     EIP712TypedStructure, Eip712Domain, ExecuteTransactionCommon, InputData, L2ChainId, Nonce,
-    StructBuilder, Transaction, EIP_1559_TX_TYPE, EIP_712_TX_TYPE, H256,
+    StructBuilder, Transaction, EIP_1559_TX_TYPE, EIP_2930_TX_TYPE, EIP_712_TX_TYPE, H256,
     PRIORITY_OPERATION_L2_TX_TYPE, PROTOCOL_UPGRADE_TX_TYPE, U256,
 };
 
@@ -19,7 +22,7 @@ use crate::api::TransactionRequest;
 use crate::fee::{encoding_len, Fee};
 use crate::helpers::unix_timestamp_ms;
 
-#[derive(Serialize, Deserialize, Debug, Clone, Copy, PartialEq, Eq)]
+#[derive(Serialize, Deserialize, Debug, Clone, Copy, PartialEq, Eq, TryFromPrimitive)]
 #[repr(u32)]
 pub enum TransactionType {
     // Native ECDSA Transaction
@@ -89,6 +92,27 @@ impl L2TxCommonData {
     pub fn set_input(&mut self, input: Vec<u8>, hash: H256) {
         self.input = Some(InputData { hash, data: input })
     }
+
+    pub fn extract_chain_id(&self) -> Option<u16> {
+        let bytes = self.input_data()?;
+        let chain_id = match bytes.first() {
+            Some(x) if *x >= 0x80 => {
+                let rlp = Rlp::new(bytes);
+                let v = rlp.val_at(6).ok()?;
+                PackedEthSignature::unpack_v(v).ok()?.1?
+            }
+            Some(x) if *x == EIP_1559_TX_TYPE => {
+                let rlp = Rlp::new(&bytes[1..]);
+                rlp.val_at(0).ok()?
+            }
+            Some(x) if *x == EIP_712_TX_TYPE => {
+                let rlp = Rlp::new(&bytes[1..]);
+                rlp.val_at(10).ok()?
+            }
+            _ => return None,
+        };
+        Some(chain_id)
+    }
 }
 
 impl Default for L2TxCommonData {
@@ -105,11 +129,12 @@ impl Default for L2TxCommonData {
     }
 }
 
-#[derive(Debug, Clone, Serialize, Deserialize)]
+#[derive(Debug, Clone, Serialize, Deserialize, PartialEq)]
 pub struct L2Tx {
     pub execute: Execute,
     pub common_data: L2TxCommonData,
     pub received_timestamp_ms: u64,
+    pub raw_bytes: Option<Bytes>,
 }
 
 impl L2Tx {
@@ -141,6 +166,7 @@ impl L2Tx {
                 paymaster_params,
             },
             received_timestamp_ms: unix_timestamp_ms(),
+            raw_bytes: None,
         }
     }
 
@@ -197,27 +223,6 @@ impl L2Tx {
         self.common_data.set_input(data, hash)
     }
 
-    pub fn extract_chain_id(&self) -> Option<u16> {
-        let bytes = self.common_data.input_data()?;
-        let chain_id = match bytes.first() {
-            Some(x) if *x >= 0x80 => {
-                let rlp = Rlp::new(bytes);
-                let v = rlp.val_at(6).ok()?;
-                PackedEthSignature::unpack_v(v).ok()?.1.unwrap_or(0)
-            }
-            Some(x) if *x == EIP_1559_TX_TYPE => {
-                let rlp = Rlp::new(&bytes[1..]);
-                rlp.val_at(0).ok()?
-            }
-            Some(x) if *x == EIP_712_TX_TYPE => {
-                let rlp = Rlp::new(&bytes[1..]);
-                rlp.val_at(10).ok()?
-            }
-            _ => return None,
-        };
-        Some(chain_id)
-    }
-
     pub fn get_rlp_bytes(&self, chain_id: L2ChainId) -> Bytes {
         let mut rlp_stream = RlpStream::new();
         let tx: TransactionRequest = self.clone().into();
@@ -246,6 +251,10 @@ impl L2Tx {
         self.common_data.signature = signature;
     }
 
+    pub fn set_raw_bytes(&mut self, bytes: Bytes) {
+        self.raw_bytes = Some(bytes);
+    }
+
     pub fn abi_encoding_len(&self) -> usize {
         let data_len = self.execute.calldata.len();
         let signature_len = self.common_data.signature.len();
@@ -278,46 +287,72 @@ impl L2Tx {
     }
 }
 
+fn signature_to_vrs(signature: &[u8], tx_type: u32) -> (Option<U64>, Option<U256>, Option<U256>) {
+    let signature = if tx_type == LEGACY_TX_TYPE as u32 {
+        // Note that we use `deserialize_packed_no_v_check` here, because we want to preserve the original `v` value.
+        // This is needed due to inconsistent behaviour on Ethereum where the `v` value is >= 27 for legacy transactions
+        // and is either 0 or 1 for other ones.
+        PackedEthSignature::deserialize_packed_no_v_check(signature)
+    } else {
+        PackedEthSignature::deserialize_packed(signature)
+    };
+
+    if let Ok(sig) = signature {
+        (
+            Some(U64::from(sig.v())),
+            Some(U256::from(sig.r())),
+            Some(U256::from(sig.s())),
+        )
+    } else {
+        (None, None, None)
+    }
+}
+
 impl From<L2Tx> for TransactionRequest {
     fn from(tx: L2Tx) -> Self {
         let tx_type = tx.common_data.transaction_type as u32;
-        let (v, r, s) =
-            if let Ok(sig) = PackedEthSignature::deserialize_packed(&tx.common_data.signature) {
-                (
-                    Some(U64::from(sig.v())),
-                    Some(U256::from(sig.r())),
-                    Some(U256::from(sig.s())),
-                )
-            } else {
-                (None, None, None)
-            };
-        TransactionRequest {
+        let (v, r, s) = signature_to_vrs(&tx.common_data.signature, tx_type);
+
+        let mut base_tx_req = TransactionRequest {
             nonce: U256::from(tx.common_data.nonce.0),
             from: Some(tx.common_data.initiator_address),
             to: Some(tx.recipient_account()),
             value: tx.execute.value,
             gas_price: tx.common_data.fee.max_fee_per_gas,
-            max_priority_fee_per_gas: Some(tx.common_data.fee.max_priority_fee_per_gas),
+            max_priority_fee_per_gas: None,
             gas: tx.common_data.fee.gas_limit,
             input: Bytes(tx.execute.calldata),
             v,
             r,
             s,
-            raw: None,
-            transaction_type: if tx_type == 0 {
-                None
-            } else {
-                Some(U64::from(tx_type))
-            },
+            raw: tx.raw_bytes,
+            transaction_type: None,
             access_list: None,
-            eip712_meta: Some(api::Eip712Meta {
-                gas_per_pubdata: tx.common_data.fee.gas_per_pubdata_limit,
-                factory_deps: tx.execute.factory_deps,
-                custom_signature: Some(tx.common_data.signature),
-                paymaster_params: Some(tx.common_data.paymaster_params),
-            }),
-            chain_id: None,
+            eip712_meta: None,
+            chain_id: tx.common_data.extract_chain_id().unwrap_or_default().into(),
+        };
+        match tx_type as u8 {
+            LEGACY_TX_TYPE => {}
+
+            EIP_712_TX_TYPE => {
+                base_tx_req.transaction_type = Some(U64::from(tx_type));
+                base_tx_req.max_priority_fee_per_gas =
+                    Some(tx.common_data.fee.max_priority_fee_per_gas);
+                base_tx_req.eip712_meta = Some(api::Eip712Meta {
+                    gas_per_pubdata: tx.common_data.fee.gas_per_pubdata_limit,
+                    factory_deps: tx.execute.factory_deps,
+                    custom_signature: Some(tx.common_data.signature),
+                    paymaster_params: Some(tx.common_data.paymaster_params),
+                });
+            }
+            EIP_1559_TX_TYPE | EIP_2930_TX_TYPE => {
+                base_tx_req.max_priority_fee_per_gas =
+                    Some(tx.common_data.fee.max_priority_fee_per_gas);
+                base_tx_req.transaction_type = Some(U64::from(tx_type));
+            }
+            _ => panic!("Invalid transaction type: {}", tx_type),
         }
+        base_tx_req
     }
 }
 
@@ -327,11 +362,13 @@ impl From<L2Tx> for Transaction {
             execute,
             common_data,
             received_timestamp_ms,
+            raw_bytes,
         } = tx;
         Self {
             common_data: ExecuteTransactionCommon::L2(common_data),
             execute,
             received_timestamp_ms,
+            raw_bytes,
         }
     }
 }
@@ -352,7 +389,7 @@ impl From<L2Tx> for api::Transaction {
 
         Self {
             hash: tx.hash(),
-            chain_id: tx.extract_chain_id().unwrap_or_default().into(),
+            chain_id: tx.common_data.extract_chain_id().unwrap_or_default().into(),
             nonce: U256::from(tx.common_data.nonce.0),
             from: Some(tx.common_data.initiator_address),
             to: Some(tx.recipient_account()),
@@ -383,6 +420,7 @@ impl TryFrom<Transaction> for L2Tx {
             common_data,
             execute,
             received_timestamp_ms,
+            raw_bytes,
         } = value;
         match common_data {
             ExecuteTransactionCommon::L1(_) => Err("Cannot convert L1Tx to L2Tx"),
@@ -390,6 +428,7 @@ impl TryFrom<Transaction> for L2Tx {
                 execute,
                 common_data,
                 received_timestamp_ms,
+                raw_bytes,
             }),
             ExecuteTransactionCommon::ProtocolUpgrade(_) => {
                 Err("Cannot convert ProtocolUpgradeTx to L2Tx")
@@ -419,3 +458,46 @@ impl EIP712TypedStructure for L2Tx {
         builder.add_member("nonce", &U256::from(self.common_data.nonce.0));
     }
 }
+
+#[cfg(test)]
+mod tests {
+    use zksync_basic_types::{Nonce, U256};
+
+    use crate::{
+        api::TransactionRequest, fee::Fee, transaction_request::PaymasterParams, Execute,
+        L2TxCommonData,
+    };
+
+    use super::{L2Tx, TransactionType};
+
+    #[test]
+    fn test_correct_l2_tx_transaction_request_conversion() {
+        // It is a random valid signature
+        let signature = hex::decode("641ab4a25c4a209e0c80eb9ac81355f2dbe28d652ea9f5971fca60c8436096da0efda9d01346eaee9fb6234895eaf78bae0a42bd921a4ae3603b93489e19ed211b").unwrap();
+        let tx = L2Tx {
+            execute: Execute {
+                contract_address: Default::default(),
+                calldata: vec![],
+                value: U256::zero(),
+                factory_deps: None,
+            },
+            common_data: L2TxCommonData {
+                nonce: Nonce(0),
+                fee: Fee::default(),
+                initiator_address: Default::default(),
+                signature: signature.clone(),
+                transaction_type: TransactionType::LegacyTransaction,
+                input: None,
+                paymaster_params: PaymasterParams::default(),
+            },
+            received_timestamp_ms: Default::default(),
+            raw_bytes: None,
+        };
+
+        let transaction_request: TransactionRequest = tx.into();
+        assert_eq!(
+            transaction_request.v.unwrap().as_u32(),
+            signature[64] as u32
+        );
+    }
+}
diff --git a/core/lib/types/src/lib.rs b/core/lib/types/src/lib.rs
index 0f8bb0d136ca..4715a2f86dac 100644
--- a/core/lib/types/src/lib.rs
+++ b/core/lib/types/src/lib.rs
@@ -22,7 +22,13 @@ pub use protocol_version::{ProtocolUpgrade, ProtocolVersion, ProtocolVersionId};
 pub use storage::*;
 pub use tx::primitives::*;
 pub use tx::Execute;
-pub use zk_evm;
+pub use vm_version::VmVersion;
+pub use zk_evm::{
+    aux_structures::{LogQuery, Timestamp},
+    reference_impls::event_sink::EventMessage,
+    zkevm_opcode_defs::FarCallOpcode,
+};
+
 pub use zkevm_test_harness;
 pub use zksync_basic_types::*;
 
@@ -54,6 +60,7 @@ pub mod prover_server_api;
 pub mod transaction_request;
 pub mod utils;
 pub mod vk_transform;
+pub mod vm_version;
 
 /// Denotes the first byte of the special zkSync's EIP-712-signed transaction.
 pub const EIP_712_TX_TYPE: u8 = 0x71;
@@ -78,6 +85,7 @@ pub struct Transaction {
     pub common_data: ExecuteTransactionCommon,
     pub execute: Execute,
     pub received_timestamp_ms: u64,
+    pub raw_bytes: Option<Bytes>,
 }
 
 impl std::fmt::Debug for Transaction {
diff --git a/core/lib/types/src/proofs.rs b/core/lib/types/src/proofs.rs
index 28d25900231d..cf23d5ae0f64 100644
--- a/core/lib/types/src/proofs.rs
+++ b/core/lib/types/src/proofs.rs
@@ -20,6 +20,7 @@ use zkevm_test_harness::{
     SchedulerCircuitInstanceWitness,
 };
 
+use crate::witness_block_state::WitnessHashBlockState;
 use zksync_basic_types::{L1BatchNumber, H256, U256};
 
 const HASH_LEN: usize = H256::len_bytes();
@@ -57,6 +58,11 @@ impl StorageLogMetadata {
             );
         })
     }
+
+    fn first_time_touching_empty_storage(&self) -> bool {
+        self.value_written == self.value_read
+            && H256::from_slice(&self.value_read) == H256::default()
+    }
 }
 
 #[derive(Clone)]
@@ -210,6 +216,25 @@ impl PrepareBasicCircuitsJob {
         }
         merkle_paths.into_iter()
     }
+
+    /// Converts this job into WitnessHashBlockState -- Witness Storage input for Witness Generation
+    pub fn into_witness_hash_block_state(self) -> WitnessHashBlockState {
+        let mut block_state = WitnessHashBlockState::default();
+        for storage_log_metadata in self.into_merkle_paths() {
+            let hash = storage_log_metadata.leaf_hashed_key;
+            if (storage_log_metadata.is_write && storage_log_metadata.first_write)
+                || storage_log_metadata.first_time_touching_empty_storage()
+            {
+                block_state.is_write_initial.insert(hash, true);
+            } else {
+                block_state.is_write_initial.insert(hash, false);
+            }
+            block_state
+                .read_storage_key
+                .insert(hash, storage_log_metadata.value_read.into());
+        }
+        block_state
+    }
 }
 
 /// Enriched `PrepareBasicCircuitsJob`. All the other fields are taken from the `l1_batches` table.
@@ -485,4 +510,86 @@ mod tests {
         let logs_from_job: Vec<_> = job.into_merkle_paths().collect();
         assert_eq!(logs_from_job, logs);
     }
+
+    fn get_arr_with_last_byte(val: u8) -> [u8; 32] {
+        let mut arr = [0; 32];
+        arr[31] = val;
+        arr
+    }
+
+    #[test]
+    fn into_witness_hash_block_state_full_conversion() {
+        use std::collections::HashMap;
+
+        let witness_hash_block_state = WitnessHashBlockState {
+            // Note that the commented out values are not derived from
+            is_write_initial: HashMap::from([
+                (U256([0, 0, 0, 1]), false), // is_write: false; first_write: false; read != write
+                (U256([0, 0, 0, 2]), false), // is_write: true;  first_write: false; read != write
+                (U256([0, 0, 0, 3]), false), // is_write: false; first_write: true;  read != write
+                (U256([0, 0, 0, 4]), true),  // is_write: true;  first_write: true;  read != write
+                (U256([0, 0, 0, 5]), false), // is_write: false; first_write: false; read == write != 0x00..00
+                (U256([0, 0, 0, 6]), false), // is_write: true;  first_write: false; read == write != 0x00..00
+                (U256([0, 0, 0, 7]), false), // is_write: false; first_write: true;  read == write != 0x00..00
+                (U256([0, 0, 0, 8]), true), // is_write: true;  first_write: true;  read == write != 0x00..00
+                (U256([0, 0, 0, 9]), true), // is_write: false; first_write: false; read == write == 0x00..00
+                (U256([0, 0, 0, 10]), true), // is_write: true;  first_write: false; read == write == 0x00..00
+                (U256([0, 0, 0, 11]), true), // is_write: false; first_write: true;  read == write == 0x00..00
+                (U256([0, 0, 0, 12]), true), // is_write: true;  first_write: true;  read == write == 0x00..00
+            ]),
+            read_storage_key: HashMap::from([
+                (U256([0, 0, 0, 1]), H256(get_arr_with_last_byte(0))),
+                (U256([0, 0, 0, 2]), H256(get_arr_with_last_byte(0))),
+                (U256([0, 0, 0, 3]), H256(get_arr_with_last_byte(1))),
+                (U256([0, 0, 0, 4]), H256(get_arr_with_last_byte(1))),
+                (U256([0, 0, 0, 5]), H256(get_arr_with_last_byte(1))),
+                (U256([0, 0, 0, 6]), H256(get_arr_with_last_byte(2))),
+                (U256([0, 0, 0, 7]), H256(get_arr_with_last_byte(3))),
+                (U256([0, 0, 0, 8]), H256(get_arr_with_last_byte(4))),
+                (U256([0, 0, 0, 9]), H256(get_arr_with_last_byte(0))),
+                (U256([0, 0, 0, 10]), H256(get_arr_with_last_byte(0))),
+                (U256([0, 0, 0, 11]), H256(get_arr_with_last_byte(0))),
+                (U256([0, 0, 0, 12]), H256(get_arr_with_last_byte(0))),
+            ]),
+        };
+
+        let storage_log_input = [
+            (false, false, 1, 1, 0),
+            (true, false, 2, 1, 0),
+            (false, true, 3, 0, 1),
+            (true, true, 4, 0, 1),
+            (false, false, 5, 1, 1),
+            (true, false, 6, 2, 2),
+            (false, true, 7, 3, 3),
+            (true, true, 8, 4, 4),
+            (false, false, 9, 0, 0),
+            (true, false, 10, 0, 0),
+            (false, true, 11, 0, 0),
+            (true, true, 12, 0, 0),
+        ];
+
+        let storage_logs = storage_log_input.map(
+            |(is_write, first_write, leaf_id, written_last_byte, read_last_byte)| {
+                StorageLogMetadata {
+                    root_hash: get_arr_with_last_byte(0),
+                    is_write,
+                    first_write,
+                    merkle_paths: vec![],
+                    leaf_hashed_key: U256([0, 0, 0, leaf_id]),
+                    leaf_enumeration_index: 0,
+                    value_written: get_arr_with_last_byte(written_last_byte),
+                    value_read: get_arr_with_last_byte(read_last_byte),
+                }
+            },
+        );
+        let mut job = PrepareBasicCircuitsJob::new(4);
+        job.reserve(storage_logs.len());
+        for log in &storage_logs {
+            job.push_merkle_path(log.clone());
+        }
+        assert_eq!(
+            job.into_witness_hash_block_state(),
+            witness_hash_block_state
+        );
+    }
 }
diff --git a/core/lib/types/src/protocol_version.rs b/core/lib/types/src/protocol_version.rs
index 403a2d7e2fb2..a36fd003cfad 100644
--- a/core/lib/types/src/protocol_version.rs
+++ b/core/lib/types/src/protocol_version.rs
@@ -1,9 +1,11 @@
-use crate::ethabi::{decode, encode, ParamType, Token};
-use crate::helpers::unix_timestamp_ms;
-use crate::web3::contract::{tokens::Detokenize, Error};
-use crate::web3::signing::keccak256;
 use crate::{
-    Address, Execute, ExecuteTransactionCommon, Log, Transaction, TransactionType, H256,
+    ethabi::{decode, encode, ParamType, Token},
+    helpers::unix_timestamp_ms,
+    web3::{
+        contract::{tokens::Detokenize, Error},
+        signing::keccak256,
+    },
+    Address, Execute, ExecuteTransactionCommon, Log, Transaction, TransactionType, VmVersion, H256,
     PROTOCOL_UPGRADE_TX_TYPE, U256,
 };
 use num_enum::TryFromPrimitive;
@@ -14,7 +16,7 @@ use zksync_utils::u256_to_account_address;
 
 #[repr(u16)]
 #[derive(
-    Debug, Clone, Copy, PartialEq, Eq, PartialOrd, Ord, Serialize, Deserialize, TryFromPrimitive,
+    Debug, Clone, Copy, PartialEq, Eq, PartialOrd, Ord, TryFromPrimitive, Serialize, Deserialize,
 )]
 pub enum ProtocolVersionId {
     Version0 = 0,
@@ -31,15 +33,42 @@ pub enum ProtocolVersionId {
     Version11,
     Version12,
     Version13,
+    Version14,
+    Version15,
+    Version16,
 }
 
 impl ProtocolVersionId {
     pub fn latest() -> Self {
-        Self::Version12
+        Self::Version15
     }
 
     pub fn next() -> Self {
-        Self::Version13
+        Self::Version16
+    }
+
+    /// Returns VM version to be used by API for this protocol version.
+    /// We temporary support only two latest VM versions for API.
+    pub fn into_api_vm_version(self) -> VmVersion {
+        match self {
+            ProtocolVersionId::Version0 => VmVersion::Vm1_3_2,
+            ProtocolVersionId::Version1 => VmVersion::Vm1_3_2,
+            ProtocolVersionId::Version2 => VmVersion::Vm1_3_2,
+            ProtocolVersionId::Version3 => VmVersion::Vm1_3_2,
+            ProtocolVersionId::Version4 => VmVersion::Vm1_3_2,
+            ProtocolVersionId::Version5 => VmVersion::Vm1_3_2,
+            ProtocolVersionId::Version6 => VmVersion::Vm1_3_2,
+            ProtocolVersionId::Version7 => VmVersion::Vm1_3_2,
+            ProtocolVersionId::Version8 => VmVersion::Vm1_3_2,
+            ProtocolVersionId::Version9 => VmVersion::Vm1_3_2,
+            ProtocolVersionId::Version10 => VmVersion::Vm1_3_2,
+            ProtocolVersionId::Version11 => VmVersion::Vm1_3_2,
+            ProtocolVersionId::Version12 => VmVersion::Vm1_3_2,
+            ProtocolVersionId::Version13 => VmVersion::VmVirtualBlocks,
+            ProtocolVersionId::Version14 => VmVersion::VmVirtualBlocks,
+            ProtocolVersionId::Version15 => VmVersion::VmVirtualBlocks,
+            ProtocolVersionId::Version16 => VmVersion::VmVirtualBlocks,
+        }
     }
 }
 
@@ -63,6 +92,32 @@ impl TryFrom<U256> for ProtocolVersionId {
     }
 }
 
+#[repr(u16)]
+#[derive(
+    Debug, Clone, Copy, PartialEq, Eq, PartialOrd, Ord, TryFromPrimitive, Serialize, Deserialize,
+)]
+pub enum FriProtocolVersionId {
+    Version0 = 0,
+    Version1,
+    Version2,
+}
+
+impl FriProtocolVersionId {
+    pub fn latest() -> Self {
+        Self::Version1
+    }
+
+    pub fn next() -> Self {
+        Self::Version2
+    }
+}
+
+impl Default for FriProtocolVersionId {
+    fn default() -> Self {
+        Self::latest()
+    }
+}
+
 #[derive(Debug, Clone, Copy, Default, Eq, PartialEq, Serialize, Deserialize)]
 pub struct VerifierParams {
     pub recursion_node_level_vk_hash: H256,
@@ -255,6 +310,7 @@ impl TryFrom<Log> for ProtocolUpgrade {
                 let paymaster_input = transaction.remove(0).into_bytes().unwrap();
                 assert_eq!(paymaster_input.len(), 0);
 
+                // TODO (SMA-1621): check that reservedDynamic are constructed correctly.
                 let reserved_dynamic = transaction.remove(0).into_bytes().unwrap();
                 assert_eq!(reserved_dynamic.len(), 0);
 
@@ -450,6 +506,7 @@ impl From<ProtocolUpgradeTx> for Transaction {
             common_data: ExecuteTransactionCommon::ProtocolUpgrade(common_data),
             execute,
             received_timestamp_ms,
+            raw_bytes: None,
         }
     }
 }
@@ -462,6 +519,7 @@ impl TryFrom<Transaction> for ProtocolUpgradeTx {
             common_data,
             execute,
             received_timestamp_ms,
+            ..
         } = value;
         match common_data {
             ExecuteTransactionCommon::L1(_) => Err("Cannot convert L1Tx to ProtocolUpgradeTx"),
@@ -474,3 +532,27 @@ impl TryFrom<Transaction> for ProtocolUpgradeTx {
         }
     }
 }
+
+impl From<ProtocolVersionId> for VmVersion {
+    fn from(value: ProtocolVersionId) -> Self {
+        match value {
+            ProtocolVersionId::Version0 => VmVersion::M5WithoutRefunds,
+            ProtocolVersionId::Version1 => VmVersion::M5WithoutRefunds,
+            ProtocolVersionId::Version2 => VmVersion::M5WithRefunds,
+            ProtocolVersionId::Version3 => VmVersion::M5WithRefunds,
+            ProtocolVersionId::Version4 => VmVersion::M6Initial,
+            ProtocolVersionId::Version5 => VmVersion::M6BugWithCompressionFixed,
+            ProtocolVersionId::Version6 => VmVersion::M6BugWithCompressionFixed,
+            ProtocolVersionId::Version7 => VmVersion::Vm1_3_2,
+            ProtocolVersionId::Version8 => VmVersion::Vm1_3_2,
+            ProtocolVersionId::Version9 => VmVersion::Vm1_3_2,
+            ProtocolVersionId::Version10 => VmVersion::Vm1_3_2,
+            ProtocolVersionId::Version11 => VmVersion::Vm1_3_2,
+            ProtocolVersionId::Version12 => VmVersion::Vm1_3_2,
+            ProtocolVersionId::Version13 => VmVersion::VmVirtualBlocks,
+            ProtocolVersionId::Version14 => VmVersion::VmVirtualBlocks,
+            ProtocolVersionId::Version15 => VmVersion::VmVirtualBlocks,
+            ProtocolVersionId::Version16 => VmVersion::VmVirtualBlocks,
+        }
+    }
+}
diff --git a/core/lib/types/src/prover_server_api/mod.rs b/core/lib/types/src/prover_server_api/mod.rs
index 237b1fbc9c51..84262b182c60 100644
--- a/core/lib/types/src/prover_server_api/mod.rs
+++ b/core/lib/types/src/prover_server_api/mod.rs
@@ -1,14 +1,17 @@
-use crate::proofs::PrepareBasicCircuitsJob;
 use serde::{Deserialize, Serialize};
-use serde_with::base64::Base64;
-use serde_with::serde_as;
 
 use zksync_basic_types::L1BatchNumber;
 
+use crate::aggregated_operations::L1BatchProofForL1;
+use crate::proofs::PrepareBasicCircuitsJob;
+use crate::protocol_version::{FriProtocolVersionId, L1VerifierConfig};
+
 #[derive(Debug, Serialize, Deserialize)]
 pub struct ProofGenerationData {
     pub l1_batch_number: L1BatchNumber,
     pub data: PrepareBasicCircuitsJob,
+    pub fri_protocol_version_id: FriProtocolVersionId,
+    pub l1_verifier_config: L1VerifierConfig,
 }
 
 #[derive(Debug, Serialize, Deserialize)]
@@ -21,17 +24,10 @@ pub enum ProofGenerationDataResponse {
 }
 
 #[derive(Debug, Serialize, Deserialize)]
-pub struct SubmitProofRequest {
-    // we have to use the RawProof until the SNARK Proof wrapper is implemented
-    // https://linear.app/matterlabs/issue/CRY-1/implement-snark-wrapper-for-boojum
-    pub proof: RawProof,
-}
-
-#[serde_as]
-#[derive(Debug, Serialize, Deserialize)]
-pub struct RawProof {
-    #[serde_as(as = "Base64")]
-    pub proof: Vec<u8>,
+pub enum SubmitProofRequest {
+    Proof(Box<L1BatchProofForL1>),
+    // The proof generation was skipped due to sampling
+    SkippedProofGeneration,
 }
 
 #[derive(Debug, Serialize, Deserialize)]
diff --git a/core/lib/types/src/storage/log.rs b/core/lib/types/src/storage/log.rs
index bac739904624..aa295a2badee 100644
--- a/core/lib/types/src/storage/log.rs
+++ b/core/lib/types/src/storage/log.rs
@@ -8,6 +8,7 @@ use zksync_utils::u256_to_h256;
 
 use crate::{StorageKey, StorageValue, U256};
 
+// TODO (SMA-1269): Refactor StorageLog/StorageLogQuery and StorageLogKind/StorageLongQueryType.
 #[derive(Debug, Clone, Copy, PartialEq, Serialize, Deserialize)]
 pub enum StorageLogKind {
     Read,
diff --git a/core/lib/types/src/storage/mod.rs b/core/lib/types/src/storage/mod.rs
index 0f2655bb1c34..b1ed25dad970 100644
--- a/core/lib/types/src/storage/mod.rs
+++ b/core/lib/types/src/storage/mod.rs
@@ -7,6 +7,7 @@ use zksync_basic_types::{web3::signing::keccak256, L2ChainId};
 use crate::{AccountTreeId, Address, H160, H256, U256};
 
 pub mod log;
+pub mod witness_block_state;
 pub mod writes;
 
 pub use log::*;
diff --git a/core/lib/types/src/storage/witness_block_state.rs b/core/lib/types/src/storage/witness_block_state.rs
new file mode 100644
index 000000000000..f698326995a1
--- /dev/null
+++ b/core/lib/types/src/storage/witness_block_state.rs
@@ -0,0 +1,21 @@
+use crate::{StorageKey, StorageValue, U256};
+use serde::{Deserialize, Serialize};
+use std::collections::HashMap;
+
+/// TODO: most likely to be discarded in favor of [`WitnessHashBlockState`].
+#[derive(Debug, Default, Serialize, Deserialize)]
+pub struct WitnessBlockState {
+    pub read_storage_key: HashMap<StorageKey, StorageValue>,
+    pub is_write_initial: HashMap<StorageKey, bool>,
+}
+
+/// Storage data used during Witness Generation.
+/// By default, witness generation uses Storage Keys:
+/// HashMap<StorageKey, StorageValue> and HashMap<StorageKey, bool>
+/// WitnessHashBlockState is exactly the same, where we extract the has for StorageKey:
+/// `storage_key.hashed_key_u256()`
+#[derive(Debug, Default, PartialEq)]
+pub struct WitnessHashBlockState {
+    pub read_storage_key: HashMap<U256, StorageValue>,
+    pub is_write_initial: HashMap<U256, bool>,
+}
diff --git a/core/lib/types/src/storage_writes_deduplicator.rs b/core/lib/types/src/storage_writes_deduplicator.rs
index 1644aaa06769..e781c963fe53 100644
--- a/core/lib/types/src/storage_writes_deduplicator.rs
+++ b/core/lib/types/src/storage_writes_deduplicator.rs
@@ -1,12 +1,29 @@
+use std::collections::HashMap;
+
+use zksync_utils::u256_to_h256;
+
 use crate::tx::tx_execution_info::DeduplicatedWritesMetrics;
 use crate::{AccountTreeId, StorageKey, StorageLogQuery, StorageLogQueryType, U256};
-use std::collections::{HashMap, HashSet};
-use zksync_utils::u256_to_h256;
+
+#[derive(Debug, Clone, Copy, PartialEq)]
+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,
+}
+
+#[derive(Debug, Clone, Copy, PartialEq)]
+enum UpdateType {
+    Remove(ModifiedSlot),
+    Update(ModifiedSlot),
+    Insert,
+}
 
 #[derive(Debug, Clone, Copy, PartialEq)]
 struct UpdateItem {
     key: StorageKey,
-    is_insertion: bool,
+    update_type: UpdateType,
     is_write_initial: bool,
 }
 
@@ -14,7 +31,8 @@ struct UpdateItem {
 #[derive(Debug, Clone, PartialEq, Default)]
 pub struct StorageWritesDeduplicator {
     initial_values: HashMap<StorageKey, U256>,
-    modified_keys: HashSet<StorageKey>,
+    // stores the mapping of storage-slot key to its values and the tx number in block
+    modified_key_values: HashMap<StorageKey, ModifiedSlot>,
     metrics: DeduplicatedWritesMetrics,
 }
 
@@ -27,6 +45,10 @@ impl StorageWritesDeduplicator {
         self.metrics
     }
 
+    pub fn into_modified_key_values(self) -> HashMap<StorageKey, ModifiedSlot> {
+        self.modified_key_values
+    }
+
     /// Applies storage logs to the state.
     pub fn apply<'a, I: IntoIterator<Item = &'a StorageLogQuery>>(&mut self, logs: I) {
         self.process_storage_logs(logs);
@@ -70,12 +92,12 @@ impl StorageWritesDeduplicator {
                 .initial_values
                 .entry(key)
                 .or_insert(log.log_query.read_value);
-
-            let was_key_modified = self.modified_keys.get(&key).is_some();
-            let is_key_modified = if log.log_query.rollback {
-                initial_value != log.log_query.read_value
+            let was_key_modified = self.modified_key_values.get(&key).is_some();
+            let modified_value = if log.log_query.rollback {
+                (initial_value != log.log_query.read_value).then_some(log.log_query.read_value)
             } else {
-                initial_value != log.log_query.written_value
+                (initial_value != log.log_query.written_value)
+                    .then_some(log.log_query.written_value)
             };
 
             let is_write_initial = log.log_type == StorageLogQueryType::InitialWrite;
@@ -85,22 +107,49 @@ impl StorageWritesDeduplicator {
                 &mut self.metrics.repeated_storage_writes
             };
 
-            match (was_key_modified, is_key_modified) {
-                (true, false) => {
-                    self.modified_keys.remove(&key);
+            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;
                     updates.push(UpdateItem {
                         key,
-                        is_insertion: false,
+                        update_type: UpdateType::Remove(value),
                         is_write_initial,
                     });
                 }
-                (false, true) => {
-                    self.modified_keys.insert(key);
+                (true, Some(new_value)) => {
+                    let old_value = self
+                        .modified_key_values
+                        .insert(
+                            key,
+                            ModifiedSlot {
+                                value: new_value,
+                                tx_index: log.log_query.tx_number_in_block,
+                            },
+                        )
+                        .unwrap_or_else(|| {
+                            panic!("tried removing key: {:?} before insertion", key)
+                        });
+                    updates.push(UpdateItem {
+                        key,
+                        update_type: UpdateType::Update(old_value),
+                        is_write_initial,
+                    })
+                }
+                (false, Some(new_value)) => {
+                    self.modified_key_values.insert(
+                        key,
+                        ModifiedSlot {
+                            value: new_value,
+                            tx_index: log.log_query.tx_number_in_block,
+                        },
+                    );
                     *field_to_change += 1;
                     updates.push(UpdateItem {
                         key,
-                        is_insertion: true,
+                        update_type: UpdateType::Insert,
                         is_write_initial,
                     });
                 }
@@ -118,12 +167,18 @@ impl StorageWritesDeduplicator {
                 &mut self.metrics.repeated_storage_writes
             };
 
-            if item.is_insertion {
-                self.modified_keys.remove(&item.key);
-                *field_to_change -= 1;
-            } else {
-                self.modified_keys.insert(item.key);
-                *field_to_change += 1;
+            match item.update_type {
+                UpdateType::Insert => {
+                    self.modified_key_values.remove(&item.key);
+                    *field_to_change -= 1;
+                }
+                UpdateType::Update(value) => {
+                    self.modified_key_values.insert(item.key, value);
+                }
+                UpdateType::Remove(value) => {
+                    self.modified_key_values.insert(item.key, value);
+                    *field_to_change += 1;
+                }
             }
         }
     }
@@ -131,9 +186,12 @@ impl StorageWritesDeduplicator {
 
 #[cfg(test)]
 mod tests {
-    use super::*;
     use zk_evm::aux_structures::{LogQuery, Timestamp};
 
+    use crate::H160;
+
+    use super::*;
+
     fn storage_log_query(
         key: U256,
         read_value: U256,
@@ -164,6 +222,16 @@ mod tests {
         }
     }
 
+    fn storage_log_query_with_address(
+        address: H160,
+        key: U256,
+        written_value: U256,
+    ) -> StorageLogQuery {
+        let mut log = storage_log_query(key, 1234u32.into(), written_value, false, false);
+        log.log_query.address = address;
+        log
+    }
+
     #[test]
     fn storage_writes_deduplicator() {
         // Each test scenario is a tuple (input, expected output, description).
@@ -273,4 +341,180 @@ mod tests {
             )
         }
     }
+
+    fn new_storage_key(address: u64, key: u32) -> StorageKey {
+        StorageKey::new(
+            AccountTreeId::new(H160::from_low_u64_be(address)),
+            u256_to_h256(key.into()),
+        )
+    }
+
+    #[test]
+    fn test_no_duplicate_storage_logs() {
+        let expected = HashMap::from([
+            (
+                new_storage_key(1, 5),
+                ModifiedSlot {
+                    value: 8u32.into(),
+                    tx_index: 0,
+                },
+            ),
+            (
+                new_storage_key(1, 4),
+                ModifiedSlot {
+                    value: 6u32.into(),
+                    tx_index: 0,
+                },
+            ),
+            (
+                new_storage_key(2, 5),
+                ModifiedSlot {
+                    value: 9u32.into(),
+                    tx_index: 0,
+                },
+            ),
+            (
+                new_storage_key(2, 4),
+                ModifiedSlot {
+                    value: 11u32.into(),
+                    tx_index: 0,
+                },
+            ),
+            (
+                new_storage_key(3, 5),
+                ModifiedSlot {
+                    value: 2u32.into(),
+                    tx_index: 0,
+                },
+            ),
+            (
+                new_storage_key(3, 4),
+                ModifiedSlot {
+                    value: 7u32.into(),
+                    tx_index: 0,
+                },
+            ),
+        ]);
+        let mut deduplicator = StorageWritesDeduplicator::new();
+        let logs = [
+            storage_log_query_with_address(H160::from_low_u64_be(1), 5u32.into(), 8u32.into()),
+            storage_log_query_with_address(H160::from_low_u64_be(1), 4u32.into(), 6u32.into()),
+            storage_log_query_with_address(H160::from_low_u64_be(2), 4u32.into(), 11u32.into()),
+            storage_log_query_with_address(H160::from_low_u64_be(2), 5u32.into(), 9u32.into()),
+            storage_log_query_with_address(H160::from_low_u64_be(3), 4u32.into(), 7u32.into()),
+            storage_log_query_with_address(H160::from_low_u64_be(3), 5u32.into(), 2u32.into()),
+        ];
+        deduplicator.apply(&logs);
+        assert_eq!(expected, deduplicator.modified_key_values);
+    }
+
+    #[test]
+    fn test_duplicate_storage_logs_within_same_address() {
+        let expected = HashMap::from([
+            (
+                new_storage_key(1, 5),
+                ModifiedSlot {
+                    value: 6u32.into(),
+                    tx_index: 0,
+                },
+            ),
+            (
+                new_storage_key(2, 4),
+                ModifiedSlot {
+                    value: 11u32.into(),
+                    tx_index: 0,
+                },
+            ),
+            (
+                new_storage_key(3, 6),
+                ModifiedSlot {
+                    value: 7u32.into(),
+                    tx_index: 0,
+                },
+            ),
+        ]);
+        let mut deduplicator = StorageWritesDeduplicator::new();
+        let logs = [
+            storage_log_query_with_address(H160::from_low_u64_be(1), 5u32.into(), 8u32.into()),
+            storage_log_query_with_address(H160::from_low_u64_be(1), 5u32.into(), 6u32.into()),
+            storage_log_query_with_address(H160::from_low_u64_be(2), 4u32.into(), 9u32.into()),
+            storage_log_query_with_address(H160::from_low_u64_be(2), 4u32.into(), 11u32.into()),
+            storage_log_query_with_address(H160::from_low_u64_be(3), 6u32.into(), 2u32.into()),
+            storage_log_query_with_address(H160::from_low_u64_be(3), 6u32.into(), 7u32.into()),
+        ];
+        deduplicator.apply(&logs);
+        assert_eq!(expected, deduplicator.modified_key_values);
+    }
+
+    #[test]
+    fn test_duplicate_all_storage_logs() {
+        let expected = HashMap::from([
+            (
+                new_storage_key(1, 2),
+                ModifiedSlot {
+                    value: 3u32.into(),
+                    tx_index: 0,
+                },
+            ),
+            (
+                new_storage_key(1, 2),
+                ModifiedSlot {
+                    value: 4u32.into(),
+                    tx_index: 0,
+                },
+            ),
+            (
+                new_storage_key(1, 2),
+                ModifiedSlot {
+                    value: 5u32.into(),
+                    tx_index: 0,
+                },
+            ),
+        ]);
+        let mut deduplicator = StorageWritesDeduplicator::new();
+        let logs = [
+            storage_log_query_with_address(H160::from_low_u64_be(1), 2u32.into(), 3u32.into()),
+            storage_log_query_with_address(H160::from_low_u64_be(1), 2u32.into(), 4u32.into()),
+            storage_log_query_with_address(H160::from_low_u64_be(1), 2u32.into(), 5u32.into()),
+        ];
+        deduplicator.apply(&logs);
+        assert_eq!(expected, deduplicator.modified_key_values);
+    }
+
+    #[test]
+    fn test_last_rollback() {
+        let expected = HashMap::from([(
+            new_storage_key(0, 1),
+            ModifiedSlot {
+                value: 2u32.into(),
+                tx_index: 0,
+            },
+        )]);
+        let mut deduplicator = StorageWritesDeduplicator::new();
+        let logs = [
+            storage_log_query(
+                U256::from(1u32),
+                U256::from(1u32),
+                U256::from(2u32),
+                false,
+                false,
+            ),
+            storage_log_query(
+                U256::from(1u32),
+                U256::from(2u32),
+                U256::from(1u32),
+                false,
+                false,
+            ),
+            storage_log_query(
+                U256::from(1u32),
+                U256::from(2u32),
+                U256::from(1u32),
+                true,
+                false,
+            ),
+        ];
+        deduplicator.apply(&logs);
+        assert_eq!(expected, deduplicator.modified_key_values);
+    }
 }
diff --git a/core/lib/types/src/system_contracts.rs b/core/lib/types/src/system_contracts.rs
index 7b2034abdcfd..b925f8ddd0fd 100644
--- a/core/lib/types/src/system_contracts.rs
+++ b/core/lib/types/src/system_contracts.rs
@@ -1,9 +1,11 @@
+use std::path::PathBuf;
+
 use zksync_basic_types::{AccountTreeId, Address, U256};
 use zksync_config::constants::{
     BOOTLOADER_UTILITIES_ADDRESS, BYTECODE_COMPRESSOR_ADDRESS, COMPLEX_UPGRADER_ADDRESS,
     EVENT_WRITER_ADDRESS,
 };
-use zksync_contracts::{read_sys_contract_bytecode, ContractLanguage};
+use zksync_contracts::{read_sys_contract_bytecode, ContractLanguage, SystemContractsRepo};
 
 use crate::{
     block::DeployedContract, ACCOUNT_CODE_STORAGE_ADDRESS, BOOTLOADER_ADDRESS,
@@ -22,124 +24,137 @@ use once_cell::sync::Lazy;
 pub const TX_NONCE_INCREMENT: U256 = U256([1, 0, 0, 0]); // 1
 pub const DEPLOYMENT_NONCE_INCREMENT: U256 = U256([0, 0, 1, 0]); // 2^128
 
-static SYSTEM_CONTRACTS: Lazy<Vec<DeployedContract>> = Lazy::new(|| {
-    let mut deployed_system_contracts = [
-        (
-            "",
-            "AccountCodeStorage",
-            ACCOUNT_CODE_STORAGE_ADDRESS,
-            ContractLanguage::Sol,
-        ),
-        (
-            "",
-            "NonceHolder",
-            NONCE_HOLDER_ADDRESS,
-            ContractLanguage::Sol,
-        ),
-        (
-            "",
-            "KnownCodesStorage",
-            KNOWN_CODES_STORAGE_ADDRESS,
-            ContractLanguage::Sol,
-        ),
-        (
-            "",
-            "ImmutableSimulator",
-            IMMUTABLE_SIMULATOR_STORAGE_ADDRESS,
-            ContractLanguage::Sol,
-        ),
-        (
-            "",
-            "ContractDeployer",
-            CONTRACT_DEPLOYER_ADDRESS,
-            ContractLanguage::Sol,
-        ),
-        (
-            "",
-            "L1Messenger",
-            L1_MESSENGER_ADDRESS,
-            ContractLanguage::Sol,
-        ),
-        (
-            "",
-            "MsgValueSimulator",
-            MSG_VALUE_SIMULATOR_ADDRESS,
-            ContractLanguage::Sol,
-        ),
-        (
-            "",
-            "L2EthToken",
-            L2_ETH_TOKEN_ADDRESS,
-            ContractLanguage::Sol,
-        ),
-        (
-            "precompiles/",
-            "Keccak256",
-            KECCAK256_PRECOMPILE_ADDRESS,
-            ContractLanguage::Yul,
-        ),
-        (
-            "precompiles/",
-            "SHA256",
-            SHA256_PRECOMPILE_ADDRESS,
-            ContractLanguage::Yul,
-        ),
-        (
-            "precompiles/",
-            "Ecrecover",
-            ECRECOVER_PRECOMPILE_ADDRESS,
-            ContractLanguage::Yul,
-        ),
-        (
-            "",
-            "SystemContext",
-            SYSTEM_CONTEXT_ADDRESS,
-            ContractLanguage::Sol,
-        ),
-        (
-            "",
-            "EventWriter",
-            EVENT_WRITER_ADDRESS,
-            ContractLanguage::Yul,
-        ),
-        (
-            "",
-            "BootloaderUtilities",
-            BOOTLOADER_UTILITIES_ADDRESS,
-            ContractLanguage::Sol,
-        ),
-        (
-            "",
-            "BytecodeCompressor",
-            BYTECODE_COMPRESSOR_ADDRESS,
-            ContractLanguage::Sol,
-        ),
-        (
-            "",
-            "ComplexUpgrader",
-            COMPLEX_UPGRADER_ADDRESS,
-            ContractLanguage::Sol,
-        ),
-    ]
-    .map(|(path, name, address, contract_lang)| DeployedContract {
-        account_id: AccountTreeId::new(address),
-        bytecode: read_sys_contract_bytecode(path, name, contract_lang),
-    })
-    .to_vec();
-
-    let empty_bytecode = read_sys_contract_bytecode("", "EmptyContract", ContractLanguage::Sol);
+static SYSTEM_CONTRACT_LIST: [(&str, &str, Address, ContractLanguage); 18] = [
+    (
+        "",
+        "AccountCodeStorage",
+        ACCOUNT_CODE_STORAGE_ADDRESS,
+        ContractLanguage::Sol,
+    ),
+    (
+        "",
+        "NonceHolder",
+        NONCE_HOLDER_ADDRESS,
+        ContractLanguage::Sol,
+    ),
+    (
+        "",
+        "KnownCodesStorage",
+        KNOWN_CODES_STORAGE_ADDRESS,
+        ContractLanguage::Sol,
+    ),
+    (
+        "",
+        "ImmutableSimulator",
+        IMMUTABLE_SIMULATOR_STORAGE_ADDRESS,
+        ContractLanguage::Sol,
+    ),
+    (
+        "",
+        "ContractDeployer",
+        CONTRACT_DEPLOYER_ADDRESS,
+        ContractLanguage::Sol,
+    ),
+    (
+        "",
+        "L1Messenger",
+        L1_MESSENGER_ADDRESS,
+        ContractLanguage::Sol,
+    ),
+    (
+        "",
+        "MsgValueSimulator",
+        MSG_VALUE_SIMULATOR_ADDRESS,
+        ContractLanguage::Sol,
+    ),
+    (
+        "",
+        "L2EthToken",
+        L2_ETH_TOKEN_ADDRESS,
+        ContractLanguage::Sol,
+    ),
+    (
+        "precompiles/",
+        "Keccak256",
+        KECCAK256_PRECOMPILE_ADDRESS,
+        ContractLanguage::Yul,
+    ),
+    (
+        "precompiles/",
+        "SHA256",
+        SHA256_PRECOMPILE_ADDRESS,
+        ContractLanguage::Yul,
+    ),
+    (
+        "precompiles/",
+        "Ecrecover",
+        ECRECOVER_PRECOMPILE_ADDRESS,
+        ContractLanguage::Yul,
+    ),
+    (
+        "",
+        "SystemContext",
+        SYSTEM_CONTEXT_ADDRESS,
+        ContractLanguage::Sol,
+    ),
+    (
+        "",
+        "EventWriter",
+        EVENT_WRITER_ADDRESS,
+        ContractLanguage::Yul,
+    ),
+    (
+        "",
+        "BootloaderUtilities",
+        BOOTLOADER_UTILITIES_ADDRESS,
+        ContractLanguage::Sol,
+    ),
+    (
+        "",
+        "BytecodeCompressor",
+        BYTECODE_COMPRESSOR_ADDRESS,
+        ContractLanguage::Sol,
+    ),
+    (
+        "",
+        "ComplexUpgrader",
+        COMPLEX_UPGRADER_ADDRESS,
+        ContractLanguage::Sol,
+    ),
     // For now, only zero address and the bootloader address have empty bytecode at the init
     // In the future, we might want to set all of the system contracts this way.
-    let empty_system_contracts =
-        [Address::zero(), BOOTLOADER_ADDRESS].map(|address| DeployedContract {
-            account_id: AccountTreeId::new(address),
-            bytecode: empty_bytecode.clone(),
-        });
+    ("", "EmptyContract", Address::zero(), ContractLanguage::Sol),
+    (
+        "",
+        "EmptyContract",
+        BOOTLOADER_ADDRESS,
+        ContractLanguage::Sol,
+    ),
+];
 
-    deployed_system_contracts.extend(empty_system_contracts);
-    deployed_system_contracts
+static SYSTEM_CONTRACTS: Lazy<Vec<DeployedContract>> = Lazy::new(|| {
+    SYSTEM_CONTRACT_LIST
+        .iter()
+        .map(|(path, name, address, contract_lang)| DeployedContract {
+            account_id: AccountTreeId::new(*address),
+            bytecode: read_sys_contract_bytecode(path, name, contract_lang.clone()),
+        })
+        .collect::<Vec<_>>()
 });
 
+/// Gets default set of system contracts, based on ZKSYNC_HOME environment variable.
 pub fn get_system_smart_contracts() -> Vec<DeployedContract> {
     SYSTEM_CONTRACTS.clone()
 }
+
+/// Loads system contracts from a given directory.
+pub fn get_system_smart_contracts_from_dir(path: PathBuf) -> Vec<DeployedContract> {
+    let repo = SystemContractsRepo { root: path };
+    SYSTEM_CONTRACT_LIST
+        .iter()
+        .map(|(path, name, address, contract_lang)| DeployedContract {
+            account_id: AccountTreeId::new(*address),
+            bytecode: repo.read_sys_contract_bytecode(path, name, contract_lang.clone()),
+        })
+        .collect::<Vec<_>>()
+}
diff --git a/core/lib/types/src/transaction_request.rs b/core/lib/types/src/transaction_request.rs
index 7ccc19e9b148..0516081434d8 100644
--- a/core/lib/types/src/transaction_request.rs
+++ b/core/lib/types/src/transaction_request.rs
@@ -6,9 +6,10 @@ use rlp::{DecoderError, Rlp, RlpStream};
 use serde::{Deserialize, Serialize};
 use thiserror::Error;
 use zksync_basic_types::H256;
+
 use zksync_config::constants::{MAX_GAS_PER_PUBDATA_BYTE, USED_BOOTLOADER_MEMORY_BYTES};
 use zksync_utils::bytecode::{hash_bytecode, validate_bytecode, InvalidBytecodeError};
-use zksync_utils::u256_to_h256;
+use zksync_utils::{concat_and_hash, u256_to_h256};
 
 // Local uses
 use super::{EIP_1559_TX_TYPE, EIP_2930_TX_TYPE, EIP_712_TX_TYPE};
@@ -18,7 +19,7 @@ use crate::{
     l2::{L2Tx, TransactionType},
     web3::{signing::keccak256, types::AccessList},
     Address, Bytes, EIP712TypedStructure, Eip712Domain, L1TxCommonData, L2ChainId, Nonce,
-    PackedEthSignature, StructBuilder, U256, U64,
+    PackedEthSignature, StructBuilder, LEGACY_TX_TYPE, U256, U64,
 };
 
 /// Call contract request (eth_call / eth_estimateGas)
@@ -376,16 +377,8 @@ impl TransactionRequest {
             .unwrap_or_default()
     }
 
-    pub fn get_signature(&self) -> Result<Vec<u8>, SerializationTransactionError> {
-        let custom_signature = self.get_custom_signature();
-        if let Some(custom_sig) = custom_signature {
-            if !custom_sig.is_empty() {
-                // There was a custom signature supplied, it overrides
-                // the v/r/s signature
-                return Ok(custom_sig);
-            }
-        }
-
+    // returns packed eth signature if it is present
+    fn get_packed_signature(&self) -> Result<PackedEthSignature, SerializationTransactionError> {
         let packed_v = self
             .v
             .ok_or(SerializationTransactionError::IncompleteSignature)?
@@ -412,6 +405,22 @@ impl TransactionRequest {
             v,
         );
 
+        Ok(packed_eth_signature)
+    }
+
+    pub fn get_signature(&self) -> Result<Vec<u8>, SerializationTransactionError> {
+        let custom_signature = self.get_custom_signature();
+        if let Some(custom_sig) = custom_signature {
+            // TODO (SMA-1584): Support empty signatures for accounts.
+            if !custom_sig.is_empty() {
+                // There was a custom signature supplied, it overrides
+                // the v/r/s signature
+                return Ok(custom_sig);
+            }
+        }
+
+        let packed_eth_signature = self.get_packed_signature()?;
+
         Ok(packed_eth_signature.serialize_packed().to_vec())
     }
 
@@ -425,6 +434,10 @@ impl TransactionRequest {
         data
     }
 
+    pub fn is_legacy_tx(&self) -> bool {
+        self.transaction_type.is_none() || self.transaction_type == Some(LEGACY_TX_TYPE.into())
+    }
+
     pub fn rlp(&self, rlp: &mut RlpStream, chain_id: u16, signature: Option<&PackedEthSignature>) {
         rlp.begin_unbounded_list();
 
@@ -464,6 +477,14 @@ impl TransactionRequest {
                 rlp.append(&self.value);
                 rlp.append(&self.input.0);
             }
+            Some(x) if x == LEGACY_TX_TYPE.into() => {
+                rlp.append(&self.nonce);
+                rlp.append(&self.gas_price);
+                rlp.append(&self.gas);
+                rlp_opt(rlp, &self.to);
+                rlp.append(&self.value);
+                rlp.append(&self.input.0);
+            }
             // Legacy (None)
             None => {
                 rlp.append(&self.nonce);
@@ -477,14 +498,14 @@ impl TransactionRequest {
         }
 
         if let Some(signature) = signature {
-            if self.is_legacy_tx() {
+            if self.is_legacy_tx() && chain_id != 0 {
                 rlp.append(&signature.v_with_chain_id(chain_id));
             } else {
                 rlp.append(&signature.v());
             }
             rlp.append(&U256::from_big_endian(signature.r()));
             rlp.append(&U256::from_big_endian(signature.s()));
-        } else if self.is_legacy_tx() {
+        } else if self.is_legacy_tx() && chain_id != 0 {
             rlp.append(&chain_id);
             rlp.append(&0u8);
             rlp.append(&0u8);
@@ -530,10 +551,6 @@ impl TransactionRequest {
         Some(EIP_712_TX_TYPE.into()) == self.transaction_type
     }
 
-    pub fn is_legacy_tx(&self) -> bool {
-        self.transaction_type.is_none()
-    }
-
     pub fn from_bytes(
         bytes: &[u8],
         chain_id: u16,
@@ -554,7 +571,7 @@ impl TransactionRequest {
                     return Err(SerializationTransactionError::WrongChainId(tx_chain_id));
                 }
                 Self {
-                    chain_id: Some(chain_id),
+                    chain_id: tx_chain_id,
                     v: Some(rlp.val_at(6)?),
                     r: Some(rlp.val_at(7)?),
                     s: Some(rlp.val_at(8)?),
@@ -634,44 +651,66 @@ impl TransactionRequest {
         }
         tx.raw = Some(Bytes(bytes.to_vec()));
 
-        let default_signed_message = tx.get_default_signed_message(chain_id);
+        let default_signed_message = tx.get_default_signed_message(tx.chain_id)?;
 
         tx.from = match tx.from {
             Some(_) => tx.from,
             None => tx.recover_default_signer(default_signed_message).ok(),
         };
 
-        let hash = if tx.is_eip712_tx() {
-            let digest = [
-                default_signed_message.as_bytes(),
-                &keccak256(&tx.get_signature()?),
-            ]
-            .concat();
-            H256(keccak256(&digest))
-        } else {
-            H256(keccak256(bytes))
-        };
+        let hash =
+            tx.get_tx_hash_with_signed_message(&default_signed_message, L2ChainId(chain_id))?;
 
         Ok((tx, hash))
     }
 
-    fn get_default_signed_message(&self, chain_id: u16) -> H256 {
+    fn get_default_signed_message(
+        &self,
+        chain_id: Option<u16>,
+    ) -> Result<H256, SerializationTransactionError> {
         if self.is_eip712_tx() {
-            PackedEthSignature::typed_data_to_signed_bytes(
-                &Eip712Domain::new(L2ChainId(chain_id)),
+            let tx_chain_id =
+                chain_id.ok_or(SerializationTransactionError::WrongChainId(chain_id))?;
+            Ok(PackedEthSignature::typed_data_to_signed_bytes(
+                &Eip712Domain::new(L2ChainId(tx_chain_id)),
                 self,
-            )
+            ))
         } else {
             let mut rlp_stream = RlpStream::new();
-            self.rlp(&mut rlp_stream, chain_id, None);
+            self.rlp(&mut rlp_stream, chain_id.unwrap_or_default(), None);
             let mut data = rlp_stream.out().to_vec();
             if let Some(tx_type) = self.transaction_type {
                 data.insert(0, tx_type.as_u64() as u8);
             }
-            PackedEthSignature::message_to_signed_bytes(&data)
+            Ok(PackedEthSignature::message_to_signed_bytes(&data))
         }
     }
 
+    fn get_tx_hash_with_signed_message(
+        &self,
+        default_signed_message: &H256,
+        chain_id: L2ChainId,
+    ) -> Result<H256, SerializationTransactionError> {
+        let hash = if self.is_eip712_tx() {
+            concat_and_hash(
+                *default_signed_message,
+                H256(keccak256(&self.get_signature()?)),
+            )
+        } else if let Some(bytes) = &self.raw {
+            H256(keccak256(&bytes.0))
+        } else {
+            let signature = self.get_packed_signature()?;
+            H256(keccak256(&self.get_signed_bytes(&signature, chain_id)))
+        };
+
+        Ok(hash)
+    }
+
+    pub fn get_tx_hash(&self, chain_id: L2ChainId) -> Result<H256, SerializationTransactionError> {
+        let default_signed_message = self.get_default_signed_message(Some(chain_id.0))?;
+        self.get_tx_hash_with_signed_message(&default_signed_message, chain_id)
+    }
+
     fn recover_default_signer(
         &self,
         default_signed_message: H256,
@@ -776,6 +815,9 @@ impl L2Tx {
         // For fee calculation we use the same structure, as a result, signature may not be provided
         tx.set_raw_signature(raw_signature);
 
+        if let Some(raw_bytes) = value.raw {
+            tx.set_raw_bytes(raw_bytes);
+        }
         tx.check_encoded_size(max_tx_size)?;
         Ok(tx)
     }
diff --git a/core/lib/types/src/tx/execute.rs b/core/lib/types/src/tx/execute.rs
index 043dfaeac9b7..e33dff694fe3 100644
--- a/core/lib/types/src/tx/execute.rs
+++ b/core/lib/types/src/tx/execute.rs
@@ -4,7 +4,7 @@ use serde::{Deserialize, Serialize};
 use zksync_utils::ZeroPrefixHexSerde;
 
 /// `Execute` transaction executes a previously deployed smart contract in the L2 rollup.
-#[derive(Debug, Clone, Serialize, Deserialize)]
+#[derive(Debug, Clone, Serialize, Deserialize, PartialEq)]
 #[serde(rename_all = "camelCase")]
 pub struct Execute {
     pub contract_address: Address,
@@ -47,6 +47,8 @@ impl Execute {
         contract_hash: H256,
         constructor_input: Vec<u8>,
     ) -> Vec<u8> {
+        // TODO (SMA-1608): We should not re-implement the ABI parts in different places, instead have the ABI available
+        //  from the `zksync_contracts` crate.
         static FUNCTION_SIGNATURE: Lazy<[u8; 4]> = Lazy::new(|| {
             ethabi::short_signature(
                 "create",
diff --git a/core/lib/types/src/tx/primitives/packed_eth_signature.rs b/core/lib/types/src/tx/primitives/packed_eth_signature.rs
index 57f065115e72..63f4911ea47f 100644
--- a/core/lib/types/src/tx/primitives/packed_eth_signature.rs
+++ b/core/lib/types/src/tx/primitives/packed_eth_signature.rs
@@ -40,18 +40,30 @@ impl PackedEthSignature {
         self.0.clone().into_electrum()
     }
 
-    pub fn deserialize_packed(bytes: &[u8]) -> Result<Self, DeserializeError> {
+    fn deserialize_signature(bytes: &[u8]) -> Result<[u8; 65], DeserializeError> {
         if bytes.len() != 65 {
             return Err(DeserializeError::IncorrectSignatureLength);
         }
+
         let mut bytes_array = [0u8; 65];
         bytes_array.copy_from_slice(bytes);
+        Ok(bytes_array)
+    }
 
-        if bytes_array[64] >= 27 {
-            bytes_array[64] -= 27;
+    pub fn deserialize_packed(bytes: &[u8]) -> Result<Self, DeserializeError> {
+        let mut signature = Self::deserialize_signature(bytes)?;
+        if signature[64] >= 27 {
+            signature[64] -= 27;
         }
 
-        Ok(PackedEthSignature(ETHSignature::from(bytes_array)))
+        Ok(PackedEthSignature(ETHSignature::from(signature)))
+    }
+
+    /// Unlike the `deserialize_packed` packed signature, this method does not make sure that the `v` value is in the range [0, 3].
+    /// This one should be generally avoided and be used only in places where preservation of the original `v` is important.
+    pub fn deserialize_packed_no_v_check(bytes: &[u8]) -> Result<Self, DeserializeError> {
+        let signature = Self::deserialize_signature(bytes)?;
+        Ok(PackedEthSignature(ETHSignature::from(signature)))
     }
 
     /// Signs message using ethereum private key, results are identical to signature created
diff --git a/core/lib/types/src/tx/tx_execution_info.rs b/core/lib/types/src/tx/tx_execution_info.rs
index 852b564065bc..32f2f3c5ef1f 100644
--- a/core/lib/types/src/tx/tx_execution_info.rs
+++ b/core/lib/types/src/tx/tx_execution_info.rs
@@ -1,11 +1,9 @@
 use crate::commitment::SerializeCommitment;
-use crate::event::{extract_long_l2_to_l1_messages, extract_published_bytecodes};
 use crate::fee::TransactionExecutionMetrics;
 use crate::l2_to_l1_log::L2ToL1Log;
 use crate::writes::{InitialStorageWrite, RepeatedStorageWrite};
-use crate::{StorageLogQuery, VmEvent, PUBLISH_BYTECODE_OVERHEAD};
+use crate::{StorageLogQuery, VmEvent};
 use std::ops::{Add, AddAssign};
-use zksync_utils::bytecode::bytecode_len_in_bytes;
 
 /// Events/storage logs/l2->l1 logs created within transaction execution.
 #[derive(Debug, Clone, Default, PartialEq)]
@@ -13,6 +11,7 @@ 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,
 }
 
@@ -89,45 +88,6 @@ impl ExecutionMetrics {
             + self.l2_l1_long_messages
             + self.published_bytecode_bytes
     }
-
-    pub fn new(
-        logs: &VmExecutionLogs,
-        gas_used: usize,
-        contracts_deployed: u16,
-        contracts_used: usize,
-        cycles_used: u32,
-        computational_gas_used: u32,
-    ) -> Self {
-        // We published the data as ABI-encoded `bytes`, so the total length is:
-        // - message length in bytes, rounded up to a multiple of 32
-        // - 32 bytes of encoded offset
-        // - 32 bytes of encoded length
-        let l2_l1_long_messages = extract_long_l2_to_l1_messages(&logs.events)
-            .iter()
-            .map(|event| (event.len() + 31) / 32 * 32 + 64)
-            .sum();
-
-        let published_bytecode_bytes = extract_published_bytecodes(&logs.events)
-            .iter()
-            .map(|bytecodehash| {
-                bytecode_len_in_bytes(*bytecodehash) + PUBLISH_BYTECODE_OVERHEAD as usize
-            })
-            .sum();
-
-        ExecutionMetrics {
-            gas_used,
-            published_bytecode_bytes,
-            l2_l1_long_messages,
-            l2_l1_logs: logs.l2_to_l1_logs.len(),
-            contracts_used,
-            contracts_deployed,
-            vm_events: logs.events.len(),
-            storage_logs: logs.storage_logs.len(),
-            total_log_queries: logs.total_log_queries_count,
-            cycles_used,
-            computational_gas_used,
-        }
-    }
 }
 
 impl Add for ExecutionMetrics {
diff --git a/core/lib/types/src/utils.rs b/core/lib/types/src/utils.rs
index e90d77923b22..8300282b7a92 100644
--- a/core/lib/types/src/utils.rs
+++ b/core/lib/types/src/utils.rs
@@ -95,12 +95,12 @@ mod tests {
     #[test]
     fn test_storage_key_for_eth_token() {
         let contract = AccountTreeId::new(Address::zero());
-        let addresses = vec![
+        let addresses = [
             "0x1dfe8ea5e8de74634db78d9f8d41a1c832ab91e8",
             "0xde03a0b5963f75f1c8485b355ff6d30f3093bde7",
             "0x2c9fc71c164f7332f368da477256e1b049575979",
         ];
-        let hashes = vec![
+        let hashes = [
             "0xd8f16e1d7fe824994134861c968a8f276930db7daf6ba4dd083567259d3ff857",
             "0x4e08bf0f8822508eed9a1fb7d98cf6067ab156c74e9ebdda0924bef229d71995",
             "0xb6ef92f5b364b6e13f237aef1213b68f53f91ac35dcea0ad60e103b5245fd85c",
diff --git a/core/lib/types/src/vm_version.rs b/core/lib/types/src/vm_version.rs
new file mode 100644
index 000000000000..410c85e899f0
--- /dev/null
+++ b/core/lib/types/src/vm_version.rs
@@ -0,0 +1,16 @@
+#[derive(Debug, Clone, Copy)]
+pub enum VmVersion {
+    M5WithoutRefunds,
+    M5WithRefunds,
+    M6Initial,
+    M6BugWithCompressionFixed,
+    Vm1_3_2,
+    VmVirtualBlocks,
+}
+
+impl VmVersion {
+    /// Returns the latest supported VM version.
+    pub const fn latest() -> VmVersion {
+        Self::VmVirtualBlocks
+    }
+}
diff --git a/core/lib/utils/Cargo.toml b/core/lib/utils/Cargo.toml
index ffea4117d0fe..48c9321de94d 100644
--- a/core/lib/utils/Cargo.toml
+++ b/core/lib/utils/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "zksync_utils"
-version = "1.0.0"
+version = "0.1.0"
 edition = "2018"
 authors = ["The Matter Labs Team <hello@matterlabs.dev>"]
 homepage = "https://zksync.io/"
@@ -10,14 +10,15 @@ keywords = ["blockchain", "zksync"]
 categories = ["cryptography"]
 
 [dependencies]
-zksync_basic_types = { path = "../../lib/basic_types", version = "1.0" }
-vlog = { path = "../../lib/vlog", version = "1.0" }
-zk_evm = {git = "https://github.com/matter-labs/era-zk_evm.git", tag = "v1.3.3-rc0"}
+zksync_basic_types = { path = "../../lib/basic_types" }
+zk_evm = { git = "https://github.com/matter-labs/era-zk_evm.git", branch = "v1.3.3" }
+vlog = { path = "../../lib/vlog" }
 
 num = { version = "0.3.1", features = ["serde"] }
-bigdecimal = { version = "0.2.2", features = ["serde"]}
+bigdecimal = { version = "0.2.2", features = ["serde"] }
 serde = { version = "1.0", features = ["derive"] }
 tokio = { version = "1", features = ["time"] }
+tracing = "0.1"
 anyhow = "1.0"
 thiserror = "1.0"
 futures = "0.3"
@@ -25,8 +26,7 @@ hex = "0.4"
 envy = "0.4"
 reqwest = { version = "0.11", features = ["blocking"] }
 itertools = "0.10.5"
-metrics = "0.20"
+metrics = "0.21"
 
 [dev-dependencies]
 serde_json = "1.0.0"
-
diff --git a/core/lib/utils/src/bytecode.rs b/core/lib/utils/src/bytecode.rs
index 05cb5619f292..249af20b1b22 100644
--- a/core/lib/utils/src/bytecode.rs
+++ b/core/lib/utils/src/bytecode.rs
@@ -124,8 +124,8 @@ impl CompressedBytecodeInfo {
 
         bytecode_hash
             .into_iter()
-            .chain(empty_cell.into_iter())
-            .chain(bytes_encoded.into_iter())
+            .chain(empty_cell)
+            .chain(bytes_encoded)
             .collect()
     }
 }
diff --git a/core/lib/utils/src/http_with_retries.rs b/core/lib/utils/src/http_with_retries.rs
index 008d51b96e7b..61742769fd65 100644
--- a/core/lib/utils/src/http_with_retries.rs
+++ b/core/lib/utils/src/http_with_retries.rs
@@ -22,8 +22,10 @@ pub async fn send_request_with_retries(
         let result = send_request(url, method.clone(), headers.clone(), body.clone()).await;
         match result {
             Ok(response) if response.status().is_success() => return Ok(response),
-            Ok(response) => vlog::error!("Received non OK http response {:?}", response.status()),
-            Err(err) => vlog::error!("Error while sending http request {:?}", err),
+            Ok(response) => {
+                tracing::error!("Received non OK http response {:?}", response.status())
+            }
+            Err(err) => tracing::error!("Error while sending http request {:?}", err),
         }
         if retries >= max_retries {
             return Err(HttpError::RetryExhausted(format!(
diff --git a/core/lib/utils/src/lib.rs b/core/lib/utils/src/lib.rs
index d403e0d2a822..f512abf72de7 100644
--- a/core/lib/utils/src/lib.rs
+++ b/core/lib/utils/src/lib.rs
@@ -9,7 +9,6 @@ pub mod misc;
 pub mod panic_extractor;
 pub mod panic_notify;
 mod serde_wrappers;
-pub mod test_utils;
 pub mod time;
 pub mod wait_for_tasks;
 
diff --git a/core/lib/utils/src/misc.rs b/core/lib/utils/src/misc.rs
index da04e90efe06..234d188400e5 100644
--- a/core/lib/utils/src/misc.rs
+++ b/core/lib/utils/src/misc.rs
@@ -1,9 +1,5 @@
 use zksync_basic_types::web3::signing::keccak256;
-use zksync_basic_types::{MiniblockNumber, H256, U256};
-
-pub fn miniblock_hash(miniblock_number: MiniblockNumber) -> H256 {
-    H256(keccak256(&miniblock_number.0.to_be_bytes()))
-}
+use zksync_basic_types::{H256, U256};
 
 pub const fn ceil_div(a: u64, b: u64) -> u64 {
     if a == 0 {
@@ -17,6 +13,13 @@ pub fn ceil_div_u256(a: U256, b: U256) -> U256 {
     (a + b - U256::from(1)) / b
 }
 
+pub fn concat_and_hash(hash1: H256, hash2: H256) -> H256 {
+    let mut bytes = [0_u8; 64];
+    bytes[..32].copy_from_slice(&hash1.0);
+    bytes[32..].copy_from_slice(&hash2.0);
+    H256(keccak256(&bytes))
+}
+
 #[cfg(test)]
 mod tests {
     use super::*;
diff --git a/core/lib/utils/src/panic_notify.rs b/core/lib/utils/src/panic_notify.rs
index a782e48c9928..27bd71b5f523 100644
--- a/core/lib/utils/src/panic_notify.rs
+++ b/core/lib/utils/src/panic_notify.rs
@@ -15,11 +15,12 @@ impl Drop for ThreadPanicNotify {
     }
 }
 
-pub fn spawn_panic_handler() -> (JoinHandle<()>, mpsc::Sender<bool>) {
+pub fn spawn_panic_handler() -> (JoinHandle<anyhow::Result<()>>, mpsc::Sender<bool>) {
     let (panic_sender, mut panic_receiver) = mpsc::channel(1);
 
     let handler = tokio::spawn(async move {
         let _ = panic_receiver.next().await;
+        Ok(())
     });
     (handler, panic_sender)
 }
diff --git a/core/lib/utils/src/wait_for_tasks.rs b/core/lib/utils/src/wait_for_tasks.rs
index 6988d89b03ee..74bb57f1fdb4 100644
--- a/core/lib/utils/src/wait_for_tasks.rs
+++ b/core/lib/utils/src/wait_for_tasks.rs
@@ -4,7 +4,7 @@ use tokio::task::JoinHandle;
 use crate::panic_extractor::try_extract_panic_message;
 
 pub async fn wait_for_tasks<Fut>(
-    task_futures: Vec<JoinHandle<()>>,
+    task_futures: Vec<JoinHandle<anyhow::Result<()>>>,
     particular_crypto_alerts: Option<Vec<String>>,
     graceful_shutdown: Option<Fut>,
     tasks_allowed_to_finish: bool,
@@ -12,23 +12,31 @@ pub async fn wait_for_tasks<Fut>(
     Fut: Future<Output = ()>,
 {
     match future::select_all(task_futures).await.0 {
-        Ok(_) => {
+        Ok(Ok(())) => {
             if tasks_allowed_to_finish {
-                vlog::info!("One of the actors finished its run. Finishing execution.");
+                tracing::info!("One of the actors finished its run. Finishing execution.");
             } else {
-                vlog::error!(
-                    "One of the actors finished its run, while it wasn't expected to do it"
-                );
+                let err = "One of the actors finished its run, while it wasn't expected to do it";
+                tracing::error!("{err}");
+                vlog::capture_message(err, vlog::AlertLevel::Warning);
                 if let Some(graceful_shutdown) = graceful_shutdown {
                     graceful_shutdown.await;
                 }
             }
         }
+        Ok(Err(err)) => {
+            let err = format!("One of the tokio actors unexpectedly finished with error: {err}");
+            tracing::error!("{err}");
+            vlog::capture_message(&err, vlog::AlertLevel::Warning);
+            if let Some(graceful_shutdown) = graceful_shutdown {
+                graceful_shutdown.await;
+            }
+        }
         Err(error) => {
             let is_panic = error.is_panic();
             let panic_message = try_extract_panic_message(error);
 
-            vlog::info!(
+            tracing::info!(
                 "One of the tokio actors unexpectedly finished with error: {panic_message}"
             );
 
diff --git a/core/lib/vlog/Cargo.toml b/core/lib/vlog/Cargo.toml
index a0a013374391..c50e94ccfc6f 100644
--- a/core/lib/vlog/Cargo.toml
+++ b/core/lib/vlog/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "vlog"
-version = "1.0.0"
+version="0.1.0"
 edition = "2018"
 authors = ["The Matter Labs Team <hello@matterlabs.dev>"]
 homepage = "https://zksync.io/"
@@ -12,11 +12,7 @@ publish = false # This is an utility crate, not to be used by libraries.
 
 [dependencies]
 chrono = "0.4"
-tracing = { version = "0.1.26", features = ["log"] }
+tracing = "0.1"
 tracing-subscriber = { version = "0.3", features = ["fmt", "env-filter", "time", "json"] }
-sentry = "0"
-opentelemetry = { version = "0.17" }
-opentelemetry-otlp = { version = "0.10", features = ["http-proto", "reqwest-blocking-client"] }
-opentelemetry-semantic-conventions = "0.9"
-tracing-opentelemetry = "0.17.2"
+sentry = "0.31"
 serde_json = "1.0"
diff --git a/core/lib/vlog/src/lib.rs b/core/lib/vlog/src/lib.rs
index 75abd3f3b50c..173770beecea 100644
--- a/core/lib/vlog/src/lib.rs
+++ b/core/lib/vlog/src/lib.rs
@@ -1,327 +1,227 @@
-//! A set of logging macros that print not only timestamp and log level,
-//! but also filename, line and column.
-//!
-//! They behave just like usual tracing::warn, tracing::info, etc.
-//! For warn and error macros we are adding file line and column to tracing variables
-//!
-//! The format of the logs in stdout can be `plain` or` json` and is set by the `MISC_LOG_FORMAT` env variable.
-//!
-//! Full documentation for the `tracing` crate here https://docs.rs/tracing/
-//!
-//! Integration with sentry for catching errors and react on them immediately
-//! https://docs.sentry.io/platforms/rust/
-//!
+//! This module contains the observability subsystem.
+//! It is responsible for providing a centralized interface for consistent observability configuration.
 
-use std::{borrow::Cow, str::FromStr};
-
-use opentelemetry::sdk::{resource::Resource, trace::Sampler};
-use opentelemetry::trace::{TraceContextExt, TraceId};
-use opentelemetry::KeyValue;
-use opentelemetry_otlp::WithExportConfig;
-use sentry::protocol::Event;
-use sentry::{types::Dsn, ClientInitGuard, ClientOptions};
 use std::backtrace::Backtrace;
-use tracing_opentelemetry::OpenTelemetrySpanExt;
-use tracing_subscriber::{fmt, layer::SubscriberExt, util::SubscriberInitExt};
+use std::borrow::Cow;
+use std::panic::PanicInfo;
 
-pub use chrono as __chrono;
-pub use sentry as __sentry;
-pub use tracing as __tracing;
-pub use tracing::{debug, info, log, trace};
-
-fn get_trace_id() -> TraceId {
-    let span = tracing::span::Span::current();
-    span.context().span().span_context().trace_id()
-}
-
-#[macro_export]
-macro_rules! warn {
-    ($fmt:expr) => {{
-        $crate::__tracing::warn!(
-            file=file!(),
-            line=line!(),
-            column=column!(),
-            $fmt,
-        );
-        // $crate::__sentry::capture_event($crate::__sentry::protocol::Event {
-        //     fingerprint: ::std::borrow::Cow::Borrowed(&[::std::borrow::Cow::Borrowed($fmt)]),
-        //     message: Some(format!($fmt)),
-        //     level: $crate::__sentry::Level::Warning,
-        //     ..Default::default()
-        // });
-    }};
+use sentry::{types::Dsn, ClientInitGuard};
+use tracing_subscriber::{fmt, layer::SubscriberExt, util::SubscriberInitExt};
 
-    ($fmt:expr, $($args:tt)*) => {
-        {
-            $crate::__tracing::warn!(
-                file=file!(),
-                line=line!(),
-                column=column!(),
-                $fmt,
-                $($args)*
-            );
-            // $crate::__sentry::capture_event($crate::__sentry::protocol::Event {
-            //     fingerprint: ::std::borrow::Cow::Borrowed(&[::std::borrow::Cow::Borrowed($fmt)]),
-            //     message: Some(format!($fmt, $($args)*)),
-            //     level: $crate::__sentry::Level::Warning,
-            //     ..Default::default()
-            // });
-        }
-    };
+/// Temporary re-export of `sentry::capture_message` aiming to simplify the transition from `vlog` to using
+/// crates directly.
+pub use sentry::capture_message;
+pub use sentry::Level as AlertLevel;
+
+/// Specifies the format of the logs in stdout.
+#[derive(Debug, Clone, Copy, Default)]
+pub enum LogFormat {
+    #[default]
+    Plain,
+    Json,
 }
 
-#[macro_export]
-macro_rules! panic {
-    ($fmt:expr) => {{
-        $crate::__tracing::error!(
-            file=file!(),
-            line=line!(),
-            column=column!(),
-            $fmt,
-        );
-        $crate::__sentry::capture_event($crate::__sentry::protocol::Event {
-            fingerprint: ::std::borrow::Cow::Borrowed(&[::std::borrow::Cow::Borrowed($fmt)]),
-            message: Some(format!($fmt)),
-            level: $crate::__sentry::Level::Fatal,
-            ..Default::default()
-        });
-    }};
-    ($fmt:expr, $($args:tt)*) => {
-        {
-            $crate::__tracing::error!(
-                file=file!(),
-                line=line!(),
-                column=column!(),
-                $fmt,
-                $($args)*
-            );
-            $crate::__sentry::capture_event($crate::__sentry::protocol::Event {
-                fingerprint: ::std::borrow::Cow::Borrowed(&[::std::borrow::Cow::Borrowed($fmt)]),
-                message: Some(format!($fmt, $($args)*)),
-                level: $crate::__sentry::Level::Fatal,
-                ..Default::default()
-            });
-        }
-    };
+/// Builder for the observability subsystem.
+/// Currently capable of configuring logging output and sentry integration.
+#[derive(Debug, Default)]
+pub struct ObservabilityBuilder {
+    log_format: LogFormat,
+    sentry_url: Option<Dsn>,
+    sentry_environment: Option<String>,
 }
 
-#[macro_export]
-macro_rules! error {
-    ($fmt:expr) => {{
-        $crate::__tracing::error!(
-            file=file!(),
-            line=line!(),
-            column=column!(),
-            $fmt,
-        );
-        $crate::__sentry::capture_event($crate::__sentry::protocol::Event {
-            fingerprint: ::std::borrow::Cow::Borrowed(&[::std::borrow::Cow::Borrowed($fmt)]),
-            message: Some(format!($fmt)),
-            level: $crate::__sentry::Level::Error,
-            ..Default::default()
-        });
-    }};
-    ($fmt:expr, $($args:tt)*) => {
-        {
-            $crate::__tracing::error!(
-                file=file!(),
-                line=line!(),
-                column=column!(),
-                $fmt,
-                $($args)*
-            );
-            $crate::__sentry::capture_event($crate::__sentry::protocol::Event {
-                fingerprint: ::std::borrow::Cow::Borrowed(&[::std::borrow::Cow::Borrowed($fmt)]),
-                message: Some(format!($fmt, $($args)*)),
-                level: $crate::__sentry::Level::Error,
-                ..Default::default()
-            });
-        }
-    };
+/// Guard for the observability subsystem.
+/// Releases configured integrations upon being dropped.
+pub struct ObservabilityGuard {
+    _sentry_guard: Option<ClientInitGuard>,
 }
 
-fn get_sentry_url() -> Option<Dsn> {
-    if let Ok(sentry_url) = std::env::var("MISC_SENTRY_URL") {
-        if let Ok(sentry_url) = Dsn::from_str(sentry_url.as_str()) {
-            return Some(sentry_url);
-        }
+impl std::fmt::Debug for ObservabilityGuard {
+    fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
+        f.debug_struct("ObservabilityGuard").finish()
     }
-    None
 }
 
-fn get_otlp_url() -> Option<String> {
-    std::env::var("MISC_OTLP_URL").ok().and_then(|url| {
-        if url.to_lowercase() == "unset" {
-            None
-        } else {
-            Some(url)
-        }
-    })
-}
+impl ObservabilityBuilder {
+    /// Creates a new builder with default values.
+    pub fn new() -> Self {
+        Self::default()
+    }
 
-pub const DEFAULT_SAMPLING_RATIO: f64 = 0.1;
+    /// Sets the log format.
+    /// Default is `LogFormat::Plain`.
+    pub fn with_log_format(mut self, log_format: LogFormat) -> Self {
+        self.log_format = log_format;
+        self
+    }
 
-fn get_sampling_ratio() -> f64 {
-    std::env::var("MISC_SAMPLING_RATIO")
-        .map(|x| x.as_str().parse::<f64>().unwrap())
-        .unwrap_or(DEFAULT_SAMPLING_RATIO)
-}
+    /// Enables Sentry integration.
+    /// Returns an error if the provided Sentry URL is invalid.
+    pub fn with_sentry_url(
+        mut self,
+        sentry_url: &str,
+    ) -> Result<Self, sentry::types::ParseDsnError> {
+        let sentry_url = sentry_url.parse()?;
+        self.sentry_url = Some(sentry_url);
+        Ok(self)
+    }
 
-/// Initialize logging with tracing and set up log format
-pub fn init() {
-    let log_format = std::env::var("MISC_LOG_FORMAT").unwrap_or_else(|_| "plain".to_string());
-    let service_name =
-        std::env::var("SERVICE_NAME").unwrap_or_else(|_| "UNKNOWN_SERVICE".to_string());
-    let namespace_name =
-        std::env::var("POD_NAMESPACE").unwrap_or_else(|_| "UNKNOWN_NAMESPACE".to_string());
-    let pod_name = std::env::var("POD_NAME").unwrap_or_else(|_| "UNKNOWN_POD".to_string());
-    let opentelemetry = get_otlp_url().map(|url| {
-        let otlp_exporter = opentelemetry_otlp::new_exporter().http().with_endpoint(url);
-        let sampler = Sampler::TraceIdRatioBased(get_sampling_ratio());
+    /// Sets the Sentry environment ID.
+    /// If not set, no environment will be provided in Sentry events.
+    pub fn with_sentry_environment(mut self, environment: Option<String>) -> Self {
+        self.sentry_environment = environment;
+        self
+    }
 
-        let tracer = opentelemetry_otlp::new_pipeline()
-            .tracing()
-            .with_exporter(otlp_exporter)
-            .with_trace_config(
-                opentelemetry::sdk::trace::config()
-                    .with_resource(Resource::new(vec![
-                        KeyValue::new(
-                            opentelemetry_semantic_conventions::resource::SERVICE_NAME,
-                            service_name,
-                        ),
-                        KeyValue::new(
-                            opentelemetry_semantic_conventions::resource::K8S_NAMESPACE_NAME,
-                            namespace_name,
-                        ),
-                        KeyValue::new(
-                            opentelemetry_semantic_conventions::resource::K8S_POD_NAME,
-                            pod_name,
-                        ),
-                    ]))
-                    .with_sampler(sampler),
-            )
-            .install_simple()
-            .unwrap();
-        tracing_opentelemetry::layer().with_tracer(tracer)
-    });
-    match log_format.as_str() {
-        "plain" => {
-            if let Some(opentelemetry) = opentelemetry {
+    /// Initializes the observability subsystem.
+    pub fn build(self) -> ObservabilityGuard {
+        // Initialize logs.
+        match self.log_format {
+            LogFormat::Plain => {
                 tracing_subscriber::registry()
-                    .with(opentelemetry)
-                    .with(fmt::Layer::default())
                     .with(tracing_subscriber::EnvFilter::from_default_env())
-                    .init();
-            } else {
-                tracing_subscriber::registry()
                     .with(fmt::Layer::default())
-                    .with(tracing_subscriber::EnvFilter::from_default_env())
                     .init();
             }
-        }
-        "json" => {
-            let timer = tracing_subscriber::fmt::time::UtcTime::rfc_3339();
-            // must be set before sentry hook for sentry to function
-            install_pretty_panic_hook();
-            if let Some(opentelemetry) = opentelemetry {
-                tracing_subscriber::registry()
-                    .with(opentelemetry)
-                    .with(fmt::Layer::default().with_timer(timer).json())
-                    .with(tracing_subscriber::EnvFilter::from_default_env())
-                    .init();
-            } else {
+            LogFormat::Json => {
+                let timer = tracing_subscriber::fmt::time::UtcTime::rfc_3339();
                 tracing_subscriber::registry()
-                    .with(fmt::Layer::default().with_timer(timer).json())
                     .with(tracing_subscriber::EnvFilter::from_default_env())
+                    .with(
+                        fmt::Layer::default()
+                            .with_file(true)
+                            .with_line_number(true)
+                            .with_timer(timer)
+                            .json(),
+                    )
                     .init();
             }
-        }
-        _ => panic!("MISC_LOG_FORMAT has an unexpected value {}", log_format),
-    };
-}
+        };
 
-/// If the sentry URL is provided via an environment variable, this function will initialize sentry.
-/// Returns a sentry client guard. The full description can be found in the official documentation:
-/// https://docs.sentry.io/platforms/rust/#configure
-pub fn init_sentry() -> Option<ClientInitGuard> {
-    get_sentry_url().map(|sentry_url| {
-        // Either use the environment provided for EN, or load it from default main node config.
-        let environment = match std::env::var("EN_SENTRY_ENVIRONMENT") {
-            Ok(environment) => environment,
-            Err(_) => {
-                // No EN environment provided, load it from the main node config.
-                let l1_network = std::env::var("CHAIN_ETH_NETWORK").expect("Must be set");
-                let l2_network = std::env::var("CHAIN_ETH_ZKSYNC_NETWORK").expect("Must be set");
+        // Check whether we need to change the default panic handler.
+        // Note that this must happen before we initialize Sentry, since otherwise
+        // Sentry's panic handler will also invoke the default one, resulting in unformatted
+        // panic info being output to stderr.
+        if matches!(self.log_format, LogFormat::Json) {
+            // Remove any existing hook. We expect that no hook is set by default.
+            let _ = std::panic::take_hook();
+            // Override the default panic handler to print the panic in JSON format.
+            std::panic::set_hook(Box::new(json_panic_handler));
+        };
 
-                format!("{} - {}", l1_network, l2_network)
-            }
+        // Initialize the Sentry.
+        let sentry_guard = if let Some(sentry_url) = self.sentry_url {
+            let options = sentry::ClientOptions {
+                release: sentry::release_name!(),
+                environment: self.sentry_environment.map(Cow::from),
+                attach_stacktrace: true,
+                ..Default::default()
+            };
+
+            Some(sentry::init((sentry_url, options)))
+        } else {
+            None
         };
 
-        let options = sentry::ClientOptions {
-            release: sentry::release_name!(),
-            environment: Some(Cow::from(environment)),
-            attach_stacktrace: true,
-            ..Default::default()
+        ObservabilityGuard {
+            _sentry_guard: sentry_guard,
         }
-        .add_integration(TraceIdToSentry);
+    }
+}
 
-        sentry::init((sentry_url, options))
-    })
+/// Loads the log format from the environment variable according to the existing zkSync configuration scheme.
+/// If the variable is not set, the default value is used.
+///
+/// This is a deprecated function existing for compatibility with the old configuration scheme.
+/// Not recommended for use in new applications.
+///
+/// # Panics
+///
+/// Panics if the value of the variable is set, but is not `plain` or `json`.
+#[deprecated(
+    note = "This function will be removed in the future. Applications are expected to handle their configuration themselves."
+)]
+pub fn log_format_from_env() -> LogFormat {
+    match std::env::var("MISC_LOG_FORMAT") {
+        Ok(log_format) => match log_format.as_str() {
+            "plain" => LogFormat::Plain,
+            "json" => LogFormat::Json,
+            _ => panic!("MISC_LOG_FORMAT has an unexpected value {}", log_format),
+        },
+        Err(_) => LogFormat::Plain,
+    }
 }
 
-/// Format panics like vlog::error
-fn install_pretty_panic_hook() {
-    // This hook does not use the previous one set because it leads to 2 logs:
-    // the first is the default panic log and the second is from this code. To avoid this situation,
-    // hook must be installed first
-    std::panic::set_hook(Box::new(move |panic_info| {
-        let backtrace = Backtrace::capture();
-        let timestamp = chrono::Utc::now();
-        let panic_message = if let Some(s) = panic_info.payload().downcast_ref::<String>() {
-            s.as_str()
-        } else if let Some(s) = panic_info.payload().downcast_ref::<&str>() {
-            s
-        } else {
-            "Panic occurred without additional info"
-        };
+/// Loads the Sentry URL from the environment variable according to the existing zkSync configuration scheme.
+/// If the environemnt value is present but the value is `unset`, `None` will be returned for compatibility with the
+/// existing configuration setup.
+///
+/// This is a deprecated function existing for compatibility with the old configuration scheme.
+/// Not recommended for use in new applications.
+#[deprecated(
+    note = "This function will be removed in the future. Applications are expected to handle their configuration themselves."
+)]
+pub fn sentry_url_from_env() -> Option<String> {
+    match std::env::var("MISC_SENTRY_URL") {
+        Ok(str) if str == "unset" => {
+            // This bogus value may be provided an sentry is expected to just not be initialized in this case.
+            None
+        }
+        Ok(str) => Some(str),
+        Err(_) => None,
+    }
+}
 
-        let panic_location = panic_info
-            .location()
-            .map(|val| val.to_string())
-            .unwrap_or_else(|| "Unknown location".to_owned());
+/// Prepared the Sentry environment ID from the environment variable according to the existing zkSync configuration
+/// scheme.
+/// This function mimics like `vlog` configuration worked historically, e.g. it would also try to load environment
+/// for the external node, and the EN variable is preferred if it is set.
+///
+/// This is a deprecated function existing for compatibility with the old configuration scheme.
+/// Not recommended for use in new applications.
+#[deprecated(
+    note = "This function will be removed in the future. Applications are expected to handle their configuration themselves."
+)]
+pub fn environment_from_env() -> Option<String> {
+    if let Ok(en_env) = std::env::var("EN_SENTRY_ENVIRONMENT") {
+        return Some(en_env);
+    }
 
-        let backtrace_str = format!("{}", backtrace);
-        let timestamp_str = format!("{}", timestamp.format("%Y-%m-%dT%H:%M:%S%.fZ"));
+    let l1_network = std::env::var("CHAIN_ETH_NETWORK").ok()?;
+    let l2_network = std::env::var("CHAIN_ETH_ZKSYNC_NETWORK").ok()?;
 
-        let trace_id = get_trace_id();
-        println!(
-            "{}",
-            serde_json::json!({
-                "timestamp": timestamp_str,
-                "trace_id": trace_id.to_string(),
-                "level": "CRITICAL",
-                "fields": {
-                    "message": panic_message,
-                    "location": panic_location,
-                    "backtrace": backtrace_str,
-                }
-            })
-        );
-    }));
+    Some(format!("{} - {}", l1_network, l2_network))
 }
 
-struct TraceIdToSentry;
+fn json_panic_handler(panic_info: &PanicInfo) {
+    let backtrace = Backtrace::capture();
+    let timestamp = chrono::Utc::now();
+    let panic_message = if let Some(s) = panic_info.payload().downcast_ref::<String>() {
+        s.as_str()
+    } else if let Some(s) = panic_info.payload().downcast_ref::<&str>() {
+        s
+    } else {
+        "Panic occurred without additional info"
+    };
 
-impl sentry::Integration for TraceIdToSentry {
-    fn process_event(
-        &self,
-        mut event: Event<'static>,
-        _options: &ClientOptions,
-    ) -> Option<Event<'static>> {
-        let trace_id = get_trace_id();
-        event
-            .extra
-            .insert("trace_id".to_string(), trace_id.to_string().into());
-        Some(event)
-    }
+    let panic_location = panic_info
+        .location()
+        .map(|val| val.to_string())
+        .unwrap_or_else(|| "Unknown location".to_owned());
+
+    let backtrace_str = backtrace.to_string();
+    let timestamp_str = timestamp.format("%Y-%m-%dT%H:%M:%S%.fZ").to_string();
+
+    println!(
+        "{}",
+        serde_json::json!({
+            "timestamp": timestamp_str,
+            "level": "CRITICAL",
+            "fields": {
+                "message": panic_message,
+                "location": panic_location,
+                "backtrace": backtrace_str,
+            }
+        })
+    );
 }
diff --git a/core/lib/vm/Cargo.toml b/core/lib/vm/Cargo.toml
index f9f2558040e3..2d21c547d618 100644
--- a/core/lib/vm/Cargo.toml
+++ b/core/lib/vm/Cargo.toml
@@ -10,25 +10,25 @@ keywords = ["blockchain", "zksync"]
 categories = ["cryptography"]
 
 [dependencies]
-zkevm-assembly = { git = "https://github.com/matter-labs/era-zkEVM-assembly.git", branch = "v1.3.2" }
-zk_evm = { git = "https://github.com/matter-labs/era-zk_evm.git", tag = "v1.3.3-rc0" }
+zk_evm = { git = "https://github.com/matter-labs/era-zk_evm.git", branch = "v1.3.3" }
 
-zksync_config = { path = "../config", version = "1.0" }
-zksync_types = { path = "../types", version = "1.0" }
-zksync_utils = { path = "../utils", version = "1.0" }
-zksync_state = { path = "../state", version = "1.0" }
+zksync_config = { path = "../config" }
+zksync_types = { path = "../types" }
+zksync_utils = { path = "../utils" }
+zksync_state = { path = "../state" }
 
 zksync_contracts = { path = "../contracts" }
-vlog = { path = "../vlog", version = "1.0" }
 
 anyhow = "1.0"
 hex = "0.4"
 itertools = "0.10"
-metrics = "0.20"
-ethabi = "18.0.0"
+metrics = "0.21"
 once_cell = "1.7"
 thiserror = "1.0"
+tracing = "0.1"
 
 [dev-dependencies]
-zksync_eth_signer = { path = "../eth_signer", version = "1.0" }
 tokio = { version = "1", features = ["time"] }
+zksync_test_account = { path = "../test_account" }
+ethabi = "18.0.0"
+zksync_eth_signer = { path = "../eth_signer" }
diff --git a/core/lib/vm/README.md b/core/lib/vm/README.md
index deb11bb51371..d515df0dfc60 100644
--- a/core/lib/vm/README.md
+++ b/core/lib/vm/README.md
@@ -1,28 +1,31 @@
 # VM Crate
 
-This crate contains code that interacts with the VM - the VM itself is in a separate repo internal:
-[zk_evm][zk_evm_repo] or external:[era-zk_evm][zk_evm_repo_ext]
+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
+## VM Dependencies
 
 The VM relies on several subcomponents or traits, such as Memory and Storage. These traits are defined in the `zk_evm`
-repo, while their implementations can be found in this crate, like the storage implementation in `oracles/storage.rs`
-and the Memory implementation in `memory.rs`.
+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 transaction doesn't fit.
+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
-gives a more in-depth look into the VM, collecting detailed debugging information and logs. More details can be found in
-the `tracer/` directory.
-
-## Running the VM
+provides a more in-depth look into the VM, collecting detailed debugging information and logs. More details can be found
+in the `tracer/` directory.
 
-To interact with the VM, first create it using methods in `vm_with_bootloader.rs`, such as `init_vm()`. Then, inject a
-transaction using `push_transaction_to_bootloader_memory()` and execute the VM, for example using
-`execute_till_block_end()` from vm.rs.
+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
 
@@ -32,10 +35,10 @@ 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
-`save_current_vm_as_snapshot()` and return to that state using `rollback_to_latest_snapshot()`.
+`make_snapshot()` and return to that state using `rollback_to_the_latest_snapshot()`.
 
-This rollback affects all subcomponents, like memory, storage, and events, and is mainly used if a transaction doesn't
-fit in a block.
+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/vm/fuzz/.gitignore b/core/lib/vm/fuzz/.gitignore
deleted file mode 100644
index 1a45eee7760d..000000000000
--- a/core/lib/vm/fuzz/.gitignore
+++ /dev/null
@@ -1,4 +0,0 @@
-target
-corpus
-artifacts
-coverage
diff --git a/core/lib/vm/fuzz/Cargo.toml b/core/lib/vm/fuzz/Cargo.toml
deleted file mode 100644
index 6aa598a314de..000000000000
--- a/core/lib/vm/fuzz/Cargo.toml
+++ /dev/null
@@ -1,26 +0,0 @@
-[package]
-name = "vm-fuzz"
-version = "0.0.0"
-publish = false
-edition = "2018"
-
-[package.metadata]
-cargo-fuzz = true
-
-[dependencies]
-libfuzzer-sys = "0.4"
-vm-benchmark-harness = {path = "../../../tests/vm-benchmark/harness"}
-zksync_types = {path = "../../types"}
-
-# Prevent this from interfering with workspaces
-[workspace]
-members = ["."]
-
-[profile.release]
-debug = 1
-
-[[bin]]
-name = "deploy_transaction"
-path = "fuzz_targets/deploy_transaction.rs"
-test = false
-doc = false
diff --git a/core/lib/vm/fuzz/compare.sh b/core/lib/vm/fuzz/compare.sh
deleted file mode 100644
index 6edf91e091a3..000000000000
--- a/core/lib/vm/fuzz/compare.sh
+++ /dev/null
@@ -1,3 +0,0 @@
-gdb ./bad --command=show_cycle.gdb -ex "show_cycle $1" > badout
-gdb ./good --command=show_cycle.gdb -ex "show_cycle $1" > goodout
-delta goodout badout --max-line-length 100000
diff --git a/core/lib/vm/fuzz/fuzz.sh b/core/lib/vm/fuzz/fuzz.sh
deleted file mode 100644
index 3b5b5e89f9cb..000000000000
--- a/core/lib/vm/fuzz/fuzz.sh
+++ /dev/null
@@ -1 +0,0 @@
-cargo +nightly fuzz run --no-cfg-fuzzing --strip-dead-code --sanitizer none --release deploy_transaction
diff --git a/core/lib/vm/fuzz/fuzz_targets/deploy_transaction.rs b/core/lib/vm/fuzz/fuzz_targets/deploy_transaction.rs
deleted file mode 100644
index a305a7aa3ce2..000000000000
--- a/core/lib/vm/fuzz/fuzz_targets/deploy_transaction.rs
+++ /dev/null
@@ -1,27 +0,0 @@
-#![no_main]
-
-use libfuzzer_sys::fuzz_target;
-use vm_benchmark_harness::{BenchmarkingVm, get_deploy_tx};
-use zksync_types::tx::tx_execution_info::TxExecutionStatus::Success;
-
-fuzz_target!(|input: &[u8]| {
-    if let Some(contract_code) = cut_to_allowed_bytecode_size(input) {
-        if let Ok(x) = BenchmarkingVm::new().run_transaction(&get_deploy_tx(contract_code)) {
-            if x.status == Success {
-                panic!("managed to produce valid code!");
-            }
-        }
-    }
-});
-
-fn cut_to_allowed_bytecode_size(bytes: &[u8]) -> Option<&[u8]> {
-    let mut words = bytes.len() / 32;
-    if words == 0 {
-        return None;
-    }
-
-    if words & 1 == 0 {
-        words -= 1;
-    }
-    Some(&bytes[..32 * words])
-}
diff --git a/core/lib/vm/fuzz/show_cycle.gdb b/core/lib/vm/fuzz/show_cycle.gdb
deleted file mode 100644
index 7069afaa34a8..000000000000
--- a/core/lib/vm/fuzz/show_cycle.gdb
+++ /dev/null
@@ -1,8 +0,0 @@
-set pagination off
-
-define show_cycle
-    break cycle.rs:395 if self.local_state.monotonic_cycle_counter == $arg0
-    run
-    p self.local_state.registers
-    quit
-end
diff --git a/core/lib/vm/src/bootloader_state/l2_block.rs b/core/lib/vm/src/bootloader_state/l2_block.rs
new file mode 100644
index 000000000000..8b08978a9adb
--- /dev/null
+++ b/core/lib/vm/src/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::bootloader_state::snapshot::L2BlockSnapshot;
+use crate::bootloader_state::tx::BootloaderTx;
+use crate::utils::l2_blocks::l2_block_hash;
+use crate::{L2Block, L2BlockEnv};
+
+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/vm/src/bootloader_state/mod.rs b/core/lib/vm/src/bootloader_state/mod.rs
new file mode 100644
index 000000000000..73830de2759b
--- /dev/null
+++ b/core/lib/vm/src/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/vm/src/bootloader_state/snapshot.rs b/core/lib/vm/src/bootloader_state/snapshot.rs
new file mode 100644
index 000000000000..e417a3b9ee69
--- /dev/null
+++ b/core/lib/vm/src/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/vm/src/bootloader_state/state.rs b/core/lib/vm/src/bootloader_state/state.rs
new file mode 100644
index 000000000000..ca6f54e233eb
--- /dev/null
+++ b/core/lib/vm/src/bootloader_state/state.rs
@@ -0,0 +1,254 @@
+use crate::bootloader_state::l2_block::BootloaderL2Block;
+use crate::bootloader_state::snapshot::BootloaderStateSnapshot;
+use crate::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::constants::TX_DESCRIPTION_OFFSET;
+use crate::types::inputs::system_env::TxExecutionMode;
+use crate::types::internals::TransactionData;
+use crate::types::outputs::BootloaderMemory;
+use crate::utils::l2_blocks::assert_next_block;
+use crate::L2BlockEnv;
+
+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/vm/src/bootloader_state/tx.rs b/core/lib/vm/src/bootloader_state/tx.rs
new file mode 100644
index 000000000000..ecf40eca824e
--- /dev/null
+++ b/core/lib/vm/src/bootloader_state/tx.rs
@@ -0,0 +1,48 @@
+use crate::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/vm/src/bootloader_state/utils.rs b/core/lib/vm/src/bootloader_state/utils.rs
new file mode 100644
index 000000000000..31ec2ede5995
--- /dev/null
+++ b/core/lib/vm/src/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::bootloader_state::l2_block::BootloaderL2Block;
+use crate::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 crate::{BootloaderMemory, TxExecutionMode};
+
+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/vm/src/constants.rs b/core/lib/vm/src/constants.rs
new file mode 100644
index 000000000000..a51688b851e7
--- /dev/null
+++ b/core/lib/vm/src/constants.rs
@@ -0,0 +1,111 @@
+use zk_evm::aux_structures::MemoryPage;
+
+use zksync_config::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::zkevm_opcode_defs::system_params::{
+    ERGS_PER_CIRCUIT, INITIAL_STORAGE_WRITE_PUBDATA_BYTES, MAX_PUBDATA_PER_BLOCK,
+};
+
+use crate::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(crate) const BLOCK_OVERHEAD_GAS: u32 = 1200000;
+pub(crate) 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::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/vm/src/errors/bootloader_error.rs b/core/lib/vm/src/errors/bootloader_error.rs
index bfbef44a42bd..07ed0899b220 100644
--- a/core/lib/vm/src/errors/bootloader_error.rs
+++ b/core/lib/vm/src/errors/bootloader_error.rs
@@ -1,3 +1,4 @@
+/// Error codes returned by the bootloader.
 #[derive(Debug)]
 pub(crate) enum BootloaderErrorCode {
     EthCall,
@@ -23,6 +24,10 @@ pub(crate) enum BootloaderErrorCode {
     NotEnoughGasProvided,
     AccountReturnedInvalidMagic,
     PaymasterReturnedInvalidMagic,
+    MintEtherFailed,
+    FailedToAppendTransactionToL2Block,
+    FailedToSetL2Block,
+    FailedToPublishBlockDataToL1,
     Unknown,
 }
 
@@ -52,6 +57,10 @@ impl From<u8> for BootloaderErrorCode {
             20 => BootloaderErrorCode::NotEnoughGasProvided,
             21 => BootloaderErrorCode::AccountReturnedInvalidMagic,
             22 => BootloaderErrorCode::PaymasterReturnedInvalidMagic,
+            23 => BootloaderErrorCode::MintEtherFailed,
+            24 => BootloaderErrorCode::FailedToAppendTransactionToL2Block,
+            25 => BootloaderErrorCode::FailedToSetL2Block,
+            26 => BootloaderErrorCode::FailedToPublishBlockDataToL1,
             _ => BootloaderErrorCode::Unknown,
         }
     }
diff --git a/core/lib/vm/src/errors/bytecode_compression.rs b/core/lib/vm/src/errors/bytecode_compression.rs
new file mode 100644
index 000000000000..c6cd094ae948
--- /dev/null
+++ b/core/lib/vm/src/errors/bytecode_compression.rs
@@ -0,0 +1,8 @@
+use thiserror::Error;
+
+/// Errors related to bytecode compression.
+#[derive(Debug, Error)]
+pub enum BytecodeCompressionError {
+    #[error("Bytecode compression failed")]
+    BytecodeCompressionFailed,
+}
diff --git a/core/lib/vm/src/errors/halt.rs b/core/lib/vm/src/errors/halt.rs
new file mode 100644
index 000000000000..10c8a8d702b9
--- /dev/null
+++ b/core/lib/vm/src/errors/halt.rs
@@ -0,0 +1,107 @@
+use crate::errors::VmRevertReason;
+use std::fmt::{Display, Formatter};
+
+/// Structure for non-contract errors from the Virtual Machine (EVM).
+
+/// Differentiates VM-specific issues from contract-related errors.
+#[derive(Debug, Clone, PartialEq)]
+pub enum Halt {
+    // Can only be returned in VerifyAndExecute
+    ValidationFailed(VmRevertReason),
+    PaymasterValidationFailed(VmRevertReason),
+    PrePaymasterPreparationFailed(VmRevertReason),
+    PayForTxFailed(VmRevertReason),
+    FailedToMarkFactoryDependencies(VmRevertReason),
+    FailedToChargeFee(VmRevertReason),
+    // Emitted when trying to call a transaction from an account that has not
+    // been deployed as an account (i.e. the `from` is just a contract).
+    // Can only be returned in VerifyAndExecute
+    FromIsNotAnAccount,
+    // Currently cannot be returned. Should be removed when refactoring errors.
+    InnerTxError,
+    Unknown(VmRevertReason),
+    // Temporarily used instead of panics to provide better experience for developers:
+    // their transaction would simply be rejected and they'll be able to provide
+    // information about the cause to us.
+    UnexpectedVMBehavior(String),
+    // Bootloader is out of gas.
+    BootloaderOutOfGas,
+    // Transaction has a too big gas limit and will not be executed by the server.
+    TooBigGasLimit,
+    // The bootloader did not have enough gas to start the transaction in the first place
+    NotEnoughGasProvided,
+    // The tx consumes too much missing invocations to memory
+    MissingInvocationLimitReached,
+    // Failed to set information about the L2 block
+    FailedToSetL2Block(String),
+    // Failed to publish information about the batch and the L2 block onto L1
+    FailedToAppendTransactionToL2Block(String),
+    VMPanic,
+}
+
+impl Display for Halt {
+    fn fmt(&self, f: &mut Formatter<'_>) -> std::fmt::Result {
+        match self {
+            Halt::ValidationFailed(reason) => {
+                write!(f, "Account validation error: {}", reason)
+            }
+            Halt::FailedToChargeFee(reason) => {
+                write!(f, "Failed to charge fee: {}", reason)
+            }
+            // Emitted when trying to call a transaction from an account that has no
+            // been deployed as an account (i.e. the `from` is just a contract).
+            Halt::FromIsNotAnAccount => write!(f, "Sender is not an account"),
+            Halt::InnerTxError => write!(f, "Bootloader-based tx failed"),
+            Halt::PaymasterValidationFailed(reason) => {
+                write!(f, "Paymaster validation error: {}", reason)
+            }
+            Halt::PrePaymasterPreparationFailed(reason) => {
+                write!(f, "Pre-paymaster preparation error: {}", reason)
+            }
+            Halt::Unknown(reason) => write!(f, "Unknown reason: {}", reason),
+            Halt::UnexpectedVMBehavior(problem) => {
+                write!(f,
+                       "virtual machine entered unexpected state. Please contact developers and provide transaction details \
+                    that caused this error. Error description: {problem}"
+                )
+            }
+            Halt::BootloaderOutOfGas => write!(f, "Bootloader out of gas"),
+            Halt::NotEnoughGasProvided => write!(
+                f,
+                "Bootloader did not have enough gas to start the transaction"
+            ),
+            Halt::FailedToMarkFactoryDependencies(reason) => {
+                write!(f, "Failed to mark factory dependencies: {}", reason)
+            }
+            Halt::PayForTxFailed(reason) => {
+                write!(f, "Failed to pay for the transaction: {}", reason)
+            }
+            Halt::TooBigGasLimit => {
+                write!(
+                    f,
+                    "Transaction has a too big ergs limit and will not be executed by the server"
+                )
+            }
+            Halt::MissingInvocationLimitReached => {
+                write!(f, "Tx produced too much cold storage accesses")
+            }
+            Halt::VMPanic => {
+                write!(f, "VM panicked")
+            }
+            Halt::FailedToSetL2Block(reason) => {
+                write!(
+                    f,
+                    "Failed to set information about the L2 block: {}",
+                    reason
+                )
+            }
+            Halt::FailedToAppendTransactionToL2Block(reason) => {
+                write!(
+                    f,
+                    "Failed to append the transaction to the current L2 block: {}",
+                    reason
+                )
+            }
+        }
+    }
+}
diff --git a/core/lib/vm/src/errors/mod.rs b/core/lib/vm/src/errors/mod.rs
index 462330b41f98..43aecf796013 100644
--- a/core/lib/vm/src/errors/mod.rs
+++ b/core/lib/vm/src/errors/mod.rs
@@ -1,9 +1,11 @@
+pub(crate) use bootloader_error::BootloaderErrorCode;
+pub use bytecode_compression::BytecodeCompressionError;
+pub use halt::Halt;
+pub use tx_revert_reason::TxRevertReason;
+pub use vm_revert_reason::{VmRevertReason, VmRevertReasonParsingError};
+
 mod bootloader_error;
+mod bytecode_compression;
+mod halt;
 mod tx_revert_reason;
 mod vm_revert_reason;
-
-pub(crate) use bootloader_error::BootloaderErrorCode;
-pub use tx_revert_reason::TxRevertReason;
-pub use vm_revert_reason::{
-    VmRevertReason, VmRevertReasonParsingError, VmRevertReasonParsingResult,
-};
diff --git a/core/lib/vm/src/errors/tx_revert_reason.rs b/core/lib/vm/src/errors/tx_revert_reason.rs
index 4775d8339f79..8e65b15a0976 100644
--- a/core/lib/vm/src/errors/tx_revert_reason.rs
+++ b/core/lib/vm/src/errors/tx_revert_reason.rs
@@ -1,42 +1,16 @@
-use std::{convert::TryFrom, fmt::Display};
+use crate::errors::halt::Halt;
+
+use std::fmt::Display;
 
 use super::{BootloaderErrorCode, VmRevertReason};
 
-// Note that currently only EthCall transactions have valid Revert Reason.
-// Same transaction executed in bootloader will just have `InnerTxError`.
-// Reasons why the transaction executed inside the bootloader could fail.
 #[derive(Debug, Clone, PartialEq)]
 pub enum TxRevertReason {
-    // Can only be returned in EthCall execution mode (=ExecuteOnly)
-    EthCall(VmRevertReason),
     // Returned when the execution of an L2 transaction has failed
+    // Or EthCall has failed
     TxReverted(VmRevertReason),
-    // Can only be returned in VerifyAndExecute
-    ValidationFailed(VmRevertReason),
-    PaymasterValidationFailed(VmRevertReason),
-    PrePaymasterPreparationFailed(VmRevertReason),
-    PayForTxFailed(VmRevertReason),
-    FailedToMarkFactoryDependencies(VmRevertReason),
-    FailedToChargeFee(VmRevertReason),
-    // Emitted when trying to call a transaction from an account that has not
-    // been deployed as an account (i.e. the `from` is just a contract).
-    // Can only be returned in VerifyAndExecute
-    FromIsNotAnAccount,
-    // Currently cannot be returned. Should be removed when refactoring errors.
-    InnerTxError,
-    Unknown(VmRevertReason),
-    // Temporarily used instead of panics to provide better experience for developers:
-    // their transaction would simply be rejected and they'll be able to provide
-    // information about the cause to us.
-    UnexpectedVMBehavior(String),
-    // Bootloader is out of gas.
-    BootloaderOutOfGas,
-    // Transaction has a too big gas limit and will not be executed by the server.
-    TooBigGasLimit,
-    // The bootloader did not have enough gas to start the transaction in the first place
-    NotEnoughGasProvided,
-    // The tx consumes too much missing invocations to memory
-    MissingInvocationLimitReached,
+    // Returned when some validation has failed or some internal errors
+    Halt(Halt),
 }
 
 impl TxRevertReason {
@@ -44,53 +18,35 @@ impl TxRevertReason {
         // The first 32 bytes should correspond with error code.
         // If the error is smaller than that, we will use a standardized bootloader error.
         if bytes.is_empty() {
-            return Self::UnexpectedVMBehavior("Bootloader returned an empty error".to_string());
+            return Self::Halt(Halt::UnexpectedVMBehavior(
+                "Bootloader returned an empty error".to_string(),
+            ));
         }
 
         let (error_code, error_msg) = bytes.split_at(1);
-        let revert_reason = match VmRevertReason::try_from(error_msg) {
-            Ok(reason) => reason,
-            Err(_) => {
-                let function_selector = if error_msg.len() >= 4 {
-                    error_msg[0..4].to_vec()
-                } else {
-                    error_msg.to_vec()
-                };
-
-                let data = if error_msg.len() > 4 {
-                    error_msg[4..].to_vec()
-                } else {
-                    vec![]
-                };
-
-                VmRevertReason::Unknown {
-                    function_selector,
-                    data,
-                }
-            }
-        };
+        let revert_reason = VmRevertReason::from(error_msg);
 
         // `error_code` is a big-endian number, so we can safely take the first byte of it.
         match BootloaderErrorCode::from(error_code[0]) {
-            BootloaderErrorCode::EthCall => Self::EthCall(revert_reason),
-            BootloaderErrorCode::AccountTxValidationFailed => Self::ValidationFailed(revert_reason),
-            BootloaderErrorCode::FailedToChargeFee => Self::FailedToChargeFee(revert_reason),
-            BootloaderErrorCode::FromIsNotAnAccount => Self::FromIsNotAnAccount,
-            BootloaderErrorCode::FailedToCheckAccount => Self::ValidationFailed(VmRevertReason::General {
+            BootloaderErrorCode::EthCall => Self::TxReverted(revert_reason),
+            BootloaderErrorCode::AccountTxValidationFailed => Self::Halt(Halt::ValidationFailed(revert_reason)),
+            BootloaderErrorCode::FailedToChargeFee => Self::Halt(Halt::FailedToChargeFee(revert_reason)),
+            BootloaderErrorCode::FromIsNotAnAccount => Self::Halt(Halt::FromIsNotAnAccount),
+            BootloaderErrorCode::FailedToCheckAccount => Self::Halt(Halt::ValidationFailed(VmRevertReason::General {
                 msg: "Failed to check if `from` is an account. Most likely not enough gas provided".to_string(),
                 data: vec![],
-            }),
-            BootloaderErrorCode::UnacceptableGasPrice => Self::UnexpectedVMBehavior(
+            })),
+            BootloaderErrorCode::UnacceptableGasPrice => Self::Halt(Halt::UnexpectedVMBehavior(
                 "The operator included transaction with an unacceptable gas price".to_owned(),
-            ),
+            )),
             BootloaderErrorCode::PrePaymasterPreparationFailed => {
-                Self::PrePaymasterPreparationFailed(revert_reason)
+                Self::Halt(Halt::PrePaymasterPreparationFailed(revert_reason))
             }
             BootloaderErrorCode::PaymasterValidationFailed => {
-                Self::PaymasterValidationFailed(revert_reason)
+                Self::Halt(Halt::PaymasterValidationFailed(revert_reason))
             }
             BootloaderErrorCode::FailedToSendFeesToTheOperator => {
-                Self::UnexpectedVMBehavior("FailedToSendFeesToTheOperator".to_owned())
+                Self::Halt(Halt::UnexpectedVMBehavior("FailedToSendFeesToTheOperator".to_owned()))
             }
             BootloaderErrorCode::FailedToSetPrevBlockHash => {
                 panic!(
@@ -99,37 +55,37 @@ impl TxRevertReason {
                 )
             }
             BootloaderErrorCode::UnacceptablePubdataPrice => {
-                Self::UnexpectedVMBehavior("UnacceptablePubdataPrice".to_owned())
+                Self::Halt(Halt::UnexpectedVMBehavior("UnacceptablePubdataPrice".to_owned()))
             }
             // This is different from AccountTxValidationFailed error in a way that it means that
             // the error was not produced by the account itself, but for some other unknown reason (most likely not enough gas)
-            BootloaderErrorCode::TxValidationError => Self::ValidationFailed(revert_reason),
+            BootloaderErrorCode::TxValidationError => Self::Halt(Halt::ValidationFailed(revert_reason)),
             // Note, that `InnerTxError` is derived only after the actual tx execution, so
             // it is not parsed here. Unknown error means that bootloader failed by a reason
             // that was not specified by the protocol:
             BootloaderErrorCode::MaxPriorityFeeGreaterThanMaxFee => {
-                Self::UnexpectedVMBehavior("Max priority fee greater than max fee".to_owned())
+                Self::Halt(Halt::UnexpectedVMBehavior("Max priority fee greater than max fee".to_owned()))
             }
             BootloaderErrorCode::PaymasterReturnedInvalidContext => {
-                Self::PaymasterValidationFailed(VmRevertReason::General {
+                Self::Halt(Halt::PaymasterValidationFailed(VmRevertReason::General {
                     msg: String::from("Paymaster returned invalid context"),
                     data: vec![],
-                })
+                }))
             }
             BootloaderErrorCode::PaymasterContextIsTooLong => {
-                Self::PaymasterValidationFailed(VmRevertReason::General {
+                Self::Halt(Halt::PaymasterValidationFailed(VmRevertReason::General {
                     msg: String::from("Paymaster returned context that is too long"),
                     data: vec![],
-                })
+                }))
             }
             BootloaderErrorCode::AssertionError => {
-                Self::UnexpectedVMBehavior(format!("Assertion error: {}", revert_reason))
+                Self::Halt(Halt::UnexpectedVMBehavior(format!("Assertion error: {}", revert_reason)))
             }
-            BootloaderErrorCode::BaseFeeGreaterThanMaxFeePerGas => Self::UnexpectedVMBehavior(
+            BootloaderErrorCode::BaseFeeGreaterThanMaxFeePerGas => Self::Halt(Halt::UnexpectedVMBehavior(
                 "Block.basefee is greater than max fee per gas".to_owned(),
-            ),
+            )),
             BootloaderErrorCode::PayForTxFailed => {
-                Self::PayForTxFailed(revert_reason)
+                Self::Halt(Halt::PayForTxFailed(revert_reason))
             },
             BootloaderErrorCode::FailedToMarkFactoryDeps => {
                 let (msg, data) = if let VmRevertReason::General { msg , data} = revert_reason {
@@ -137,26 +93,37 @@ impl TxRevertReason {
                 } else {
                     (String::from("Most likely not enough gas provided"), vec![])
                 };
-                Self::FailedToMarkFactoryDependencies(VmRevertReason::General {
+                Self::Halt(Halt::FailedToMarkFactoryDependencies(VmRevertReason::General {
                     msg, data
-                })
+                }))
             },
             BootloaderErrorCode::TxValidationOutOfGas => {
-                Self::ValidationFailed(VmRevertReason::General { msg: String::from("Not enough gas for transaction validation"), data: vec![] })
+                Self::Halt(Halt::ValidationFailed(VmRevertReason::General { msg: String::from("Not enough gas for transaction validation"), data: vec![] }))
             },
             BootloaderErrorCode::NotEnoughGasProvided => {
-                Self::NotEnoughGasProvided
+                Self::Halt(Halt::NotEnoughGasProvided)
             },
             BootloaderErrorCode::AccountReturnedInvalidMagic => {
-                Self::ValidationFailed(VmRevertReason::General { msg: String::from("Account validation returned invalid magic value. Most often this means that the signature is incorrect"), data: vec![] })
+                Self::Halt(Halt::ValidationFailed(VmRevertReason::General { msg: String::from("Account validation returned invalid magic value. Most often this means that the signature is incorrect"), data: vec![] }))
             },
             BootloaderErrorCode::PaymasterReturnedInvalidMagic => {
-                Self::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![] })
+                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::Unknown => Self::UnexpectedVMBehavior(format!(
+            BootloaderErrorCode::Unknown => Self::Halt(Halt::UnexpectedVMBehavior(format!(
                 "Unsupported error code: {}. Revert reason: {}",
                 error_code[0], revert_reason
-            )),
+            ))),
+            BootloaderErrorCode::MintEtherFailed => Self::Halt(Halt::UnexpectedVMBehavior(format!("Failed to mint ether: {}", revert_reason))),
+            BootloaderErrorCode::FailedToAppendTransactionToL2Block => {
+                Self::Halt(Halt::FailedToAppendTransactionToL2Block(format!("Failed to append transaction to L2 block: {}", revert_reason)))
+            }
+            BootloaderErrorCode::FailedToSetL2Block => {
+                Self::Halt(Halt::FailedToSetL2Block(format!("{}", revert_reason)))
+
+            }
+            BootloaderErrorCode::FailedToPublishBlockDataToL1 => {
+                Self::Halt(Halt::UnexpectedVMBehavior(format!("Failed to publish block data to L1: {}", revert_reason)))
+            }
         }
     }
 }
@@ -164,52 +131,8 @@ impl TxRevertReason {
 impl Display for TxRevertReason {
     fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
         match &self {
-            // EthCall reason is usually returned unchanged.
-            TxRevertReason::EthCall(reason) => write!(f, "{}", reason),
             TxRevertReason::TxReverted(reason) => write!(f, "{}", reason),
-            TxRevertReason::ValidationFailed(reason) => {
-                write!(f, "Account validation error: {}", reason)
-            }
-            TxRevertReason::FailedToChargeFee(reason) => {
-                write!(f, "Failed to charge fee: {}", reason)
-            }
-            // Emitted when trying to call a transaction from an account that has no
-            // been deployed as an account (i.e. the `from` is just a contract).
-            TxRevertReason::FromIsNotAnAccount => write!(f, "Sender is not an account"),
-            TxRevertReason::InnerTxError => write!(f, "Bootloader-based tx failed"),
-            TxRevertReason::PaymasterValidationFailed(reason) => {
-                write!(f, "Paymaster validation error: {}", reason)
-            }
-            TxRevertReason::PrePaymasterPreparationFailed(reason) => {
-                write!(f, "Pre-paymaster preparation error: {}", reason)
-            }
-            TxRevertReason::Unknown(reason) => write!(f, "Unknown reason: {}", reason),
-            TxRevertReason::UnexpectedVMBehavior(problem) => {
-                write!(f,
-                    "virtual machine entered unexpected state. Please contact developers and provide transaction details \
-                    that caused this error. Error description: {problem}" 
-                )
-            }
-            TxRevertReason::BootloaderOutOfGas => write!(f, "Bootloader out of gas"),
-            TxRevertReason::NotEnoughGasProvided => write!(
-                f,
-                "Bootloader did not have enough gas to start the transaction"
-            ),
-            TxRevertReason::FailedToMarkFactoryDependencies(reason) => {
-                write!(f, "Failed to mark factory dependencies: {}", reason)
-            }
-            TxRevertReason::PayForTxFailed(reason) => {
-                write!(f, "Failed to pay for the transaction: {}", reason)
-            }
-            TxRevertReason::TooBigGasLimit => {
-                write!(
-                    f,
-                    "Transaction has a too big ergs limit and will not be executed by the server"
-                )
-            }
-            TxRevertReason::MissingInvocationLimitReached => {
-                write!(f, "Tx produced too much cold storage accesses")
-            }
+            TxRevertReason::Halt(reason) => write!(f, "{}", reason),
         }
     }
 }
diff --git a/core/lib/vm/src/errors/vm_revert_reason.rs b/core/lib/vm/src/errors/vm_revert_reason.rs
index 93d6cd370705..531d8b5507f6 100644
--- a/core/lib/vm/src/errors/vm_revert_reason.rs
+++ b/core/lib/vm/src/errors/vm_revert_reason.rs
@@ -1,10 +1,7 @@
-use std::convert::TryFrom;
 use std::fmt::{Debug, Display};
 
 use zksync_types::U256;
 
-use crate::TxRevertReason;
-
 #[derive(Debug, thiserror::Error)]
 pub enum VmRevertReasonParsingError {
     #[error("Incorrect data offset. Data: {0:?}")]
@@ -32,8 +29,8 @@ pub enum VmRevertReason {
 
 impl VmRevertReason {
     const GENERAL_ERROR_SELECTOR: &'static [u8] = &[0x08, 0xc3, 0x79, 0xa0];
-    fn parse_general_error(original_bytes: &[u8]) -> Result<Self, VmRevertReasonParsingError> {
-        let bytes = &original_bytes[4..];
+    fn parse_general_error(raw_bytes: &[u8]) -> Result<Self, VmRevertReasonParsingError> {
+        let bytes = &raw_bytes[4..];
         if bytes.len() < 32 {
             return Err(VmRevertReasonParsingError::InputIsTooShort(bytes.to_vec()));
         }
@@ -65,7 +62,7 @@ impl VmRevertReason {
         let raw_data = &data[32..32 + string_length];
         Ok(Self::General {
             msg: String::from_utf8_lossy(raw_data).to_string(),
-            data: original_bytes.to_vec(),
+            data: raw_bytes.to_vec(),
         })
     }
 
@@ -85,12 +82,8 @@ impl VmRevertReason {
             _ => vec![],
         }
     }
-}
-
-impl TryFrom<&[u8]> for VmRevertReason {
-    type Error = VmRevertReasonParsingError;
 
-    fn try_from(bytes: &[u8]) -> Result<Self, VmRevertReasonParsingError> {
+    fn try_from_bytes(bytes: &[u8]) -> Result<Self, VmRevertReasonParsingError> {
         if bytes.len() < 4 {
             // Note, that when the method reverts with no data
             // the selector is empty as well.
@@ -118,13 +111,39 @@ impl TryFrom<&[u8]> for VmRevertReason {
                     function_selector: function_selector.to_vec(),
                     data: bytes.to_vec(),
                 };
-                vlog::warn!("Unsupported error type: {}", result);
+                tracing::warn!("Unsupported error type: {}", result);
                 Ok(result)
             }
         }
     }
 }
 
+impl From<&[u8]> for VmRevertReason {
+    fn from(error_msg: &[u8]) -> Self {
+        match Self::try_from_bytes(error_msg) {
+            Ok(reason) => reason,
+            Err(_) => {
+                let function_selector = if error_msg.len() >= 4 {
+                    error_msg[0..4].to_vec()
+                } else {
+                    error_msg.to_vec()
+                };
+
+                let data = if error_msg.len() > 4 {
+                    error_msg[4..].to_vec()
+                } else {
+                    vec![]
+                };
+
+                VmRevertReason::Unknown {
+                    function_selector,
+                    data,
+                }
+            }
+        }
+    }
+}
+
 impl Display for VmRevertReason {
     fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
         use VmRevertReason::{General, InnerTxError, Unknown, VmError};
@@ -146,25 +165,8 @@ impl Display for VmRevertReason {
     }
 }
 
-#[derive(Debug, Clone, PartialEq)]
-pub struct VmRevertReasonParsingResult {
-    pub revert_reason: TxRevertReason,
-    pub original_data: Vec<u8>,
-}
-
-impl VmRevertReasonParsingResult {
-    pub fn new(revert_reason: TxRevertReason, original_data: Vec<u8>) -> Self {
-        Self {
-            revert_reason,
-            original_data,
-        }
-    }
-}
-
 #[cfg(test)]
 mod tests {
-    use std::convert::TryFrom;
-
     use super::VmRevertReason;
 
     #[test]
@@ -178,7 +180,7 @@ mod tests {
             0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
             0, 0, 0, 0, 0, 0, 0, 0, 0,
         ];
-        let reason = VmRevertReason::try_from(msg.as_slice()).expect("Shouldn't be error");
+        let reason = VmRevertReason::try_from_bytes(msg.as_slice()).expect("Shouldn't be error");
         assert_eq!(
             reason,
             VmRevertReason::General {
@@ -199,7 +201,7 @@ mod tests {
             0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
             0, 0, 0, 0, 0, 0, 0, 0, 0,
         ];
-        let reason = VmRevertReason::try_from(msg.as_slice()).expect("Shouldn't be error");
+        let reason = VmRevertReason::try_from_bytes(msg.as_slice()).expect("Shouldn't be error");
         assert!(matches!(reason, VmRevertReason::Unknown { .. }));
     }
 
@@ -214,7 +216,7 @@ mod tests {
             0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
             0, 0, 0, 0, 0, 0, 0, 0, 0,
         ];
-        let reason = VmRevertReason::try_from(msg.as_slice());
+        let reason = VmRevertReason::try_from_bytes(msg.as_slice());
         assert!(reason.is_err());
     }
 
@@ -229,7 +231,7 @@ mod tests {
             0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
             0, 0, 0, 0, 0, 0, 0, 0, 0,
         ];
-        let reason = VmRevertReason::try_from(msg.as_slice());
+        let reason = VmRevertReason::try_from_bytes(msg.as_slice());
         assert!(reason.is_err());
     }
 
@@ -244,7 +246,7 @@ mod tests {
             0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
             0, 0, 0, 0, 0, 0, 0, 0, 0,
         ];
-        let reason = VmRevertReason::try_from(msg.as_slice());
+        let reason = VmRevertReason::try_from_bytes(msg.as_slice());
         assert!(reason.is_err());
     }
 }
diff --git a/core/lib/vm/src/implementation/bytecode.rs b/core/lib/vm/src/implementation/bytecode.rs
new file mode 100644
index 000000000000..053d980bad73
--- /dev/null
+++ b/core/lib/vm/src/implementation/bytecode.rs
@@ -0,0 +1,57 @@
+use itertools::Itertools;
+
+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::{HistoryMode, 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/vm/src/implementation/execution.rs b/core/lib/vm/src/implementation/execution.rs
new file mode 100644
index 000000000000..9944a37f7e83
--- /dev/null
+++ b/core/lib/vm/src/implementation/execution.rs
@@ -0,0 +1,123 @@
+use zk_evm::aux_structures::Timestamp;
+use zksync_state::WriteStorage;
+
+use crate::old_vm::{
+    history_recorder::HistoryMode,
+    utils::{vm_may_have_ended_inner, VmExecutionResult},
+};
+use crate::tracers::{
+    traits::{BoxedTracer, ExecutionEndTracer, ExecutionProcessing, VmTracer},
+    DefaultExecutionTracer, RefundsTracer,
+};
+use crate::types::{inputs::VmExecutionMode, outputs::VmExecutionResultAndLogs};
+use crate::vm::Vm;
+use crate::VmExecutionStopReason;
+
+impl<S: WriteStorage, H: HistoryMode> Vm<S, H> {
+    pub(crate) fn inspect_inner(
+        &mut self,
+        mut tracers: Vec<Box<dyn VmTracer<S, H>>>,
+        execution_mode: VmExecutionMode,
+    ) -> VmExecutionResultAndLogs {
+        if let VmExecutionMode::OneTx = execution_mode {
+            // For correct results we have to include refunds tracer to the desired tracers
+            tracers.push(RefundsTracer::new(self.batch_env.clone()).into_boxed());
+            // Move the pointer to the next transaction
+            self.bootloader_state.move_tx_to_execute_pointer();
+        }
+        let (_, result) = self.inspect_and_collect_results(tracers, execution_mode);
+        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,
+        tracers: Vec<Box<dyn VmTracer<S, H>>>,
+        execution_mode: VmExecutionMode,
+    ) -> (VmExecutionStopReason, VmExecutionResultAndLogs) {
+        let mut tx_tracer: DefaultExecutionTracer<S, H> = DefaultExecutionTracer::new(
+            self.system_env.default_validation_computational_gas_limit,
+            execution_mode,
+            tracers,
+            self.storage.clone(),
+        );
+
+        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 statistics = self.get_statistics(
+            timestamp_initial,
+            cycles_initial,
+            &tx_tracer,
+            gas_remaining_before,
+            gas_remaining_after,
+            spent_pubdata_counter_before,
+            logs.total_log_queries_count,
+        );
+
+        let result = tx_tracer.result_tracer.into_result();
+
+        let mut result = VmExecutionResultAndLogs {
+            result,
+            logs,
+            statistics,
+            refunds: Default::default(),
+        };
+
+        for tracer in tx_tracer.custom_tracers.iter_mut() {
+            tracer.save_results(&mut result);
+        }
+        (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>,
+    ) -> 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
+            );
+
+            tracer.before_cycle(&mut self.state);
+            self.state
+                .cycle(tracer)
+                .expect("Failed execution VM cycle.");
+
+            tracer.after_cycle(&mut self.state, &mut self.bootloader_state);
+            if self.has_ended() {
+                break VmExecutionStopReason::VmFinished;
+            }
+
+            if tracer.should_stop_execution() {
+                break VmExecutionStopReason::TracerRequestedStop;
+            }
+        };
+        tracer.after_vm_execution(&mut self.state, &self.bootloader_state, result);
+        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/vm/src/implementation/gas.rs b/core/lib/vm/src/implementation/gas.rs
new file mode 100644
index 000000000000..a7938125540e
--- /dev/null
+++ b/core/lib/vm/src/implementation/gas.rs
@@ -0,0 +1,42 @@
+use zksync_state::WriteStorage;
+
+use crate::old_vm::history_recorder::HistoryMode;
+use crate::tracers::DefaultExecutionTracer;
+use crate::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>,
+        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/vm/src/implementation/logs.rs b/core/lib/vm/src/implementation/logs.rs
new file mode 100644
index 000000000000..6bc095740ef1
--- /dev/null
+++ b/core/lib/vm/src/implementation/logs.rs
@@ -0,0 +1,64 @@
+use zk_evm::aux_structures::Timestamp;
+use zksync_state::WriteStorage;
+
+use zksync_types::l2_to_l1_log::L2ToL1Log;
+use zksync_types::tx::tx_execution_info::VmExecutionLogs;
+use zksync_types::VmEvent;
+
+use crate::old_vm::events::merge_events;
+use crate::old_vm::history_recorder::HistoryMode;
+use crate::old_vm::utils::precompile_calls_count_after_timestamp;
+use crate::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,
+            l2_to_l1_logs,
+            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/vm/src/implementation/mod.rs b/core/lib/vm/src/implementation/mod.rs
new file mode 100644
index 000000000000..161732cf0348
--- /dev/null
+++ b/core/lib/vm/src/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/vm/src/implementation/snapshots.rs b/core/lib/vm/src/implementation/snapshots.rs
new file mode 100644
index 000000000000..8ca12b941f81
--- /dev/null
+++ b/core/lib/vm/src/implementation/snapshots.rs
@@ -0,0 +1,89 @@
+use std::time::Instant;
+use zk_evm::aux_structures::Timestamp;
+use zksync_state::WriteStorage;
+
+use crate::old_vm::history_recorder::HistoryEnabled;
+use crate::old_vm::oracles::OracleWithHistory;
+use crate::types::internals::VmSnapshot;
+use crate::vm::Vm;
+
+/// 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 mut stage_started_at = Instant::now();
+        let timestamp = Timestamp(local_state.timestamp);
+        tracing::trace!("Rolling back decomitter");
+        self.state
+            .decommittment_processor
+            .rollback_to_timestamp(timestamp);
+        metrics::histogram!(
+            "server.vm.rollback_time",
+            stage_started_at.elapsed(),
+            "stage" => "decommittment_processor_rollback"
+        );
+
+        stage_started_at = Instant::now();
+        tracing::trace!("Rolling back event_sink");
+        self.state.event_sink.rollback_to_timestamp(timestamp);
+        metrics::histogram!(
+            "server.vm.rollback_time",
+            stage_started_at.elapsed(),
+            "stage" => "event_sink_rollback"
+        );
+
+        stage_started_at = Instant::now();
+        tracing::trace!("Rolling back storage");
+        self.state.storage.rollback_to_timestamp(timestamp);
+        metrics::histogram!(
+            "server.vm.rollback_time",
+            stage_started_at.elapsed(),
+            "stage" => "event_sink_rollback"
+        );
+
+        stage_started_at = Instant::now();
+        tracing::trace!("Rolling back memory");
+        self.state.memory.rollback_to_timestamp(timestamp);
+        metrics::histogram!(
+            "server.vm.rollback_time",
+            stage_started_at.elapsed(),
+            "stage" => "memory_rollback"
+        );
+
+        stage_started_at = Instant::now();
+        tracing::trace!("Rolling back precompiles_processor");
+        self.state
+            .precompiles_processor
+            .rollback_to_timestamp(timestamp);
+        metrics::histogram!(
+            "server.vm.rollback_time",
+            stage_started_at.elapsed(),
+            "stage" => "precompiles_processor_rollback"
+        );
+
+        self.state.local_state = local_state;
+        stage_started_at = Instant::now();
+        self.bootloader_state.apply_snapshot(bootloader_state);
+        metrics::histogram!(
+            "server.vm.rollback_time",
+            stage_started_at.elapsed(),
+            "stage" => "apply_bootloader_snapshot"
+        );
+    }
+}
diff --git a/core/lib/vm/src/implementation/statistics.rs b/core/lib/vm/src/implementation/statistics.rs
new file mode 100644
index 000000000000..54b77d574940
--- /dev/null
+++ b/core/lib/vm/src/implementation/statistics.rs
@@ -0,0 +1,87 @@
+use zk_evm::aux_structures::Timestamp;
+use zksync_state::WriteStorage;
+
+use zksync_types::U256;
+
+use crate::old_vm::history_recorder::HistoryMode;
+use crate::tracers::DefaultExecutionTracer;
+use crate::types::outputs::VmExecutionStatistics;
+use crate::vm::Vm;
+
+use crate::VmMemoryMetrics;
+
+/// 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>,
+        gas_remaining_before: u32,
+        gas_remaining_after: u32,
+        spent_pubdata_counter_before: 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,
+        }
+    }
+
+    /// 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 fn record_vm_memory_metrics(&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(),
+        }
+    }
+}
+
+impl VmMemoryMetrics {
+    pub fn full_size(&self) -> usize {
+        [
+            self.event_sink_inner,
+            self.event_sink_history,
+            self.memory_inner,
+            self.memory_history,
+            self.decommittment_processor_inner,
+            self.decommittment_processor_history,
+            self.storage_inner,
+            self.storage_history,
+        ]
+        .iter()
+        .sum::<usize>()
+    }
+}
diff --git a/core/lib/vm/src/implementation/tx.rs b/core/lib/vm/src/implementation/tx.rs
new file mode 100644
index 000000000000..8341782d8abf
--- /dev/null
+++ b/core/lib/vm/src/implementation/tx.rs
@@ -0,0 +1,65 @@
+use crate::constants::BOOTLOADER_HEAP_PAGE;
+use crate::implementation::bytecode::{bytecode_to_factory_dep, compress_bytecodes};
+use zk_evm::aux_structures::Timestamp;
+use zksync_state::WriteStorage;
+use zksync_types::l1::is_l1_tx_type;
+use zksync_types::Transaction;
+
+use crate::old_vm::history_recorder::HistoryMode;
+use crate::types::internals::TransactionData;
+use crate::vm::Vm;
+
+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/vm/src/lib.rs b/core/lib/vm/src/lib.rs
index c648fcacce1a..34c25f4addcf 100644
--- a/core/lib/vm/src/lib.rs
+++ b/core/lib/vm/src/lib.rs
@@ -1,36 +1,50 @@
-#![allow(clippy::derive_partial_eq_without_eq)]
+#![deny(unreachable_pub)]
+#![deny(unused_crate_dependencies)]
+#![warn(unused_extern_crates)]
+#![warn(unused_imports)]
+
+pub use old_vm::{
+    history_recorder::{HistoryDisabled, HistoryEnabled, HistoryMode},
+    memory::SimpleMemory,
+    oracles::storage::StorageOracle,
+};
+
+pub use errors::{
+    BytecodeCompressionError, Halt, TxRevertReason, VmRevertReason, VmRevertReasonParsingError,
+};
+
+pub use tracers::{
+    call::CallTracer,
+    traits::{BoxedTracer, DynTracer, ExecutionEndTracer, ExecutionProcessing, VmTracer},
+    utils::VmExecutionStopReason,
+    validation::ViolatedValidationRule,
+    StorageInvocations, ValidationError, ValidationTracer, ValidationTracerParams,
+};
+
+pub use types::{
+    inputs::{L1BatchEnv, L2BlockEnv, SystemEnv, TxExecutionMode, VmExecutionMode},
+    internals::ZkSyncVmState,
+    outputs::{
+        BootloaderMemory, CurrentExecutionState, ExecutionResult, FinishedL1Batch, L2Block,
+        Refunds, VmExecutionResultAndLogs, VmExecutionStatistics, VmMemoryMetrics,
+    },
+};
+pub use utils::transaction_encoding::TransactionVmExt;
+
+pub use bootloader_state::BootloaderState;
+
+pub use crate::vm::Vm;
 
 mod bootloader_state;
-pub mod errors;
-pub mod event_sink;
-mod events;
-mod history_recorder;
-pub mod memory;
-mod oracle_tools;
-pub mod oracles;
-mod pubdata_utils;
-mod refunds;
-pub mod test_utils;
-pub mod transaction_data;
+mod errors;
+mod implementation;
+mod old_vm;
+mod tracers;
+mod types;
+mod vm;
+
+pub mod constants;
 pub mod utils;
-pub mod vm;
-pub mod vm_with_bootloader;
 
 #[cfg(test)]
 mod tests;
-
-pub use crate::errors::TxRevertReason;
-pub use crate::history_recorder::{HistoryDisabled, HistoryEnabled, HistoryMode};
-pub use crate::oracle_tools::OracleTools;
-pub use crate::oracles::storage::StorageOracle;
-pub use crate::vm::{VmBlockResult, VmExecutionResult, VmInstance};
-pub use zk_evm;
-pub use zksync_types::vm_trace::VmExecutionTrace;
-
-pub type Word = zksync_types::U256;
-
-pub const MEMORY_SIZE: usize = 1 << 16;
-pub const MAX_CALLS: usize = 65536;
-pub const REGISTERS_COUNT: usize = 16;
-pub const MAX_STACK_SIZE: usize = 256;
-pub const MAX_CYCLES_FOR_TX: u32 = u32::MAX;
diff --git a/core/lib/vm/src/old_vm/event_sink.rs b/core/lib/vm/src/old_vm/event_sink.rs
new file mode 100644
index 000000000000..03156e83b9fb
--- /dev/null
+++ b/core/lib/vm/src/old_vm/event_sink.rs
@@ -0,0 +1,171 @@
+use crate::old_vm::{
+    history_recorder::{AppDataFrameManagerWithHistory, HistoryEnabled, HistoryMode},
+    oracles::OracleWithHistory,
+};
+use std::collections::HashMap;
+use zk_evm::{
+    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/vm/src/old_vm/events.rs b/core/lib/vm/src/old_vm/events.rs
new file mode 100644
index 000000000000..384a0eb86d67
--- /dev/null
+++ b/core/lib/vm/src/old_vm/events.rs
@@ -0,0 +1,146 @@
+use zk_evm::{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/vm/src/old_vm/history_recorder.rs b/core/lib/vm/src/old_vm/history_recorder.rs
new file mode 100644
index 000000000000..1a5f7db58664
--- /dev/null
+++ b/core/lib/vm/src/old_vm/history_recorder.rs
@@ -0,0 +1,805 @@
+use std::{collections::HashMap, fmt::Debug, hash::Hash};
+
+use zk_evm::{
+    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,
+        )
+    }
+}
+
+/// 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::old_vm::history_recorder::{HistoryRecorder, MemoryWrapper};
+    use crate::HistoryDisabled;
+    use zk_evm::{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/vm/src/old_vm/memory.rs b/core/lib/vm/src/old_vm/memory.rs
new file mode 100644
index 000000000000..8569c135d1e2
--- /dev/null
+++ b/core/lib/vm/src/old_vm/memory.rs
@@ -0,0 +1,323 @@
+use zk_evm::abstractions::{Memory, MemoryType};
+use zk_evm::aux_structures::{MemoryPage, MemoryQuery, Timestamp};
+use zk_evm::vm_state::PrimitiveValue;
+use zk_evm::zkevm_opcode_defs::FatPointer;
+use zksync_types::U256;
+
+use crate::old_vm::history_recorder::{
+    FramedStack, HistoryEnabled, HistoryMode, IntFrameManagerWithHistory, MemoryWithHistory,
+    MemoryWrapper, WithHistory,
+};
+use crate::old_vm::oracles::OracleWithHistory;
+use crate::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/vm/src/old_vm/mod.rs b/core/lib/vm/src/old_vm/mod.rs
new file mode 100644
index 000000000000..afade1984614
--- /dev/null
+++ b/core/lib/vm/src/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/vm/src/old_vm/oracles/decommitter.rs b/core/lib/vm/src/old_vm/oracles/decommitter.rs
new file mode 100644
index 000000000000..e91380a6d385
--- /dev/null
+++ b/core/lib/vm/src/old_vm/oracles/decommitter.rs
@@ -0,0 +1,238 @@
+use std::collections::HashMap;
+use std::fmt::Debug;
+
+use crate::old_vm::history_recorder::{HistoryEnabled, HistoryMode, HistoryRecorder, WithHistory};
+
+use zk_evm::abstractions::MemoryType;
+use zk_evm::aux_structures::Timestamp;
+use zk_evm::{
+    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::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/vm/src/old_vm/oracles/mod.rs b/core/lib/vm/src/old_vm/oracles/mod.rs
new file mode 100644
index 000000000000..daa2e21672df
--- /dev/null
+++ b/core/lib/vm/src/old_vm/oracles/mod.rs
@@ -0,0 +1,9 @@
+use zk_evm::aux_structures::Timestamp;
+
+pub(crate) mod decommitter;
+pub(crate) mod precompile;
+pub(crate) mod storage;
+
+pub(crate) trait OracleWithHistory {
+    fn rollback_to_timestamp(&mut self, timestamp: Timestamp);
+}
diff --git a/core/lib/vm/src/old_vm/oracles/precompile.rs b/core/lib/vm/src/old_vm/oracles/precompile.rs
new file mode 100644
index 000000000000..72b751c75d49
--- /dev/null
+++ b/core/lib/vm/src/old_vm/oracles/precompile.rs
@@ -0,0 +1,75 @@
+use zk_evm::{
+    abstractions::Memory,
+    abstractions::PrecompileCyclesWitness,
+    abstractions::PrecompilesProcessor,
+    aux_structures::{LogQuery, MemoryQuery, Timestamp},
+    precompiles::DefaultPrecompilesProcessor,
+};
+
+use crate::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 occured.
+        // 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/vm/src/old_vm/oracles/storage.rs b/core/lib/vm/src/old_vm/oracles/storage.rs
new file mode 100644
index 000000000000..482cc69bbbd8
--- /dev/null
+++ b/core/lib/vm/src/old_vm/oracles/storage.rs
@@ -0,0 +1,338 @@
+use std::collections::HashMap;
+
+use crate::old_vm::history_recorder::{
+    AppDataFrameManagerWithHistory, HashMapHistoryEvent, HistoryEnabled, HistoryMode,
+    HistoryRecorder, StorageWrapper, WithHistory,
+};
+
+use zk_evm::abstractions::RefundedAmounts;
+use zk_evm::zkevm_opcode_defs::system_params::INITIAL_STORAGE_WRITE_PUBDATA_BYTES;
+use zk_evm::{
+    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_config::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::zkevm_opcode_defs::system_params::INITIAL_STORAGE_WRITE_PUBDATA_BYTES as u32
+    } else {
+        zk_evm::zkevm_opcode_defs::system_params::REPEATED_STORAGE_WRITE_PUBDATA_BYTES as u32
+    }
+}
diff --git a/core/lib/vm/src/old_vm/utils.rs b/core/lib/vm/src/old_vm/utils.rs
new file mode 100644
index 000000000000..5df4c6aa8012
--- /dev/null
+++ b/core/lib/vm/src/old_vm/utils.rs
@@ -0,0 +1,222 @@
+use crate::old_vm::memory::SimpleMemory;
+
+use crate::types::internals::ZkSyncVmState;
+use crate::HistoryMode;
+
+use zk_evm::zkevm_opcode_defs::decoding::{AllowedPcOrImm, EncodingModeProduction, VmEncodingMode};
+use zk_evm::zkevm_opcode_defs::RET_IMPLICIT_RETURNDATA_PARAMS_REGISTER;
+use zk_evm::{
+    aux_structures::{MemoryPage, Timestamp},
+    vm_state::PrimitiveValue,
+    zkevm_opcode_defs::FatPointer,
+};
+use zksync_config::constants::L1_GAS_PER_PUBDATA_BYTE;
+use zksync_state::WriteStorage;
+
+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/vm/src/tests/bootloader.rs b/core/lib/vm/src/tests/bootloader.rs
index 38add8f22272..0479672a6ef2 100644
--- a/core/lib/vm/src/tests/bootloader.rs
+++ b/core/lib/vm/src/tests/bootloader.rs
@@ -1,2144 +1,53 @@
-//!
-//! Tests for the bootloader
-//! The description for each of the tests can be found in the corresponding `.yul` file.
-//!
-use itertools::Itertools;
-use std::{
-    collections::{HashMap, HashSet},
-    convert::{TryFrom, TryInto},
-};
-use zksync_eth_signer::{raw_ethereum_tx::TransactionParameters, EthereumSigner, PrivateKeySigner};
+use zksync_types::U256;
 
-use crate::{
-    errors::VmRevertReason,
-    history_recorder::HistoryMode,
-    oracles::tracer::{StorageInvocationTracer, TransactionResultTracer},
-    test_utils::{
-        get_create_zksync_address, get_deploy_tx, get_error_tx, mock_loadnext_test_call,
-        verify_required_storage,
-    },
-    tests::utils::{
-        get_l1_deploy_tx, get_l1_execute_test_contract_tx_with_sender, read_error_contract,
-        read_long_return_data_contract, read_test_contract,
-    },
-    transaction_data::TransactionData,
-    utils::{
-        create_test_block_params, read_bootloader_test_code, BASE_SYSTEM_CONTRACTS, BLOCK_GAS_LIMIT,
-    },
-    vm::{tx_has_failed, VmExecutionStopReason, ZkSyncVmState},
-    vm_with_bootloader::{
-        bytecode_to_factory_dep, get_bootloader_memory, get_bootloader_memory_for_encoded_tx,
-        push_raw_transaction_to_bootloader_memory, BlockContext, BlockContextMode,
-        BootloaderJobType, TxExecutionMode,
-    },
-    vm_with_bootloader::{
-        init_vm_inner, push_transaction_to_bootloader_memory, DerivedBlockContext,
-        BOOTLOADER_HEAP_PAGE, TX_DESCRIPTION_OFFSET, TX_GAS_LIMIT_OFFSET,
-    },
-    HistoryEnabled, OracleTools, TxRevertReason, VmBlockResult, VmExecutionResult, VmInstance,
-};
+use crate::constants::BOOTLOADER_HEAP_PAGE;
+use crate::errors::Halt;
+use crate::tests::tester::VmTesterBuilder;
+use crate::tests::utils::{get_bootloader, verify_required_memory, BASE_SYSTEM_CONTRACTS};
+use crate::types::inputs::system_env::TxExecutionMode;
 
-use zk_evm::{
-    aux_structures::Timestamp, block_properties::BlockProperties, zkevm_opcode_defs::FarCallOpcode,
-};
-use zksync_state::{InMemoryStorage, ReadStorage, StoragePtr, StorageView, WriteStorage};
-use zksync_types::{
-    block::DeployedContract,
-    ethabi::encode,
-    ethabi::Token,
-    fee::Fee,
-    get_code_key, get_is_account_key, get_known_code_key, get_nonce_key,
-    l2::L2Tx,
-    l2_to_l1_log::L2ToL1Log,
-    storage_writes_deduplicator::StorageWritesDeduplicator,
-    system_contracts::{DEPLOYMENT_NONCE_INCREMENT, TX_NONCE_INCREMENT},
-    transaction_request::TransactionRequest,
-    tx::tx_execution_info::TxExecutionStatus,
-    utils::{
-        deployed_address_create, storage_key_for_eth_balance,
-        storage_key_for_standard_token_balance,
-    },
-    vm_trace::{Call, CallType},
-    AccountTreeId, Address, Eip712Domain, Execute, ExecuteTransactionCommon, L1TxCommonData,
-    L2ChainId, Nonce, PackedEthSignature, Transaction, BOOTLOADER_ADDRESS, H160, H256,
-    L1_MESSENGER_ADDRESS, L2_ETH_TOKEN_ADDRESS, MAX_GAS_PER_PUBDATA_BYTE,
-    REQUIRED_L1_TO_L2_GAS_PER_PUBDATA_BYTE, SYSTEM_CONTEXT_ADDRESS, U256,
-};
-use zksync_utils::{
-    bytecode::CompressedBytecodeInfo,
-    test_utils::LoadnextContractExecutionParams,
-    {bytecode::hash_bytecode, bytes_to_be_words, h256_to_u256, u256_to_h256},
-};
-
-use zksync_contracts::{
-    get_loadnext_contract, load_contract, SystemContractCode, PLAYGROUND_BLOCK_BOOTLOADER_CODE,
-};
-
-use super::utils::{read_many_owners_custom_account_contract, read_nonce_holder_tester};
-/// Helper struct for tests, that takes care of setting the database and provides some functions to get and set balances.
-/// Example use:
-///```ignore
-///      let test_env = VmTestEnv::default();
-///      test_env.set_rich_account(address);
-///      // To create VM and run a single transaction:
-///      test_env.run_vm_or_die(transaction_data);
-///      // To create VM:
-///      let mut helper = VmTestHelper::new(&test_env);
-///      let mut vm = helper.vm();
-/// ```
-#[derive(Debug)]
-pub struct VmTestEnv {
-    pub block_context: DerivedBlockContext,
-    pub block_properties: BlockProperties,
-    pub storage_ptr: Box<StorageView<InMemoryStorage>>,
-}
-
-impl VmTestEnv {
-    /// Creates a new test helper with a bunch of already deployed contracts.
-    pub fn new_with_contracts(contracts: &[(H160, Vec<u8>)]) -> Self {
-        let (block_context, block_properties): (DerivedBlockContext, BlockProperties) = {
-            let (block_context, block_properties) = create_test_block_params();
-            (block_context.into(), block_properties)
-        };
-
-        let mut raw_storage = InMemoryStorage::with_system_contracts(hash_bytecode);
-        for (address, bytecode) in contracts {
-            let account = DeployedContract {
-                account_id: AccountTreeId::new(*address),
-                bytecode: bytecode.clone(),
-            };
-
-            insert_contracts(&mut raw_storage, vec![(account, true)]);
-        }
-
-        let storage_ptr = Box::new(StorageView::new(raw_storage));
-
-        VmTestEnv {
-            block_context,
-            block_properties,
-            storage_ptr,
-        }
-    }
-
-    /// Gets the current ETH balance for a given account.
-    pub fn get_eth_balance(&mut self, address: &H160) -> U256 {
-        get_eth_balance(address, self.storage_ptr.as_mut())
-    }
-
-    /// Sets a large balance for a given account.
-    pub fn set_rich_account(&mut self, address: &H160) {
-        let key = storage_key_for_eth_balance(address);
-
-        self.storage_ptr
-            .set_value(key, u256_to_h256(U256::from(10u64.pow(19))));
-    }
-
-    /// Runs a given transaction in a VM.
-    // Note: that storage changes will be preserved, but not changed to events etc.
-    // Strongly suggest to use this function only if this is the only transaction executed within the test.
-    pub fn run_vm(&mut self, transaction_data: TransactionData) -> (VmExecutionResult, bool) {
-        let mut oracle_tools = OracleTools::new(self.storage_ptr.as_mut(), HistoryEnabled);
-        let (result, tx_has_failed) = run_vm_with_raw_tx(
-            &mut oracle_tools,
-            self.block_context,
-            &self.block_properties,
-            transaction_data,
-        );
-        (result, tx_has_failed)
-    }
-
-    /// Runs a given transaction in a VM and asserts if it fails.
-    pub fn run_vm_or_die(&mut self, transaction_data: TransactionData) {
-        let (result, tx_has_failed) = self.run_vm(transaction_data);
-        assert!(
-            !tx_has_failed,
-            "Transaction failed with: {:?}",
-            result.revert_reason
-        );
-    }
-}
-
-impl Default for VmTestEnv {
-    fn default() -> Self {
-        VmTestEnv::new_with_contracts(&[])
-    }
-}
-
-/// Helper struct to create a default VM for a given environment.
-#[derive(Debug)]
-pub struct VmTestHelper<'a> {
-    pub oracle_tools: OracleTools<'a, false, HistoryEnabled>,
-    pub block_context: DerivedBlockContext,
-    pub block_properties: BlockProperties,
-    vm_created: bool,
-}
-
-impl<'a> VmTestHelper<'a> {
-    pub fn new(test_env: &'a mut VmTestEnv) -> Self {
-        let block_context = test_env.block_context;
-        let block_properties = test_env.block_properties;
-
-        let oracle_tools = OracleTools::new(test_env.storage_ptr.as_mut(), HistoryEnabled);
-        VmTestHelper {
-            oracle_tools,
-            block_context,
-            block_properties,
-            vm_created: false,
-        }
-    }
-
-    /// Creates the VM that can be used in tests.
-    pub fn vm(&'a mut self) -> Box<VmInstance<'a, HistoryEnabled>> {
-        assert!(!self.vm_created, "Vm can be created only once");
-        let vm = init_vm_inner(
-            &mut self.oracle_tools,
-            BlockContextMode::NewBlock(self.block_context, Default::default()),
-            &self.block_properties,
-            BLOCK_GAS_LIMIT,
-            &BASE_SYSTEM_CONTRACTS,
-            TxExecutionMode::VerifyExecute,
-        );
-        self.vm_created = true;
-        vm
-    }
-}
-
-fn run_vm_with_custom_factory_deps<'a, H: HistoryMode>(
-    oracle_tools: &'a mut OracleTools<'a, false, H>,
-    block_context: BlockContext,
-    block_properties: &'a BlockProperties,
-    encoded_tx: Vec<U256>,
-    predefined_overhead: u32,
-    expected_error: Option<TxRevertReason>,
-) {
-    let mut base_system_contracts = BASE_SYSTEM_CONTRACTS.clone();
-    base_system_contracts.bootloader = PLAYGROUND_BLOCK_BOOTLOADER_CODE.clone();
-    let mut vm = init_vm_inner(
-        oracle_tools,
-        BlockContextMode::OverrideCurrent(block_context.into()),
-        block_properties,
-        BLOCK_GAS_LIMIT,
-        &base_system_contracts,
-        TxExecutionMode::VerifyExecute,
-    );
-
-    vm.bootloader_state.add_tx_data(encoded_tx.len());
-    vm.state.memory.populate_page(
-        BOOTLOADER_HEAP_PAGE as usize,
-        get_bootloader_memory_for_encoded_tx(
-            encoded_tx,
-            0,
-            TxExecutionMode::VerifyExecute,
-            0,
-            0,
-            predefined_overhead,
-            u32::MAX,
-            0,
-            vec![],
-        ),
-        Timestamp(0),
-    );
-
-    let result = vm.execute_next_tx(u32::MAX, false).err();
-
-    assert_eq!(expected_error, result);
-}
-
-fn get_balance(token_id: AccountTreeId, account: &Address, main_storage: StoragePtr) -> U256 {
-    let key = storage_key_for_standard_token_balance(token_id, account);
-    h256_to_u256(main_storage.borrow_mut().read_value(&key))
-}
-
-fn get_eth_balance(account: &Address, main_storage: &mut StorageView<InMemoryStorage>) -> U256 {
-    let key =
-        storage_key_for_standard_token_balance(AccountTreeId::new(L2_ETH_TOKEN_ADDRESS), account);
-    h256_to_u256(main_storage.read_value(&key))
-}
+use crate::types::outputs::ExecutionResult;
+use crate::{HistoryEnabled, VmExecutionMode};
 
 #[test]
 fn test_dummy_bootloader() {
-    let mut vm_test_env = VmTestEnv::default();
-    let mut oracle_tools = OracleTools::new(vm_test_env.storage_ptr.as_mut(), HistoryEnabled);
     let mut base_system_contracts = BASE_SYSTEM_CONTRACTS.clone();
-    let bootloader_code = read_bootloader_test_code("dummy");
-    let bootloader_hash = hash_bytecode(&bootloader_code);
+    base_system_contracts.bootloader = get_bootloader("dummy");
 
-    base_system_contracts.bootloader = SystemContractCode {
-        code: bytes_to_be_words(bootloader_code),
-        hash: bootloader_hash,
-    };
+    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 mut vm = init_vm_inner(
-        &mut oracle_tools,
-        BlockContextMode::NewBlock(vm_test_env.block_context, Default::default()),
-        &vm_test_env.block_properties,
-        BLOCK_GAS_LIMIT,
-        &base_system_contracts,
-        TxExecutionMode::VerifyExecute,
-    );
-
-    let VmBlockResult {
-        full_result: res, ..
-    } = vm.execute_till_block_end(BootloaderJobType::BlockPostprocessing);
-
-    // Dummy bootloader should not panic
-    assert!(res.revert_reason.is_none());
+    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.state,
+        &vm.vm.state,
         vec![(correct_first_cell, BOOTLOADER_HEAP_PAGE, 0)],
     );
 }
 
 #[test]
 fn test_bootloader_out_of_gas() {
-    let mut vm_test_env = VmTestEnv::default();
-    let mut oracle_tools = OracleTools::new(vm_test_env.storage_ptr.as_mut(), HistoryEnabled);
-
-    let mut base_system_contracts = BASE_SYSTEM_CONTRACTS.clone();
-
-    let bootloader_code = read_bootloader_test_code("dummy");
-    let bootloader_hash = hash_bytecode(&bootloader_code);
-
-    base_system_contracts.bootloader = SystemContractCode {
-        code: bytes_to_be_words(bootloader_code),
-        hash: bootloader_hash,
-    };
-
-    // init vm with only 10 ergs
-    let mut vm = init_vm_inner(
-        &mut oracle_tools,
-        BlockContextMode::NewBlock(vm_test_env.block_context, Default::default()),
-        &vm_test_env.block_properties,
-        10,
-        &base_system_contracts,
-        TxExecutionMode::VerifyExecute,
-    );
-
-    let res = vm.execute_block_tip();
-
-    assert_eq!(res.revert_reason, Some(TxRevertReason::BootloaderOutOfGas));
-}
-
-fn verify_required_memory<H: HistoryMode>(
-    state: &ZkSyncVmState<'_, 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);
-    }
-}
-
-#[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_test_env = VmTestEnv::default();
-
-    let operator_address = vm_test_env.block_context.context.operator_address;
-    let base_fee = vm_test_env.block_context.base_fee;
-    // We deploy here counter contract, because its logic is trivial
-    let contract_code = read_test_contract();
-    let contract_code_hash = hash_bytecode(&contract_code);
-    let tx: Transaction = get_deploy_tx(
-        H256::random(),
-        Nonce(0),
-        &contract_code,
-        vec![],
-        &[],
-        Fee {
-            gas_limit: U256::from(20000000u32),
-            max_fee_per_gas: U256::from(base_fee),
-            max_priority_fee_per_gas: U256::from(0),
-            gas_per_pubdata_limit: U256::from(MAX_GAS_PER_PUBDATA_BYTE),
-        },
-    )
-    .into();
-    let tx_data: TransactionData = tx.clone().into();
-
-    let maximal_fee = tx_data.gas_limit * tx_data.max_fee_per_gas;
-    let sender_address = tx_data.from();
-
-    vm_test_env.set_rich_account(&sender_address);
-
-    let mut vm_helper = VmTestHelper::new(&mut vm_test_env);
-    let mut vm = vm_helper.vm();
-
-    push_transaction_to_bootloader_memory(&mut vm, &tx, TxExecutionMode::VerifyExecute, None);
-
-    let tx_execution_result = vm
-        .execute_next_tx(u32::MAX, false)
-        .expect("Bootloader failed while processing transaction");
-
-    assert_eq!(
-        tx_execution_result.status,
-        TxExecutionStatus::Success,
-        "Transaction wasn't successful"
-    );
-
-    let VmBlockResult {
-        full_result: res, ..
-    } = vm.execute_till_block_end(BootloaderJobType::TransactionExecution);
-    // Should not panic
-    assert!(
-        res.revert_reason.is_none(),
-        "Bootloader was not expected to revert: {:?}",
-        res.revert_reason
-    );
-
-    // Both deployment and ordinary nonce should be incremented by one.
-    let account_nonce_key = get_nonce_key(&sender_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(&contract_code_hash);
-
-    // The contract should be deployed successfully.
-    let deployed_address = deployed_address_create(sender_address, U256::zero());
-    let account_code_key = get_code_key(&deployed_address);
-
-    let expected_slots = vec![
-        (u256_to_h256(expected_nonce), account_nonce_key),
-        (u256_to_h256(U256::from(1u32)), known_codes_key),
-        (contract_code_hash, account_code_key),
-    ];
-
-    verify_required_storage(&vm.state, expected_slots);
-
-    assert!(!tx_has_failed(&vm.state, 0));
-
-    let expected_fee =
-        maximal_fee - U256::from(tx_execution_result.gas_refunded) * U256::from(base_fee);
-    let operator_balance = get_balance(
-        AccountTreeId::new(L2_ETH_TOKEN_ADDRESS),
-        &operator_address,
-        vm.state.storage.storage.get_ptr(),
-    );
-
-    assert_eq!(
-        operator_balance, expected_fee,
-        "Operator did not receive his fee"
-    );
-}
-
-fn execute_vm_with_predetermined_refund(
-    txs: Vec<Transaction>,
-    refunds: Vec<u32>,
-    compressed_bytecodes: Vec<Vec<CompressedBytecodeInfo>>,
-) -> VmBlockResult {
-    let mut vm_test_env = VmTestEnv::default();
-    let block_context = vm_test_env.block_context;
-
-    for tx in txs.iter() {
-        let sender_address = tx.initiator_account();
-        vm_test_env.set_rich_account(&sender_address);
-    }
-
-    let mut vm_helper = VmTestHelper::new(&mut vm_test_env);
-    let mut vm = vm_helper.vm();
-
-    let codes_for_decommiter = txs
-        .iter()
-        .flat_map(|tx| {
-            tx.execute
-                .factory_deps
-                .clone()
-                .unwrap_or_default()
-                .iter()
-                .map(|dep| bytecode_to_factory_dep(dep.clone()))
-                .collect::<Vec<(U256, Vec<U256>)>>()
-        })
-        .collect();
-
-    vm.state.decommittment_processor.populate(
-        codes_for_decommiter,
-        Timestamp(vm.state.local_state.timestamp),
-    );
-
-    let memory_with_suggested_refund = get_bootloader_memory(
-        txs.into_iter().map(Into::into).collect(),
-        refunds,
-        compressed_bytecodes,
-        TxExecutionMode::VerifyExecute,
-        BlockContextMode::NewBlock(block_context, Default::default()),
-    );
-
-    vm.state.memory.populate_page(
-        BOOTLOADER_HEAP_PAGE as usize,
-        memory_with_suggested_refund,
-        Timestamp(0),
-    );
-
-    vm.execute_till_block_end(BootloaderJobType::TransactionExecution)
-}
-
-#[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_test_env = VmTestEnv::default();
-    let base_fee = vm_test_env.block_context.base_fee;
-
-    // We deploy here counter contract, because its logic is trivial
-    let contract_code = read_test_contract();
-    let published_bytecode = CompressedBytecodeInfo::from_original(contract_code.clone()).unwrap();
-    let tx: Transaction = get_deploy_tx(
-        H256::random(),
-        Nonce(0),
-        &contract_code,
-        vec![],
-        &[],
-        Fee {
-            gas_limit: U256::from(20000000u32),
-            max_fee_per_gas: U256::from(base_fee),
-            max_priority_fee_per_gas: U256::from(0),
-            gas_per_pubdata_limit: U256::from(MAX_GAS_PER_PUBDATA_BYTE),
-        },
-    )
-    .into();
-
-    let sender_address = tx.initiator_account();
-
-    // set balance
-    vm_test_env.set_rich_account(&sender_address);
-
-    let mut vm_helper = VmTestHelper::new(&mut vm_test_env);
-    let mut vm = vm_helper.vm();
-
-    push_transaction_to_bootloader_memory(&mut vm, &tx, TxExecutionMode::VerifyExecute, None);
-
-    let tx_execution_result = vm
-        .execute_next_tx(u32::MAX, false)
-        .expect("Bootloader failed while processing transaction");
-
-    assert_eq!(
-        tx_execution_result.status,
-        TxExecutionStatus::Success,
-        "Transaction wasn't successful"
-    );
-
-    // 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!(
-        tx_execution_result.operator_suggested_refund > 0,
-        "The operator's refund is 0"
-    );
-    assert!(
-        tx_execution_result.gas_refunded > 0,
-        "The final refund is 0"
-    );
-
-    let mut result = vm.execute_till_block_end(BootloaderJobType::TransactionExecution);
-    assert!(
-        result.full_result.revert_reason.is_none(),
-        "Bootloader was not expected to revert: {:?}",
-        result.full_result.revert_reason
-    );
-
-    let mut result_with_predetermined_refund = execute_vm_with_predetermined_refund(
-        vec![tx],
-        vec![tx_execution_result.operator_suggested_refund],
-        vec![vec![published_bytecode]],
-    );
-    // We need to sort these lists as those are flattened from HashMaps
-    result.full_result.used_contract_hashes.sort();
-    result_with_predetermined_refund
-        .full_result
-        .used_contract_hashes
-        .sort();
-
-    assert_eq!(
-        result.full_result.events,
-        result_with_predetermined_refund.full_result.events
-    );
-    assert_eq!(
-        result.full_result.l2_to_l1_logs,
-        result_with_predetermined_refund.full_result.l2_to_l1_logs
-    );
-    assert_eq!(
-        result.full_result.storage_log_queries,
-        result_with_predetermined_refund
-            .full_result
-            .storage_log_queries
-    );
-    assert_eq!(
-        result.full_result.used_contract_hashes,
-        result_with_predetermined_refund
-            .full_result
-            .used_contract_hashes
-    );
-}
-
-#[derive(Debug, Clone)]
-enum TransactionRollbackTestInfo {
-    Rejected(Transaction, TxRevertReason),
-    Processed(Transaction, bool, TxExecutionStatus),
-}
-
-impl TransactionRollbackTestInfo {
-    fn new_rejected(transaction: Transaction, revert_reason: TxRevertReason) -> Self {
-        Self::Rejected(transaction, revert_reason)
-    }
-
-    fn new_processed(
-        transaction: Transaction,
-        should_be_rollbacked: bool,
-        expected_status: TxExecutionStatus,
-    ) -> Self {
-        Self::Processed(transaction, should_be_rollbacked, expected_status)
-    }
-
-    fn get_transaction(&self) -> &Transaction {
-        match self {
-            TransactionRollbackTestInfo::Rejected(tx, _) => tx,
-            TransactionRollbackTestInfo::Processed(tx, _, _) => tx,
-        }
-    }
-
-    fn rejection_reason(&self) -> Option<TxRevertReason> {
-        match self {
-            TransactionRollbackTestInfo::Rejected(_, revert_reason) => Some(revert_reason.clone()),
-            TransactionRollbackTestInfo::Processed(_, _, _) => None,
-        }
-    }
-
-    fn should_rollback(&self) -> bool {
-        match self {
-            TransactionRollbackTestInfo::Rejected(_, _) => true,
-            TransactionRollbackTestInfo::Processed(_, x, _) => *x,
-        }
-    }
-
-    fn expected_status(&self) -> TxExecutionStatus {
-        match self {
-            TransactionRollbackTestInfo::Rejected(_, _) => {
-                panic!("There is no execution status for rejected transaction")
-            }
-            TransactionRollbackTestInfo::Processed(_, _, status) => *status,
-        }
-    }
-}
-
-// Accepts the address of the sender as well as the list of pairs of its transactions
-// and whether these transactions should succeed.
-fn execute_vm_with_possible_rollbacks(
-    sender_address: Address,
-    transactions: Vec<TransactionRollbackTestInfo>,
-    block_context: DerivedBlockContext,
-    block_properties: BlockProperties,
-) -> VmExecutionResult {
-    let mut vm_test_env = VmTestEnv {
-        block_context,
-        block_properties,
-        ..Default::default()
-    };
-
-    // Setting infinite balance for the sender.
-    vm_test_env.set_rich_account(&sender_address);
-
-    let mut vm_helper = VmTestHelper::new(&mut vm_test_env);
-    let mut vm = vm_helper.vm();
-
-    for test_info in transactions {
-        vm.save_current_vm_as_snapshot();
-        let vm_state_before_tx = vm.dump_inner_state();
-        push_transaction_to_bootloader_memory(
-            &mut vm,
-            test_info.get_transaction(),
-            TxExecutionMode::VerifyExecute,
-            None,
-        );
-
-        match vm.execute_next_tx(u32::MAX, false) {
-            Err(reason) => {
-                assert_eq!(test_info.rejection_reason(), Some(reason));
-            }
-            Ok(res) => {
-                assert_eq!(test_info.rejection_reason(), None);
-                assert_eq!(
-                    res.status,
-                    test_info.expected_status(),
-                    "Transaction status is not correct"
-                );
-            }
-        };
-
-        if test_info.should_rollback() {
-            // Some error has occured, we should reject the transaction
-            vm.rollback_to_latest_snapshot();
-
-            // vm_state_before_tx.
-            let state_after_rollback = vm.dump_inner_state();
-            assert_eq!(
-                vm_state_before_tx, state_after_rollback,
-                "Did not rollback VM state correctly"
-            );
-        }
-    }
-
-    let VmBlockResult {
-        full_result: mut result,
-        ..
-    } = vm.execute_till_block_end(BootloaderJobType::BlockPostprocessing);
-    // Used contract hashes are retrieved in unordered manner.
-    // However it must be sorted for the comparisons in tests to work
-    result.used_contract_hashes.sort();
-
-    result
-}
-
-// Sets the signature for an L2 transaction and returns the same transaction
-// but this different signature.
-fn change_signature(mut tx: Transaction, signature: Vec<u8>) -> Transaction {
-    tx.common_data = match tx.common_data {
-        ExecuteTransactionCommon::L2(mut data) => {
-            data.signature = signature;
-            ExecuteTransactionCommon::L2(data)
-        }
-        _ => unreachable!(),
-    };
-
-    tx
-}
-
-#[test]
-fn test_vm_rollbacks() {
-    let (block_context, block_properties): (DerivedBlockContext, BlockProperties) = {
-        let (block_context, block_properties) = create_test_block_params();
-        (block_context.into(), block_properties)
-    };
-
-    let base_fee = U256::from(block_context.base_fee);
-
-    let sender_private_key = H256::random();
-    let contract_code = read_test_contract();
-
-    let tx_nonce_0: Transaction = get_deploy_tx(
-        sender_private_key,
-        Nonce(0),
-        &contract_code,
-        vec![],
-        &[],
-        Fee {
-            gas_limit: U256::from(12000000u32),
-            max_fee_per_gas: base_fee,
-            max_priority_fee_per_gas: U256::zero(),
-            gas_per_pubdata_limit: U256::from(MAX_GAS_PER_PUBDATA_BYTE),
-        },
-    )
-    .into();
-    let tx_nonce_1: Transaction = get_deploy_tx(
-        sender_private_key,
-        Nonce(1),
-        &contract_code,
-        vec![],
-        &[],
-        Fee {
-            gas_limit: U256::from(12000000u32),
-            max_fee_per_gas: base_fee,
-            max_priority_fee_per_gas: U256::zero(),
-            gas_per_pubdata_limit: U256::from(MAX_GAS_PER_PUBDATA_BYTE),
-        },
-    )
-    .into();
-    let tx_nonce_2: Transaction = get_deploy_tx(
-        sender_private_key,
-        Nonce(2),
-        &contract_code,
-        vec![],
-        &[],
-        Fee {
-            gas_limit: U256::from(12000000u32),
-            max_fee_per_gas: base_fee,
-            max_priority_fee_per_gas: U256::zero(),
-            gas_per_pubdata_limit: U256::from(MAX_GAS_PER_PUBDATA_BYTE),
-        },
-    )
-    .into();
-
-    let wrong_signature_length_tx = change_signature(tx_nonce_0.clone(), vec![1u8; 32]);
-    let wrong_v_tx = change_signature(tx_nonce_0.clone(), vec![1u8; 65]);
-    let wrong_signature_tx = change_signature(tx_nonce_0.clone(), vec![27u8; 65]);
-
-    let sender_address = tx_nonce_0.initiator_account();
-
-    let result_without_rollbacks = execute_vm_with_possible_rollbacks(
-        sender_address,
-        vec![
-            // The nonces are ordered correctly, all the transactions should succeed.
-            TransactionRollbackTestInfo::new_processed(
-                tx_nonce_0.clone(),
-                false,
-                TxExecutionStatus::Success,
-            ),
-            TransactionRollbackTestInfo::new_processed(
-                tx_nonce_1.clone(),
-                false,
-                TxExecutionStatus::Success,
-            ),
-            TransactionRollbackTestInfo::new_processed(
-                tx_nonce_2.clone(),
-                false,
-                TxExecutionStatus::Success,
-            ),
-        ],
-        block_context,
-        block_properties,
-    );
-
-    let incorrect_nonce = TxRevertReason::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,
-        ],
-    });
-    let reusing_nonce_twice = TxRevertReason::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,
-        ],
-    });
-    let signature_length_is_incorrect = TxRevertReason::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,
-        ],
-    });
-    let v_is_incorrect = TxRevertReason::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,
-        ],
-    });
-    let signature_is_incorrect = TxRevertReason::ValidationFailed(VmRevertReason::General {
-        msg: "Account validation returned invalid magic value. Most often this means that the signature is incorrect".to_string(),
-        data: vec![],
-    });
-
-    let result_with_rollbacks = execute_vm_with_possible_rollbacks(
-        sender_address,
-        vec![
-            TransactionRollbackTestInfo::new_rejected(
-                wrong_signature_length_tx,
-                signature_length_is_incorrect,
-            ),
-            TransactionRollbackTestInfo::new_rejected(wrong_v_tx, v_is_incorrect),
-            TransactionRollbackTestInfo::new_rejected(wrong_signature_tx, signature_is_incorrect),
-            // The correct nonce is 0, this tx will fail
-            TransactionRollbackTestInfo::new_rejected(tx_nonce_2.clone(), incorrect_nonce.clone()),
-            // This tx will succeed
-            TransactionRollbackTestInfo::new_processed(
-                tx_nonce_0.clone(),
-                false,
-                TxExecutionStatus::Success,
-            ),
-            // The correct nonce is 1, this tx will fail
-            TransactionRollbackTestInfo::new_rejected(
-                tx_nonce_0.clone(),
-                reusing_nonce_twice.clone(),
-            ),
-            // The correct nonce is 1, this tx will fail
-            TransactionRollbackTestInfo::new_rejected(tx_nonce_2.clone(), incorrect_nonce),
-            // This tx will succeed
-            TransactionRollbackTestInfo::new_processed(
-                tx_nonce_1,
-                false,
-                TxExecutionStatus::Success,
-            ),
-            // The correct nonce is 2, this tx will fail
-            TransactionRollbackTestInfo::new_rejected(tx_nonce_0, reusing_nonce_twice.clone()),
-            // This tx will succeed
-            TransactionRollbackTestInfo::new_processed(
-                tx_nonce_2.clone(),
-                false,
-                TxExecutionStatus::Success,
-            ),
-            // This tx will fail
-            TransactionRollbackTestInfo::new_rejected(tx_nonce_2, reusing_nonce_twice.clone()),
-        ],
-        block_context,
-        block_properties,
-    );
-
-    assert_eq!(result_without_rollbacks, result_with_rollbacks);
-
-    let loadnext_contract = get_loadnext_contract();
-
-    let loadnext_constructor_data = encode(&[Token::Uint(U256::from(100))]);
-    let loadnext_deploy_tx: Transaction = get_deploy_tx(
-        sender_private_key,
-        Nonce(0),
-        &loadnext_contract.bytecode,
-        loadnext_contract.factory_deps,
-        &loadnext_constructor_data,
-        Fee {
-            gas_limit: U256::from(70000000u32),
-            max_fee_per_gas: base_fee,
-            max_priority_fee_per_gas: U256::zero(),
-            gas_per_pubdata_limit: U256::from(MAX_GAS_PER_PUBDATA_BYTE),
-        },
-    )
-    .into();
-    let loadnext_contract_address =
-        get_create_zksync_address(loadnext_deploy_tx.initiator_account(), Nonce(0));
-    let deploy_loadnext_tx_info = TransactionRollbackTestInfo::new_processed(
-        loadnext_deploy_tx,
-        false,
-        TxExecutionStatus::Success,
-    );
-
-    let get_load_next_tx = |params: LoadnextContractExecutionParams, nonce: Nonce| {
-        // Here we test loadnext with various kinds of operations
-        let tx: Transaction = mock_loadnext_test_call(
-            sender_private_key,
-            nonce,
-            loadnext_contract_address,
-            Fee {
-                gas_limit: U256::from(100000000u32),
-                max_fee_per_gas: base_fee,
-                max_priority_fee_per_gas: U256::zero(),
-                gas_per_pubdata_limit: U256::from(MAX_GAS_PER_PUBDATA_BYTE),
-            },
-            params,
-        )
-        .into();
-
-        tx
-    };
-
-    let loadnext_tx_0 = get_load_next_tx(
-        LoadnextContractExecutionParams {
-            reads: 100,
-            writes: 100,
-            events: 100,
-            hashes: 500,
-            recursive_calls: 10,
-            deploys: 60,
-        },
-        Nonce(1),
-    );
-    let loadnext_tx_1 = get_load_next_tx(
-        LoadnextContractExecutionParams {
-            reads: 100,
-            writes: 100,
-            events: 100,
-            hashes: 500,
-            recursive_calls: 10,
-            deploys: 60,
-        },
-        Nonce(2),
-    );
-
-    let result_without_rollbacks = execute_vm_with_possible_rollbacks(
-        sender_address,
-        vec![
-            deploy_loadnext_tx_info.clone(),
-            TransactionRollbackTestInfo::new_processed(
-                loadnext_tx_0.clone(),
-                false,
-                TxExecutionStatus::Success,
-            ),
-            TransactionRollbackTestInfo::new_processed(
-                loadnext_tx_1.clone(),
-                false,
-                TxExecutionStatus::Success,
-            ),
-        ],
-        block_context,
-        block_properties,
-    );
-
-    let result_with_rollbacks = execute_vm_with_possible_rollbacks(
-        sender_address,
-        vec![
-            deploy_loadnext_tx_info,
-            TransactionRollbackTestInfo::new_processed(
-                loadnext_tx_0.clone(),
-                true,
-                TxExecutionStatus::Success,
-            ),
-            // After the previous tx has been rolled back, this one should succeed
-            TransactionRollbackTestInfo::new_processed(
-                loadnext_tx_0.clone(),
-                false,
-                TxExecutionStatus::Success,
-            ),
-            // The nonce has been bumped up, this transaction should now fail
-            TransactionRollbackTestInfo::new_rejected(loadnext_tx_0, reusing_nonce_twice.clone()),
-            TransactionRollbackTestInfo::new_processed(
-                loadnext_tx_1.clone(),
-                true,
-                TxExecutionStatus::Success,
-            ),
-            // After the previous tx has been rolled back, this one should succeed
-            TransactionRollbackTestInfo::new_processed(
-                loadnext_tx_1.clone(),
-                true,
-                TxExecutionStatus::Success,
-            ),
-            // After the previous tx has been rolled back, this one should succeed
-            TransactionRollbackTestInfo::new_processed(
-                loadnext_tx_1.clone(),
-                false,
-                TxExecutionStatus::Success,
-            ),
-            // The nonce has been bumped up, this transaction should now fail
-            TransactionRollbackTestInfo::new_rejected(loadnext_tx_1, reusing_nonce_twice),
-        ],
-        block_context,
-        block_properties,
-    );
-
-    assert_eq!(result_without_rollbacks, result_with_rollbacks);
-}
-
-// 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: Vec<(DeployedContract, bool)>) {
-    for (contract, is_account) in contracts {
-        let deployer_code_key = get_code_key(contract.account_id.address());
-        raw_storage.set_value(deployer_code_key, hash_bytecode(&contract.bytecode));
-
-        if is_account {
-            let is_account_key = get_is_account_key(contract.account_id.address());
-            raw_storage.set_value(is_account_key, u256_to_h256(1_u32.into()));
-        }
-
-        raw_storage.store_factory_dep(hash_bytecode(&contract.bytecode), contract.bytecode);
-    }
-}
-
-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,
-        }
-    }
-}
-
-fn get_nonce_holder_test_tx(
-    nonce: U256,
-    account_address: Address,
-    test_mode: NonceHolderTestMode,
-    block_context: &DerivedBlockContext,
-) -> TransactionData {
-    TransactionData {
-        tx_type: 113,
-        from: account_address,
-        to: account_address,
-        gas_limit: U256::from(10000000u32),
-        pubdata_price_limit: U256::from(MAX_GAS_PER_PUBDATA_BYTE),
-        max_fee_per_gas: U256::from(block_context.base_fee),
-        max_priority_fee_per_gas: U256::zero(),
-        nonce,
-        // 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![12],
-        signature: vec![test_mode.into()],
-
-        ..Default::default()
-    }
-}
-
-fn run_vm_with_raw_tx<'a, H: HistoryMode>(
-    oracle_tools: &'a mut OracleTools<'a, false, H>,
-    block_context: DerivedBlockContext,
-    block_properties: &'a BlockProperties,
-    tx: TransactionData,
-) -> (VmExecutionResult, bool) {
     let mut base_system_contracts = BASE_SYSTEM_CONTRACTS.clone();
-    base_system_contracts.bootloader = PLAYGROUND_BLOCK_BOOTLOADER_CODE.clone();
-    let mut vm = init_vm_inner(
-        oracle_tools,
-        BlockContextMode::OverrideCurrent(block_context),
-        block_properties,
-        BLOCK_GAS_LIMIT,
-        &base_system_contracts,
-        TxExecutionMode::VerifyExecute,
-    );
-
-    let block_gas_price_per_pubdata = block_context.context.block_gas_price_per_pubdata();
-
-    let overhead = tx.overhead_gas(block_gas_price_per_pubdata as u32);
-    push_raw_transaction_to_bootloader_memory(
-        &mut vm,
-        tx,
-        TxExecutionMode::VerifyExecute,
-        overhead,
-        None,
-    );
-    let VmBlockResult {
-        full_result: result,
-        ..
-    } = vm.execute_till_block_end(BootloaderJobType::TransactionExecution);
-
-    (result, tx_has_failed(&vm.state, 0))
-}
+    base_system_contracts.bootloader = get_bootloader("dummy");
 
-#[test]
-fn test_nonce_holder() {
-    let account_address = H160::random();
-    let mut vm_test_env =
-        VmTestEnv::new_with_contracts(&[(account_address, read_nonce_holder_tester())]);
-
-    vm_test_env.set_rich_account(&account_address);
+    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 mut run_nonce_test = |nonce: U256,
-                              test_mode: NonceHolderTestMode,
-                              error_message: Option<String>,
-                              comment: &'static str| {
-        let tx = get_nonce_holder_test_tx(
-            nonce,
-            account_address,
-            test_mode,
-            &vm_test_env.block_context,
-        );
+    let res = vm.vm.execute(VmExecutionMode::Batch);
 
-        let (result, tx_has_failed) = vm_test_env.run_vm(tx);
-        if let Some(msg) = error_message {
-            let expected_error =
-                TxRevertReason::ValidationFailed(VmRevertReason::General { msg, data: vec![] });
-            assert_eq!(
-                result
-                    .revert_reason
-                    .expect("No revert reason")
-                    .revert_reason
-                    .to_string(),
-                expected_error.to_string(),
-                "{}",
-                comment
-            );
-        } else {
-            assert!(!tx_has_failed, "{}", comment);
+    assert!(matches!(
+        res.result,
+        ExecutionResult::Halt {
+            reason: Halt::BootloaderOutOfGas
         }
-    };
-
-    // Test 1: trying to set value under non sequential nonce value.
-    run_nonce_test(
-        1u32.into(),
-        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.into(),
-        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.into(),
-        NonceHolderTestMode::SetValueUnderNonce,
-        None,
-        "Failed to set value under nonce sequential value",
-    );
-
-    // Test 5: migrate to the arbitrary nonce ordering:
-    run_nonce_test(
-        2u32.into(),
-        NonceHolderTestMode::SwitchToArbitraryOrdering,
-        None,
-        "Failed to switch to arbitrary ordering",
-    );
-
-    // Test 6: increase min nonce by 5
-    run_nonce_test(
-        6u32.into(),
-        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.into(),
-        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.into(),
-        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.into(),
-        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.into(),
-        NonceHolderTestMode::IncreaseMinNonceBy5,
-        None,
-        "Did not allow to use a bumped nonce",
-    );
-
-    // Test 6: Do not allow bumping nonce by too much
-    run_nonce_test(
-        16u32.into(),
-        NonceHolderTestMode::IncreaseMinNonceTooMuch,
-        Some("The value for incrementing the nonce is too high".to_string()),
-        "Allowed for incrementing min nonce too much",
-    );
-
-    // Test 7: Do not allow not setting a nonce as used
-    run_nonce_test(
-        16u32.into(),
-        NonceHolderTestMode::LeaveNonceUnused,
-        Some("The nonce was not set as used".to_string()),
-        "Allowed to leave nonce as unused",
-    );
-}
-
-#[test]
-fn test_l1_tx_execution() {
-    // In this test, we try to execute a contract deployment from L1
-    let mut vm_test_env = VmTestEnv::default();
-    let mut vm_helper = VmTestHelper::new(&mut vm_test_env);
-    // Here instead of marking code hash via the bootloader means, we will
-    // using L1->L2 communication, the same it would likely be done during the priority mode.
-    let contract_code = read_test_contract();
-    let contract_code_hash = hash_bytecode(&contract_code);
-    let l1_deploy_tx = get_l1_deploy_tx(&contract_code, &[]);
-    let l1_deploy_tx_data: TransactionData = l1_deploy_tx.clone().into();
-
-    let required_l2_to_l1_logs = vec![
-        L2ToL1Log {
-            shard_id: 0,
-            is_service: false,
-            tx_number_in_block: 0,
-            sender: SYSTEM_CONTEXT_ADDRESS,
-            key: u256_to_h256(U256::from(vm_helper.block_context.context.block_timestamp)),
-            value: Default::default(),
-        },
-        L2ToL1Log {
-            shard_id: 0,
-            is_service: true,
-            tx_number_in_block: 0,
-            sender: BOOTLOADER_ADDRESS,
-            key: l1_deploy_tx_data.canonical_l1_tx_hash(),
-            value: u256_to_h256(U256::from(1u32)),
-        },
-    ];
-
-    let sender_address = l1_deploy_tx_data.from();
-
-    vm_helper.oracle_tools.decommittment_processor.populate(
-        vec![(
-            h256_to_u256(contract_code_hash),
-            bytes_to_be_words(contract_code),
-        )],
-        Timestamp(0),
-    );
-
-    let mut vm = vm_helper.vm();
-
-    push_transaction_to_bootloader_memory(
-        &mut vm,
-        &l1_deploy_tx,
-        TxExecutionMode::VerifyExecute,
-        None,
-    );
-
-    let res = vm.execute_next_tx(u32::MAX, false).unwrap();
-
-    // The code hash of the deployed contract should be marked as republished.
-    let known_codes_key = get_known_code_key(&contract_code_hash);
-
-    // The contract should be deployed successfully.
-    let deployed_address = deployed_address_create(sender_address, U256::zero());
-    let account_code_key = get_code_key(&deployed_address);
-
-    let expected_slots = vec![
-        (u256_to_h256(U256::from(1u32)), known_codes_key),
-        (contract_code_hash, account_code_key),
-    ];
-    assert!(!tx_has_failed(&vm.state, 0));
-
-    verify_required_storage(&vm.state, expected_slots);
-
-    assert_eq!(res.result.logs.l2_to_l1_logs, required_l2_to_l1_logs);
-
-    let tx = get_l1_execute_test_contract_tx(deployed_address, true);
-    push_transaction_to_bootloader_memory(&mut vm, &tx, TxExecutionMode::VerifyExecute, None);
-
-    let res = StorageWritesDeduplicator::apply_on_empty_state(
-        &vm.execute_next_tx(u32::MAX, false)
-            .unwrap()
-            .result
-            .logs
-            .storage_logs,
-    );
-    assert_eq!(res.initial_storage_writes, 0);
-
-    let tx = get_l1_execute_test_contract_tx(deployed_address, false);
-    push_transaction_to_bootloader_memory(&mut vm, &tx, TxExecutionMode::VerifyExecute, None);
-    let res = StorageWritesDeduplicator::apply_on_empty_state(
-        &vm.execute_next_tx(u32::MAX, false)
-            .unwrap()
-            .result
-            .logs
-            .storage_logs,
-    );
-    assert_eq!(res.initial_storage_writes, 2);
-
-    let repeated_writes = res.repeated_storage_writes;
-
-    push_transaction_to_bootloader_memory(&mut vm, &tx, TxExecutionMode::VerifyExecute, None);
-    let res = StorageWritesDeduplicator::apply_on_empty_state(
-        &vm.execute_next_tx(u32::MAX, false)
-            .unwrap()
-            .result
-            .logs
-            .storage_logs,
-    );
-    assert_eq!(res.initial_storage_writes, 1);
-    // We do the same storage write, so it will be deduplicated
-    assert_eq!(res.repeated_storage_writes, repeated_writes);
-
-    let mut tx = get_l1_execute_test_contract_tx(deployed_address, false);
-    tx.execute.value = U256::from(1);
-    match &mut tx.common_data {
-        ExecuteTransactionCommon::L1(l1_data) => {
-            l1_data.to_mint = U256::from(4);
-        }
-        _ => unreachable!(),
-    }
-    push_transaction_to_bootloader_memory(&mut vm, &tx, TxExecutionMode::VerifyExecute, None);
-    let execution_result = vm.execute_next_tx(u32::MAX, false).unwrap();
-    // The method is not payable, so the transaction with non-zero value should fail
-    assert_eq!(
-        execution_result.status,
-        TxExecutionStatus::Failure,
-        "The transaction should fail"
-    );
-
-    let res =
-        StorageWritesDeduplicator::apply_on_empty_state(&execution_result.result.logs.storage_logs);
-
-    // There are 2 initial writes here:
-    // - totalSupply of ETH token
-    // - balance of the refund recipient
-    assert_eq!(res.initial_storage_writes, 2);
-}
-
-#[test]
-fn test_invalid_bytecode() {
-    let mut vm_test_env = VmTestEnv::default();
-
-    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,
-            ],
-        )),
-    );
-}
-
-#[test]
-fn test_tracing_of_execution_errors() {
-    // In this test, we are checking that the execution errors are transmitted correctly from the bootloader.
-    let contract_address = Address::random();
-
-    let mut vm_test_env =
-        VmTestEnv::new_with_contracts(&[(contract_address, read_error_contract())]);
-
-    let private_key = H256::random();
-
-    let tx = get_error_tx(
-        private_key,
-        Nonce(0),
-        contract_address,
-        Fee {
-            gas_limit: U256::from(1000000u32),
-            max_fee_per_gas: U256::from(10000000000u64),
-            max_priority_fee_per_gas: U256::zero(),
-            gas_per_pubdata_limit: U256::from(MAX_GAS_PER_PUBDATA_BYTE),
-        },
-    );
-
-    vm_test_env.set_rich_account(&tx.common_data.initiator_address);
-    let mut vm_helper = VmTestHelper::new(&mut vm_test_env);
-    let mut vm = vm_helper.vm();
-
-    push_transaction_to_bootloader_memory(
-        &mut vm,
-        &tx.into(),
-        TxExecutionMode::VerifyExecute,
-        None,
-    );
-
-    let mut tracer = TransactionResultTracer::new(usize::MAX, false);
-    assert_eq!(
-        vm.execute_with_custom_tracer(&mut tracer),
-        VmExecutionStopReason::VmFinished,
-        "Tracer should never request stop"
-    );
-
-    match tracer.revert_reason {
-        Some(revert_reason) => {
-            let revert_reason = VmRevertReason::try_from(&revert_reason as &[u8]).unwrap();
-            assert_eq!(
-                revert_reason,
-                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
-                    ],
-                }
-            )
-        }
-        _ => panic!(
-            "Tracer captured incorrect result {:#?}",
-            tracer.revert_reason
-        ),
-    }
-
-    let mut vm_helper = VmTestHelper::new(&mut vm_test_env);
-    let mut vm = vm_helper.vm();
-    let tx = get_error_tx(
-        private_key,
-        Nonce(1),
-        contract_address,
-        Fee {
-            gas_limit: U256::from(1000000u32),
-            max_fee_per_gas: U256::from(10000000000u64),
-            max_priority_fee_per_gas: U256::zero(),
-            gas_per_pubdata_limit: U256::from(MAX_GAS_PER_PUBDATA_BYTE),
-        },
-    );
-    push_transaction_to_bootloader_memory(
-        &mut vm,
-        &tx.into(),
-        TxExecutionMode::VerifyExecute,
-        None,
-    );
-
-    let mut tracer = TransactionResultTracer::new(10, false);
-    assert_eq!(
-        vm.execute_with_custom_tracer(&mut tracer),
-        VmExecutionStopReason::TracerRequestedStop,
-    );
-    assert!(tracer.is_limit_reached());
-}
-
-/// Checks that `TX_GAS_LIMIT_OFFSET` constant is correct.
-#[test]
-fn test_tx_gas_limit_offset() {
-    let gas_limit = U256::from(999999);
-    let mut vm_test_env = VmTestEnv::default();
-
-    let contract_code = read_test_contract();
-    let tx: Transaction = get_deploy_tx(
-        H256::random(),
-        Nonce(0),
-        &contract_code,
-        Default::default(),
-        Default::default(),
-        Fee {
-            gas_limit,
-            ..Default::default()
-        },
-    )
-    .into();
-
-    let mut vm_helper = VmTestHelper::new(&mut vm_test_env);
-    let mut vm = vm_helper.vm();
-    push_transaction_to_bootloader_memory(&mut vm, &tx, TxExecutionMode::VerifyExecute, None);
-
-    let gas_limit_from_memory = 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);
-}
-
-#[test]
-fn test_is_write_initial_behaviour() {
-    // In this test, we check result of `is_write_initial` at different stages.
-    let mut vm_test_env = VmTestEnv::default();
-
-    let base_fee = vm_test_env.block_context.base_fee;
-    let account_pk = H256::random();
-    let contract_code = read_test_contract();
-    let tx: Transaction = get_deploy_tx(
-        account_pk,
-        Nonce(0),
-        &contract_code,
-        vec![],
-        &[],
-        Fee {
-            gas_limit: U256::from(20000000u32),
-            max_fee_per_gas: U256::from(base_fee),
-            max_priority_fee_per_gas: U256::from(0),
-            gas_per_pubdata_limit: U256::from(MAX_GAS_PER_PUBDATA_BYTE),
-        },
-    )
-    .into();
-
-    let sender_address = tx.initiator_account();
-    let nonce_key = get_nonce_key(&sender_address);
-
-    // Check that the next write to the nonce key will be initial.
-    assert!(vm_test_env.storage_ptr.is_write_initial(&nonce_key));
-
-    // Set balance to be able to pay fee for txs.
-    vm_test_env.set_rich_account(&sender_address);
-
-    let mut vm_helper = VmTestHelper::new(&mut vm_test_env);
-    let mut vm = vm_helper.vm();
-
-    push_transaction_to_bootloader_memory(&mut vm, &tx, TxExecutionMode::VerifyExecute, None);
-
-    vm.execute_next_tx(u32::MAX, false)
-        .expect("Bootloader failed while processing the first transaction");
-    // Check that `is_write_initial` still returns true for the nonce key.
-    assert!(vm_test_env.storage_ptr.is_write_initial(&nonce_key));
-}
-
-pub fn get_l1_tx_with_custom_bytecode_hash(
-    bytecode_hash: U256,
-    block_gas_per_pubdata: u32,
-) -> (Vec<U256>, u32) {
-    let tx: TransactionData = get_l1_execute_test_contract_tx(Default::default(), false).into();
-    let predefined_overhead =
-        tx.overhead_gas_with_custom_factory_deps(vec![bytecode_hash], block_gas_per_pubdata);
-    let tx_bytes = tx.abi_encode_with_custom_factory_deps(vec![bytecode_hash]);
-
-    (bytes_to_be_words(tx_bytes), predefined_overhead)
-}
-
-pub fn get_l1_execute_test_contract_tx(deployed_address: Address, with_panic: bool) -> Transaction {
-    let sender = H160::random();
-    get_l1_execute_test_contract_tx_with_sender(
-        sender,
-        deployed_address,
-        with_panic,
-        U256::zero(),
-        false,
-    )
-}
-
-pub fn get_l1_tx_with_large_output(sender: Address, deployed_address: Address) -> Transaction {
-    let test_contract = load_contract(
-        "etc/contracts-test-data/artifacts-zk/contracts/long-return-data/long-return-data.sol/LongReturnData.json",
-    );
-
-    let function = test_contract.function("longReturnData").unwrap();
-
-    let calldata = function
-        .encode_input(&[])
-        .expect("failed to encode parameters");
-
-    Transaction {
-        common_data: ExecuteTransactionCommon::L1(L1TxCommonData {
-            sender,
-            gas_limit: U256::from(100000000u32),
-            gas_per_pubdata_limit: REQUIRED_L1_TO_L2_GAS_PER_PUBDATA_BYTE.into(),
-            ..Default::default()
-        }),
-        execute: Execute {
-            contract_address: deployed_address,
-            calldata,
-            value: U256::zero(),
-            factory_deps: None,
-        },
-        received_timestamp_ms: 0,
-    }
-}
-
-#[test]
-fn test_call_tracer() {
-    let mut vm_test_env = VmTestEnv::default();
-
-    let sender = H160::random();
-
-    let contract_code = read_test_contract();
-    let contract_code_hash = hash_bytecode(&contract_code);
-    let l1_deploy_tx = get_l1_deploy_tx(&contract_code, &[]);
-    let l1_deploy_tx_data: TransactionData = l1_deploy_tx.clone().into();
-
-    let sender_address_counter = l1_deploy_tx_data.from();
-
-    vm_test_env.set_rich_account(&sender_address_counter);
-    let mut vm_helper = VmTestHelper::new(&mut vm_test_env);
-
-    vm_helper.oracle_tools.decommittment_processor.populate(
-        vec![(
-            h256_to_u256(contract_code_hash),
-            bytes_to_be_words(contract_code),
-        )],
-        Timestamp(0),
-    );
-
-    let contract_code = read_long_return_data_contract();
-    let contract_code_hash = hash_bytecode(&contract_code);
-    let l1_deploy_long_return_data_tx = get_l1_deploy_tx(&contract_code, &[]);
-    vm_helper.oracle_tools.decommittment_processor.populate(
-        vec![(
-            h256_to_u256(contract_code_hash),
-            bytes_to_be_words(contract_code),
-        )],
-        Timestamp(0),
-    );
-
-    let tx_data: TransactionData = l1_deploy_long_return_data_tx.clone().into();
-    let sender_long_return_address = tx_data.from();
-    // The contract should be deployed successfully.
-    let deployed_address_long_return_data =
-        deployed_address_create(sender_long_return_address, U256::zero());
-    let mut vm = vm_helper.vm();
-
-    push_transaction_to_bootloader_memory(
-        &mut vm,
-        &l1_deploy_tx,
-        TxExecutionMode::VerifyExecute,
-        None,
-    );
-
-    // The contract should be deployed successfully.
-    let deployed_address = deployed_address_create(sender_address_counter, U256::zero());
-    let res = vm.execute_next_tx(u32::MAX, true).unwrap();
-    let calls = res.call_traces;
-    let mut create_call = None;
-    // The first MIMIC call is call to value simulator. All calls goes through it.
-    // The second MIMIC call is call to Deployer contract.
-    // And only third level call is construct call to the newly deployed contract And we call it create_call.
-    for call in &calls {
-        if let CallType::Call(FarCallOpcode::Mimic) = call.r#type {
-            for call in &call.calls {
-                if let CallType::Call(FarCallOpcode::Mimic) = call.r#type {
-                    for call in &call.calls {
-                        if let CallType::Create = call.r#type {
-                            create_call = Some(call.clone());
-                        }
-                    }
-                }
-            }
-        }
-    }
-    let expected = Call {
-        r#type: CallType::Create,
-        to: deployed_address,
-        from: sender_address_counter,
-        parent_gas: 0,
-        gas_used: 0,
-        gas: 0,
-        value: U256::zero(),
-        input: vec![],
-        output: vec![
-            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, 0,
-        ],
-        error: None,
-        revert_reason: None,
-        calls: vec![],
-    };
-    assert_eq!(create_call.unwrap(), expected);
-
-    push_transaction_to_bootloader_memory(
-        &mut vm,
-        &l1_deploy_long_return_data_tx,
-        TxExecutionMode::VerifyExecute,
-        None,
-    );
-
-    vm.execute_next_tx(u32::MAX, false).unwrap();
-
-    let tx = get_l1_execute_test_contract_tx_with_sender(
-        sender,
-        deployed_address,
-        false,
-        U256::from(1u8),
-        true,
-    );
-
-    let tx_data: TransactionData = tx.clone().into();
-    push_transaction_to_bootloader_memory(&mut vm, &tx, TxExecutionMode::VerifyExecute, None);
-
-    let res = vm.execute_next_tx(u32::MAX, true).unwrap();
-    let calls = res.call_traces;
-
-    // We don't want to compare gas used, because it's not fully deterministic.
-    let expected = Call {
-        r#type: CallType::Call(FarCallOpcode::Mimic),
-        to: deployed_address,
-        from: tx_data.from(),
-        parent_gas: 0,
-        gas_used: 0,
-        gas: 0,
-        value: U256::from(1),
-        input: tx_data.data,
-        output: vec![
-            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, 1,
-        ],
-        error: None,
-        revert_reason: None,
-        calls: vec![],
-    };
-
-    // First loop filter out the bootloaders calls and
-    // the second loop filters out the calls msg value simulator calls
-    for call in calls {
-        if let CallType::Call(FarCallOpcode::Mimic) = call.r#type {
-            for call in call.calls {
-                if let CallType::Call(FarCallOpcode::Mimic) = call.r#type {
-                    assert_eq!(expected, call);
-                }
-            }
-        }
-    }
-
-    let tx = get_l1_execute_test_contract_tx_with_sender(
-        sender,
-        deployed_address,
-        true,
-        U256::from(1u8),
-        true,
-    );
-
-    let tx_data: TransactionData = tx.clone().into();
-    push_transaction_to_bootloader_memory(&mut vm, &tx, TxExecutionMode::VerifyExecute, None);
-
-    let res = vm.execute_next_tx(u32::MAX, true).unwrap();
-    let calls = res.call_traces;
-
-    let expected = Call {
-        r#type: CallType::Call(FarCallOpcode::Mimic),
-        to: deployed_address,
-        from: tx_data.from(),
-        parent_gas: 257030,
-        gas_used: 348,
-        gas: 253008,
-        value: U256::from(1u8),
-        input: tx_data.data,
-        output: vec![],
-        error: None,
-        revert_reason: Some("This method always reverts".to_string()),
-        calls: vec![],
-    };
-
-    for call in calls {
-        if let CallType::Call(FarCallOpcode::Mimic) = call.r#type {
-            for call in call.calls {
-                if let CallType::Call(FarCallOpcode::Mimic) = call.r#type {
-                    assert_eq!(expected, call);
-                }
-            }
-        }
-    }
-
-    let tx = get_l1_tx_with_large_output(sender, deployed_address_long_return_data);
-
-    let tx_data: TransactionData = tx.clone().into();
-    push_transaction_to_bootloader_memory(&mut vm, &tx, TxExecutionMode::VerifyExecute, None);
-
-    assert_ne!(deployed_address_long_return_data, deployed_address);
-    let res = vm.execute_next_tx(u32::MAX, true).unwrap();
-    let calls = res.call_traces;
-    for call in calls {
-        if let CallType::Call(FarCallOpcode::Mimic) = call.r#type {
-            for call in call.calls {
-                if let CallType::Call(FarCallOpcode::Mimic) = call.r#type {
-                    assert_eq!(call.input, tx_data.data);
-                    assert_eq!(
-                        call.revert_reason,
-                        Some("Unknown revert reason".to_string())
-                    );
-                }
-            }
-        }
-    }
-}
-
-#[test]
-fn test_get_used_contracts() {
-    let mut vm_test_env = VmTestEnv::default();
-
-    let mut vm_helper = VmTestHelper::new(&mut vm_test_env);
-    let mut vm = vm_helper.vm();
-
-    assert!(known_bytecodes_without_aa_code(&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 contract_code_hash = hash_bytecode(&contract_code);
-    let tx1 = get_l1_deploy_tx(&contract_code, &[]);
-
-    push_transaction_to_bootloader_memory(&mut vm, &tx1, TxExecutionMode::VerifyExecute, None);
-
-    let res1 = vm.execute_next_tx(u32::MAX, true).unwrap();
-    assert_eq!(res1.status, TxExecutionStatus::Success);
-    assert!(vm
-        .get_used_contracts()
-        .contains(&h256_to_u256(contract_code_hash)));
-
-    assert_eq!(
-        vm.get_used_contracts()
-            .into_iter()
-            .collect::<HashSet<U256>>(),
-        known_bytecodes_without_aa_code(&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 mut tx2 = tx1;
-    tx2.execute.contract_address = L1_MESSENGER_ADDRESS;
-
-    let calldata = vec![1, 2, 3];
-    let big_calldata: Vec<u8> = calldata
-        .iter()
-        .cycle()
-        .take(calldata.len() * 1024)
-        .cloned()
-        .collect();
-
-    tx2.execute.calldata = big_calldata;
-    tx2.execute.factory_deps = Some(vec![vec![1; 32]]);
-
-    push_transaction_to_bootloader_memory(&mut vm, &tx2, TxExecutionMode::VerifyExecute, None);
-
-    let res2 = vm.execute_next_tx(u32::MAX, false).unwrap();
-
-    assert_eq!(res2.status, TxExecutionStatus::Failure);
-
-    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)
-            .keys()
-            .contains(&hash_to_u256));
-        assert!(!vm.get_used_contracts().contains(&hash_to_u256));
-    }
-}
-
-fn known_bytecodes_without_aa_code<H: HistoryMode>(vm: &VmInstance<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
-}
-
-#[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_address = H160::random();
-
-    let (bytecode, contract) = read_many_owners_custom_account_contract();
-
-    let mut vm_test_env = VmTestEnv::new_with_contracts(&[(account_address, bytecode)]);
-
-    let beneficiary = H160::random();
-
-    assert_eq!(vm_test_env.get_eth_balance(&beneficiary), U256::from(0));
-
-    let private_key = H256::random();
-    let private_address = PackedEthSignature::address_from_private_key(&private_key).unwrap();
-    let pk_signer = PrivateKeySigner::new(private_key);
-
-    vm_test_env.set_rich_account(&account_address);
-    vm_test_env.set_rich_account(&private_address);
-
-    let chain_id: u16 = 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_address)])]);
-
-        // Create a legacy transaction to set the owners.
-        let raw_tx = TransactionParameters {
-            nonce: U256::from(0),
-            to: Some(account_address),
-            gas: U256::from(100000000),
-            gas_price: Some(U256::from(10000000)),
-            value: U256::from(0),
-            data: encoded_input.unwrap(),
-            chain_id: chain_id as u64,
-            transaction_type: None,
-            access_list: None,
-            max_fee_per_gas: U256::from(1000000000),
-            max_priority_fee_per_gas: U256::from(1000000000),
-        };
-        let txn = pk_signer.sign_transaction(raw_tx).await.unwrap();
-
-        let (txn_request, hash) = TransactionRequest::from_bytes(&txn, chain_id).unwrap();
-
-        let mut l2_tx: L2Tx = L2Tx::from_request(txn_request, 100000).unwrap();
-        l2_tx.set_input(txn, hash);
-        let transaction: Transaction = l2_tx.try_into().unwrap();
-        let transaction_data: TransactionData = transaction.try_into().unwrap();
-
-        vm_test_env.run_vm_or_die(transaction_data);
-    }
-
-    let private_account_balance = vm_test_env.get_eth_balance(&private_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),
-            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_txn = pk_signer.sign_transaction(aa_raw_tx).await.unwrap();
-
-        let (aa_txn_request, aa_hash) = TransactionRequest::from_bytes(&aa_txn, 270).unwrap();
-
-        let mut l2_tx: L2Tx = L2Tx::from_request(aa_txn_request, 100000).unwrap();
-        l2_tx.set_input(aa_txn, aa_hash);
-        // Pretend that operator is malicious and sets the initiator to the AA account.
-        l2_tx.common_data.initiator_address = account_address;
-
-        let transaction: Transaction = l2_tx.try_into().unwrap();
-
-        let transaction_data: TransactionData = transaction.try_into().unwrap();
-
-        vm_test_env.run_vm_or_die(transaction_data);
-        assert_eq!(
-            vm_test_env.get_eth_balance(&beneficiary),
-            U256::from(888000088)
-        );
-        // Make sure that the tokens were transfered from the AA account.
-        assert_eq!(
-            private_account_balance,
-            vm_test_env.get_eth_balance(&private_address)
-        )
-    }
-
-    // Now send the 'classic' EIP712 transaction
-    {
-        let tx_712 = L2Tx::new(
-            beneficiary,
-            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_address,
-            U256::from(28374938),
-            None,
-            Default::default(),
-        );
-
-        let transaction_request: TransactionRequest = tx_712.into();
-
-        let domain = Eip712Domain::new(L2ChainId(chain_id));
-        let signature = pk_signer
-            .sign_typed_data(&domain, &transaction_request)
-            .await
-            .unwrap();
-        let encoded_tx = transaction_request.get_signed_bytes(&signature, L2ChainId(chain_id));
-
-        let (aa_txn_request, aa_hash) =
-            TransactionRequest::from_bytes(&encoded_tx, chain_id).unwrap();
-
-        let mut l2_tx: L2Tx = L2Tx::from_request(aa_txn_request, 100000).unwrap();
-        l2_tx.set_input(encoded_tx, aa_hash);
-
-        let transaction: Transaction = l2_tx.try_into().unwrap();
-        let transaction_data: TransactionData = transaction.try_into().unwrap();
-
-        vm_test_env.run_vm_or_die(transaction_data);
-
-        assert_eq!(
-            vm_test_env.get_eth_balance(&beneficiary),
-            U256::from(916375026)
-        );
-        assert_eq!(
-            private_account_balance,
-            vm_test_env.get_eth_balance(&private_address)
-        );
-    }
+    ));
 }
diff --git a/core/lib/vm/src/tests/bytecode_publishing.rs b/core/lib/vm/src/tests/bytecode_publishing.rs
new file mode 100644
index 000000000000..60e45e252570
--- /dev/null
+++ b/core/lib/vm/src/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::tests::tester::{DeployContractsTx, TxType, VmTesterBuilder};
+use crate::tests::utils::read_test_contract;
+use crate::types::inputs::system_env::TxExecutionMode;
+use crate::{HistoryEnabled, VmExecutionMode};
+
+#[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/vm/src/tests/call_tracer.rs b/core/lib/vm/src/tests/call_tracer.rs
new file mode 100644
index 000000000000..822178a1cd93
--- /dev/null
+++ b/core/lib/vm/src/tests/call_tracer.rs
@@ -0,0 +1,43 @@
+use crate::constants::BLOCK_GAS_LIMIT;
+use crate::tests::tester::VmTesterBuilder;
+use crate::tests::utils::read_max_depth_contract;
+use crate::{CallTracer, HistoryEnabled, TxExecutionMode, VmExecutionMode};
+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());
+}
diff --git a/core/lib/vm/src/tests/default_aa.rs b/core/lib/vm/src/tests/default_aa.rs
new file mode 100644
index 000000000000..b4c5f6b58323
--- /dev/null
+++ b/core/lib/vm/src/tests/default_aa.rs
@@ -0,0 +1,68 @@
+use zksync_config::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::tests::tester::{DeployContractsTx, TxType, VmTesterBuilder};
+use crate::tests::utils::{get_balance, read_test_contract, verify_required_storage};
+use crate::types::inputs::system_env::TxExecutionMode;
+use crate::{HistoryEnabled, VmExecutionMode};
+
+#[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/vm/src/tests/gas_limit.rs b/core/lib/vm/src/tests/gas_limit.rs
new file mode 100644
index 000000000000..c439b6d89b20
--- /dev/null
+++ b/core/lib/vm/src/tests/gas_limit.rs
@@ -0,0 +1,45 @@
+use zksync_types::fee::Fee;
+use zksync_types::Execute;
+
+use crate::constants::{BOOTLOADER_HEAP_PAGE, TX_DESCRIPTION_OFFSET, TX_GAS_LIMIT_OFFSET};
+use crate::tests::tester::VmTesterBuilder;
+
+use crate::types::inputs::system_env::TxExecutionMode;
+use crate::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/vm/src/tests/get_used_contracts.rs b/core/lib/vm/src/tests/get_used_contracts.rs
new file mode 100644
index 000000000000..4eb535cd00eb
--- /dev/null
+++ b/core/lib/vm/src/tests/get_used_contracts.rs
@@ -0,0 +1,104 @@
+use std::collections::{HashMap, HashSet};
+
+use itertools::Itertools;
+
+use zksync_config::constants::CONTRACT_DEPLOYER_ADDRESS;
+use zksync_state::WriteStorage;
+use zksync_test_account::Account;
+use zksync_types::{Execute, U256};
+use zksync_utils::bytecode::hash_bytecode;
+use zksync_utils::h256_to_u256;
+
+use crate::tests::tester::{TxType, VmTesterBuilder};
+use crate::tests::utils::{read_test_contract, BASE_SYSTEM_CONTRACTS};
+use crate::types::inputs::system_env::TxExecutionMode;
+use crate::{HistoryDisabled, HistoryMode, Vm, VmExecutionMode};
+
+#[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 = vec![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/vm/src/tests/invalid_bytecode.rs b/core/lib/vm/src/tests/invalid_bytecode.rs
new file mode 100644
index 000000000000..6353d445e718
--- /dev/null
+++ b/core/lib/vm/src/tests/invalid_bytecode.rs
@@ -0,0 +1,120 @@
+use zksync_types::H256;
+use zksync_utils::h256_to_u256;
+
+use crate::tests::tester::VmTesterBuilder;
+use crate::types::inputs::system_env::TxExecutionMode;
+use crate::{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/vm/src/tests/is_write_initial.rs b/core/lib/vm/src/tests/is_write_initial.rs
new file mode 100644
index 000000000000..7ccdf072744a
--- /dev/null
+++ b/core/lib/vm/src/tests/is_write_initial.rs
@@ -0,0 +1,42 @@
+use zksync_state::ReadStorage;
+use zksync_types::get_nonce_key;
+
+use crate::tests::tester::{Account, TxType, VmTesterBuilder};
+use crate::tests::utils::read_test_contract;
+use crate::types::inputs::system_env::TxExecutionMode;
+use crate::{HistoryDisabled, VmExecutionMode};
+
+#[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/vm/src/tests/l1_tx_execution.rs b/core/lib/vm/src/tests/l1_tx_execution.rs
new file mode 100644
index 000000000000..5afe6af7918a
--- /dev/null
+++ b/core/lib/vm/src/tests/l1_tx_execution.rs
@@ -0,0 +1,123 @@
+use zksync_config::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, L2ChainId, U256};
+use zksync_utils::u256_to_h256;
+
+use crate::tests::tester::{TxType, VmTesterBuilder};
+use crate::tests::utils::{read_test_contract, verify_required_storage, BASE_SYSTEM_CONTRACTS};
+use crate::types::inputs::system_env::TxExecutionMode;
+use crate::types::internals::TransactionData;
+use crate::{HistoryEnabled, VmExecutionMode};
+
+#[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(L2ChainId(0)),
+        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.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/vm/src/tests/l2_blocks.rs b/core/lib/vm/src/tests/l2_blocks.rs
new file mode 100644
index 000000000000..9deac837f902
--- /dev/null
+++ b/core/lib/vm/src/tests/l2_blocks.rs
@@ -0,0 +1,500 @@
+//!
+//! Tests for the bootloader
+//! The description for each of the tests can be found in the corresponding `.yul` file.
+//!
+
+use crate::constants::{
+    BOOTLOADER_HEAP_PAGE, TX_OPERATOR_L2_BLOCK_INFO_OFFSET, TX_OPERATOR_SLOTS_PER_L2_BLOCK_INFO,
+};
+use crate::tests::tester::default_l1_batch;
+use crate::tests::tester::VmTesterBuilder;
+use crate::utils::l2_blocks::get_l2_block_hash_key;
+use crate::{
+    ExecutionResult, Halt, HistoryEnabled, HistoryMode, L2BlockEnv, TxExecutionMode, Vm,
+    VmExecutionMode,
+};
+use zk_evm::aux_structures::Timestamp;
+use zksync_config::constants::{
+    CURRENT_VIRTUAL_BLOCK_INFO_POSITION, REQUIRED_L1_TO_L2_GAS_PER_PUBDATA_BYTE,
+};
+use zksync_state::{ReadStorage, WriteStorage};
+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/vm/src/tests/mod.rs b/core/lib/vm/src/tests/mod.rs
index a8c040fbdd65..ffb38dd3725a 100644
--- a/core/lib/vm/src/tests/mod.rs
+++ b/core/lib/vm/src/tests/mod.rs
@@ -1,4 +1,20 @@
 mod bootloader;
-mod upgrades;
-
+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/vm/src/tests/nonce_holder.rs b/core/lib/vm/src/tests/nonce_holder.rs
new file mode 100644
index 000000000000..35af6ad15f43
--- /dev/null
+++ b/core/lib/vm/src/tests/nonce_holder.rs
@@ -0,0 +1,180 @@
+use zksync_types::{Execute, Nonce};
+
+use crate::errors::VmRevertReason;
+use crate::tests::tester::{Account, VmTesterBuilder};
+use crate::tests::utils::read_nonce_holder_tester;
+use crate::types::inputs::system_env::TxExecutionMode;
+use crate::types::internals::TransactionData;
+use crate::{ExecutionResult, Halt, HistoryEnabled, TxRevertReason, VmExecutionMode};
+
+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/vm/src/tests/refunds.rs b/core/lib/vm/src/tests/refunds.rs
new file mode 100644
index 000000000000..4314f57489eb
--- /dev/null
+++ b/core/lib/vm/src/tests/refunds.rs
@@ -0,0 +1,152 @@
+use crate::tests::tester::{DeployContractsTx, TxType, VmTesterBuilder};
+use crate::tests::utils::read_test_contract;
+use crate::types::inputs::system_env::TxExecutionMode;
+
+use crate::types::internals::TransactionData;
+use crate::{HistoryEnabled, VmExecutionMode};
+
+#[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.l2_to_l1_logs,
+        current_state_without_predefined_refunds.l2_to_l1_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.l2_to_l1_logs,
+        current_state_without_predefined_refunds.l2_to_l1_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/vm/src/tests/require_eip712.rs b/core/lib/vm/src/tests/require_eip712.rs
new file mode 100644
index 000000000000..d77e4d6a33a3
--- /dev/null
+++ b/core/lib/vm/src/tests/require_eip712.rs
@@ -0,0 +1,162 @@
+use std::convert::TryInto;
+
+use ethabi::Token;
+
+use zksync_config::constants::L2_ETH_TOKEN_ADDRESS;
+use zksync_eth_signer::raw_ethereum_tx::TransactionParameters;
+use zksync_eth_signer::EthereumSigner;
+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::tests::tester::{Account, VmTester, VmTesterBuilder};
+use crate::tests::utils::read_many_owners_custom_account_contract;
+use crate::types::inputs::system_env::TxExecutionMode;
+use crate::{HistoryDisabled, VmExecutionMode};
+
+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: u16 = 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, 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(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(chain_id));
+
+    let (aa_txn_request, aa_hash) = TransactionRequest::from_bytes(&encoded_tx, 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/vm/src/tests/rollbacks.rs b/core/lib/vm/src/tests/rollbacks.rs
new file mode 100644
index 000000000000..1fa6a2afe390
--- /dev/null
+++ b/core/lib/vm/src/tests/rollbacks.rs
@@ -0,0 +1,146 @@
+use ethabi::Token;
+
+use zksync_contracts::get_loadnext_contract;
+use zksync_contracts::test_contracts::LoadnextContractExecutionParams;
+
+use zksync_types::{Execute, U256};
+
+use crate::tests::tester::{
+    DeployContractsTx, TransactionTestInfo, TxModifier, TxType, VmTesterBuilder,
+};
+use crate::tests::utils::read_test_contract;
+use crate::types::inputs::system_env::TxExecutionMode;
+use crate::HistoryEnabled;
+
+#[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);
+}
diff --git a/core/lib/vm/src/tests/simple_execution.rs b/core/lib/vm/src/tests/simple_execution.rs
new file mode 100644
index 000000000000..40e51739b072
--- /dev/null
+++ b/core/lib/vm/src/tests/simple_execution.rs
@@ -0,0 +1,77 @@
+use crate::tests::tester::{TxType, VmTesterBuilder};
+use crate::types::outputs::ExecutionResult;
+use crate::{HistoryDisabled, VmExecutionMode};
+
+#[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/vm/src/tests/tester/inner_state.rs b/core/lib/vm/src/tests/tester/inner_state.rs
new file mode 100644
index 000000000000..08220724b4dd
--- /dev/null
+++ b/core/lib/vm/src/tests/tester/inner_state.rs
@@ -0,0 +1,116 @@
+use std::collections::HashMap;
+
+use zk_evm::aux_structures::Timestamp;
+use zk_evm::vm_state::VmLocalState;
+use zksync_state::WriteStorage;
+
+use zksync_types::{StorageKey, StorageLogQuery, StorageValue, U256};
+
+use crate::old_vm::event_sink::InMemoryEventSink;
+use crate::old_vm::history_recorder::{AppDataFrameManagerWithHistory, HistoryRecorder};
+use crate::{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>,
+}
+
+#[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(),
+        };
+        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/vm/src/tests/tester/mod.rs b/core/lib/vm/src/tests/tester/mod.rs
new file mode 100644
index 000000000000..dfe8905a7e08
--- /dev/null
+++ b/core/lib/vm/src/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/vm/src/tests/tester/transaction_test_info.rs b/core/lib/vm/src/tests/tester/transaction_test_info.rs
new file mode 100644
index 000000000000..65ceb3c5cf3c
--- /dev/null
+++ b/core/lib/vm/src/tests/tester/transaction_test_info.rs
@@ -0,0 +1,216 @@
+use zksync_types::{ExecuteTransactionCommon, Transaction};
+
+use crate::errors::VmRevertReason;
+use crate::tests::tester::vm_tester::VmTester;
+use crate::{
+    CurrentExecutionState, ExecutionResult, Halt, HistoryEnabled, TxRevertReason, VmExecutionMode,
+    VmExecutionResultAndLogs,
+};
+
+#[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/vm/src/tests/tester/vm_tester.rs b/core/lib/vm/src/tests/tester/vm_tester.rs
new file mode 100644
index 000000000000..c113b71bc83f
--- /dev/null
+++ b/core/lib/vm/src/tests/tester/vm_tester.rs
@@ -0,0 +1,294 @@
+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::constants::BLOCK_GAS_LIMIT;
+
+use crate::tests::tester::Account;
+use crate::tests::tester::TxType;
+use crate::tests::utils::read_test_contract;
+use crate::types::inputs::system_env::TxExecutionMode;
+use crate::utils::l2_blocks::load_last_l2_block;
+use crate::{HistoryMode, L1BatchEnv, L2BlockEnv, SystemEnv, Vm, VmExecutionMode};
+
+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());
+            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(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/vm/src/tests/tracing_execution_error.rs b/core/lib/vm/src/tests/tracing_execution_error.rs
new file mode 100644
index 000000000000..dbe9f74a85bd
--- /dev/null
+++ b/core/lib/vm/src/tests/tracing_execution_error.rs
@@ -0,0 +1,49 @@
+use zksync_types::{Execute, H160};
+
+use crate::errors::VmRevertReason;
+use crate::tests::tester::{ExpectedError, TransactionTestInfo, VmTesterBuilder};
+use crate::tests::utils::{get_execute_error_calldata, read_error_contract, BASE_SYSTEM_CONTRACTS};
+use crate::types::inputs::system_env::TxExecutionMode;
+use crate::{HistoryEnabled, TxRevertReason};
+
+#[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/vm/src/tests/upgrades.rs b/core/lib/vm/src/tests/upgrade.rs
similarity index 66%
rename from core/lib/vm/src/tests/upgrades.rs
rename to core/lib/vm/src/tests/upgrade.rs
index 2abb154eb15c..05646326ffd1 100644
--- a/core/lib/vm/src/tests/upgrades.rs
+++ b/core/lib/vm/src/tests/upgrade.rs
@@ -1,18 +1,7 @@
-use crate::{
-    test_utils::verify_required_storage,
-    tests::utils::get_l1_deploy_tx,
-    utils::{create_test_block_params, BASE_SYSTEM_CONTRACTS, BLOCK_GAS_LIMIT},
-    vm::tx_has_failed,
-    vm_with_bootloader::{init_vm_inner, push_transaction_to_bootloader_memory},
-    vm_with_bootloader::{BlockContextMode, TxExecutionMode},
-    HistoryEnabled, OracleTools, TxRevertReason,
-};
-
 use zk_evm::aux_structures::Timestamp;
 
 use zksync_types::{
     ethabi::Contract,
-    tx::tx_execution_info::TxExecutionStatus,
     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},
@@ -23,8 +12,11 @@ use zksync_utils::{bytecode::hash_bytecode, bytes_to_be_words, h256_to_u256, u25
 
 use zksync_contracts::{deployer_contract, load_contract, load_sys_contract, read_bytecode};
 use zksync_state::WriteStorage;
+use zksync_test_account::TxType;
 
-use crate::tests::utils::create_storage_view;
+use crate::tests::tester::VmTesterBuilder;
+use crate::tests::utils::verify_required_storage;
+use crate::{ExecutionResult, Halt, HistoryEnabled, TxExecutionMode, VmExecutionMode};
 use zksync_types::protocol_version::ProtocolUpgradeTxCommonData;
 
 use super::utils::read_test_contract;
@@ -34,9 +26,11 @@ use super::utils::read_test_contract;
 /// - If present, this transaction must be the first one in block
 #[test]
 fn test_protocol_upgrade_is_first() {
-    let mut storage_view = create_storage_view();
-    let mut oracle_tools = OracleTools::new(&mut storage_view, HistoryEnabled);
-    let (block_context, block_properties) = create_test_block_params();
+    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());
 
@@ -54,82 +48,72 @@ fn test_protocol_upgrade_is_first() {
         input: vec![],
     }]);
 
-    let normal_l1_transaction = get_l1_deploy_tx(&read_test_contract(), &[]);
-
-    let mut vm = init_vm_inner(
-        &mut oracle_tools,
-        BlockContextMode::NewBlock(block_context.into(), Default::default()),
-        &block_properties,
-        BLOCK_GAS_LIMIT,
-        &BASE_SYSTEM_CONTRACTS,
-        TxExecutionMode::VerifyExecute,
-    );
+    let normal_l1_transaction = vm.rich_accounts[0]
+        .get_deploy_tx(&read_test_contract(), None, TxType::L1 { serial_id: 0 })
+        .tx;
 
-    let expected_error = TxRevertReason::UnexpectedVMBehavior(
-        "Assertion error: Protocol upgrade tx not first".to_string(),
-    );
+    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.save_current_vm_as_snapshot();
+    vm.vm.push_transaction(protocol_upgrade_transaction.clone());
+    vm.vm.push_transaction(normal_l1_transaction.clone());
+    vm.vm.push_transaction(protocol_upgrade_transaction.clone());
 
-    push_transaction_to_bootloader_memory(
-        &mut vm,
-        &protocol_upgrade_transaction,
-        TxExecutionMode::VerifyExecute,
-        None,
-    );
-    push_transaction_to_bootloader_memory(
-        &mut vm,
-        &normal_l1_transaction,
-        TxExecutionMode::VerifyExecute,
-        None,
-    );
-    push_transaction_to_bootloader_memory(
-        &mut vm,
-        &protocol_upgrade_transaction,
-        TxExecutionMode::VerifyExecute,
-        None,
+    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()
+        }
     );
 
-    vm.execute_next_tx(u32::MAX, false).unwrap();
-    vm.execute_next_tx(u32::MAX, false).unwrap();
-    let res = vm.execute_next_tx(u32::MAX, false);
-    assert_eq!(res, Err(expected_error.clone()));
-
     // Test 2: the protocol upgrade tx must be the first one in block
-    vm.rollback_to_latest_snapshot();
+    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());
 
-    push_transaction_to_bootloader_memory(
-        &mut vm,
-        &normal_l1_transaction,
-        TxExecutionMode::VerifyExecute,
-        None,
-    );
-    push_transaction_to_bootloader_memory(
-        &mut vm,
-        &protocol_upgrade_transaction,
-        TxExecutionMode::VerifyExecute,
-        None,
+    vm.vm.execute(VmExecutionMode::OneTx);
+    let result = vm.vm.execute(VmExecutionMode::OneTx);
+    assert_eq!(
+        result.result,
+        ExecutionResult::Halt {
+            reason: expected_error
+        }
     );
 
-    vm.execute_next_tx(u32::MAX, false).unwrap();
-    let res = vm.execute_next_tx(u32::MAX, false);
-    assert_eq!(res, Err(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 storage_view = create_storage_view();
+    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.set_value(known_code_key, u256_to_h256(1.into()));
-
-    let mut oracle_tools = OracleTools::new(&mut storage_view, HistoryEnabled);
-    let (block_context, block_properties) = create_test_block_params();
+    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:
@@ -146,38 +130,30 @@ fn test_force_deploy_upgrade() {
         input: vec![],
     }]);
 
-    let mut vm = init_vm_inner(
-        &mut oracle_tools,
-        BlockContextMode::NewBlock(block_context.into(), Default::default()),
-        &block_properties,
-        BLOCK_GAS_LIMIT,
-        &BASE_SYSTEM_CONTRACTS,
-        TxExecutionMode::VerifyExecute,
-    );
-    push_transaction_to_bootloader_memory(
-        &mut vm,
-        &transaction,
-        TxExecutionMode::VerifyExecute,
-        None,
-    );
-    let result = vm.execute_next_tx(u32::MAX, false).unwrap();
-    assert_eq!(
-        result.status,
-        TxExecutionStatus::Success,
+    vm.vm.push_transaction(transaction);
+
+    let result = vm.vm.execute(VmExecutionMode::OneTx);
+    assert!(
+        !result.result.is_failed(),
         "The force upgrade was not successful"
     );
-    assert!(!tx_has_failed(&vm.state, 0));
 
     let expected_slots = vec![(bytecode_hash, get_code_key(&address_to_deploy))];
 
     // Verify that the bytecode has been set correctly
-    verify_required_storage(&vm.state, expected_slots);
+    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 storage_view = create_storage_view();
+    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());
@@ -187,16 +163,19 @@ fn test_complex_upgrader() {
     let upgrade_impl = H160::random();
     let account_code_key = get_code_key(&upgrade_impl);
 
-    storage_view.set_value(get_known_code_key(&bytecode_hash), u256_to_h256(1.into()));
-    storage_view.set_value(
+    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.set_value(account_code_key, bytecode_hash);
+    storage_view
+        .borrow_mut()
+        .set_value(account_code_key, bytecode_hash);
+    drop(storage_view);
 
-    let mut oracle_tools: OracleTools<false, HistoryEnabled> =
-        OracleTools::new(&mut storage_view, HistoryEnabled);
-    oracle_tools.decommittment_processor.populate(
+    vm.vm.state.decommittment_processor.populate(
         vec![
             (
                 h256_to_u256(bytecode_hash),
@@ -210,8 +189,6 @@ fn test_complex_upgrader() {
         Timestamp(0),
     );
 
-    let (block_context, block_properties) = create_test_block_params();
-
     let address_to_deploy1 = H160::random();
     let address_to_deploy2 = H160::random();
 
@@ -222,27 +199,12 @@ fn test_complex_upgrader() {
         bytecode_hash,
     );
 
-    let mut vm = init_vm_inner(
-        &mut oracle_tools,
-        BlockContextMode::NewBlock(block_context.into(), Default::default()),
-        &block_properties,
-        BLOCK_GAS_LIMIT,
-        &BASE_SYSTEM_CONTRACTS,
-        TxExecutionMode::VerifyExecute,
-    );
-    push_transaction_to_bootloader_memory(
-        &mut vm,
-        &transaction,
-        TxExecutionMode::VerifyExecute,
-        None,
-    );
-    let result = vm.execute_next_tx(u32::MAX, false).unwrap();
-    assert_eq!(
-        result.status,
-        TxExecutionStatus::Success,
+    vm.vm.push_transaction(transaction);
+    let result = vm.vm.execute(VmExecutionMode::OneTx);
+    assert!(
+        !result.result.is_failed(),
         "The force upgrade was not successful"
     );
-    assert!(!tx_has_failed(&vm.state, 0));
 
     let expected_slots = vec![
         (bytecode_hash, get_code_key(&address_to_deploy1)),
@@ -250,7 +212,7 @@ fn test_complex_upgrader() {
     ];
 
     // Verify that the bytecode has been set correctly
-    verify_required_storage(&vm.state, expected_slots);
+    verify_required_storage(&vm.vm.state, expected_slots);
 }
 
 #[derive(Debug, Clone)]
@@ -306,6 +268,7 @@ fn get_forced_deploy_tx(deployment: &[ForceDeployment]) -> Transaction {
         }),
         execute,
         received_timestamp_ms: 0,
+        raw_bytes: None,
     }
 }
 
@@ -355,6 +318,7 @@ fn get_complex_upgrade_tx(
         }),
         execute,
         received_timestamp_ms: 0,
+        raw_bytes: None,
     }
 }
 
diff --git a/core/lib/vm/src/tests/utils.rs b/core/lib/vm/src/tests/utils.rs
index 5b6d253bb9d3..f709ebdd8ede 100644
--- a/core/lib/vm/src/tests/utils.rs
+++ b/core/lib/vm/src/tests/utils.rs
@@ -1,110 +1,106 @@
-//!
-//! Tests for the bootloader
-//! The description for each of the tests can be found in the corresponding `.yul` file.
-//!
-use zksync_types::{
-    ethabi::Contract,
-    Execute, L1TxCommonData, H160, REQUIRED_L1_TO_L2_GAS_PER_PUBDATA_BYTE,
-    {ethabi::Token, Address, ExecuteTransactionCommon, Transaction, U256},
-};
+use ethabi::Contract;
+use once_cell::sync::Lazy;
 
-use zksync_contracts::{load_contract, read_bytecode};
-use zksync_state::{InMemoryStorage, StorageView};
+use crate::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::types::internals::ZkSyncVmState;
+use crate::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);
+    }
+}
 
-use crate::test_utils::get_create_execute;
+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 fn read_test_contract() -> Vec<u8> {
+pub(crate) fn read_test_contract() -> Vec<u8> {
     read_bytecode("etc/contracts-test-data/artifacts-zk/contracts/counter/counter.sol/Counter.json")
 }
 
-pub fn read_long_return_data_contract() -> Vec<u8> {
-    read_bytecode("etc/contracts-test-data/artifacts-zk/contracts/long-return-data/long-return-data.sol/LongReturnData.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 fn read_nonce_holder_tester() -> Vec<u8> {
+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 fn read_error_contract() -> Vec<u8> {
+pub(crate) fn read_error_contract() -> Vec<u8> {
     read_bytecode(
         "etc/contracts-test-data/artifacts-zk/contracts/error/error.sol/SimpleRequire.json",
     )
 }
 
-pub 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 fn get_l1_execute_test_contract_tx_with_sender(
-    sender: Address,
-    deployed_address: Address,
-    with_panic: bool,
-    value: U256,
-    payable: bool,
-) -> Transaction {
-    let execute = execute_test_contract(deployed_address, with_panic, value, payable);
-
-    Transaction {
-        common_data: ExecuteTransactionCommon::L1(L1TxCommonData {
-            sender,
-            gas_limit: U256::from(200_000_000u32),
-            gas_per_pubdata_limit: REQUIRED_L1_TO_L2_GAS_PER_PUBDATA_BYTE.into(),
-            to_mint: value,
-            ..Default::default()
-        }),
-        execute,
-        received_timestamp_ms: 0,
-    }
-}
-
-fn execute_test_contract(
-    address: Address,
-    with_panic: bool,
-    value: U256,
-    payable: bool,
-) -> Execute {
+pub(crate) fn get_execute_error_calldata() -> Vec<u8> {
     let test_contract = load_contract(
-        "etc/contracts-test-data/artifacts-zk/contracts/counter/counter.sol/Counter.json",
+        "etc/contracts-test-data/artifacts-zk/contracts/error/error.sol/SimpleRequire.json",
     );
 
-    let function = if payable {
-        test_contract
-            .function("incrementWithRevertPayable")
-            .unwrap()
-    } else {
-        test_contract.function("incrementWithRevert").unwrap()
-    };
-
-    let calldata = function
-        .encode_input(&[Token::Uint(U256::from(1u8)), Token::Bool(with_panic)])
-        .expect("failed to encode parameters");
-
-    Execute {
-        contract_address: address,
-        calldata,
-        value,
-        factory_deps: None,
-    }
+    let function = test_contract.function("require_short").unwrap();
+
+    function
+        .encode_input(&[])
+        .expect("failed to encode parameters")
 }
 
-pub fn get_l1_deploy_tx(code: &[u8], calldata: &[u8]) -> Transaction {
-    let execute = get_create_execute(code, calldata);
-
-    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,
-        received_timestamp_ms: 0,
-    }
+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 fn create_storage_view() -> StorageView<InMemoryStorage> {
-    let raw_storage = InMemoryStorage::with_system_contracts(hash_bytecode);
-    StorageView::new(raw_storage)
+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/vm/src/tracers/call.rs b/core/lib/vm/src/tracers/call.rs
new file mode 100644
index 000000000000..768db81f85a1
--- /dev/null
+++ b/core/lib/vm/src/tracers/call.rs
@@ -0,0 +1,240 @@
+use once_cell::sync::OnceCell;
+use std::marker::PhantomData;
+use std::sync::Arc;
+
+use zk_evm::tracing::{AfterExecutionData, VmLocalStateData};
+use zk_evm::zkevm_opcode_defs::{
+    FarCallABI, FarCallOpcode, FatPointer, Opcode, RetOpcode,
+    CALL_IMPLICIT_CALLDATA_FAT_PTR_REGISTER, RET_IMPLICIT_RETURNDATA_PARAMS_REGISTER,
+};
+
+use zksync_config::constants::CONTRACT_DEPLOYER_ADDRESS;
+use zksync_state::{StoragePtr, WriteStorage};
+use zksync_types::vm_trace::{Call, CallType};
+use zksync_types::U256;
+
+use crate::errors::VmRevertReason;
+use crate::old_vm::history_recorder::HistoryMode;
+use crate::old_vm::memory::SimpleMemory;
+use crate::tracers::traits::{DynTracer, ExecutionEndTracer, ExecutionProcessing, VmTracer};
+use crate::types::outputs::VmExecutionResultAndLogs;
+
+#[derive(Debug, Clone)]
+pub struct CallTracer<H: HistoryMode> {
+    stack: Vec<FarcallAndNearCallCount>,
+    result: Arc<OnceCell<Vec<Call>>>,
+    _phantom: PhantomData<fn() -> H>,
+}
+
+#[derive(Debug, Clone)]
+struct FarcallAndNearCallCount {
+    farcall: Call,
+    near_calls_after: usize,
+}
+
+impl<H: HistoryMode> CallTracer<H> {
+    pub fn new(resulted_stack: Arc<OnceCell<Vec<Call>>>, _history: H) -> Self {
+        Self {
+            stack: vec![],
+            result: resulted_stack,
+            _phantom: PhantomData,
+        }
+    }
+}
+
+impl<S, H: HistoryMode> DynTracer<S, H> for CallTracer<H> {
+    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(state, data, memory, &mut current_call);
+                self.stack.push(FarcallAndNearCallCount {
+                    farcall: current_call,
+                    near_calls_after: 0,
+                });
+            }
+            Opcode::Ret(ret_code) => {
+                self.handle_ret_op_code(state, data, memory, ret_code);
+            }
+            _ => {}
+        };
+    }
+}
+
+impl<H: HistoryMode> ExecutionEndTracer<H> for CallTracer<H> {}
+
+impl<S: WriteStorage, H: HistoryMode> ExecutionProcessing<S, H> for CallTracer<H> {}
+
+impl<S: WriteStorage, H: HistoryMode> VmTracer<S, H> for CallTracer<H> {
+    fn save_results(&mut self, _result: &mut VmExecutionResultAndLogs) {
+        self.result
+            .set(
+                std::mem::take(&mut self.stack)
+                    .into_iter()
+                    .map(|x| x.farcall)
+                    .collect(),
+            )
+            .expect("Result is already set");
+    }
+}
+
+impl<H: HistoryMode> CallTracer<H> {
+    fn handle_far_call_op_code(
+        &mut self,
+        state: VmLocalStateData<'_>,
+        _data: AfterExecutionData,
+        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(
+        &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(
+        &mut self,
+        state: VmLocalStateData<'_>,
+        _data: AfterExecutionData,
+        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;
+            return;
+        }
+
+        current_call.farcall.gas_used = current_call
+            .farcall
+            .parent_gas
+            .saturating_sub(state.vm_local_state.callstack.current.ergs_remaining);
+
+        self.save_output(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/vm/src/tracers/default_tracers.rs b/core/lib/vm/src/tracers/default_tracers.rs
new file mode 100644
index 000000000000..7cc1e19869cf
--- /dev/null
+++ b/core/lib/vm/src/tracers/default_tracers.rs
@@ -0,0 +1,259 @@
+use std::fmt::{Debug, Formatter};
+
+use zk_evm::witness_trace::DummyTracer;
+use zk_evm::zkevm_opcode_defs::{Opcode, RetOpcode};
+use zk_evm::{
+    tracing::{
+        AfterDecodingData, AfterExecutionData, BeforeExecutionData, Tracer, VmLocalStateData,
+    },
+    vm_state::VmLocalState,
+};
+use zksync_state::{StoragePtr, WriteStorage};
+use zksync_types::Timestamp;
+
+use crate::bootloader_state::utils::apply_l2_block;
+use crate::bootloader_state::BootloaderState;
+use crate::constants::BOOTLOADER_HEAP_PAGE;
+use crate::old_vm::history_recorder::HistoryMode;
+use crate::old_vm::memory::SimpleMemory;
+use crate::tracers::traits::{DynTracer, ExecutionEndTracer, ExecutionProcessing, VmTracer};
+use crate::tracers::utils::{
+    computational_gas_price, gas_spent_on_bytecodes_and_long_messages_this_opcode,
+    print_debug_if_needed, VmHook,
+};
+use crate::tracers::ResultTracer;
+use crate::types::internals::ZkSyncVmState;
+use crate::{VmExecutionMode, VmExecutionStopReason};
+
+/// Default tracer for the VM. It manages the other tracers execution and stop the vm when needed.
+pub(crate) struct DefaultExecutionTracer<S, 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,
+    pub(crate) custom_tracers: Vec<Box<dyn VmTracer<S, H>>>,
+    ret_from_the_bootloader: Option<RetOpcode>,
+    storage: StoragePtr<S>,
+}
+
+impl<S, H: HistoryMode> Debug for DefaultExecutionTracer<S, H> {
+    fn fmt(&self, f: &mut Formatter<'_>) -> std::fmt::Result {
+        f.debug_struct("DefaultExecutionTracer").finish()
+    }
+}
+
+impl<S, H: HistoryMode> Tracer for DefaultExecutionTracer<S, H> {
+    const CALL_BEFORE_DECODING: bool = true;
+    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<'_>, memory: &Self::SupportedMemory) {
+        <ResultTracer as DynTracer<S, H>>::before_decoding(&mut self.result_tracer, state, memory);
+        for tracer in self.custom_tracers.iter_mut() {
+            tracer.before_decoding(state, memory)
+        }
+    }
+
+    fn after_decoding(
+        &mut self,
+        state: VmLocalStateData<'_>,
+        data: AfterDecodingData,
+        memory: &Self::SupportedMemory,
+    ) {
+        <ResultTracer as DynTracer<S, H>>::after_decoding(
+            &mut self.result_tracer,
+            state,
+            data,
+            memory,
+        );
+        for tracer in self.custom_tracers.iter_mut() {
+            tracer.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());
+        for tracer in self.custom_tracers.iter_mut() {
+            tracer.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::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());
+        for tracer in self.custom_tracers.iter_mut() {
+            tracer.after_execution(state, data, memory, self.storage.clone());
+        }
+    }
+}
+
+impl<S: WriteStorage, H: HistoryMode> ExecutionEndTracer<H> for DefaultExecutionTracer<S, H> {
+    fn should_stop_execution(&self) -> bool {
+        let mut should_stop = match self.execution_mode {
+            VmExecutionMode::OneTx => self.tx_has_been_processed(),
+            VmExecutionMode::Batch => false,
+            VmExecutionMode::Bootloader => self.ret_from_the_bootloader == Some(RetOpcode::Ok),
+        };
+        should_stop = should_stop || self.validation_run_out_of_gas();
+        for tracer in self.custom_tracers.iter() {
+            should_stop = should_stop || tracer.should_stop_execution();
+        }
+        should_stop
+    }
+}
+
+impl<S: WriteStorage, H: HistoryMode> DefaultExecutionTracer<S, H> {
+    pub(crate) fn new(
+        computational_gas_limit: u32,
+        execution_mode: VmExecutionMode,
+        custom_tracers: Vec<Box<dyn VmTracer<S, H>>>,
+        storage: StoragePtr<S>,
+    ) -> 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),
+            custom_tracers,
+            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;
+    }
+}
+
+impl<S, H: HistoryMode> DynTracer<S, H> for DefaultExecutionTracer<S, H> {}
+
+impl<S: WriteStorage, H: HistoryMode> ExecutionProcessing<S, H> for DefaultExecutionTracer<S, H> {
+    fn initialize_tracer(&mut self, state: &mut ZkSyncVmState<S, H>) {
+        self.result_tracer.initialize_tracer(state);
+        for processor in self.custom_tracers.iter_mut() {
+            processor.initialize_tracer(state);
+        }
+    }
+
+    fn before_cycle(&mut self, state: &mut ZkSyncVmState<S, H>) {
+        self.result_tracer.before_cycle(state);
+        for processor in self.custom_tracers.iter_mut() {
+            processor.before_cycle(state);
+        }
+    }
+
+    fn after_cycle(
+        &mut self,
+        state: &mut ZkSyncVmState<S, H>,
+        bootloader_state: &mut BootloaderState,
+    ) {
+        self.result_tracer.after_cycle(state, bootloader_state);
+        for processor in self.custom_tracers.iter_mut() {
+            processor.after_cycle(state, bootloader_state);
+        }
+        if self.final_batch_info_requested {
+            self.set_fictive_l2_block(state, bootloader_state)
+        }
+    }
+
+    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);
+        for processor in self.custom_tracers.iter_mut() {
+            processor.after_vm_execution(state, bootloader_state, stop_reason);
+        }
+    }
+}
+
+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/vm/src/tracers/mod.rs b/core/lib/vm/src/tracers/mod.rs
new file mode 100644
index 000000000000..11fefedc85a5
--- /dev/null
+++ b/core/lib/vm/src/tracers/mod.rs
@@ -0,0 +1,15 @@
+pub(crate) use default_tracers::DefaultExecutionTracer;
+pub(crate) use refunds::RefundsTracer;
+pub(crate) use result_tracer::ResultTracer;
+pub use storage_invocations::StorageInvocations;
+pub use validation::{ValidationError, ValidationTracer, ValidationTracerParams};
+
+pub(crate) mod default_tracers;
+pub(crate) mod refunds;
+pub(crate) mod result_tracer;
+
+pub(crate) mod call;
+pub(crate) mod storage_invocations;
+pub(crate) mod traits;
+pub(crate) mod utils;
+pub(crate) mod validation;
diff --git a/core/lib/vm/src/tracers/refunds.rs b/core/lib/vm/src/tracers/refunds.rs
new file mode 100644
index 000000000000..62b64eb73bc4
--- /dev/null
+++ b/core/lib/vm/src/tracers/refunds.rs
@@ -0,0 +1,374 @@
+use std::collections::HashMap;
+
+use zk_evm::{
+    aux_structures::Timestamp,
+    tracing::{BeforeExecutionData, VmLocalStateData},
+    vm_state::VmLocalState,
+};
+
+use zksync_config::constants::{PUBLISH_BYTECODE_OVERHEAD, SYSTEM_CONTEXT_ADDRESS};
+use zksync_state::{StoragePtr, WriteStorage};
+use zksync_types::{
+    event::{extract_long_l2_to_l1_messages, extract_published_bytecodes},
+    l2_to_l1_log::L2ToL1Log,
+    zkevm_test_harness::witness::sort_storage_access::sort_storage_access_queries,
+    L1BatchNumber, StorageKey, U256,
+};
+use zksync_utils::bytecode::bytecode_len_in_bytes;
+use zksync_utils::{ceil_div_u256, u256_to_h256};
+
+use crate::bootloader_state::BootloaderState;
+use crate::constants::{BOOTLOADER_HEAP_PAGE, OPERATOR_REFUNDS_OFFSET, TX_GAS_LIMIT_OFFSET};
+use crate::old_vm::{
+    events::merge_events, history_recorder::HistoryMode, memory::SimpleMemory,
+    oracles::storage::storage_key_of_log, utils::eth_price_per_pubdata_byte,
+};
+use crate::tracers::utils::gas_spent_on_bytecodes_and_long_messages_this_opcode;
+use crate::tracers::{
+    traits::{DynTracer, ExecutionEndTracer, ExecutionProcessing, VmTracer},
+    utils::{get_vm_hook_params, VmHook},
+};
+use crate::types::{
+    inputs::L1BatchEnv,
+    internals::ZkSyncVmState,
+    outputs::{Refunds, VmExecutionResultAndLogs},
+};
+
+/// 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,
+}
+
+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,
+        }
+    }
+}
+
+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 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()
+    }
+}
+
+impl<S, H: HistoryMode> DynTracer<S, H> for RefundsTracer {
+    fn before_execution(
+        &mut self,
+        state: VmLocalStateData<'_>,
+        data: BeforeExecutionData,
+        memory: &SimpleMemory<H>,
+        _storage: StoragePtr<S>,
+    ) {
+        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 RefundsTracer {
+    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
+    }
+}
+
+impl<H: HistoryMode> ExecutionEndTracer<H> for RefundsTracer {}
+
+impl<S: WriteStorage, H: HistoryMode> ExecutionProcessing<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 before_cycle(&mut self, state: &mut ZkSyncVmState<S, H>) {
+        self.timestamp_before_cycle = Timestamp(state.local_state.timestamp);
+    }
+
+    fn after_cycle(
+        &mut self,
+        state: &mut ZkSyncVmState<S, H>,
+        bootloader_state: &mut BootloaderState,
+    ) {
+        // 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 pubdata_published =
+                pubdata_published(state, self.timestamp_initial, self.l1_batch.number);
+
+            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: {}, bootloader refund: {}",
+                        tx_body_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: {}, bootloader refund: {}",
+                        tx_gas_limit,
+                        bootloader_refund
+                    );
+            }
+            if tx_gas_limit < refund_to_propose {
+                tracing::error!(
+                        "Tx gas limit is less than operator refund. Tx gas limit: {}, operator refund: {}",
+                        tx_gas_limit,
+                        refund_to_propose
+                    );
+            }
+
+            metrics::histogram!("vm.refund", bootloader_refund as f64 / tx_gas_limit as f64 * 100.0, "type" => "bootloader");
+            metrics::histogram!("vm.refund", refund_to_propose as f64 / tx_gas_limit as f64 * 100.0, "type" => "operator");
+            metrics::histogram!(
+                "vm.refund.diff",
+                (refund_to_propose as f64 - bootloader_refund as f64) / tx_gas_limit as f64 * 100.0
+            );
+        }
+    }
+}
+
+/// 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>,
+    from_timestamp: Timestamp,
+    batch_number: L1BatchNumber,
+) -> u32 {
+    let storage_writes_pubdata_published = pubdata_published_for_writes(state, from_timestamp);
+
+    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::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
+}
+
+fn pubdata_published_for_writes<S: WriteStorage, H: HistoryMode>(
+    state: &ZkSyncVmState<S, H>,
+    from_timestamp: Timestamp,
+) -> u32 {
+    // This `HashMap` contains how much was already paid for every slot that was paid during the last tx execution.
+    // For the slots that weren't paid during the last tx execution we can just use
+    // `self.state.storage.paid_changes.inner().get(&key)` to get how much it was paid before.
+    let pre_paid_before_tx_map: HashMap<StorageKey, u32> = state
+        .storage
+        .paid_changes
+        .history()
+        .iter()
+        .rev()
+        .take_while(|history_elem| history_elem.0 >= from_timestamp)
+        .map(|history_elem| (history_elem.1.key, history_elem.1.value.unwrap_or(0)))
+        .collect();
+    let pre_paid_before_tx = |key: &StorageKey| -> u32 {
+        if let Some(pre_paid) = pre_paid_before_tx_map.get(key) {
+            *pre_paid
+        } else {
+            state
+                .storage
+                .paid_changes
+                .inner()
+                .get(key)
+                .copied()
+                .unwrap_or(0)
+        }
+    };
+
+    let storage_logs = state
+        .storage
+        .storage_log_queries_after_timestamp(from_timestamp);
+    let (_, deduplicated_logs) =
+        sort_storage_access_queries(storage_logs.iter().map(|log| &log.log_query));
+
+    deduplicated_logs
+        .into_iter()
+        .filter_map(|log| {
+            if log.rw_flag {
+                let key = storage_key_of_log(&log);
+                let pre_paid = pre_paid_before_tx(&key);
+                let to_pay_by_user = state.storage.base_price_for_write(&log);
+
+                if to_pay_by_user > pre_paid {
+                    Some(to_pay_by_user - pre_paid)
+                } else {
+                    None
+                }
+            } else {
+                None
+            }
+        })
+        .sum()
+}
+
+impl<S: WriteStorage, H: HistoryMode> VmTracer<S, H> for RefundsTracer {
+    fn save_results(&mut self, result: &mut VmExecutionResultAndLogs) {
+        result.refunds = Refunds {
+            gas_refunded: self.refund_gas,
+            operator_suggested_refund: self.operator_refund.unwrap_or_default(),
+        }
+    }
+}
diff --git a/core/lib/vm/src/tracers/result_tracer.rs b/core/lib/vm/src/tracers/result_tracer.rs
new file mode 100644
index 000000000000..b8e089493565
--- /dev/null
+++ b/core/lib/vm/src/tracers/result_tracer.rs
@@ -0,0 +1,246 @@
+use zk_evm::{
+    tracing::{AfterDecodingData, BeforeExecutionData, VmLocalStateData},
+    vm_state::{ErrorFlags, VmLocalState},
+    zkevm_opcode_defs::FatPointer,
+};
+use zksync_state::{StoragePtr, WriteStorage};
+
+use zksync_types::U256;
+
+use crate::bootloader_state::BootloaderState;
+use crate::errors::VmRevertReason;
+use crate::old_vm::{
+    history_recorder::HistoryMode,
+    memory::SimpleMemory,
+    utils::{vm_may_have_ended_inner, VmExecutionResult},
+};
+use crate::tracers::{
+    traits::{DynTracer, ExecutionEndTracer, ExecutionProcessing, VmTracer},
+    utils::{get_vm_hook_params, read_pointer, VmHook},
+};
+use crate::types::{
+    internals::ZkSyncVmState,
+    outputs::{ExecutionResult, VmExecutionResultAndLogs},
+};
+
+use crate::constants::{BOOTLOADER_HEAP_PAGE, RESULT_SUCCESS_FIRST_SLOT};
+use crate::{Halt, TxRevertReason};
+use crate::{VmExecutionMode, VmExecutionStopReason};
+
+#[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, 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<H: HistoryMode> ExecutionEndTracer<H> for ResultTracer {}
+
+impl<S: WriteStorage, H: HistoryMode> ExecutionProcessing<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 => {
+                match self.execution_mode {
+                    VmExecutionMode::OneTx => self.vm_stopped_execution(state, bootloader_state),
+                    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,
+    ) {
+        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 },
+        }
+    }
+}
+
+impl<S: WriteStorage, H: HistoryMode> VmTracer<S, H> for ResultTracer {
+    fn save_results(&mut self, _result: &mut VmExecutionResultAndLogs) {}
+}
+
+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/vm/src/tracers/storage_invocations.rs b/core/lib/vm/src/tracers/storage_invocations.rs
new file mode 100644
index 000000000000..ef4b59c60a88
--- /dev/null
+++ b/core/lib/vm/src/tracers/storage_invocations.rs
@@ -0,0 +1,44 @@
+use crate::bootloader_state::BootloaderState;
+use crate::old_vm::history_recorder::HistoryMode;
+use crate::tracers::traits::{DynTracer, ExecutionEndTracer, ExecutionProcessing, VmTracer};
+use crate::types::internals::ZkSyncVmState;
+use zksync_state::WriteStorage;
+
+#[derive(Debug, Default, Clone)]
+pub struct StorageInvocations {
+    limit: usize,
+    current: usize,
+}
+
+impl StorageInvocations {
+    pub fn new(limit: usize) -> Self {
+        Self { limit, current: 0 }
+    }
+}
+
+/// 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 StorageInvocations {}
+
+impl<H: HistoryMode> ExecutionEndTracer<H> for StorageInvocations {
+    fn should_stop_execution(&self) -> bool {
+        self.current >= self.limit
+    }
+}
+
+impl<S: WriteStorage, H: HistoryMode> ExecutionProcessing<S, H> for StorageInvocations {
+    fn after_cycle(
+        &mut self,
+        state: &mut ZkSyncVmState<S, H>,
+        _bootloader_state: &mut BootloaderState,
+    ) {
+        self.current = state
+            .storage
+            .storage
+            .get_ptr()
+            .borrow()
+            .missed_storage_invocations();
+    }
+}
+
+impl<S: WriteStorage, H: HistoryMode> VmTracer<S, H> for StorageInvocations {}
diff --git a/core/lib/vm/src/tracers/traits.rs b/core/lib/vm/src/tracers/traits.rs
new file mode 100644
index 000000000000..6e76a041fabc
--- /dev/null
+++ b/core/lib/vm/src/tracers/traits.rs
@@ -0,0 +1,85 @@
+use zk_evm::tracing::{
+    AfterDecodingData, AfterExecutionData, BeforeExecutionData, VmLocalStateData,
+};
+use zksync_state::{StoragePtr, WriteStorage};
+
+use crate::bootloader_state::BootloaderState;
+use crate::old_vm::history_recorder::HistoryMode;
+use crate::old_vm::memory::SimpleMemory;
+use crate::types::internals::ZkSyncVmState;
+use crate::types::outputs::VmExecutionResultAndLogs;
+use crate::VmExecutionStopReason;
+
+/// Run tracer for collecting data during the vm execution cycles
+pub trait ExecutionProcessing<S: WriteStorage, H: HistoryMode>:
+    DynTracer<S, H> + ExecutionEndTracer<H>
+{
+    fn initialize_tracer(&mut self, _state: &mut ZkSyncVmState<S, H>) {}
+    fn before_cycle(&mut self, _state: &mut ZkSyncVmState<S, H>) {}
+    fn after_cycle(
+        &mut self,
+        _state: &mut ZkSyncVmState<S, H>,
+        _bootloader_state: &mut BootloaderState,
+    ) {
+    }
+    fn after_vm_execution(
+        &mut self,
+        _state: &mut ZkSyncVmState<S, H>,
+        _bootloader_state: &BootloaderState,
+        _stop_reason: VmExecutionStopReason,
+    ) {
+    }
+}
+
+/// Stop the vm execution if the tracer conditions are met
+pub trait ExecutionEndTracer<H: HistoryMode> {
+    // Returns whether the vm execution should stop.
+    fn should_stop_execution(&self) -> bool {
+        false
+    }
+}
+
+/// Version of zk_evm::Tracer suitable for dynamic dispatch.
+pub trait DynTracer<S, H: HistoryMode> {
+    fn before_decoding(&mut self, _state: VmLocalStateData<'_>, _memory: &SimpleMemory<H>) {}
+    fn after_decoding(
+        &mut self,
+        _state: VmLocalStateData<'_>,
+        _data: AfterDecodingData,
+        _memory: &SimpleMemory<H>,
+    ) {
+    }
+    fn before_execution(
+        &mut self,
+        _state: VmLocalStateData<'_>,
+        _data: BeforeExecutionData,
+        _memory: &SimpleMemory<H>,
+        _storage: StoragePtr<S>,
+    ) {
+    }
+    fn after_execution(
+        &mut self,
+        _state: VmLocalStateData<'_>,
+        _data: AfterExecutionData,
+        _memory: &SimpleMemory<H>,
+        _storage: StoragePtr<S>,
+    ) {
+    }
+}
+
+/// Save the results of the vm execution.
+pub trait VmTracer<S: WriteStorage, H: HistoryMode>:
+    DynTracer<S, H> + ExecutionEndTracer<H> + ExecutionProcessing<S, H> + Send
+{
+    fn save_results(&mut self, _result: &mut VmExecutionResultAndLogs) {}
+}
+
+pub trait BoxedTracer<S, H> {
+    fn into_boxed(self) -> Box<dyn VmTracer<S, H>>;
+}
+
+impl<S: WriteStorage, H: HistoryMode, T: VmTracer<S, H> + 'static> BoxedTracer<S, H> for T {
+    fn into_boxed(self) -> Box<dyn VmTracer<S, H>> {
+        Box::new(self)
+    }
+}
diff --git a/core/lib/vm/src/tracers/utils.rs b/core/lib/vm/src/tracers/utils.rs
new file mode 100644
index 000000000000..f86b496b0787
--- /dev/null
+++ b/core/lib/vm/src/tracers/utils.rs
@@ -0,0 +1,224 @@
+use zk_evm::aux_structures::MemoryPage;
+use zk_evm::zkevm_opcode_defs::{FarCallABI, FarCallForwardPageType};
+use zk_evm::{
+    tracing::{BeforeExecutionData, VmLocalStateData},
+    zkevm_opcode_defs::{FatPointer, LogOpcode, Opcode, UMAOpcode},
+};
+
+use zksync_config::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::constants::{
+    BOOTLOADER_HEAP_PAGE, VM_HOOK_PARAMS_COUNT, VM_HOOK_PARAMS_START_POSITION, VM_HOOK_POSITION,
+};
+use crate::old_vm::history_recorder::HistoryMode;
+use crate::old_vm::memory::SimpleMemory;
+use crate::old_vm::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,
+    )
+}
+
+#[derive(Debug, Clone, Copy, PartialEq)]
+pub enum VmExecutionStopReason {
+    VmFinished,
+    TracerRequestedStop,
+}
diff --git a/core/lib/vm/src/tracers/validation/error.rs b/core/lib/vm/src/tracers/validation/error.rs
new file mode 100644
index 000000000000..49afb22e10d8
--- /dev/null
+++ b/core/lib/vm/src/tracers/validation/error.rs
@@ -0,0 +1,57 @@
+use crate::Halt;
+use std::fmt::Display;
+use zksync_types::{Address, U256};
+use zksync_utils::u256_to_h256;
+
+#[derive(Debug, Clone)]
+pub enum ViolatedValidationRule {
+    TouchedUnallowedStorageSlots(Address, U256),
+    CalledContractWithNoCode(Address),
+    TouchedUnallowedContext,
+    TookTooManyComputationalGas(u32),
+}
+
+#[derive(Debug, Clone)]
+pub enum ValidationError {
+    FailedTx(Halt),
+    ViolatedRule(ViolatedValidationRule),
+}
+
+impl Display for ViolatedValidationRule {
+    fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
+        match self {
+            ViolatedValidationRule::TouchedUnallowedStorageSlots(contract, key) => write!(
+                f,
+                "Touched unallowed storage slots: address {}, key: {}",
+                hex::encode(contract),
+                hex::encode(u256_to_h256(*key))
+            ),
+            ViolatedValidationRule::CalledContractWithNoCode(contract) => {
+                write!(f, "Called contract with no code: {}", hex::encode(contract))
+            }
+            ViolatedValidationRule::TouchedUnallowedContext => {
+                write!(f, "Touched unallowed context")
+            }
+            ViolatedValidationRule::TookTooManyComputationalGas(gas_limit) => {
+                write!(
+                    f,
+                    "Took too many computational gas, allowed limit: {}",
+                    gas_limit
+                )
+            }
+        }
+    }
+}
+
+impl Display for ValidationError {
+    fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
+        match self {
+            Self::FailedTx(revert_reason) => {
+                write!(f, "Validation revert: {}", revert_reason)
+            }
+            Self::ViolatedRule(rule) => {
+                write!(f, "Violated validation rules: {}", rule)
+            }
+        }
+    }
+}
diff --git a/core/lib/vm/src/tracers/validation/mod.rs b/core/lib/vm/src/tracers/validation/mod.rs
new file mode 100644
index 000000000000..4b94e3f177b5
--- /dev/null
+++ b/core/lib/vm/src/tracers/validation/mod.rs
@@ -0,0 +1,388 @@
+mod error;
+mod params;
+mod types;
+
+use std::sync::Arc;
+use std::{collections::HashSet, marker::PhantomData};
+
+use once_cell::sync::OnceCell;
+use zk_evm::{
+    tracing::{BeforeExecutionData, VmLocalStateData},
+    zkevm_opcode_defs::{ContextOpcode, FarCallABI, LogOpcode, Opcode},
+};
+
+use zksync_config::constants::{
+    ACCOUNT_CODE_STORAGE_ADDRESS, BOOTLOADER_ADDRESS, CONTRACT_DEPLOYER_ADDRESS,
+    KECCAK256_PRECOMPILE_ADDRESS, L2_ETH_TOKEN_ADDRESS, MSG_VALUE_SIMULATOR_ADDRESS,
+    SYSTEM_CONTEXT_ADDRESS,
+};
+use zksync_state::{StoragePtr, WriteStorage};
+
+use zksync_types::{
+    get_code_key, web3::signing::keccak256, AccountTreeId, Address, StorageKey, H256, U256,
+};
+use zksync_utils::{
+    be_bytes_to_safe_address, h256_to_account_address, u256_to_account_address, u256_to_h256,
+};
+
+use crate::old_vm::history_recorder::HistoryMode;
+use crate::old_vm::memory::SimpleMemory;
+use crate::tracers::traits::{DynTracer, ExecutionEndTracer, ExecutionProcessing, VmTracer};
+use crate::tracers::utils::{
+    computational_gas_price, get_calldata_page_via_abi, print_debug_if_needed, VmHook,
+};
+
+pub use error::{ValidationError, ViolatedValidationRule};
+pub use params::ValidationTracerParams;
+
+use types::NewTrustedValidationItems;
+use types::ValidationTracerMode;
+
+use crate::VmExecutionResultAndLogs;
+
+/// Tracer that is used to ensure that the validation adheres to all the rules
+/// to prevent DDoS attacks on the server.
+#[derive(Debug, Clone)]
+pub struct ValidationTracer<H> {
+    validation_mode: ValidationTracerMode,
+    auxilary_allowed_slots: HashSet<H256>,
+
+    user_address: Address,
+    #[allow(dead_code)]
+    paymaster_address: Address,
+    should_stop_execution: bool,
+    trusted_slots: HashSet<(Address, U256)>,
+    trusted_addresses: HashSet<Address>,
+    trusted_address_slots: HashSet<(Address, U256)>,
+    computational_gas_used: u32,
+    computational_gas_limit: u32,
+    result: Arc<OnceCell<ViolatedValidationRule>>,
+    _marker: PhantomData<fn(H) -> H>,
+}
+
+type ValidationRoundResult = Result<NewTrustedValidationItems, ViolatedValidationRule>;
+
+impl<H: HistoryMode> ValidationTracer<H> {
+    pub fn new(params: ValidationTracerParams) -> (Self, Arc<OnceCell<ViolatedValidationRule>>) {
+        let result = Arc::new(OnceCell::new());
+        (
+            Self {
+                validation_mode: ValidationTracerMode::NoValidation,
+                auxilary_allowed_slots: Default::default(),
+
+                should_stop_execution: false,
+                user_address: params.user_address,
+                paymaster_address: params.paymaster_address,
+                trusted_slots: params.trusted_slots,
+                trusted_addresses: params.trusted_addresses,
+                trusted_address_slots: params.trusted_address_slots,
+                computational_gas_used: 0,
+                computational_gas_limit: params.computational_gas_limit,
+                result: result.clone(),
+                _marker: Default::default(),
+            },
+            result,
+        )
+    }
+
+    fn process_validation_round_result(&mut self, result: ValidationRoundResult) {
+        match result {
+            Ok(NewTrustedValidationItems {
+                new_allowed_slots,
+                new_trusted_addresses,
+            }) => {
+                self.auxilary_allowed_slots.extend(new_allowed_slots);
+                self.trusted_addresses.extend(new_trusted_addresses);
+            }
+            Err(err) => {
+                if self.result.get().is_some() {
+                    tracing::trace!("Validation error is already set, skipping");
+                    return;
+                }
+                self.result.set(err).expect("Result should be empty");
+            }
+        }
+    }
+
+    // Checks whether such storage access is acceptable.
+    fn is_allowed_storage_read<S: WriteStorage>(
+        &self,
+        storage: StoragePtr<S>,
+        address: Address,
+        key: U256,
+        msg_sender: Address,
+    ) -> bool {
+        // If there are no restrictions, all storage reads are valid.
+        // We also don't support the paymaster validation for now.
+        if matches!(
+            self.validation_mode,
+            ValidationTracerMode::NoValidation | ValidationTracerMode::PaymasterTxValidation
+        ) {
+            return true;
+        }
+
+        // The pair of MSG_VALUE_SIMULATOR_ADDRESS & L2_ETH_TOKEN_ADDRESS simulates the behavior of transfering ETH
+        // that is safe for the DDoS protection rules.
+        if valid_eth_token_call(address, msg_sender) {
+            return true;
+        }
+
+        if self.trusted_slots.contains(&(address, key))
+            || self.trusted_addresses.contains(&address)
+            || self.trusted_address_slots.contains(&(address, key))
+        {
+            return true;
+        }
+
+        if touches_allowed_context(address, key) {
+            return true;
+        }
+
+        // The user is allowed to touch its own slots or slots semantically related to him.
+        let valid_users_slot = address == self.user_address
+            || u256_to_account_address(&key) == self.user_address
+            || self.auxilary_allowed_slots.contains(&u256_to_h256(key));
+        if valid_users_slot {
+            return true;
+        }
+
+        if is_constant_code_hash(address, key, storage) {
+            return true;
+        }
+
+        false
+    }
+
+    // Used to remember user-related fields (its balance/allowance/etc).
+    // Note that it assumes that the length of the calldata is 64 bytes.
+    fn slot_to_add_from_keccak_call(
+        &self,
+        calldata: &[u8],
+        validated_address: Address,
+    ) -> Option<H256> {
+        assert_eq!(calldata.len(), 64);
+
+        let (potential_address_bytes, potential_position_bytes) = calldata.split_at(32);
+        let potential_address = be_bytes_to_safe_address(potential_address_bytes);
+
+        // If the validation_address is equal to the potential_address,
+        // then it is a request that could be used for mapping of kind mapping(address => ...).
+        //
+        // If the potential_position_bytes were already allowed before, then this keccak might be used
+        // for ERC-20 allowance or any other of mapping(address => mapping(...))
+        if potential_address == Some(validated_address)
+            || self
+                .auxilary_allowed_slots
+                .contains(&H256::from_slice(potential_position_bytes))
+        {
+            // This is request that could be used for mapping of kind mapping(address => ...)
+
+            // We could theoretically wait for the slot number to be returned by the
+            // keccak256 precompile itself, but this would complicate the code even further
+            // so let's calculate it here.
+            let slot = keccak256(calldata);
+
+            // Adding this slot to the allowed ones
+            Some(H256(slot))
+        } else {
+            None
+        }
+    }
+
+    fn check_user_restrictions<S: WriteStorage>(
+        &mut self,
+        state: VmLocalStateData<'_>,
+        data: BeforeExecutionData,
+        memory: &SimpleMemory<H>,
+        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, H> for ValidationTracer<H> {
+    fn before_execution(
+        &mut self,
+        state: VmLocalStateData<'_>,
+        data: BeforeExecutionData,
+        memory: &SimpleMemory<H>,
+        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(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<H: HistoryMode> ExecutionEndTracer<H> for ValidationTracer<H> {
+    fn should_stop_execution(&self) -> bool {
+        self.should_stop_execution || self.result.get().is_some()
+    }
+}
+
+impl<S: WriteStorage, H: HistoryMode> ExecutionProcessing<S, H> for ValidationTracer<H> {}
+
+impl<S: WriteStorage, H: HistoryMode> VmTracer<S, H> for ValidationTracer<H> {
+    fn save_results(&mut self, _result: &mut VmExecutionResultAndLogs) {}
+}
+
+fn touches_allowed_context(address: Address, key: U256) -> bool {
+    // Context is not touched at all
+    if address != SYSTEM_CONTEXT_ADDRESS {
+        return false;
+    }
+
+    // Only chain_id is allowed to be touched.
+    key == U256::from(0u32)
+}
+
+fn is_constant_code_hash<S: WriteStorage>(
+    address: Address,
+    key: U256,
+    storage: StoragePtr<S>,
+) -> bool {
+    if address != ACCOUNT_CODE_STORAGE_ADDRESS {
+        // Not a code hash
+        return false;
+    }
+
+    let value = storage.borrow_mut().read_value(&StorageKey::new(
+        AccountTreeId::new(address),
+        u256_to_h256(key),
+    ));
+
+    value != H256::zero()
+}
+
+fn valid_eth_token_call(address: Address, msg_sender: Address) -> bool {
+    let is_valid_caller = msg_sender == MSG_VALUE_SIMULATOR_ADDRESS
+        || msg_sender == CONTRACT_DEPLOYER_ADDRESS
+        || msg_sender == BOOTLOADER_ADDRESS;
+    address == L2_ETH_TOKEN_ADDRESS && is_valid_caller
+}
diff --git a/core/lib/vm/src/tracers/validation/params.rs b/core/lib/vm/src/tracers/validation/params.rs
new file mode 100644
index 000000000000..1a4ced478b67
--- /dev/null
+++ b/core/lib/vm/src/tracers/validation/params.rs
@@ -0,0 +1,18 @@
+use std::collections::HashSet;
+use zksync_types::{Address, U256};
+
+#[derive(Debug, Clone)]
+pub struct ValidationTracerParams {
+    pub user_address: Address,
+    pub paymaster_address: Address,
+    /// Slots that are trusted (i.e. the user can access them).
+    pub trusted_slots: HashSet<(Address, U256)>,
+    /// Trusted addresses (the user can access any slots on these addresses).
+    pub trusted_addresses: HashSet<Address>,
+    /// Slots, that are trusted and the value of them is the new trusted address.
+    /// They are needed to work correctly with beacon proxy, where the address of the implementation is
+    /// stored in the beacon.
+    pub trusted_address_slots: HashSet<(Address, U256)>,
+    /// Number of computational gas that validation step is allowed to use.
+    pub computational_gas_limit: u32,
+}
diff --git a/core/lib/vm/src/tracers/validation/types.rs b/core/lib/vm/src/tracers/validation/types.rs
new file mode 100644
index 000000000000..b9d442279927
--- /dev/null
+++ b/core/lib/vm/src/tracers/validation/types.rs
@@ -0,0 +1,18 @@
+use zksync_types::{Address, H256};
+
+#[derive(Debug, Clone, Eq, PartialEq, Copy)]
+#[allow(clippy::enum_variant_names)]
+pub(super) enum ValidationTracerMode {
+    /// Should be activated when the transaction is being validated by user.
+    UserTxValidation,
+    /// Should be activated when the transaction is being validated by the paymaster.
+    PaymasterTxValidation,
+    /// Is a state when there are no restrictions on the execution.
+    NoValidation,
+}
+
+#[derive(Debug, Clone, Default)]
+pub(super) struct NewTrustedValidationItems {
+    pub(super) new_allowed_slots: Vec<H256>,
+    pub(super) new_trusted_addresses: Vec<Address>,
+}
diff --git a/core/lib/vm/src/types/inputs/execution_mode.rs b/core/lib/vm/src/types/inputs/execution_mode.rs
new file mode 100644
index 000000000000..41492af6edc5
--- /dev/null
+++ b/core/lib/vm/src/types/inputs/execution_mode.rs
@@ -0,0 +1,15 @@
+/// Execution mode determines when the virtual machine execution should stop.
+/// We are also using a different set of tracers, depending on the selected mode - for example for OneTx,
+/// we use Refund Tracer, and for Bootloader we use 'DefaultTracer` in a special mode to track the Bootloader return code
+/// Flow of execution:
+/// VmStarted -> Enter the bootloader -> Tx1 -> Tx2 -> ... -> TxN ->
+/// -> Terminate bootloader execution -> Exit bootloader -> VmStopped
+#[derive(Debug, Copy, Clone)]
+pub enum VmExecutionMode {
+    /// Stop after executing the next transaction.
+    OneTx,
+    /// Stop after executing the entire batch.
+    Batch,
+    /// Stop after executing the entire bootloader. But before you exit the bootloader.
+    Bootloader,
+}
diff --git a/core/lib/vm/src/types/inputs/l1_batch_env.rs b/core/lib/vm/src/types/inputs/l1_batch_env.rs
new file mode 100644
index 000000000000..ff8433257698
--- /dev/null
+++ b/core/lib/vm/src/types/inputs/l1_batch_env.rs
@@ -0,0 +1,76 @@
+use std::collections::HashMap;
+
+use crate::L2BlockEnv;
+use zk_evm::address_to_u256;
+use zksync_types::{Address, L1BatchNumber, H256, U256};
+use zksync_utils::h256_to_u256;
+
+use crate::utils::fee::derive_base_fee_and_gas_per_pubdata;
+
+/// Unique params for each block
+#[derive(Debug, Clone)]
+pub struct L1BatchEnv {
+    // If previous batch hash is None, then this is the first batch
+    pub previous_batch_hash: Option<H256>,
+    pub number: L1BatchNumber,
+    pub timestamp: u64,
+    pub l1_gas_price: u64,
+    pub fair_l2_gas_price: u64,
+    pub fee_account: Address,
+    pub enforced_base_fee: Option<u64>,
+    pub first_l2_block: L2BlockEnv,
+}
+
+impl L1BatchEnv {
+    pub fn base_fee(&self) -> u64 {
+        if let Some(base_fee) = self.enforced_base_fee {
+            return base_fee;
+        }
+        let (base_fee, _) =
+            derive_base_fee_and_gas_per_pubdata(self.l1_gas_price, self.fair_l2_gas_price);
+        base_fee
+    }
+}
+
+impl L1BatchEnv {
+    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(&self) -> Vec<(usize, U256)> {
+        let mut base_params: HashMap<usize, U256> = vec![
+            (
+                Self::OPERATOR_ADDRESS_SLOT,
+                address_to_u256(&self.fee_account),
+            ),
+            (Self::PREV_BLOCK_HASH_SLOT, Default::default()),
+            (Self::NEW_BLOCK_TIMESTAMP_SLOT, U256::from(self.timestamp)),
+            (Self::NEW_BLOCK_NUMBER_SLOT, U256::from(self.number.0)),
+            (Self::L1_GAS_PRICE_SLOT, U256::from(self.l1_gas_price)),
+            (
+                Self::FAIR_L2_GAS_PRICE_SLOT,
+                U256::from(self.fair_l2_gas_price),
+            ),
+            (Self::EXPECTED_BASE_FEE_SLOT, U256::from(self.base_fee())),
+            (Self::SHOULD_SET_NEW_BLOCK_SLOT, U256::from(0u32)),
+        ]
+        .into_iter()
+        .collect();
+
+        if let Some(prev_block_hash) = self.previous_batch_hash {
+            base_params.insert(Self::PREV_BLOCK_HASH_SLOT, h256_to_u256(prev_block_hash));
+            base_params.insert(Self::SHOULD_SET_NEW_BLOCK_SLOT, U256::from(1u32));
+        }
+        base_params.into_iter().collect()
+    }
+
+    pub(crate) fn block_gas_price_per_pubdata(&self) -> u64 {
+        derive_base_fee_and_gas_per_pubdata(self.l1_gas_price, self.fair_l2_gas_price).1
+    }
+}
diff --git a/core/lib/vm/src/types/inputs/l2_block.rs b/core/lib/vm/src/types/inputs/l2_block.rs
new file mode 100644
index 000000000000..42d0709f5ddc
--- /dev/null
+++ b/core/lib/vm/src/types/inputs/l2_block.rs
@@ -0,0 +1,9 @@
+use zksync_types::H256;
+
+#[derive(Debug, Clone, Copy)]
+pub struct L2BlockEnv {
+    pub number: u32,
+    pub timestamp: u64,
+    pub prev_block_hash: H256,
+    pub max_virtual_blocks_to_create: u32,
+}
diff --git a/core/lib/vm/src/types/inputs/mod.rs b/core/lib/vm/src/types/inputs/mod.rs
new file mode 100644
index 000000000000..f88d40def4bf
--- /dev/null
+++ b/core/lib/vm/src/types/inputs/mod.rs
@@ -0,0 +1,9 @@
+pub use execution_mode::VmExecutionMode;
+pub use l1_batch_env::L1BatchEnv;
+pub use l2_block::L2BlockEnv;
+pub use system_env::{SystemEnv, TxExecutionMode};
+
+pub(crate) mod execution_mode;
+pub(crate) mod l1_batch_env;
+pub(crate) mod l2_block;
+pub(crate) mod system_env;
diff --git a/core/lib/vm/src/types/inputs/system_env.rs b/core/lib/vm/src/types/inputs/system_env.rs
new file mode 100644
index 000000000000..3f861bddce09
--- /dev/null
+++ b/core/lib/vm/src/types/inputs/system_env.rs
@@ -0,0 +1,52 @@
+use std::fmt::Debug;
+
+use zksync_contracts::BaseSystemContracts;
+use zksync_types::{L2ChainId, ProtocolVersionId};
+
+/// Params related to the execution process, not batch it self
+#[derive(Clone)]
+pub struct SystemEnv {
+    // Always false for VM
+    pub zk_porter_available: bool,
+    pub version: ProtocolVersionId,
+    pub base_system_smart_contracts: BaseSystemContracts,
+    pub gas_limit: u32,
+    pub execution_mode: TxExecutionMode,
+    pub default_validation_computational_gas_limit: u32,
+    pub chain_id: L2ChainId,
+}
+
+impl Debug for SystemEnv {
+    fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
+        f.debug_struct("SystemEnv")
+            .field("zk_porter_available", &self.zk_porter_available)
+            .field("version", &self.version)
+            .field(
+                "base_system_smart_contracts",
+                &self.base_system_smart_contracts.hashes(),
+            )
+            .field("gas_limit", &self.gas_limit)
+            .field(
+                "default_validation_computational_gas_limit",
+                &self.default_validation_computational_gas_limit,
+            )
+            .field("execution_mode", &self.execution_mode)
+            .field("chain_id", &self.chain_id)
+            .finish()
+    }
+}
+
+/// Enum denoting the *in-server* execution mode for the bootloader transactions.
+///
+/// If `EthCall` mode is chosen, the bootloader will use `mimicCall` opcode
+/// to simulate the call instead of using the standard `execute` method of account.
+/// This is needed to be able to behave equivalently to Ethereum without much overhead for custom account builders.
+/// With `VerifyExecute` mode, transaction will be executed normally.
+/// With `EstimateFee`, the bootloader will be used that has the same behavior
+/// as the full `VerifyExecute` block, but errors in the account validation will be ignored.
+#[derive(Debug, Clone, Copy, PartialEq, Eq)]
+pub enum TxExecutionMode {
+    VerifyExecute,
+    EstimateFee,
+    EthCall,
+}
diff --git a/core/lib/vm/src/types/internals/mod.rs b/core/lib/vm/src/types/internals/mod.rs
new file mode 100644
index 000000000000..601b7b8bd014
--- /dev/null
+++ b/core/lib/vm/src/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/vm/src/types/internals/snapshot.rs b/core/lib/vm/src/types/internals/snapshot.rs
new file mode 100644
index 000000000000..3b336d5e3541
--- /dev/null
+++ b/core/lib/vm/src/types/internals/snapshot.rs
@@ -0,0 +1,11 @@
+use zk_evm::vm_state::VmLocalState;
+
+use crate::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/vm/src/types/internals/transaction_data.rs b/core/lib/vm/src/types/internals/transaction_data.rs
new file mode 100644
index 000000000000..7d8598842d83
--- /dev/null
+++ b/core/lib/vm/src/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::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/vm/src/types/internals/vm_state.rs b/core/lib/vm/src/types/internals/vm_state.rs
new file mode 100644
index 000000000000..9592b57b7014
--- /dev/null
+++ b/core/lib/vm/src/types/internals/vm_state.rs
@@ -0,0 +1,162 @@
+use zk_evm::{
+    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 zk_evm::zkevm_opcode_defs::{
+    BOOTLOADER_BASE_PAGE, BOOTLOADER_CODE_PAGE, STARTING_BASE_PAGE, STARTING_TIMESTAMP,
+};
+use zksync_config::constants::BOOTLOADER_ADDRESS;
+use zksync_state::{StoragePtr, WriteStorage};
+use zksync_types::{zkevm_test_harness::INITIAL_MONOTONIC_CYCLE_COUNTER, Address};
+use zksync_utils::h256_to_u256;
+
+use crate::bootloader_state::BootloaderState;
+use crate::constants::BOOTLOADER_HEAP_PAGE;
+use crate::old_vm::{
+    event_sink::InMemoryEventSink, history_recorder::HistoryMode, memory::SimpleMemory,
+    oracles::decommitter::DecommitterOracle, oracles::precompile::PrecompilesProcessorWithHistory,
+    oracles::storage::StorageOracle,
+};
+use crate::types::inputs::{L1BatchEnv, SystemEnv};
+use crate::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 = load_last_l2_block(storage.clone());
+    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 = l1_batch_env.bootloader_initial_memory();
+    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/vm/src/types/mod.rs b/core/lib/vm/src/types/mod.rs
new file mode 100644
index 000000000000..cd31e7dc5c59
--- /dev/null
+++ b/core/lib/vm/src/types/mod.rs
@@ -0,0 +1,3 @@
+pub(crate) mod inputs;
+pub(crate) mod internals;
+pub(crate) mod outputs;
diff --git a/core/lib/vm/src/types/outputs/execution_result.rs b/core/lib/vm/src/types/outputs/execution_result.rs
new file mode 100644
index 000000000000..bb46cb41ec81
--- /dev/null
+++ b/core/lib/vm/src/types/outputs/execution_result.rs
@@ -0,0 +1,83 @@
+use crate::{Halt, VmExecutionStatistics, VmRevertReason};
+use zksync_config::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::tx::ExecutionMetrics;
+use zksync_types::Transaction;
+use zksync_utils::bytecode::bytecode_len_in_bytes;
+
+/// Refunds produced for the user.
+#[derive(Debug, Clone, Default)]
+pub struct Refunds {
+    pub gas_refunded: u32,
+    pub operator_suggested_refund: u32,
+}
+
+/// Result and logs of the VM execution.
+#[derive(Debug, Clone)]
+pub struct VmExecutionResultAndLogs {
+    pub result: ExecutionResult,
+    pub logs: VmExecutionLogs,
+    pub statistics: VmExecutionStatistics,
+    pub refunds: Refunds,
+}
+
+#[derive(Debug, Clone, PartialEq)]
+pub enum ExecutionResult {
+    /// Returned successfully
+    Success { output: Vec<u8> },
+    /// Reverted by contract
+    Revert { output: VmRevertReason },
+    /// Reverted for various reasons
+    Halt { reason: Halt },
+}
+
+impl ExecutionResult {
+    /// Returns `true` if the execution was failed.
+    pub fn is_failed(&self) -> bool {
+        matches!(self, Self::Revert { .. } | Self::Halt { .. })
+    }
+}
+
+impl VmExecutionResultAndLogs {
+    pub fn get_execution_metrics(&self, tx: Option<&Transaction>) -> ExecutionMetrics {
+        let contracts_deployed = tx
+            .map(|tx| {
+                tx.execute
+                    .factory_deps
+                    .as_ref()
+                    .map_or(0, |deps| deps.len() as u16)
+            })
+            .unwrap_or(0);
+
+        // We published the data as ABI-encoded `bytes`, so the total length is:
+        // - message length in bytes, rounded up to a multiple of 32
+        // - 32 bytes of encoded offset
+        // - 32 bytes of encoded length
+        let l2_l1_long_messages = extract_long_l2_to_l1_messages(&self.logs.events)
+            .iter()
+            .map(|event| (event.len() + 31) / 32 * 32 + 64)
+            .sum();
+
+        let published_bytecode_bytes = extract_published_bytecodes(&self.logs.events)
+            .iter()
+            .map(|bytecodehash| {
+                bytecode_len_in_bytes(*bytecodehash) + PUBLISH_BYTECODE_OVERHEAD as usize
+            })
+            .sum();
+
+        ExecutionMetrics {
+            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(),
+            contracts_used: self.statistics.contracts_used,
+            contracts_deployed,
+            vm_events: self.logs.events.len(),
+            storage_logs: self.logs.storage_logs.len(),
+            total_log_queries: self.statistics.total_log_queries,
+            cycles_used: self.statistics.cycles_used,
+            computational_gas_used: self.statistics.computational_gas_used,
+        }
+    }
+}
diff --git a/core/lib/vm/src/types/outputs/execution_state.rs b/core/lib/vm/src/types/outputs/execution_state.rs
new file mode 100644
index 000000000000..3ae36a179672
--- /dev/null
+++ b/core/lib/vm/src/types/outputs/execution_state.rs
@@ -0,0 +1,22 @@
+use zksync_types::l2_to_l1_log::L2ToL1Log;
+use zksync_types::{StorageLogQuery, VmEvent, U256};
+
+/// State of the VM since the start of the batch execution.
+#[derive(Debug, Clone, PartialEq)]
+pub struct CurrentExecutionState {
+    /// Events produced by the VM.
+    pub events: Vec<VmEvent>,
+    /// Storage logs produced by the VM.
+    pub storage_log_queries: Vec<StorageLogQuery>,
+    /// 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>,
+    /// 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,
+}
+
+/// Bootloader Memory of the VM.
+pub type BootloaderMemory = Vec<(usize, U256)>;
diff --git a/core/lib/vm/src/types/outputs/finished_l1batch.rs b/core/lib/vm/src/types/outputs/finished_l1batch.rs
new file mode 100644
index 000000000000..064d4c2d6586
--- /dev/null
+++ b/core/lib/vm/src/types/outputs/finished_l1batch.rs
@@ -0,0 +1,12 @@
+use crate::{BootloaderMemory, CurrentExecutionState, VmExecutionResultAndLogs};
+
+/// State of the VM after the batch execution.
+#[derive(Debug, Clone)]
+pub struct FinishedL1Batch {
+    /// Result of the execution of the block tip part of the batch.
+    pub block_tip_execution_result: VmExecutionResultAndLogs,
+    /// State of the VM after the execution of the last transaction.
+    pub final_execution_state: CurrentExecutionState,
+    /// Memory of the bootloader with all executed transactions. Could be optional for old versions of the VM.
+    pub final_bootloader_memory: Option<BootloaderMemory>,
+}
diff --git a/core/lib/vm/src/types/outputs/l2_block.rs b/core/lib/vm/src/types/outputs/l2_block.rs
new file mode 100644
index 000000000000..ccbcba15f654
--- /dev/null
+++ b/core/lib/vm/src/types/outputs/l2_block.rs
@@ -0,0 +1,7 @@
+use zksync_types::H256;
+
+pub struct L2Block {
+    pub number: u32,
+    pub timestamp: u64,
+    pub hash: H256,
+}
diff --git a/core/lib/vm/src/types/outputs/mod.rs b/core/lib/vm/src/types/outputs/mod.rs
new file mode 100644
index 000000000000..8aa029cb53fa
--- /dev/null
+++ b/core/lib/vm/src/types/outputs/mod.rs
@@ -0,0 +1,11 @@
+mod execution_result;
+mod execution_state;
+mod finished_l1batch;
+mod l2_block;
+mod statistic;
+
+pub use execution_result::{ExecutionResult, Refunds, VmExecutionResultAndLogs};
+pub use execution_state::{BootloaderMemory, CurrentExecutionState};
+pub use finished_l1batch::FinishedL1Batch;
+pub use l2_block::L2Block;
+pub use statistic::{VmExecutionStatistics, VmMemoryMetrics};
diff --git a/core/lib/vm/src/types/outputs/statistic.rs b/core/lib/vm/src/types/outputs/statistic.rs
new file mode 100644
index 000000000000..8f03678315f9
--- /dev/null
+++ b/core/lib/vm/src/types/outputs/statistic.rs
@@ -0,0 +1,26 @@
+/// Statistics of the tx execution.
+#[derive(Debug, Default, Clone)]
+pub struct VmExecutionStatistics {
+    /// Number of contracts used by the VM during the tx execution.
+    pub contracts_used: usize,
+    /// Cycles used by the VM during the tx execution.
+    pub cycles_used: u32,
+    /// Gas used by the VM during the tx execution.
+    pub gas_used: u32,
+    /// Computational gas used by the VM during the tx execution.
+    pub computational_gas_used: u32,
+    /// Number of log queries produced by the VM during the tx execution.
+    pub total_log_queries: usize,
+}
+
+/// Oracle metrics of the VM.
+pub struct VmMemoryMetrics {
+    pub event_sink_inner: usize,
+    pub event_sink_history: usize,
+    pub memory_inner: usize,
+    pub memory_history: usize,
+    pub decommittment_processor_inner: usize,
+    pub decommittment_processor_history: usize,
+    pub storage_inner: usize,
+    pub storage_history: usize,
+}
diff --git a/core/lib/vm/src/utils/fee.rs b/core/lib/vm/src/utils/fee.rs
new file mode 100644
index 000000000000..dc1e814aa2d7
--- /dev/null
+++ b/core/lib/vm/src/utils/fee.rs
@@ -0,0 +1,29 @@
+///! Utility functions for vm
+use zksync_config::constants::MAX_GAS_PER_PUBDATA_BYTE;
+use zksync_utils::ceil_div;
+
+use crate::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/vm/src/utils/l2_blocks.rs b/core/lib/vm/src/utils/l2_blocks.rs
new file mode 100644
index 000000000000..7a8c32bdb045
--- /dev/null
+++ b/core/lib/vm/src/utils/l2_blocks.rs
@@ -0,0 +1,98 @@
+use crate::{L2Block, L2BlockEnv};
+use zksync_config::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_state::{ReadStorage, StoragePtr};
+use zksync_types::block::{legacy_miniblock_hash, 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) {
+    assert_eq!(prev_block.number + 1, next_block.number);
+    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!(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>) -> 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. This is the scenario of either the first L2 block ever or
+        // the first block after the upgrade for support of L2 blocks.
+        return L2Block {
+            number: block_number,
+            timestamp: block_timestamp,
+            hash: legacy_miniblock_hash(MiniblockNumber(block_number)),
+        };
+    }
+
+    // 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,
+    );
+
+    L2Block {
+        number: block_number,
+        timestamp: block_timestamp,
+        hash: current_block_hash,
+    }
+}
diff --git a/core/lib/vm/src/utils/mod.rs b/core/lib/vm/src/utils/mod.rs
new file mode 100644
index 000000000000..15ffa92b5490
--- /dev/null
+++ b/core/lib/vm/src/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/vm/src/utils/overhead.rs b/core/lib/vm/src/utils/overhead.rs
new file mode 100644
index 000000000000..6fdce9c724eb
--- /dev/null
+++ b/core/lib/vm/src/utils/overhead.rs
@@ -0,0 +1,347 @@
+use crate::constants::{BLOCK_OVERHEAD_GAS, BLOCK_OVERHEAD_PUBDATA, BOOTLOADER_TX_ENCODING_SPACE};
+use zk_evm::zkevm_opcode_defs::system_params::MAX_TX_ERGS_LIMIT;
+use zksync_config::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/vm/src/utils/transaction_encoding.rs b/core/lib/vm/src/utils/transaction_encoding.rs
new file mode 100644
index 000000000000..e911a2805d82
--- /dev/null
+++ b/core/lib/vm/src/utils/transaction_encoding.rs
@@ -0,0 +1,15 @@
+use crate::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/vm/src/vm.rs b/core/lib/vm/src/vm.rs
index 104cdbf2fdc0..ee196683db37 100644
--- a/core/lib/vm/src/vm.rs
+++ b/core/lib/vm/src/vm.rs
@@ -1,972 +1,158 @@
-use std::convert::TryFrom;
-use std::fmt::Debug;
+use zksync_state::{StoragePtr, WriteStorage};
+use zksync_types::Transaction;
+use zksync_utils::bytecode::CompressedBytecodeInfo;
 
-use zk_evm::aux_structures::Timestamp;
-use zk_evm::vm_state::{PrimitiveValue, VmLocalState, VmState};
-use zk_evm::witness_trace::DummyTracer;
-use zk_evm::zkevm_opcode_defs::decoding::{AllowedPcOrImm, EncodingModeProduction, VmEncodingMode};
-use zk_evm::zkevm_opcode_defs::definitions::RET_IMPLICIT_RETURNDATA_PARAMS_REGISTER;
-use zksync_config::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::vm_trace::{Call, VmExecutionTrace, VmTrace};
-use zksync_types::{L1BatchNumber, StorageLogQuery, VmEvent, U256};
-use zksync_utils::bytes_to_be_words;
+use crate::old_vm::events::merge_events;
+use crate::old_vm::history_recorder::{HistoryEnabled, HistoryMode};
 
 use crate::bootloader_state::BootloaderState;
-use crate::errors::{TxRevertReason, VmRevertReason, VmRevertReasonParsingResult};
-use crate::event_sink::InMemoryEventSink;
-use crate::events::merge_events;
-use crate::history_recorder::{HistoryEnabled, HistoryMode};
-use crate::memory::SimpleMemory;
-use crate::oracles::decommitter::DecommitterOracle;
-use crate::oracles::precompile::PrecompilesProcessorWithHistory;
-use crate::oracles::storage::StorageOracle;
-use crate::oracles::tracer::{
-    BootloaderTracer, ExecutionEndTracer, OneTxTracer, PendingRefundTracer, PubdataSpentTracer,
-    StorageInvocationTracer, TransactionResultTracer, ValidationError, ValidationTracer,
-    ValidationTracerParams,
+use crate::errors::BytecodeCompressionError;
+use crate::tracers::traits::VmTracer;
+use crate::types::{
+    inputs::{L1BatchEnv, SystemEnv, VmExecutionMode},
+    internals::{new_vm_state, VmSnapshot, ZkSyncVmState},
+    outputs::{BootloaderMemory, CurrentExecutionState, VmExecutionResultAndLogs},
 };
-use crate::oracles::OracleWithHistory;
-use crate::utils::{
-    calculate_computational_gas_used, dump_memory_page_using_primitive_value,
-    precompile_calls_count_after_timestamp,
-};
-use crate::vm_with_bootloader::{
-    BootloaderJobType, DerivedBlockContext, TxExecutionMode, BOOTLOADER_HEAP_PAGE,
-    OPERATOR_REFUNDS_OFFSET,
-};
-use crate::Word;
-
-pub type ZkSyncVmState<'a, H> = VmState<
-    'a,
-    StorageOracle<'a, H>,
-    SimpleMemory<H>,
-    InMemoryEventSink<H>,
-    PrecompilesProcessorWithHistory<false, H>,
-    DecommitterOracle<'a, false, H>,
-    DummyTracer,
->;
-
-pub 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;
-// The slot that is used for tracking vm hooks
-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) 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,
-    )
-}
+use crate::L2BlockEnv;
 
+/// Main entry point for Virtual Machine integration.
+/// The instance should process only one l1 batch
 #[derive(Debug)]
-pub struct VmInstance<'a, H: HistoryMode> {
-    pub gas_limit: u32,
-    pub state: ZkSyncVmState<'a, H>,
-    pub execution_mode: TxExecutionMode,
-    pub block_context: DerivedBlockContext,
+pub struct Vm<S: WriteStorage, H: HistoryMode> {
     pub(crate) bootloader_state: BootloaderState,
-
-    pub snapshots: Vec<VmSnapshot>,
-}
-
-/// This structure stores data that accumulates during the VM run.
-#[derive(Debug, PartialEq)]
-pub struct VmExecutionResult {
-    pub events: Vec<VmEvent>,
-    pub storage_log_queries: Vec<StorageLogQuery>,
-    pub used_contract_hashes: Vec<U256>,
-    pub l2_to_l1_logs: Vec<L2ToL1Log>,
-    pub return_data: Vec<Word>,
-
-    /// Value denoting the amount of gas spent withing VM invocation.
-    /// Note that return value represents the difference between the amount of gas
-    /// available to VM before and after execution.
-    ///
-    /// It means, that depending on the context, `gas_used` may represent different things.
-    /// If VM is continuously invoked and interrupted after each tx, this field may represent the
-    /// amount of gas spent by a single transaction.
-    ///
-    /// To understand, which value does `gas_used` represent, see the documentation for the method
-    /// that you use to get `VmExecutionResult` object.
-    ///
-    /// Side note: this may sound confusing, but this arises from the nature of the bootloader: for it,
-    /// processing multiple transactions is a single action. We *may* intrude and stop VM once transaction
-    /// is executed, but it's not enforced. So best we can do is to calculate the amount of gas before and
-    /// after the invocation, leaving the interpretation of this value to the user.
-    pub gas_used: u32,
-    /// This value also depends on the context, the same as `gas_used`.
-    pub computational_gas_used: u32,
-    pub contracts_used: usize,
-    pub revert_reason: Option<VmRevertReasonParsingResult>,
-    pub trace: VmTrace,
-    pub total_log_queries: usize,
-    pub cycles_used: u32,
-}
-
-impl VmExecutionResult {
-    pub fn error_message(&self) -> Option<String> {
-        self.revert_reason
-            .as_ref()
-            .map(|result| result.revert_reason.to_string())
-    }
-}
-
-#[derive(Debug, PartialEq)]
-pub struct VmBlockResult {
-    /// Result for the whole block execution.
-    pub full_result: VmExecutionResult,
-    /// Result for the block tip execution.
-    pub block_tip_result: VmPartialExecutionResult,
+    // Current state and oracles of virtual machine
+    pub(crate) state: ZkSyncVmState<S, H>,
+    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>,
 }
 
-#[derive(Debug, Clone, PartialEq)]
-pub struct VmPartialExecutionResult {
-    pub logs: VmExecutionLogs,
-    pub revert_reason: Option<TxRevertReason>,
-    pub contracts_used: usize,
-    pub cycles_used: u32,
-    pub computational_gas_used: u32,
-}
-
-#[derive(Debug, Clone, PartialEq)]
-pub struct VmTxExecutionResult {
-    pub status: TxExecutionStatus,
-    pub result: VmPartialExecutionResult,
-    pub call_traces: Vec<Call>,
-    // Gas refunded to the user at the end of the transaction
-    pub gas_refunded: u32,
-    // Gas proposed by the operator to be refunded, before the postOp call.
-    // This value is needed to correctly recover memory of the bootloader.
-    pub operator_suggested_refund: u32,
-}
-
-#[derive(Debug, Clone, Copy, PartialEq)]
-pub enum VmExecutionStopReason {
-    VmFinished,
-    TracerRequestedStop,
-}
-
-use crate::utils::VmExecutionResult as NewVmExecutionResult;
-
-fn vm_may_have_ended_inner<H: HistoryMode>(vm: &ZkSyncVmState<H>) -> Option<NewVmExecutionResult> {
-    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(NewVmExecutionResult::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(NewVmExecutionResult::Panic)
-            } else {
-                let returndata = dump_memory_page_using_primitive_value(vm.memory, r1);
-                Some(NewVmExecutionResult::Revert(returndata))
-            }
+/// Public interface for VM
+impl<S: WriteStorage, H: HistoryMode> Vm<S, H> {
+    pub fn new(batch_env: L1BatchEnv, system_env: SystemEnv, storage: StoragePtr<S>, _: H) -> 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(),
         }
-        (_, a) => Some(NewVmExecutionResult::MostLikelyDidNotFinish(
-            current_address,
-            a as u16,
-        )),
     }
-}
-
-// This method returns `VmExecutionResult` struct, but some of the fields are left empty.
-//
-// `gas_before` argument is used to calculate the amount of gas spent by transaction.
-// It is required because the same VM instance is continuously used to apply several transactions.
-fn vm_may_have_ended<H: HistoryMode>(
-    vm: &VmInstance<H>,
-    gas_before: u32,
-) -> Option<VmExecutionResult> {
-    let basic_execution_result = vm_may_have_ended_inner(&vm.state)?;
-
-    let gas_used = gas_before
-        .checked_sub(vm.gas_remaining())
-        .expect("underflow");
 
-    match basic_execution_result {
-        NewVmExecutionResult::Ok(mut data) => {
-            while data.len() % 32 != 0 {
-                data.push(0)
-            }
-            Some(VmExecutionResult {
-                // The correct `events` value for this field should be set separately
-                // later on based on the information inside the event_sink oracle.
-                events: vec![],
-                storage_log_queries: vm.state.storage.get_final_log_queries(),
-                used_contract_hashes: vm.get_used_contracts(),
-                l2_to_l1_logs: vec![],
-                return_data: bytes_to_be_words(data),
-                gas_used,
-                // The correct `computational_gas_used` value for this field should be set separately later.
-                computational_gas_used: 0,
-                contracts_used: vm
-                    .state
-                    .decommittment_processor
-                    .get_used_bytecode_hashes()
-                    .len(),
-                revert_reason: None,
-                trace: VmTrace::ExecutionTrace(VmExecutionTrace::default()),
-                total_log_queries: vm.state.event_sink.get_log_queries()
-                    + vm.state.precompiles_processor.get_timestamp_history().len()
-                    + vm.state.storage.get_final_log_queries().len(),
-                cycles_used: vm.state.local_state.monotonic_cycle_counter,
-            })
-        }
-        NewVmExecutionResult::Revert(data) => {
-            let revert_reason = VmRevertReasonParsingResult::new(
-                TxRevertReason::parse_error(data.as_slice()),
-                data,
-            );
-
-            // Check if error indicates a bug in server/vm/bootloader.
-            if matches!(
-                revert_reason.revert_reason,
-                TxRevertReason::UnexpectedVMBehavior(_)
-            ) {
-                vlog::error!(
-                    "Observed error that should never happen: {:?}. Full VM data: {:?}",
-                    revert_reason,
-                    vm
-                );
-            }
-
-            Some(VmExecutionResult {
-                events: vec![],
-                storage_log_queries: vm.state.storage.get_final_log_queries(),
-                used_contract_hashes: vm.get_used_contracts(),
-                l2_to_l1_logs: vec![],
-                return_data: vec![],
-                gas_used,
-                // The correct `computational_gas_used` value for this field should be set separately later.
-                computational_gas_used: 0,
-                contracts_used: vm
-                    .state
-                    .decommittment_processor
-                    .get_used_bytecode_hashes()
-                    .len(),
-                revert_reason: Some(revert_reason),
-                trace: VmTrace::ExecutionTrace(VmExecutionTrace::default()),
-                total_log_queries: vm.state.event_sink.get_log_queries()
-                    + vm.state.precompiles_processor.get_timestamp_history().len()
-                    + vm.state.storage.get_final_log_queries().len(),
-                cycles_used: vm.state.local_state.monotonic_cycle_counter,
-            })
-        }
-        // Panic is effectively the same as Revert, but has different nature.
-        NewVmExecutionResult::Panic => Some(VmExecutionResult {
-            events: vec![],
-            storage_log_queries: vec![],
-            used_contract_hashes: vec![],
-            l2_to_l1_logs: vec![],
-            return_data: vec![],
-            gas_used,
-            // The correct `computational_gas_used` value for this field should be set separately later.
-            computational_gas_used: 0,
-            contracts_used: vm
-                .state
-                .decommittment_processor
-                .get_used_bytecode_hashes()
-                .len(),
-            revert_reason: Some(VmRevertReasonParsingResult {
-                revert_reason: TxRevertReason::Unknown(VmRevertReason::VmError),
-                original_data: vec![],
-            }),
-            trace: VmTrace::ExecutionTrace(VmExecutionTrace::default()),
-            total_log_queries: vm.state.event_sink.get_log_queries()
-                + vm.state.precompiles_processor.get_timestamp_history().len()
-                + vm.state.storage.get_final_log_queries().len(),
-            cycles_used: vm.state.local_state.monotonic_cycle_counter,
-        }),
-        NewVmExecutionResult::MostLikelyDidNotFinish(_, _) => {
-            // The execution has not ended yet. It should either continue
-            // or throw Out-of-gas error.
-            None
-        }
+    /// Push tx into memory for the future execution
+    pub fn push_transaction(&mut self, tx: Transaction) {
+        self.push_transaction_with_compression(tx, true)
     }
-}
-
-/// A snapshot of the VM that holds enough information to
-/// rollback the VM to some historical state.
-#[derive(Debug, Clone)]
-pub struct VmSnapshot {
-    local_state: VmLocalState,
-    bootloader_state: BootloaderState,
-}
 
-impl<H: HistoryMode> VmInstance<'_, H> {
-    fn has_ended(&self) -> bool {
-        match vm_may_have_ended_inner(&self.state) {
-            None | Some(NewVmExecutionResult::MostLikelyDidNotFinish(_, _)) => false,
-            Some(
-                NewVmExecutionResult::Ok(_)
-                | NewVmExecutionResult::Revert(_)
-                | NewVmExecutionResult::Panic,
-            ) => true,
-        }
+    /// Execute VM with default tracers. The execution mode determines whether the VM will stop and
+    /// how the vm will be processed.
+    pub fn execute(&mut self, execution_mode: VmExecutionMode) -> VmExecutionResultAndLogs {
+        self.inspect(vec![], execution_mode)
     }
 
-    fn revert_reason(&self) -> Option<VmRevertReasonParsingResult> {
-        match vm_may_have_ended_inner(&self.state) {
-            None
-            | Some(
-                NewVmExecutionResult::MostLikelyDidNotFinish(_, _) | NewVmExecutionResult::Ok(_),
-            ) => None,
-            Some(NewVmExecutionResult::Revert(data)) => {
-                let revert_reason = VmRevertReasonParsingResult::new(
-                    TxRevertReason::parse_error(data.as_slice()),
-                    data,
-                );
-
-                // Check if error indicates a bug in server/vm/bootloader.
-                if matches!(
-                    revert_reason.revert_reason,
-                    TxRevertReason::UnexpectedVMBehavior(_)
-                ) {
-                    vlog::error!(
-                        "Observed error that should never happen: {:?}. Full VM data: {:?}",
-                        revert_reason,
-                        self
-                    );
-                }
-
-                Some(revert_reason)
-            }
-            Some(NewVmExecutionResult::Panic) => Some(VmRevertReasonParsingResult {
-                revert_reason: TxRevertReason::Unknown(VmRevertReason::VmError),
-                original_data: vec![],
-            }),
-        }
+    /// Execute VM with custom tracers.
+    pub fn inspect(
+        &mut self,
+        tracers: Vec<Box<dyn VmTracer<S, H>>>,
+        execution_mode: VmExecutionMode,
+    ) -> VmExecutionResultAndLogs {
+        self.inspect_inner(tracers, execution_mode)
     }
 
-    /// Removes the latest snapshot without rollbacking to it.
-    /// This function expects that there is at least one snapshot present.
-    pub fn pop_snapshot_no_rollback(&mut self) {
-        self.snapshots.pop().unwrap();
+    /// Get current state of bootloader memory.
+    pub fn get_bootloader_memory(&self) -> BootloaderMemory {
+        self.bootloader_state.bootloader_memory()
     }
 
-    /// 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
+    /// Get compressed bytecodes of the last executed transaction
+    pub fn get_last_tx_compressed_bytecodes(&self) -> Vec<CompressedBytecodeInfo> {
+        self.bootloader_state.get_last_tx_compressed_bytecodes()
     }
 
-    /// Returns the amount of gas consumed by the VM so far (based on the `gas_limit` provided
-    /// to initiate the virtual machine).
-    ///
-    /// 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 fn gas_consumed(&self) -> u32 {
-        self.gas_limit
-            .checked_sub(self.gas_remaining())
-            .expect("underflow")
+    pub fn start_new_l2_block(&mut self, l2_block_env: L2BlockEnv) {
+        self.bootloader_state.start_new_l2_block(l2_block_env);
     }
 
-    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);
+    /// Get current state of virtual machine.
+    /// This method should be used only after the batch execution.
+    /// Otherwise it can panic.
+    pub 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)
             .into_iter()
-            .map(|e| e.into_vm_event(L1BatchNumber(self.block_context.context.block_number)))
+            .map(|e| e.into_vm_event(self.batch_env.number))
             .collect();
-        (
-            events,
-            l1_messages.into_iter().map(L2ToL1Log::from).collect(),
-        )
-    }
-
-    fn collect_execution_logs_after_timestamp(&self, from_timestamp: Timestamp) -> VmExecutionLogs {
-        let storage_logs = self
-            .state
-            .storage
-            .storage_log_queries_after_timestamp(from_timestamp)
-            .to_vec();
-        let storage_logs_count = storage_logs.len();
-        let storage_logs = storage_logs.iter().map(|x| **x).collect();
-
-        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 l2_to_l1_logs = l1_messages.into_iter().map(|log| 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();
 
-        let precompile_calls_count = precompile_calls_count_after_timestamp(
-            self.state.precompiles_processor.timestamp_history.inner(),
-            from_timestamp,
-        );
-        VmExecutionLogs {
-            storage_logs,
+        CurrentExecutionState {
             events,
+            storage_log_queries: self.state.storage.get_final_log_queries(),
+            used_contract_hashes: self.get_used_contracts(),
             l2_to_l1_logs,
-            total_log_queries_count: storage_logs_count
-                + log_queries.len()
-                + precompile_calls_count,
-        }
-    }
-
-    /// Executes VM until the end or tracer says to stop.
-    /// Returns a tuple of `VmExecutionStopReason` and the size of the refund proposed by the operator
-    fn execute_with_custom_tracer_and_refunds<
-        T: ExecutionEndTracer<H>
-            + PendingRefundTracer<H>
-            + PubdataSpentTracer<H>
-            + StorageInvocationTracer<H>,
-    >(
-        &mut self,
-        tracer: &mut T,
-    ) -> (VmExecutionStopReason, u32) {
-        let mut operator_refund = None;
-        let timestamp_initial = Timestamp(self.state.local_state.timestamp);
-        let gas_remaining_before = self.gas_remaining();
-        let spent_pubdata_counter_before = self.state.local_state.spent_pubdata_counter;
-
-        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
-            );
-
-            let timestamp_before_cycle = self.state.local_state.timestamp;
-            self.state
-                .cycle(tracer)
-                .expect("Failed execution VM cycle.");
-
-            if self.has_ended() {
-                return (
-                    VmExecutionStopReason::VmFinished,
-                    operator_refund.unwrap_or_default(),
-                );
-            }
-
-            // 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) = tracer.requested_refund() {
-                assert!(
-                    operator_refund.is_none(),
-                    "Operator was asked for refund two times"
-                );
-
-                let gas_spent_on_pubdata = tracer.gas_spent_on_pubdata(&self.state.local_state)
-                    - spent_pubdata_counter_before;
-                let tx_body_refund =
-                    self.tx_body_refund(timestamp_initial, bootloader_refund, gas_spent_on_pubdata);
-
-                if tx_body_refund < bootloader_refund {
-                    vlog::error!(
-                        "Suggested tx body refund is less than bootloader refund. Tx body refund: {}, bootloader refund: {}",
-                        tx_body_refund,
-                        bootloader_refund
-                    );
-                }
-
-                let refund_to_propose = tx_body_refund
-                    + self.block_overhead_refund(
-                        timestamp_initial,
-                        gas_remaining_before,
-                        gas_spent_on_pubdata,
-                    );
-
-                let current_tx_index = self.bootloader_state.tx_to_execute() - 1;
-                let refund_slot = OPERATOR_REFUNDS_OFFSET + current_tx_index;
-
-                // Writing the refund into memory
-                self.state.memory.memory.write_to_memory(
-                    BOOTLOADER_HEAP_PAGE as usize,
-                    refund_slot,
-                    PrimitiveValue {
-                        value: refund_to_propose.into(),
-                        is_pointer: false,
-                    },
-                    Timestamp(timestamp_before_cycle),
-                );
-                operator_refund = Some(refund_to_propose);
-                tracer.set_refund_as_done();
-
-                let tx_gas_limit = self.get_tx_gas_limit(current_tx_index);
-
-                if tx_gas_limit < bootloader_refund {
-                    vlog::error!(
-                        "Tx gas limit is less than bootloader refund. Tx gas limit: {}, bootloader refund: {}",
-                        tx_gas_limit,
-                        bootloader_refund
-                    );
-                }
-                if tx_gas_limit < refund_to_propose {
-                    vlog::error!(
-                        "Tx gas limit is less than operator refund. Tx gas limit: {}, operator refund: {}",
-                        tx_gas_limit,
-                        refund_to_propose
-                    );
-                }
-
-                metrics::histogram!("vm.refund", bootloader_refund as f64 / tx_gas_limit as f64 * 100.0, "type" => "bootloader");
-                metrics::histogram!("vm.refund", refund_to_propose as f64 / tx_gas_limit as f64 * 100.0, "type" => "operator");
-                metrics::histogram!(
-                    "vm.refund.diff",
-                    (refund_to_propose as f64 - bootloader_refund as f64) / tx_gas_limit as f64
-                        * 100.0
-                );
-            }
-
-            tracer.set_missed_storage_invocations(
-                self.state
-                    .storage
-                    .storage
-                    .get_ptr()
-                    .borrow()
-                    .missed_storage_invocations(),
-            );
-
-            if tracer.should_stop_execution() {
-                return (
-                    VmExecutionStopReason::TracerRequestedStop,
-                    operator_refund.unwrap_or_default(),
-                );
-            }
+            total_log_queries,
+            cycles_used: self.state.local_state.monotonic_cycle_counter,
         }
     }
 
-    // Executes VM until the end or tracer says to stop.
-    pub(crate) fn execute_with_custom_tracer<
-        T: ExecutionEndTracer<H>
-            + PendingRefundTracer<H>
-            + PubdataSpentTracer<H>
-            + StorageInvocationTracer<H>,
-    >(
+    /// Execute transaction with optional bytecode compression.
+    pub fn execute_transaction_with_bytecode_compression(
         &mut self,
-        tracer: &mut T,
-    ) -> VmExecutionStopReason {
-        self.execute_with_custom_tracer_and_refunds(tracer).0
-    }
-
-    /// Executes the VM until the end of the next transaction.
-    /// Panics if there are no new transactions in bootloader.
-    /// Internally uses the OneTxTracer to stop the VM when the last opcode from the transaction is reached.
-    // Err when transaction is rejected.
-    // Ok(status: TxExecutionStatus::Success) when the transaction succeeded
-    // Ok(status: TxExecutionStatus::Failure) when the transaction failed.
-    // Note that failed transactions are considered properly processed and are included in blocks
-    pub fn execute_next_tx(
-        &mut self,
-        validation_computational_gas_limit: u32,
-        with_call_tracer: bool,
-    ) -> Result<VmTxExecutionResult, TxRevertReason> {
-        let tx_index = self.bootloader_state.next_unexecuted_tx() as u32;
-
-        let mut tx_tracer: OneTxTracer<H> =
-            OneTxTracer::new(validation_computational_gas_limit, with_call_tracer);
-
-        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, operator_suggested_refund) =
-            self.execute_with_custom_tracer_and_refunds(&mut tx_tracer);
-        match stop_reason {
-            VmExecutionStopReason::VmFinished => {
-                // Bootloader resulted in panic or revert, this means either the transaction is rejected
-                // (e.g. not enough fee or incorrect signature) or bootloader is out of gas.
-
-                // Collect generated events to show bootloader debug logs.
-                let _ = self.collect_events_and_l1_logs_after_timestamp(timestamp_initial);
-
-                let error = if tx_tracer.is_bootloader_out_of_gas() {
-                    TxRevertReason::BootloaderOutOfGas
-                } else {
-                    self.revert_reason()
-                        .expect("vm ended execution prematurely, but no revert reason is given")
-                        .revert_reason
-                };
-                Err(error)
-            }
-            VmExecutionStopReason::TracerRequestedStop => {
-                if tx_tracer.tx_has_been_processed() {
-                    let tx_execution_status =
-                        TxExecutionStatus::from_has_failed(tx_has_failed(&self.state, tx_index));
-                    let vm_execution_logs =
-                        self.collect_execution_logs_after_timestamp(timestamp_initial);
-
-                    let computational_gas_used = calculate_computational_gas_used(
-                        self,
-                        &tx_tracer,
-                        gas_remaining_before,
-                        spent_pubdata_counter_before,
-                    );
-
-                    Ok(VmTxExecutionResult {
-                        gas_refunded: tx_tracer.refund_gas,
-                        operator_suggested_refund,
-                        status: tx_execution_status,
-                        result: VmPartialExecutionResult {
-                            logs: vm_execution_logs,
-                            // If there is a revert Err is already returned above.
-                            revert_reason: None,
-                            // getting contracts used during this transaction
-                            // at least for now the number returned here is always <= to the number
-                            // of the code hashes actually used by the transaction, since it might've
-                            // reused bytecode hashes from some of the previous ones.
-                            contracts_used: self
-                                .state
-                                .decommittment_processor
-                                .get_decommitted_bytecodes_after_timestamp(timestamp_initial),
-                            cycles_used: self.state.local_state.monotonic_cycle_counter
-                                - cycles_initial,
-                            computational_gas_used,
-                        },
-                        call_traces: tx_tracer.call_traces(),
-                    })
-                } else if tx_tracer.validation_run_out_of_gas() {
-                    Err(TxRevertReason::ValidationFailed(VmRevertReason::General {
-                        msg: format!(
-                            "Took too many computational gas, allowed limit: {}",
-                            validation_computational_gas_limit
-                        ),
-                        data: vec![],
-                    }))
-                } else {
-                    // VM ended up in state
-                    // `stop_reason == VmExecutionStopReason::TracerRequestedStop && !tx_tracer.tx_has_been_processed() && !tx_tracer.validation_run_out_of_gas()`.
-                    // It means that bootloader successfully finished its execution without executing the transaction.
-                    // It is an unexpected situation.
-                    panic!("VM successfully finished executing bootloader but transaction wasn't executed");
-                }
-            }
-        }
-    }
-
-    /// Returns full VM result and partial result produced within the current execution.
-    pub fn execute_till_block_end(&mut self, job_type: BootloaderJobType) -> VmBlockResult {
-        self.execute_till_block_end_with_tracer(
-            job_type,
-            &mut TransactionResultTracer::new(self.execution_mode.invocation_limit(), false),
-        )
-    }
-
-    pub fn execute_till_block_end_with_call_tracer(
-        &mut self,
-        job_type: BootloaderJobType,
-    ) -> VmBlockResult {
-        let mut tracer = TransactionResultTracer::new(self.execution_mode.invocation_limit(), true);
-        let mut block_result = self.execute_till_block_end_with_tracer(job_type, &mut tracer);
-        block_result.full_result.trace = VmTrace::CallTrace(tracer.call_trace().unwrap());
-        block_result
-    }
-
-    fn execute_till_block_end_with_tracer(
-        &mut self,
-        job_type: BootloaderJobType,
-        tx_result_tracer: &mut TransactionResultTracer<H>,
-    ) -> VmBlockResult {
-        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_custom_tracer(tx_result_tracer);
-        match stop_reason {
-            VmExecutionStopReason::VmFinished => {
-                let mut full_result = vm_may_have_ended(self, gas_remaining_before).unwrap();
-
-                let computational_gas_used = calculate_computational_gas_used(
-                    self,
-                    tx_result_tracer,
-                    gas_remaining_before,
-                    spent_pubdata_counter_before,
-                );
-
-                if job_type == BootloaderJobType::TransactionExecution
-                    && tx_has_failed(&self.state, 0)
-                    && full_result.revert_reason.is_none()
-                {
-                    let revert_reason = tx_result_tracer
-                        .revert_reason
-                        .clone()
-                        .map(|reason| {
-                            let vm_revert_reason = VmRevertReason::try_from(reason.as_slice())
-                                .unwrap_or_else(|_| VmRevertReason::Unknown {
-                                    function_selector: vec![],
-                                    data: reason.clone(),
-                                });
-
-                            VmRevertReasonParsingResult {
-                                revert_reason: TxRevertReason::TxReverted(vm_revert_reason),
-                                original_data: reason,
-                            }
-                        })
-                        .unwrap_or_else(|| VmRevertReasonParsingResult {
-                            revert_reason: TxRevertReason::TxReverted(VmRevertReason::General {
-                                msg: "Transaction reverted with empty reason. Possibly out of gas"
-                                    .to_string(),
-                                data: vec![],
-                            }),
-                            original_data: vec![],
-                        });
-
-                    full_result.revert_reason = Some(revert_reason);
-                }
-
-                let block_tip_result = VmPartialExecutionResult {
-                    logs: self.collect_execution_logs_after_timestamp(timestamp_initial),
-                    revert_reason: full_result.revert_reason.clone().map(|r| r.revert_reason),
-                    contracts_used: self
-                        .state
-                        .decommittment_processor
-                        .get_decommitted_bytecodes_after_timestamp(timestamp_initial),
-                    cycles_used: self.state.local_state.monotonic_cycle_counter - cycles_initial,
-                    computational_gas_used,
-                };
-
-                // Collecting `block_tip_result` needs logs with timestamp, so we drain events for the `full_result`
-                // after because draining will drop timestamps.
-                let (_full_history, raw_events, l1_messages) = self.state.event_sink.flatten();
-                full_result.events = merge_events(raw_events)
-                    .into_iter()
-                    .map(|e| {
-                        e.into_vm_event(L1BatchNumber(self.block_context.context.block_number))
-                    })
-                    .collect();
-                full_result.l2_to_l1_logs = l1_messages.into_iter().map(L2ToL1Log::from).collect();
-                full_result.computational_gas_used = block_tip_result.computational_gas_used;
-                VmBlockResult {
-                    full_result,
-                    block_tip_result,
-                }
-            }
-            VmExecutionStopReason::TracerRequestedStop => {
-                metrics::increment_counter!("runtime_context.execution.dropped");
-
-                if tx_result_tracer.is_limit_reached() {
-                    VmBlockResult {
-                        // Normally tracer should never stop, but if it's transaction call and it consumes
-                        // too much requests to memory, we stop execution and return error.
-                        full_result: VmExecutionResult {
-                            events: vec![],
-                            storage_log_queries: vec![],
-                            used_contract_hashes: vec![],
-                            l2_to_l1_logs: vec![],
-                            return_data: vec![],
-                            gas_used: 0,
-                            computational_gas_used: 0,
-                            contracts_used: 0,
-                            revert_reason: Some(VmRevertReasonParsingResult {
-                                revert_reason: TxRevertReason::MissingInvocationLimitReached,
-                                original_data: vec![],
-                            }),
-                            trace: VmTrace::ExecutionTrace(VmExecutionTrace::default()),
-                            total_log_queries: 0,
-                            cycles_used: 0,
-                        },
-                        block_tip_result: VmPartialExecutionResult {
-                            logs: Default::default(),
-                            revert_reason: Some(TxRevertReason::MissingInvocationLimitReached),
-                            contracts_used: 0,
-                            cycles_used: 0,
-                            computational_gas_used: 0,
-                        },
-                    }
-                } else {
-                    unreachable!(
-                        "Tracer should never stop execution, except MissingInvocationLimitReached"
-                    );
-                }
-            }
-        }
-    }
-
-    /// Unlike `execute_till_block_end` methods returns only result for the block tip execution.
-    pub fn execute_block_tip(&mut self) -> VmPartialExecutionResult {
-        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 mut bootloader_tracer: BootloaderTracer<H> = BootloaderTracer::default();
-
-        let stop_reason = self.execute_with_custom_tracer(&mut bootloader_tracer);
-        let revert_reason = match stop_reason {
-            VmExecutionStopReason::VmFinished => {
-                // Bootloader panicked or reverted.
-                let revert_reason = if bootloader_tracer.is_bootloader_out_of_gas() {
-                    TxRevertReason::BootloaderOutOfGas
-                } else {
-                    self.revert_reason()
-                        .expect("vm ended execution prematurely, but no revert reason is given")
-                        .revert_reason
-                };
-                Some(revert_reason)
-            }
-            VmExecutionStopReason::TracerRequestedStop => {
-                // Bootloader finished successfully.
-                None
-            }
-        };
-
-        let computational_gas_used = calculate_computational_gas_used(
-            self,
-            &bootloader_tracer,
-            gas_remaining_before,
-            spent_pubdata_counter_before,
-        );
-        VmPartialExecutionResult {
-            logs: self.collect_execution_logs_after_timestamp(timestamp_initial),
-            revert_reason,
-            contracts_used: self
-                .state
-                .decommittment_processor
-                .get_decommitted_bytecodes_after_timestamp(timestamp_initial),
-            cycles_used: self.state.local_state.monotonic_cycle_counter - cycles_initial,
-            computational_gas_used,
-        }
+        tx: Transaction,
+        with_compression: bool,
+    ) -> Result<VmExecutionResultAndLogs, BytecodeCompressionError> {
+        self.inspect_transaction_with_bytecode_compression(vec![], tx, with_compression)
     }
 
-    pub fn execute_validation(
+    /// Inspect transaction with optional bytecode compression.
+    pub fn inspect_transaction_with_bytecode_compression(
         &mut self,
-        validation_params: ValidationTracerParams,
-    ) -> Result<(), ValidationError> {
-        let mut validation_tracer: ValidationTracer<H> = ValidationTracer::new(
-            self.state.storage.storage.inner().get_ptr(),
-            validation_params,
-        );
-
-        let stop_reason = self.execute_with_custom_tracer(&mut validation_tracer);
-
-        match (stop_reason, validation_tracer.validation_error) {
-            (VmExecutionStopReason::VmFinished, _) => {
-                // The tx should only end in case of a revert, so it is safe to unwrap here
-                Err(ValidationError::FailedTx(self.revert_reason().unwrap()))
-            }
-            (VmExecutionStopReason::TracerRequestedStop, Some(err)) => {
-                Err(ValidationError::ViolatedRule(err))
-            }
-            (VmExecutionStopReason::TracerRequestedStop, None) => Ok(()),
+        tracers: Vec<Box<dyn VmTracer<S, H>>>,
+        tx: Transaction,
+        with_compression: bool,
+    ) -> Result<VmExecutionResultAndLogs, BytecodeCompressionError> {
+        self.push_transaction_with_compression(tx, with_compression);
+        let result = self.inspect(tracers, VmExecutionMode::OneTx);
+        if self.has_unpublished_bytecodes() {
+            Err(BytecodeCompressionError::BytecodeCompressionFailed)
+        } else {
+            Ok(result)
         }
     }
-
-    /// Returns the keys of contracts that are already loaded (known) by bootloader.
-    pub(crate) fn get_used_contracts(&self) -> Vec<U256> {
-        self.state
-            .decommittment_processor
-            .decommitted_code_hashes
-            .inner()
-            .keys()
-            .cloned()
-            .collect()
-    }
-
-    pub fn number_of_updated_storage_slots(&self) -> usize {
-        self.state
-            .storage
-            .storage
-            .inner()
-            .get_ptr()
-            .borrow_mut()
-            .modified_storage_keys()
-            .len()
-    }
 }
 
-impl VmInstance<'_, HistoryEnabled> {
-    /// Saves the snapshot of the current state of the VM that can be used
-    /// to roll back its state later on.
-    pub fn save_current_vm_as_snapshot(&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.clone(),
-        });
+/// Methods of vm, which required some history manipullations
+impl<S: WriteStorage> Vm<S, HistoryEnabled> {
+    /// Create snapshot of current vm state and push it into the memory
+    pub fn make_snapshot(&mut self) {
+        self.make_snapshot_inner()
     }
 
-    fn rollback_to_snapshot(&mut self, snapshot: VmSnapshot) {
-        let VmSnapshot {
-            local_state,
-            bootloader_state,
-        } = snapshot;
-
-        let timestamp = Timestamp(local_state.timestamp);
-
-        vlog::trace!("Rolling back decomitter");
-        self.state
-            .decommittment_processor
-            .rollback_to_timestamp(timestamp);
-
-        vlog::trace!("Rolling back event_sink");
-        self.state.event_sink.rollback_to_timestamp(timestamp);
-
-        vlog::trace!("Rolling back storage");
-        self.state.storage.rollback_to_timestamp(timestamp);
-
-        vlog::trace!("Rolling back memory");
-        self.state.memory.rollback_to_timestamp(timestamp);
-
-        vlog::trace!("Rolling back precompiles_processor");
-        self.state
-            .precompiles_processor
-            .rollback_to_timestamp(timestamp);
-        self.state.local_state = local_state;
-        self.bootloader_state = bootloader_state;
-    }
-
-    /// Rollbacks the state of the VM to the state of the latest snapshot.
-    pub fn rollback_to_latest_snapshot(&mut self) {
-        let snapshot = self.snapshots.last().cloned().unwrap();
+    /// Rollback vm state to the latest snapshot and destroy the snapshot
+    pub 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);
     }
 
-    /// Rollbacks the state of the VM to the state of the latest snapshot.
-    /// Removes that snapshot from the list.
-    pub fn rollback_to_latest_snapshot_popping(&mut self) {
-        let snapshot = self.snapshots.pop().unwrap();
-        self.rollback_to_snapshot(snapshot);
+    /// Pop the latest snapshot from the memory and destroy it
+    pub fn pop_snapshot_no_rollback(&mut self) {
+        self.snapshots
+            .pop()
+            .expect("Snapshot should be created before rolling it back");
     }
 }
-
-// Reads the bootloader memory and checks whether the execution step of the transaction
-// has failed.
-pub(crate) fn tx_has_failed<H: HistoryMode>(state: &ZkSyncVmState<'_, 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/web3_decl/Cargo.toml b/core/lib/web3_decl/Cargo.toml
index 2be268b4c22a..120cc525d9fe 100644
--- a/core/lib/web3_decl/Cargo.toml
+++ b/core/lib/web3_decl/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "zksync_web3_decl"
-version = "1.0.0"
+version = "0.1.0"
 edition = "2018"
 authors = ["The Matter Labs Team <hello@matterlabs.dev>"]
 homepage = "https://zksync.io/"
@@ -16,9 +16,11 @@ serde_json = "1.0"
 rlp = "0.5.0"
 thiserror = "1.0"
 bigdecimal = { version = "0.2.2", features = ["serde"] }
-jsonrpsee = { version = "0.19.0", default-features = false, features = ["macros"] }
+jsonrpsee = { version = "0.19.0", default-features = false, features = [
+    "macros",
+] }
 chrono = "0.4"
-zksync_types = { path = "../../lib/types", version = "1.0" }
+zksync_types = { path = "../../lib/types" }
 
 [features]
 default = ["server", "client"]
diff --git a/core/lib/web3_decl/src/error.rs b/core/lib/web3_decl/src/error.rs
index eddba9cb2628..20235fe65c18 100644
--- a/core/lib/web3_decl/src/error.rs
+++ b/core/lib/web3_decl/src/error.rs
@@ -35,4 +35,6 @@ pub enum Web3Error {
     LogsLimitExceeded(usize, u32, u32),
     #[error("invalid filter: if blockHash is supplied fromBlock and toBlock must not be")]
     InvalidFilterBlockHash,
+    #[error("Query returned more than {0} results. Try smaller range of blocks")]
+    TooManyLogs(usize),
 }
diff --git a/core/lib/web3_decl/src/namespaces/zks.rs b/core/lib/web3_decl/src/namespaces/zks.rs
index e28342ad95aa..b56368f116c9 100644
--- a/core/lib/web3_decl/src/namespaces/zks.rs
+++ b/core/lib/web3_decl/src/namespaces/zks.rs
@@ -13,7 +13,7 @@ use zksync_types::{
     Address, L1BatchNumber, MiniblockNumber, H256, U256, U64,
 };
 
-use crate::types::Token;
+use crate::types::{Filter, Log, Token};
 
 #[cfg_attr(
     all(feature = "client", feature = "server"),
@@ -107,4 +107,7 @@ pub trait ZksNamespace {
         &self,
         version_id: Option<u16>,
     ) -> RpcResult<Option<ProtocolVersion>>;
+
+    #[method(name = "getLogsWithVirtualBlocks")]
+    async fn get_logs_with_virtual_blocks(&self, filter: Filter) -> RpcResult<Vec<Log>>;
 }
diff --git a/core/lib/web3_decl/src/types.rs b/core/lib/web3_decl/src/types.rs
index b928424bb41b..326d7936653b 100644
--- a/core/lib/web3_decl/src/types.rs
+++ b/core/lib/web3_decl/src/types.rs
@@ -81,6 +81,7 @@ impl From<EIP2718TransactionCallData> for TransactionCalldata {
 }
 
 impl TryFrom<Vec<u8>> for TransactionCalldata {
+    // TODO (SMA-1613): improve length error
     type Error = usize;
 
     fn try_from(mut calldata: Vec<u8>) -> Result<Self, Self::Error> {
diff --git a/core/multivm_deps/vm_1_3_2/Cargo.toml b/core/multivm_deps/vm_1_3_2/Cargo.toml
new file mode 100644
index 000000000000..42e029082cee
--- /dev/null
+++ b/core/multivm_deps/vm_1_3_2/Cargo.toml
@@ -0,0 +1,34 @@
+[package]
+name = "vm_1_3_2"
+version = "0.1.0"
+edition = "2018"
+authors = ["The Matter Labs Team <hello@matterlabs.dev>"]
+homepage = "https://zksync.io/"
+repository = "https://github.com/matter-labs/zksync-era"
+license = "MIT OR Apache-2.0"
+keywords = ["blockchain", "zksync"]
+categories = ["cryptography"]
+
+[dependencies]
+zkevm-assembly = { git = "https://github.com/matter-labs/era-zkEVM-assembly.git", branch = "v1.3.2" }
+zk_evm = { git = "https://github.com/matter-labs/era-zk_evm.git", branch = "v1.3.3" }
+
+zksync_config = { path = "../../lib/config" }
+zksync_types = { path = "../../lib/types" }
+zksync_utils = { path = "../../lib/utils" }
+zksync_state = { path = "../../lib/state" }
+
+zksync_contracts = { path = "../../lib/contracts" }
+
+anyhow = "1.0"
+hex = "0.4"
+itertools = "0.10"
+metrics = "0.21"
+ethabi = "18.0.0"
+once_cell = "1.7"
+thiserror = "1.0"
+tracing = "0.1"
+
+[dev-dependencies]
+zksync_eth_signer = { path = "../../lib/eth_signer" }
+tokio = { version = "1", features = ["time"] }
diff --git a/core/multivm_deps/vm_1_3_2/README.md b/core/multivm_deps/vm_1_3_2/README.md
new file mode 100644
index 000000000000..deb11bb51371
--- /dev/null
+++ b/core/multivm_deps/vm_1_3_2/README.md
@@ -0,0 +1,41 @@
+# VM Crate
+
+This crate contains code that interacts with the VM - the VM itself is in a separate repo internal:
+[zk_evm][zk_evm_repo] or external:[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`
+repo, while their implementations can be found in this crate, like 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 transaction doesn't fit.
+
+### Tracers
+
+The VM implementation allows for the addition of `Tracers`, which are activated before and after each instruction. This
+gives a more in-depth look into the VM, collecting detailed debugging information and logs. More details can be found in
+the `tracer/` directory.
+
+## Running the VM
+
+To interact with the VM, first create it using methods in `vm_with_bootloader.rs`, such as `init_vm()`. Then, inject a
+transaction using `push_transaction_to_bootloader_memory()` and execute the VM, for example using
+`execute_till_block_end()` from vm.rs.
+
+### 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
+`save_current_vm_as_snapshot()` and return to that state using `rollback_to_latest_snapshot()`.
+
+This rollback affects all subcomponents, like 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/vm/src/bootloader_state.rs b/core/multivm_deps/vm_1_3_2/src/bootloader_state.rs
similarity index 98%
rename from core/lib/vm/src/bootloader_state.rs
rename to core/multivm_deps/vm_1_3_2/src/bootloader_state.rs
index 2ecb845dfa64..8832a59dc50e 100644
--- a/core/lib/vm/src/bootloader_state.rs
+++ b/core/multivm_deps/vm_1_3_2/src/bootloader_state.rs
@@ -69,6 +69,7 @@ impl BootloaderState {
 
     /// Returns the size of the transaction with given index.
     /// Panics if there is no such transaction.
+    /// Use it after TODO (SMA-1715): make users pay for the overhead
     #[allow(dead_code)]
     pub(crate) fn get_tx_size(&self, tx_index: usize) -> usize {
         self.tx_sizes[tx_index]
diff --git a/core/multivm_deps/vm_1_3_2/src/errors/bootloader_error.rs b/core/multivm_deps/vm_1_3_2/src/errors/bootloader_error.rs
new file mode 100644
index 000000000000..bfbef44a42bd
--- /dev/null
+++ b/core/multivm_deps/vm_1_3_2/src/errors/bootloader_error.rs
@@ -0,0 +1,58 @@
+#[derive(Debug)]
+pub(crate) enum BootloaderErrorCode {
+    EthCall,
+    AccountTxValidationFailed,
+    FailedToChargeFee,
+    FromIsNotAnAccount,
+    FailedToCheckAccount,
+    UnacceptableGasPrice,
+    PayForTxFailed,
+    PrePaymasterPreparationFailed,
+    PaymasterValidationFailed,
+    FailedToSendFeesToTheOperator,
+    FailedToSetPrevBlockHash,
+    UnacceptablePubdataPrice,
+    TxValidationError,
+    MaxPriorityFeeGreaterThanMaxFee,
+    BaseFeeGreaterThanMaxFeePerGas,
+    PaymasterReturnedInvalidContext,
+    PaymasterContextIsTooLong,
+    AssertionError,
+    FailedToMarkFactoryDeps,
+    TxValidationOutOfGas,
+    NotEnoughGasProvided,
+    AccountReturnedInvalidMagic,
+    PaymasterReturnedInvalidMagic,
+    Unknown,
+}
+
+impl From<u8> for BootloaderErrorCode {
+    fn from(code: u8) -> BootloaderErrorCode {
+        match code {
+            0 => BootloaderErrorCode::EthCall,
+            1 => BootloaderErrorCode::AccountTxValidationFailed,
+            2 => BootloaderErrorCode::FailedToChargeFee,
+            3 => BootloaderErrorCode::FromIsNotAnAccount,
+            4 => BootloaderErrorCode::FailedToCheckAccount,
+            5 => BootloaderErrorCode::UnacceptableGasPrice,
+            6 => BootloaderErrorCode::FailedToSetPrevBlockHash,
+            7 => BootloaderErrorCode::PayForTxFailed,
+            8 => BootloaderErrorCode::PrePaymasterPreparationFailed,
+            9 => BootloaderErrorCode::PaymasterValidationFailed,
+            10 => BootloaderErrorCode::FailedToSendFeesToTheOperator,
+            11 => BootloaderErrorCode::UnacceptablePubdataPrice,
+            12 => BootloaderErrorCode::TxValidationError,
+            13 => BootloaderErrorCode::MaxPriorityFeeGreaterThanMaxFee,
+            14 => BootloaderErrorCode::BaseFeeGreaterThanMaxFeePerGas,
+            15 => BootloaderErrorCode::PaymasterReturnedInvalidContext,
+            16 => BootloaderErrorCode::PaymasterContextIsTooLong,
+            17 => BootloaderErrorCode::AssertionError,
+            18 => BootloaderErrorCode::FailedToMarkFactoryDeps,
+            19 => BootloaderErrorCode::TxValidationOutOfGas,
+            20 => BootloaderErrorCode::NotEnoughGasProvided,
+            21 => BootloaderErrorCode::AccountReturnedInvalidMagic,
+            22 => BootloaderErrorCode::PaymasterReturnedInvalidMagic,
+            _ => BootloaderErrorCode::Unknown,
+        }
+    }
+}
diff --git a/core/multivm_deps/vm_1_3_2/src/errors/mod.rs b/core/multivm_deps/vm_1_3_2/src/errors/mod.rs
new file mode 100644
index 000000000000..462330b41f98
--- /dev/null
+++ b/core/multivm_deps/vm_1_3_2/src/errors/mod.rs
@@ -0,0 +1,9 @@
+mod bootloader_error;
+mod tx_revert_reason;
+mod vm_revert_reason;
+
+pub(crate) use bootloader_error::BootloaderErrorCode;
+pub use tx_revert_reason::TxRevertReason;
+pub use vm_revert_reason::{
+    VmRevertReason, VmRevertReasonParsingError, VmRevertReasonParsingResult,
+};
diff --git a/core/multivm_deps/vm_1_3_2/src/errors/tx_revert_reason.rs b/core/multivm_deps/vm_1_3_2/src/errors/tx_revert_reason.rs
new file mode 100644
index 000000000000..4775d8339f79
--- /dev/null
+++ b/core/multivm_deps/vm_1_3_2/src/errors/tx_revert_reason.rs
@@ -0,0 +1,215 @@
+use std::{convert::TryFrom, fmt::Display};
+
+use super::{BootloaderErrorCode, VmRevertReason};
+
+// Note that currently only EthCall transactions have valid Revert Reason.
+// Same transaction executed in bootloader will just have `InnerTxError`.
+// Reasons why the transaction executed inside the bootloader could fail.
+#[derive(Debug, Clone, PartialEq)]
+pub enum TxRevertReason {
+    // Can only be returned in EthCall execution mode (=ExecuteOnly)
+    EthCall(VmRevertReason),
+    // Returned when the execution of an L2 transaction has failed
+    TxReverted(VmRevertReason),
+    // Can only be returned in VerifyAndExecute
+    ValidationFailed(VmRevertReason),
+    PaymasterValidationFailed(VmRevertReason),
+    PrePaymasterPreparationFailed(VmRevertReason),
+    PayForTxFailed(VmRevertReason),
+    FailedToMarkFactoryDependencies(VmRevertReason),
+    FailedToChargeFee(VmRevertReason),
+    // Emitted when trying to call a transaction from an account that has not
+    // been deployed as an account (i.e. the `from` is just a contract).
+    // Can only be returned in VerifyAndExecute
+    FromIsNotAnAccount,
+    // Currently cannot be returned. Should be removed when refactoring errors.
+    InnerTxError,
+    Unknown(VmRevertReason),
+    // Temporarily used instead of panics to provide better experience for developers:
+    // their transaction would simply be rejected and they'll be able to provide
+    // information about the cause to us.
+    UnexpectedVMBehavior(String),
+    // Bootloader is out of gas.
+    BootloaderOutOfGas,
+    // Transaction has a too big gas limit and will not be executed by the server.
+    TooBigGasLimit,
+    // The bootloader did not have enough gas to start the transaction in the first place
+    NotEnoughGasProvided,
+    // The tx consumes too much missing invocations to memory
+    MissingInvocationLimitReached,
+}
+
+impl TxRevertReason {
+    pub fn parse_error(bytes: &[u8]) -> Self {
+        // The first 32 bytes should correspond with error code.
+        // If the error is smaller than that, we will use a standardized bootloader error.
+        if bytes.is_empty() {
+            return Self::UnexpectedVMBehavior("Bootloader returned an empty error".to_string());
+        }
+
+        let (error_code, error_msg) = bytes.split_at(1);
+        let revert_reason = match VmRevertReason::try_from(error_msg) {
+            Ok(reason) => reason,
+            Err(_) => {
+                let function_selector = if error_msg.len() >= 4 {
+                    error_msg[0..4].to_vec()
+                } else {
+                    error_msg.to_vec()
+                };
+
+                let data = if error_msg.len() > 4 {
+                    error_msg[4..].to_vec()
+                } else {
+                    vec![]
+                };
+
+                VmRevertReason::Unknown {
+                    function_selector,
+                    data,
+                }
+            }
+        };
+
+        // `error_code` is a big-endian number, so we can safely take the first byte of it.
+        match BootloaderErrorCode::from(error_code[0]) {
+            BootloaderErrorCode::EthCall => Self::EthCall(revert_reason),
+            BootloaderErrorCode::AccountTxValidationFailed => Self::ValidationFailed(revert_reason),
+            BootloaderErrorCode::FailedToChargeFee => Self::FailedToChargeFee(revert_reason),
+            BootloaderErrorCode::FromIsNotAnAccount => Self::FromIsNotAnAccount,
+            BootloaderErrorCode::FailedToCheckAccount => Self::ValidationFailed(VmRevertReason::General {
+                msg: "Failed to check if `from` is an account. Most likely not enough gas provided".to_string(),
+                data: vec![],
+            }),
+            BootloaderErrorCode::UnacceptableGasPrice => Self::UnexpectedVMBehavior(
+                "The operator included transaction with an unacceptable gas price".to_owned(),
+            ),
+            BootloaderErrorCode::PrePaymasterPreparationFailed => {
+                Self::PrePaymasterPreparationFailed(revert_reason)
+            }
+            BootloaderErrorCode::PaymasterValidationFailed => {
+                Self::PaymasterValidationFailed(revert_reason)
+            }
+            BootloaderErrorCode::FailedToSendFeesToTheOperator => {
+                Self::UnexpectedVMBehavior("FailedToSendFeesToTheOperator".to_owned())
+            }
+            BootloaderErrorCode::FailedToSetPrevBlockHash => {
+                panic!(
+                    "The bootloader failed to set previous block hash. Reason: {}",
+                    revert_reason
+                )
+            }
+            BootloaderErrorCode::UnacceptablePubdataPrice => {
+                Self::UnexpectedVMBehavior("UnacceptablePubdataPrice".to_owned())
+            }
+            // This is different from AccountTxValidationFailed error in a way that it means that
+            // the error was not produced by the account itself, but for some other unknown reason (most likely not enough gas)
+            BootloaderErrorCode::TxValidationError => Self::ValidationFailed(revert_reason),
+            // Note, that `InnerTxError` is derived only after the actual tx execution, so
+            // it is not parsed here. Unknown error means that bootloader failed by a reason
+            // that was not specified by the protocol:
+            BootloaderErrorCode::MaxPriorityFeeGreaterThanMaxFee => {
+                Self::UnexpectedVMBehavior("Max priority fee greater than max fee".to_owned())
+            }
+            BootloaderErrorCode::PaymasterReturnedInvalidContext => {
+                Self::PaymasterValidationFailed(VmRevertReason::General {
+                    msg: String::from("Paymaster returned invalid context"),
+                    data: vec![],
+                })
+            }
+            BootloaderErrorCode::PaymasterContextIsTooLong => {
+                Self::PaymasterValidationFailed(VmRevertReason::General {
+                    msg: String::from("Paymaster returned context that is too long"),
+                    data: vec![],
+                })
+            }
+            BootloaderErrorCode::AssertionError => {
+                Self::UnexpectedVMBehavior(format!("Assertion error: {}", revert_reason))
+            }
+            BootloaderErrorCode::BaseFeeGreaterThanMaxFeePerGas => Self::UnexpectedVMBehavior(
+                "Block.basefee is greater than max fee per gas".to_owned(),
+            ),
+            BootloaderErrorCode::PayForTxFailed => {
+                Self::PayForTxFailed(revert_reason)
+            },
+            BootloaderErrorCode::FailedToMarkFactoryDeps => {
+                let (msg, data) = if let VmRevertReason::General { msg , data} = revert_reason {
+                    (msg, data)
+                } else {
+                    (String::from("Most likely not enough gas provided"), vec![])
+                };
+                Self::FailedToMarkFactoryDependencies(VmRevertReason::General {
+                    msg, data
+                })
+            },
+            BootloaderErrorCode::TxValidationOutOfGas => {
+                Self::ValidationFailed(VmRevertReason::General { msg: String::from("Not enough gas for transaction validation"), data: vec![] })
+            },
+            BootloaderErrorCode::NotEnoughGasProvided => {
+                Self::NotEnoughGasProvided
+            },
+            BootloaderErrorCode::AccountReturnedInvalidMagic => {
+                Self::ValidationFailed(VmRevertReason::General { msg: String::from("Account validation returned invalid magic value. Most often this means that the signature is incorrect"), data: vec![] })
+            },
+            BootloaderErrorCode::PaymasterReturnedInvalidMagic => {
+                Self::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::Unknown => Self::UnexpectedVMBehavior(format!(
+                "Unsupported error code: {}. Revert reason: {}",
+                error_code[0], revert_reason
+            )),
+        }
+    }
+}
+
+impl Display for TxRevertReason {
+    fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
+        match &self {
+            // EthCall reason is usually returned unchanged.
+            TxRevertReason::EthCall(reason) => write!(f, "{}", reason),
+            TxRevertReason::TxReverted(reason) => write!(f, "{}", reason),
+            TxRevertReason::ValidationFailed(reason) => {
+                write!(f, "Account validation error: {}", reason)
+            }
+            TxRevertReason::FailedToChargeFee(reason) => {
+                write!(f, "Failed to charge fee: {}", reason)
+            }
+            // Emitted when trying to call a transaction from an account that has no
+            // been deployed as an account (i.e. the `from` is just a contract).
+            TxRevertReason::FromIsNotAnAccount => write!(f, "Sender is not an account"),
+            TxRevertReason::InnerTxError => write!(f, "Bootloader-based tx failed"),
+            TxRevertReason::PaymasterValidationFailed(reason) => {
+                write!(f, "Paymaster validation error: {}", reason)
+            }
+            TxRevertReason::PrePaymasterPreparationFailed(reason) => {
+                write!(f, "Pre-paymaster preparation error: {}", reason)
+            }
+            TxRevertReason::Unknown(reason) => write!(f, "Unknown reason: {}", reason),
+            TxRevertReason::UnexpectedVMBehavior(problem) => {
+                write!(f,
+                    "virtual machine entered unexpected state. Please contact developers and provide transaction details \
+                    that caused this error. Error description: {problem}" 
+                )
+            }
+            TxRevertReason::BootloaderOutOfGas => write!(f, "Bootloader out of gas"),
+            TxRevertReason::NotEnoughGasProvided => write!(
+                f,
+                "Bootloader did not have enough gas to start the transaction"
+            ),
+            TxRevertReason::FailedToMarkFactoryDependencies(reason) => {
+                write!(f, "Failed to mark factory dependencies: {}", reason)
+            }
+            TxRevertReason::PayForTxFailed(reason) => {
+                write!(f, "Failed to pay for the transaction: {}", reason)
+            }
+            TxRevertReason::TooBigGasLimit => {
+                write!(
+                    f,
+                    "Transaction has a too big ergs limit and will not be executed by the server"
+                )
+            }
+            TxRevertReason::MissingInvocationLimitReached => {
+                write!(f, "Tx produced too much cold storage accesses")
+            }
+        }
+    }
+}
diff --git a/core/multivm_deps/vm_1_3_2/src/errors/vm_revert_reason.rs b/core/multivm_deps/vm_1_3_2/src/errors/vm_revert_reason.rs
new file mode 100644
index 000000000000..f8e9d704ff87
--- /dev/null
+++ b/core/multivm_deps/vm_1_3_2/src/errors/vm_revert_reason.rs
@@ -0,0 +1,250 @@
+use std::convert::TryFrom;
+use std::fmt::{Debug, Display};
+
+use zksync_types::U256;
+
+use crate::TxRevertReason;
+
+#[derive(Debug, thiserror::Error)]
+pub enum VmRevertReasonParsingError {
+    #[error("Incorrect data offset. Data: {0:?}")]
+    IncorrectDataOffset(Vec<u8>),
+    #[error("Input is too short. Data: {0:?}")]
+    InputIsTooShort(Vec<u8>),
+    #[error("Incorrect string length. Data: {0:?}")]
+    IncorrectStringLength(Vec<u8>),
+}
+
+/// Rich Revert Reasons https://github.com/0xProject/ZEIPs/issues/32
+#[derive(Debug, Clone, PartialEq)]
+pub enum VmRevertReason {
+    General {
+        msg: String,
+        data: Vec<u8>,
+    },
+    InnerTxError,
+    VmError,
+    Unknown {
+        function_selector: Vec<u8>,
+        data: Vec<u8>,
+    },
+}
+
+impl VmRevertReason {
+    const GENERAL_ERROR_SELECTOR: &'static [u8] = &[0x08, 0xc3, 0x79, 0xa0];
+    fn parse_general_error(raw_bytes: &[u8]) -> Result<Self, VmRevertReasonParsingError> {
+        let bytes = &raw_bytes[4..];
+        if bytes.len() < 32 {
+            return Err(VmRevertReasonParsingError::InputIsTooShort(bytes.to_vec()));
+        }
+        let data_offset = U256::from_big_endian(&bytes[0..32]).as_usize();
+
+        // Data offset couldn't be less than 32 because data offset size is 32 bytes
+        // and data offset bytes are part of the offset. Also data offset couldn't be greater than
+        // data length
+        if data_offset > bytes.len() || data_offset < 32 {
+            return Err(VmRevertReasonParsingError::IncorrectDataOffset(
+                bytes.to_vec(),
+            ));
+        };
+
+        let data = &bytes[data_offset..];
+
+        if data.len() < 32 {
+            return Err(VmRevertReasonParsingError::InputIsTooShort(bytes.to_vec()));
+        };
+
+        let string_length = U256::from_big_endian(&data[0..32]).as_usize();
+
+        if string_length + 32 > data.len() {
+            return Err(VmRevertReasonParsingError::IncorrectStringLength(
+                bytes.to_vec(),
+            ));
+        };
+
+        let raw_data = &data[32..32 + string_length];
+        Ok(Self::General {
+            msg: String::from_utf8_lossy(raw_data).to_string(),
+            data: raw_bytes.to_vec(),
+        })
+    }
+
+    pub fn to_user_friendly_string(&self) -> String {
+        match self {
+            // In case of `Unknown` reason we suppress it to prevent verbose Error function_selector = 0x{}
+            // message shown to user.
+            VmRevertReason::Unknown { .. } => "".to_owned(),
+            _ => self.to_string(),
+        }
+    }
+
+    pub fn encoded_data(&self) -> Vec<u8> {
+        match self {
+            VmRevertReason::Unknown { data, .. } => data.clone(),
+            VmRevertReason::General { data, .. } => data.clone(),
+            _ => vec![],
+        }
+    }
+}
+
+impl TryFrom<&[u8]> for VmRevertReason {
+    type Error = VmRevertReasonParsingError;
+
+    fn try_from(bytes: &[u8]) -> Result<Self, VmRevertReasonParsingError> {
+        if bytes.len() < 4 {
+            // Note, that when the method reverts with no data
+            // the selector is empty as well.
+            // For now, we only accept errors with either no data or
+            // the data with complete selectors.
+            if !bytes.is_empty() {
+                return Err(VmRevertReasonParsingError::IncorrectStringLength(
+                    bytes.to_owned(),
+                ));
+            }
+
+            let result = VmRevertReason::Unknown {
+                function_selector: vec![],
+                data: bytes.to_vec(),
+            };
+
+            return Ok(result);
+        }
+
+        let function_selector = &bytes[0..4];
+        match function_selector {
+            VmRevertReason::GENERAL_ERROR_SELECTOR => Self::parse_general_error(bytes),
+            _ => {
+                let result = VmRevertReason::Unknown {
+                    function_selector: function_selector.to_vec(),
+                    data: bytes.to_vec(),
+                };
+                tracing::warn!("Unsupported error type: {}", result);
+                Ok(result)
+            }
+        }
+    }
+}
+
+impl Display for VmRevertReason {
+    fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
+        use VmRevertReason::{General, InnerTxError, Unknown, VmError};
+
+        match self {
+            General { msg, .. } => write!(f, "{}", msg),
+            VmError => write!(f, "VM Error",),
+            InnerTxError => write!(f, "Bootloader-based tx failed"),
+            Unknown {
+                function_selector,
+                data,
+            } => write!(
+                f,
+                "Error function_selector = 0x{}, data = 0x{}",
+                hex::encode(function_selector),
+                hex::encode(data)
+            ),
+        }
+    }
+}
+
+#[derive(Debug, Clone, PartialEq)]
+pub struct VmRevertReasonParsingResult {
+    pub revert_reason: TxRevertReason,
+    pub original_data: Vec<u8>,
+}
+
+impl VmRevertReasonParsingResult {
+    pub fn new(revert_reason: TxRevertReason, original_data: Vec<u8>) -> Self {
+        Self {
+            revert_reason,
+            original_data,
+        }
+    }
+}
+
+#[cfg(test)]
+mod tests {
+    use std::convert::TryFrom;
+
+    use super::VmRevertReason;
+
+    #[test]
+    fn revert_reason_parsing() {
+        let msg = 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, 38, 69, 82, 67, 50, 48, 58, 32, 116, 114, 97, 110,
+            115, 102, 101, 114, 32, 97, 109, 111, 117, 110, 116, 32, 101, 120, 99, 101, 101, 100,
+            115, 32, 98, 97, 108, 97, 110, 99, 101, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+            0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+            0, 0, 0, 0, 0, 0, 0, 0, 0,
+        ];
+        let reason = VmRevertReason::try_from(msg.as_slice()).expect("Shouldn't be error");
+        assert_eq!(
+            reason,
+            VmRevertReason::General {
+                msg: "ERC20: transfer amount exceeds balance".to_string(),
+                data: msg
+            }
+        );
+    }
+
+    #[test]
+    fn revert_reason_with_wrong_function_selector() {
+        let msg = vec![
+            8, 195, 121, 161, 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, 38, 69, 82, 67, 50, 48, 58, 32, 116, 114, 97, 110,
+            115, 102, 101, 114, 32, 97, 109, 111, 117, 110, 116, 32, 101, 120, 99, 101, 101, 100,
+            115, 32, 98, 97, 108, 97, 110, 99, 101, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+            0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+            0, 0, 0, 0, 0, 0, 0, 0, 0,
+        ];
+        let reason = VmRevertReason::try_from(msg.as_slice()).expect("Shouldn't be error");
+        assert!(matches!(reason, VmRevertReason::Unknown { .. }));
+    }
+
+    #[test]
+    fn revert_reason_with_wrong_data_offset() {
+        let msg = 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, 31, 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, 38, 69, 82, 67, 50, 48, 58, 32, 116, 114, 97, 110,
+            115, 102, 101, 114, 32, 97, 109, 111, 117, 110, 116, 32, 101, 120, 99, 101, 101, 100,
+            115, 32, 98, 97, 108, 97, 110, 99, 101, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+            0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+            0, 0, 0, 0, 0, 0, 0, 0, 0,
+        ];
+        let reason = VmRevertReason::try_from(msg.as_slice());
+        assert!(reason.is_err());
+    }
+
+    #[test]
+    fn revert_reason_with_big_data_offset() {
+        let msg = 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, 132, 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, 38, 69, 82, 67, 50, 48, 58, 32, 116, 114, 97, 110,
+            115, 102, 101, 114, 32, 97, 109, 111, 117, 110, 116, 32, 101, 120, 99, 101, 101, 100,
+            115, 32, 98, 97, 108, 97, 110, 99, 101, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+            0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+            0, 0, 0, 0, 0, 0, 0, 0, 0,
+        ];
+        let reason = VmRevertReason::try_from(msg.as_slice());
+        assert!(reason.is_err());
+    }
+
+    #[test]
+    fn revert_reason_with_wrong_string_length() {
+        let msg = 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, 158, 69, 82, 67, 50, 48, 58, 32, 116, 114, 97, 110,
+            115, 102, 101, 114, 32, 97, 109, 111, 117, 110, 116, 32, 101, 120, 99, 101, 101, 100,
+            115, 32, 98, 97, 108, 97, 110, 99, 101, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+            0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+            0, 0, 0, 0, 0, 0, 0, 0, 0,
+        ];
+        let reason = VmRevertReason::try_from(msg.as_slice());
+        assert!(reason.is_err());
+    }
+}
diff --git a/core/lib/vm/src/event_sink.rs b/core/multivm_deps/vm_1_3_2/src/event_sink.rs
similarity index 100%
rename from core/lib/vm/src/event_sink.rs
rename to core/multivm_deps/vm_1_3_2/src/event_sink.rs
diff --git a/core/lib/vm/src/events.rs b/core/multivm_deps/vm_1_3_2/src/events.rs
similarity index 100%
rename from core/lib/vm/src/events.rs
rename to core/multivm_deps/vm_1_3_2/src/events.rs
diff --git a/core/lib/vm/src/history_recorder.rs b/core/multivm_deps/vm_1_3_2/src/history_recorder.rs
similarity index 98%
rename from core/lib/vm/src/history_recorder.rs
rename to core/multivm_deps/vm_1_3_2/src/history_recorder.rs
index 279e91fae568..16b264d1721d 100644
--- a/core/lib/vm/src/history_recorder.rs
+++ b/core/multivm_deps/vm_1_3_2/src/history_recorder.rs
@@ -6,7 +6,7 @@ use zk_evm::{
     zkevm_opcode_defs::{self},
 };
 
-use zksync_state::StoragePtr;
+use zksync_state::{StoragePtr, WriteStorage};
 use zksync_types::{StorageKey, U256};
 use zksync_utils::{h256_to_u256, u256_to_h256};
 
@@ -697,19 +697,21 @@ impl<H: HistoryMode> HistoryRecorder<MemoryWrapper, H> {
 }
 
 #[derive(Debug)]
-pub struct StorageWrapper<'a> {
-    storage_ptr: StoragePtr<'a>,
+pub struct StorageWrapper<S> {
+    storage_ptr: StoragePtr<S>,
 }
 
-impl<'a> StorageWrapper<'a> {
-    pub fn new(storage_ptr: StoragePtr<'a>) -> Self {
+impl<S> StorageWrapper<S> {
+    pub fn new(storage_ptr: StoragePtr<S>) -> Self {
         Self { storage_ptr }
     }
 
-    pub fn get_ptr(&self) -> StoragePtr<'a> {
+    pub fn get_ptr(&self) -> StoragePtr<S> {
         self.storage_ptr.clone()
     }
+}
 
+impl<S: WriteStorage> StorageWrapper<S> {
     pub fn read_from_storage(&self, key: &StorageKey) -> U256 {
         h256_to_u256(self.storage_ptr.borrow_mut().read_value(key))
     }
@@ -721,7 +723,7 @@ pub struct StorageHistoryRecord {
     pub value: U256,
 }
 
-impl WithHistory for StorageWrapper<'_> {
+impl<S: WriteStorage> WithHistory for StorageWrapper<S> {
     type HistoryRecord = StorageHistoryRecord;
     type ReturnValue = U256;
 
@@ -744,7 +746,7 @@ impl WithHistory for StorageWrapper<'_> {
     }
 }
 
-impl<'a, H: HistoryMode> HistoryRecorder<StorageWrapper<'a>, H> {
+impl<S: WriteStorage, H: HistoryMode> HistoryRecorder<StorageWrapper<S>, H> {
     pub fn read_from_storage(&self, key: &StorageKey) -> U256 {
         self.inner.read_from_storage(key)
     }
@@ -756,7 +758,7 @@ impl<'a, H: HistoryMode> HistoryRecorder<StorageWrapper<'a>, H> {
     /// 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<'a> {
+    pub fn get_ptr(&self) -> StoragePtr<S> {
         self.inner.get_ptr()
     }
 }
diff --git a/core/multivm_deps/vm_1_3_2/src/lib.rs b/core/multivm_deps/vm_1_3_2/src/lib.rs
new file mode 100644
index 000000000000..39a69776f5a2
--- /dev/null
+++ b/core/multivm_deps/vm_1_3_2/src/lib.rs
@@ -0,0 +1,37 @@
+#![allow(clippy::derive_partial_eq_without_eq)]
+
+mod bootloader_state;
+pub mod errors;
+pub mod event_sink;
+mod events;
+mod history_recorder;
+pub mod memory;
+mod oracle_tools;
+pub mod oracles;
+mod pubdata_utils;
+mod refunds;
+pub mod test_utils;
+pub mod transaction_data;
+pub mod utils;
+pub mod vm;
+pub mod vm_with_bootloader;
+
+#[cfg(test)]
+mod tests;
+
+pub use crate::errors::TxRevertReason;
+pub use crate::history_recorder::{HistoryDisabled, HistoryEnabled, HistoryMode};
+pub use crate::oracle_tools::OracleTools;
+pub use crate::oracles::storage::StorageOracle;
+pub use crate::vm::{VmBlockResult, VmExecutionResult, VmInstance};
+pub use zk_evm;
+pub use zk_evm::block_properties::BlockProperties;
+pub use zksync_types::vm_trace::VmExecutionTrace;
+
+pub type Word = zksync_types::U256;
+
+pub const MEMORY_SIZE: usize = 1 << 16;
+pub const MAX_CALLS: usize = 65536;
+pub const REGISTERS_COUNT: usize = 16;
+pub const MAX_STACK_SIZE: usize = 256;
+pub const MAX_CYCLES_FOR_TX: u32 = u32::MAX;
diff --git a/core/lib/vm/src/memory.rs b/core/multivm_deps/vm_1_3_2/src/memory.rs
similarity index 100%
rename from core/lib/vm/src/memory.rs
rename to core/multivm_deps/vm_1_3_2/src/memory.rs
diff --git a/core/lib/vm/src/oracle_tools.rs b/core/multivm_deps/vm_1_3_2/src/oracle_tools.rs
similarity index 69%
rename from core/lib/vm/src/oracle_tools.rs
rename to core/multivm_deps/vm_1_3_2/src/oracle_tools.rs
index aa56145af5b2..bc2b2d9220c0 100644
--- a/core/lib/vm/src/oracle_tools.rs
+++ b/core/multivm_deps/vm_1_3_2/src/oracle_tools.rs
@@ -1,6 +1,4 @@
-use std::cell::RefCell;
 use std::fmt::Debug;
-use std::rc::Rc;
 
 use crate::event_sink::InMemoryEventSink;
 use crate::history_recorder::HistoryMode;
@@ -10,7 +8,7 @@ use crate::oracles::{
     storage::StorageOracle,
 };
 use zk_evm::witness_trace::DummyTracer;
-use zksync_state::WriteStorage;
+use zksync_state::{StoragePtr, WriteStorage};
 
 /// zkEVM requires a bunch of objects implementing given traits to work.
 /// For example: Storage, Memory, PrecompilerProcessor etc
@@ -19,25 +17,23 @@ use zksync_state::WriteStorage;
 /// that also support additional features (like rollbacks & history).
 /// The OracleTools struct, holds all these things together in one place.
 #[derive(Debug)]
-pub struct OracleTools<'a, const B: bool, H: HistoryMode> {
-    pub storage: StorageOracle<'a, H>,
+pub struct OracleTools<S: WriteStorage, const B: bool, H: HistoryMode> {
+    pub storage: StorageOracle<S, H>,
     pub memory: SimpleMemory<H>,
     pub event_sink: InMemoryEventSink<H>,
     pub precompiles_processor: PrecompilesProcessorWithHistory<B, H>,
-    pub decommittment_processor: DecommitterOracle<'a, B, H>,
+    pub decommittment_processor: DecommitterOracle<S, B, H>,
     pub witness_tracer: DummyTracer,
 }
 
-impl<'a, H: HistoryMode> OracleTools<'a, false, H> {
-    pub fn new(storage_view: &'a mut dyn WriteStorage, _: H) -> Self {
-        let pointer = Rc::new(RefCell::new(storage_view));
-
+impl<S: WriteStorage, H: HistoryMode> OracleTools<S, false, H> {
+    pub fn new(storage_view: StoragePtr<S>) -> Self {
         Self {
-            storage: StorageOracle::new(pointer.clone()),
+            storage: StorageOracle::new(storage_view.clone()),
             memory: SimpleMemory::default(),
             event_sink: InMemoryEventSink::default(),
             precompiles_processor: PrecompilesProcessorWithHistory::default(),
-            decommittment_processor: DecommitterOracle::new(pointer),
+            decommittment_processor: DecommitterOracle::new(storage_view),
             witness_tracer: DummyTracer {},
         }
     }
diff --git a/core/lib/vm/src/oracles/decommitter.rs b/core/multivm_deps/vm_1_3_2/src/oracles/decommitter.rs
similarity index 94%
rename from core/lib/vm/src/oracles/decommitter.rs
rename to core/multivm_deps/vm_1_3_2/src/oracles/decommitter.rs
index 099b5cfacbce..4c46843341b6 100644
--- a/core/lib/vm/src/oracles/decommitter.rs
+++ b/core/multivm_deps/vm_1_3_2/src/oracles/decommitter.rs
@@ -8,7 +8,7 @@ use zk_evm::{
     abstractions::{DecommittmentProcessor, Memory},
     aux_structures::{DecommittmentQuery, MemoryIndex, MemoryLocation, MemoryPage, MemoryQuery},
 };
-use zksync_state::StoragePtr;
+use zksync_state::{StoragePtr, WriteStorage};
 use zksync_types::U256;
 use zksync_utils::bytecode::bytecode_len_in_words;
 use zksync_utils::{bytes_to_be_words, u256_to_h256};
@@ -18,9 +18,9 @@ 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<'a, const B: bool, H: HistoryMode> {
+pub struct DecommitterOracle<S, const B: bool, H: HistoryMode> {
     /// Pointer that enables to read contract bytecodes from the database.
-    storage: StoragePtr<'a>,
+    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>,
@@ -32,8 +32,8 @@ pub struct DecommitterOracle<'a, const B: bool, H: HistoryMode> {
     decommitment_requests: HistoryRecorder<Vec<()>, H>,
 }
 
-impl<'a, const B: bool, H: HistoryMode> DecommitterOracle<'a, B, H> {
-    pub fn new(storage: StoragePtr<'a>) -> Self {
+impl<S: WriteStorage, const B: bool, H: HistoryMode> DecommitterOracle<S, B, H> {
+    pub fn new(storage: StoragePtr<S>) -> Self {
         Self {
             storage,
             known_bytecodes: HistoryRecorder::default(),
@@ -99,7 +99,7 @@ impl<'a, const B: bool, H: HistoryMode> DecommitterOracle<'a, B, H> {
     }
 
     /// Returns the storage handle. Used only in tests.
-    pub fn get_storage(&self) -> StoragePtr<'a> {
+    pub fn get_storage(&self) -> StoragePtr<S> {
         self.storage.clone()
     }
 
@@ -149,7 +149,7 @@ impl<'a, const B: bool, H: HistoryMode> DecommitterOracle<'a, B, H> {
     }
 }
 
-impl<const B: bool> OracleWithHistory for DecommitterOracle<'_, B, HistoryEnabled> {
+impl<S: WriteStorage, const B: bool> OracleWithHistory for DecommitterOracle<S, B, HistoryEnabled> {
     fn rollback_to_timestamp(&mut self, timestamp: Timestamp) {
         self.decommitted_code_hashes
             .rollback_to_timestamp(timestamp);
@@ -158,7 +158,9 @@ impl<const B: bool> OracleWithHistory for DecommitterOracle<'_, B, HistoryEnable
     }
 }
 
-impl<const B: bool, H: HistoryMode> DecommittmentProcessor for DecommitterOracle<'_, B, H> {
+impl<S: WriteStorage, const B: bool, H: HistoryMode> DecommittmentProcessor
+    for DecommitterOracle<S, B, H>
+{
     /// Loads a given bytecode hash into memory (see trait description for more details).
     fn decommit_into_memory<M: Memory>(
         &mut self,
diff --git a/core/lib/vm/src/oracles/mod.rs b/core/multivm_deps/vm_1_3_2/src/oracles/mod.rs
similarity index 100%
rename from core/lib/vm/src/oracles/mod.rs
rename to core/multivm_deps/vm_1_3_2/src/oracles/mod.rs
diff --git a/core/lib/vm/src/oracles/precompile.rs b/core/multivm_deps/vm_1_3_2/src/oracles/precompile.rs
similarity index 100%
rename from core/lib/vm/src/oracles/precompile.rs
rename to core/multivm_deps/vm_1_3_2/src/oracles/precompile.rs
diff --git a/core/lib/vm/src/oracles/storage.rs b/core/multivm_deps/vm_1_3_2/src/oracles/storage.rs
similarity index 93%
rename from core/lib/vm/src/oracles/storage.rs
rename to core/multivm_deps/vm_1_3_2/src/oracles/storage.rs
index 08a6086ad8ea..0f68fcdd4c93 100644
--- a/core/lib/vm/src/oracles/storage.rs
+++ b/core/multivm_deps/vm_1_3_2/src/oracles/storage.rs
@@ -11,7 +11,7 @@ use zk_evm::{
     abstractions::{RefundType, Storage as VmStorageOracle},
     aux_structures::{LogQuery, Timestamp},
 };
-use zksync_state::StoragePtr;
+use zksync_state::{StoragePtr, WriteStorage};
 use zksync_types::utils::storage_key_for_eth_balance;
 use zksync_types::{
     AccountTreeId, Address, StorageKey, StorageLogQuery, StorageLogQueryType, BOOTLOADER_ADDRESS,
@@ -32,11 +32,11 @@ pub fn storage_key_of_log(query: &LogQuery) -> StorageKey {
 }
 
 #[derive(Debug)]
-pub struct StorageOracle<'a, H: HistoryMode> {
+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 storage: HistoryRecorder<StorageWrapper<'a>, H>,
+    pub storage: HistoryRecorder<StorageWrapper<S>, H>,
 
     pub frames_stack: AppDataFrameManagerWithHistory<Box<StorageLogQuery>, H>,
 
@@ -47,7 +47,7 @@ pub struct StorageOracle<'a, H: HistoryMode> {
     pub paid_changes: HistoryRecorder<HashMap<StorageKey, u32>, HistoryEnabled>,
 }
 
-impl OracleWithHistory for StorageOracle<'_, 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);
@@ -55,8 +55,8 @@ impl OracleWithHistory for StorageOracle<'_, HistoryEnabled> {
     }
 }
 
-impl<'a, H: HistoryMode> StorageOracle<'a, H> {
-    pub fn new(storage: StoragePtr<'a>) -> Self {
+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(),
@@ -147,6 +147,7 @@ impl<'a, H: HistoryMode> StorageOracle<'a, H> {
     }
 
     // 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);
 
@@ -201,7 +202,7 @@ impl<'a, H: HistoryMode> StorageOracle<'a, H> {
 
     pub fn get_history_size(&self) -> usize {
         let storage_size = self.storage.borrow_history(|h| h.len(), 0)
-            * std::mem::size_of::<<StorageWrapper as WithHistory>::HistoryRecord>();
+            * 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>();
@@ -209,7 +210,7 @@ impl<'a, H: HistoryMode> StorageOracle<'a, H> {
     }
 }
 
-impl<H: HistoryMode> VmStorageOracle for StorageOracle<'_, H> {
+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(
@@ -217,7 +218,7 @@ impl<H: HistoryMode> VmStorageOracle for StorageOracle<'_, H> {
         _monotonic_cycle_counter: u32,
         query: LogQuery,
     ) -> LogQuery {
-        // vlog::trace!(
+        // tracing::trace!(
         //     "execute partial query cyc {:?} addr {:?} key {:?}, rw {:?}, wr {:?}, tx {:?}",
         //     _monotonic_cycle_counter,
         //     query.address,
@@ -283,7 +284,7 @@ impl<H: HistoryMode> VmStorageOracle for StorageOracle<'_, H> {
                 let read_value = match query.log_type {
                     StorageLogQueryType::Read => {
                         // Having Read logs in rollback is not possible
-                        vlog::warn!("Read log in rollback queue {:?}", query);
+                        tracing::warn!("Read log in rollback queue {:?}", query);
                         continue;
                     }
                     StorageLogQueryType::InitialWrite | StorageLogQueryType::RepeatedWrite => {
@@ -326,6 +327,8 @@ impl<H: HistoryMode> VmStorageOracle for StorageOracle<'_, H> {
 //   - 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::zkevm_opcode_defs::system_params::INITIAL_STORAGE_WRITE_PUBDATA_BYTES as u32
     } else {
diff --git a/core/lib/vm/src/oracles/tracer/bootloader.rs b/core/multivm_deps/vm_1_3_2/src/oracles/tracer/bootloader.rs
similarity index 100%
rename from core/lib/vm/src/oracles/tracer/bootloader.rs
rename to core/multivm_deps/vm_1_3_2/src/oracles/tracer/bootloader.rs
diff --git a/core/lib/vm/src/oracles/tracer/call.rs b/core/multivm_deps/vm_1_3_2/src/oracles/tracer/call.rs
similarity index 100%
rename from core/lib/vm/src/oracles/tracer/call.rs
rename to core/multivm_deps/vm_1_3_2/src/oracles/tracer/call.rs
diff --git a/core/lib/vm/src/oracles/tracer/mod.rs b/core/multivm_deps/vm_1_3_2/src/oracles/tracer/mod.rs
similarity index 93%
rename from core/lib/vm/src/oracles/tracer/mod.rs
rename to core/multivm_deps/vm_1_3_2/src/oracles/tracer/mod.rs
index 270e012aaedd..677dea459637 100644
--- a/core/lib/vm/src/oracles/tracer/mod.rs
+++ b/core/multivm_deps/vm_1_3_2/src/oracles/tracer/mod.rs
@@ -11,7 +11,9 @@ mod validation;
 pub use bootloader::BootloaderTracer;
 pub use call::CallTracer;
 pub use one_tx::OneTxTracer;
-pub use validation::{ValidationError, ValidationTracer, ValidationTracerParams};
+pub use validation::{
+    ValidationError, ValidationTracer, ValidationTracerParams, ViolatedValidationRule,
+};
 
 pub(crate) use transaction_result::TransactionResultTracer;
 
diff --git a/core/lib/vm/src/oracles/tracer/one_tx.rs b/core/multivm_deps/vm_1_3_2/src/oracles/tracer/one_tx.rs
similarity index 100%
rename from core/lib/vm/src/oracles/tracer/one_tx.rs
rename to core/multivm_deps/vm_1_3_2/src/oracles/tracer/one_tx.rs
diff --git a/core/lib/vm/src/oracles/tracer/transaction_result.rs b/core/multivm_deps/vm_1_3_2/src/oracles/tracer/transaction_result.rs
similarity index 100%
rename from core/lib/vm/src/oracles/tracer/transaction_result.rs
rename to core/multivm_deps/vm_1_3_2/src/oracles/tracer/transaction_result.rs
diff --git a/core/lib/vm/src/oracles/tracer/utils.rs b/core/multivm_deps/vm_1_3_2/src/oracles/tracer/utils.rs
similarity index 99%
rename from core/lib/vm/src/oracles/tracer/utils.rs
rename to core/multivm_deps/vm_1_3_2/src/oracles/tracer/utils.rs
index b1d4914565f9..9521813a14a8 100644
--- a/core/lib/vm/src/oracles/tracer/utils.rs
+++ b/core/multivm_deps/vm_1_3_2/src/oracles/tracer/utils.rs
@@ -144,7 +144,7 @@ pub(crate) fn print_debug_if_needed<H: HistoryMode>(
         _ => return,
     };
 
-    vlog::trace!("{}", log);
+    tracing::trace!("{}", log);
 }
 
 pub(crate) fn computational_gas_price(
diff --git a/core/lib/vm/src/oracles/tracer/validation.rs b/core/multivm_deps/vm_1_3_2/src/oracles/tracer/validation.rs
similarity index 94%
rename from core/lib/vm/src/oracles/tracer/validation.rs
rename to core/multivm_deps/vm_1_3_2/src/oracles/tracer/validation.rs
index 440b7a71b37f..0991e16d168e 100644
--- a/core/lib/vm/src/oracles/tracer/validation.rs
+++ b/core/multivm_deps/vm_1_3_2/src/oracles/tracer/validation.rs
@@ -23,7 +23,7 @@ use zksync_config::constants::{
     KECCAK256_PRECOMPILE_ADDRESS, L2_ETH_TOKEN_ADDRESS, MSG_VALUE_SIMULATOR_ADDRESS,
     SYSTEM_CONTEXT_ADDRESS,
 };
-use zksync_state::StoragePtr;
+use zksync_state::{StoragePtr, WriteStorage};
 use zksync_types::{
     get_code_key, web3::signing::keccak256, AccountTreeId, Address, StorageKey, H256, U256,
 };
@@ -104,7 +104,11 @@ fn touches_allowed_context(address: Address, key: U256) -> bool {
     key == U256::from(0u32)
 }
 
-fn is_constant_code_hash(address: Address, key: U256, storage: StoragePtr<'_>) -> bool {
+fn is_constant_code_hash<S: WriteStorage>(
+    address: Address,
+    key: U256,
+    storage: StoragePtr<S>,
+) -> bool {
     if address != ACCOUNT_CODE_STORAGE_ADDRESS {
         // Not a code hash
         return false;
@@ -128,9 +132,9 @@ fn valid_eth_token_call(address: Address, msg_sender: Address) -> bool {
 /// Tracer that is used to ensure that the validation adheres to all the rules
 /// to prevent DDoS attacks on the server.
 #[derive(Debug, Clone)]
-pub struct ValidationTracer<'a, H> {
+pub struct ValidationTracer<S: WriteStorage, H> {
     // A copy of it should be used in the Storage oracle
-    pub storage: StoragePtr<'a>,
+    pub storage: StoragePtr<S>,
     pub validation_mode: ValidationTracerMode,
     pub auxilary_allowed_slots: HashSet<H256>,
     pub validation_error: Option<ViolatedValidationRule>,
@@ -172,8 +176,8 @@ pub struct NewTrustedValidationItems {
 
 type ValidationRoundResult = Result<NewTrustedValidationItems, ViolatedValidationRule>;
 
-impl<'a, H: HistoryMode> ValidationTracer<'a, H> {
-    pub fn new(storage: StoragePtr<'a>, params: ValidationTracerParams) -> Self {
+impl<S: WriteStorage, H: HistoryMode> ValidationTracer<S, H> {
+    pub fn new(storage: StoragePtr<S>, params: ValidationTracerParams) -> Self {
         ValidationTracer {
             storage,
             validation_error: None,
@@ -348,7 +352,7 @@ impl<'a, H: HistoryMode> ValidationTracer<'a, H> {
                         return Err(ViolatedValidationRule::TouchedUnallowedContext);
                     }
                     ContextOpcode::ErgsLeft => {
-                        //
+                        // TODO (SMA-1168): implement the correct restrictions for the gas left opcode.
                     }
                     _ => {}
                 }
@@ -384,7 +388,7 @@ impl<'a, H: HistoryMode> ValidationTracer<'a, H> {
     }
 }
 
-impl<H: HistoryMode> Tracer for ValidationTracer<'_, H> {
+impl<S: WriteStorage, H: HistoryMode> Tracer for ValidationTracer<S, H> {
     const CALL_BEFORE_EXECUTION: bool = true;
 
     type SupportedMemory = SimpleMemory<H>;
@@ -453,12 +457,12 @@ impl<H: HistoryMode> Tracer for ValidationTracer<'_, H> {
     }
 }
 
-impl<H: HistoryMode> ExecutionEndTracer<H> for ValidationTracer<'_, H> {
+impl<S: WriteStorage, H: HistoryMode> ExecutionEndTracer<H> for ValidationTracer<S, H> {
     fn should_stop_execution(&self) -> bool {
         self.should_stop_execution || self.validation_error.is_some()
     }
 }
 
-impl<H: HistoryMode> PendingRefundTracer<H> for ValidationTracer<'_, H> {}
-impl<H: HistoryMode> PubdataSpentTracer<H> for ValidationTracer<'_, H> {}
-impl<H: HistoryMode> StorageInvocationTracer<H> for ValidationTracer<'_, H> {}
+impl<S: WriteStorage, H: HistoryMode> PendingRefundTracer<H> for ValidationTracer<S, H> {}
+impl<S: WriteStorage, H: HistoryMode> PubdataSpentTracer<H> for ValidationTracer<S, H> {}
+impl<S: WriteStorage, H: HistoryMode> StorageInvocationTracer<H> for ValidationTracer<S, H> {}
diff --git a/core/lib/vm/src/pubdata_utils.rs b/core/multivm_deps/vm_1_3_2/src/pubdata_utils.rs
similarity index 97%
rename from core/lib/vm/src/pubdata_utils.rs
rename to core/multivm_deps/vm_1_3_2/src/pubdata_utils.rs
index 74c8bfd70fb8..d58450ce51a8 100644
--- a/core/lib/vm/src/pubdata_utils.rs
+++ b/core/multivm_deps/vm_1_3_2/src/pubdata_utils.rs
@@ -3,12 +3,13 @@ use crate::oracles::storage::storage_key_of_log;
 use crate::VmInstance;
 use std::collections::HashMap;
 use zk_evm::aux_structures::Timestamp;
+use zksync_state::WriteStorage;
 use zksync_types::event::{extract_long_l2_to_l1_messages, extract_published_bytecodes};
 use zksync_types::zkevm_test_harness::witness::sort_storage_access::sort_storage_access_queries;
 use zksync_types::{StorageKey, PUBLISH_BYTECODE_OVERHEAD, SYSTEM_CONTEXT_ADDRESS};
 use zksync_utils::bytecode::bytecode_len_in_bytes;
 
-impl<H: HistoryMode> VmInstance<'_, H> {
+impl<H: HistoryMode, S: WriteStorage> VmInstance<S, H> {
     pub fn pubdata_published(&self, from_timestamp: Timestamp) -> u32 {
         let storage_writes_pubdata_published = self.pubdata_published_for_writes(from_timestamp);
 
diff --git a/core/lib/vm/src/refunds.rs b/core/multivm_deps/vm_1_3_2/src/refunds.rs
similarity index 92%
rename from core/lib/vm/src/refunds.rs
rename to core/multivm_deps/vm_1_3_2/src/refunds.rs
index f064bf0fff7d..b3aae253a4fd 100644
--- a/core/lib/vm/src/refunds.rs
+++ b/core/multivm_deps/vm_1_3_2/src/refunds.rs
@@ -4,10 +4,11 @@ use crate::vm_with_bootloader::{
 };
 use crate::VmInstance;
 use zk_evm::aux_structures::Timestamp;
+use zksync_state::WriteStorage;
 use zksync_types::U256;
 use zksync_utils::ceil_div_u256;
 
-impl<H: HistoryMode> VmInstance<'_, H> {
+impl<H: HistoryMode, S: WriteStorage> VmInstance<S, H> {
     pub(crate) fn tx_body_refund(
         &self,
         from_timestamp: Timestamp,
@@ -21,7 +22,7 @@ impl<H: HistoryMode> VmInstance<'_, H> {
         let gas_spent_on_computation = total_gas_spent
             .checked_sub(gas_spent_on_pubdata)
             .unwrap_or_else(|| {
-                vlog::error!(
+                tracing::error!(
                     "Gas spent on pubdata is greater than total gas spent. On pubdata: {}, total: {}",
                     gas_spent_on_pubdata,
                     total_gas_spent
@@ -52,7 +53,7 @@ impl<H: HistoryMode> VmInstance<'_, H> {
             + 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(|| {
-            vlog::error!(
+            tracing::error!(
                 "Fair fee is greater than pre paid. Fair fee: {} wei, pre paid: {} wei",
                 fair_fee_eth,
                 pre_paid_eth
@@ -72,13 +73,14 @@ impl<H: HistoryMode> VmInstance<'_, H> {
         _gas_remaining_before: u32,
         _gas_spent_on_pubdata: u32,
     ) -> u32 {
+        // TODO (SMA-1715): Make users pay for the block overhead
         0
 
         // let pubdata_published = self.pubdata_published(from_timestamp);
         //
         // let total_gas_spent = gas_remaining_before - self.gas_remaining();
         // let gas_spent_on_computation = total_gas_spent.checked_sub(gas_spent_on_pubdata).unwrap_or_else(|| {
-        //     vlog::error!("Gas spent on pubdata is greater than total gas spent. On pubdata: {}, total: {}", gas_spent_on_pubdata, total_gas_spent);
+        //     tracing::error!("Gas spent on pubdata is greater than total gas spent. On pubdata: {}, total: {}", gas_spent_on_pubdata, total_gas_spent);
         //     0
         // });
         // let (_, l2_to_l1_logs) = self.collect_events_and_l1_logs_after_timestamp(from_timestamp);
@@ -109,9 +111,9 @@ impl<H: HistoryMode> VmInstance<'_, H> {
         //     predefined_overhead - actual_overhead
         // } else {
         //     // This should never happen but potential mistakes at the early stage should not bring the server down.
-        //     //
+        //     // TODO (SMA-1700): log addition information (e.g overhead for each of criteria: pubdata, single-instance circuits capacity etc)
         //     //   to make debugging easier.
-        //     vlog::error!(
+        //     tracing::error!(
         //         "Actual overhead is greater than predefined one, actual: {}, predefined: {}",
         //         actual_overhead,
         //         predefined_overhead
@@ -120,6 +122,7 @@ impl<H: HistoryMode> VmInstance<'_, H> {
         // }
     }
 
+    // TODO (SMA-1715): Make users pay for the block overhead
     #[allow(dead_code)]
     fn actual_overhead_gas(
         _gas_per_pubdata_byte_limit: u32,
diff --git a/core/lib/vm/src/test_utils.rs b/core/multivm_deps/vm_1_3_2/src/test_utils.rs
similarity index 97%
rename from core/lib/vm/src/test_utils.rs
rename to core/multivm_deps/vm_1_3_2/src/test_utils.rs
index 34fa3b69aabe..2ebaebb4e379 100644
--- a/core/lib/vm/src/test_utils.rs
+++ b/core/multivm_deps/vm_1_3_2/src/test_utils.rs
@@ -10,7 +10,9 @@ use std::collections::HashMap;
 
 use itertools::Itertools;
 use zk_evm::{aux_structures::Timestamp, vm_state::VmLocalState};
+use zksync_contracts::test_contracts::LoadnextContractExecutionParams;
 use zksync_contracts::{deployer_contract, get_loadnext_contract, load_contract};
+use zksync_state::WriteStorage;
 use zksync_types::{
     ethabi::{Address, Token},
     fee::Fee,
@@ -20,8 +22,7 @@ use zksync_types::{
     CONTRACT_DEPLOYER_ADDRESS, H256, U256,
 };
 use zksync_utils::{
-    address_to_h256, bytecode::hash_bytecode, h256_to_account_address,
-    test_utils::LoadnextContractExecutionParams, u256_to_h256,
+    address_to_h256, bytecode::hash_bytecode, h256_to_account_address, u256_to_h256,
 };
 
 /// The tests here help us with the testing the VM
@@ -91,7 +92,7 @@ pub struct VmInstanceInnerState<H: HistoryMode> {
     local_state: VmLocalState,
 }
 
-impl<H: HistoryMode> VmInstance<'_, H> {
+impl<H: HistoryMode, S: WriteStorage> VmInstance<S, H> {
     /// This method is mostly to be used in tests. It dumps the inner state of all the oracles and the VM itself.
     pub fn dump_inner_state(&self) -> VmInstanceInnerState<H> {
         let event_sink = self.state.event_sink.clone();
@@ -331,8 +332,8 @@ pub fn get_create_zksync_address(sender_address: Address, sender_nonce: Nonce) -
     h256_to_account_address(&H256(hash))
 }
 
-pub fn verify_required_storage<H: HistoryMode>(
-    state: &ZkSyncVmState<'_, H>,
+pub fn verify_required_storage<H: HistoryMode, S: WriteStorage>(
+    state: &ZkSyncVmState<S, H>,
     required_values: Vec<(H256, StorageKey)>,
 ) {
     for (required_value, key) in required_values {
diff --git a/core/multivm_deps/vm_1_3_2/src/tests/bootloader.rs b/core/multivm_deps/vm_1_3_2/src/tests/bootloader.rs
new file mode 100644
index 000000000000..34705896a343
--- /dev/null
+++ b/core/multivm_deps/vm_1_3_2/src/tests/bootloader.rs
@@ -0,0 +1,2144 @@
+// //!
+// //! Tests for the bootloader
+// //! The description for each of the tests can be found in the corresponding `.yul` file.
+// //!
+// use itertools::Itertools;
+// use std::{
+//     collections::{HashMap, HashSet},
+//     convert::{TryFrom, TryInto},
+// };
+// use zksync_eth_signer::{raw_ethereum_tx::TransactionParameters, EthereumSigner, PrivateKeySigner};
+
+// use crate::{
+//     errors::VmRevertReason,
+//     history_recorder::HistoryMode,
+//     oracles::tracer::{StorageInvocationTracer, TransactionResultTracer},
+//     test_utils::{
+//         get_create_zksync_address, get_deploy_tx, get_error_tx, mock_loadnext_test_call,
+//         verify_required_storage,
+//     },
+//     tests::utils::{
+//         get_l1_deploy_tx, get_l1_execute_test_contract_tx_with_sender, read_error_contract,
+//         read_long_return_data_contract, read_test_contract,
+//     },
+//     transaction_data::TransactionData,
+//     utils::{
+//         create_test_block_params, read_bootloader_test_code, BASE_SYSTEM_CONTRACTS, BLOCK_GAS_LIMIT,
+//     },
+//     vm::{tx_has_failed, VmExecutionStopReason, ZkSyncVmState},
+//     vm_with_bootloader::{
+//         bytecode_to_factory_dep, get_bootloader_memory, get_bootloader_memory_for_encoded_tx,
+//         push_raw_transaction_to_bootloader_memory, BlockContext, BlockContextMode,
+//         BootloaderJobType, TxExecutionMode,
+//     },
+//     vm_with_bootloader::{
+//         init_vm_inner, push_transaction_to_bootloader_memory, DerivedBlockContext,
+//         BOOTLOADER_HEAP_PAGE, TX_DESCRIPTION_OFFSET, TX_GAS_LIMIT_OFFSET,
+//     },
+//     HistoryEnabled, OracleTools, TxRevertReason, VmBlockResult, VmExecutionResult, VmInstance,
+// };
+
+// use zk_evm::{
+//     aux_structures::Timestamp, block_properties::BlockProperties, zkevm_opcode_defs::FarCallOpcode,
+// };
+// use zksync_state::{InMemoryStorage, ReadStorage, StoragePtr, StorageView, WriteStorage};
+// use zksync_types::{
+//     block::DeployedContract,
+//     ethabi::encode,
+//     ethabi::Token,
+//     fee::Fee,
+//     get_code_key, get_is_account_key, get_known_code_key, get_nonce_key,
+//     l2::L2Tx,
+//     l2_to_l1_log::L2ToL1Log,
+//     storage_writes_deduplicator::StorageWritesDeduplicator,
+//     system_contracts::{DEPLOYMENT_NONCE_INCREMENT, TX_NONCE_INCREMENT},
+//     transaction_request::TransactionRequest,
+//     tx::tx_execution_info::TxExecutionStatus,
+//     utils::{
+//         deployed_address_create, storage_key_for_eth_balance,
+//         storage_key_for_standard_token_balance,
+//     },
+//     vm_trace::{Call, CallType},
+//     AccountTreeId, Address, Eip712Domain, Execute, ExecuteTransactionCommon, L1TxCommonData,
+//     L2ChainId, Nonce, PackedEthSignature, Transaction, BOOTLOADER_ADDRESS, H160, H256,
+//     L1_MESSENGER_ADDRESS, L2_ETH_TOKEN_ADDRESS, MAX_GAS_PER_PUBDATA_BYTE,
+//     REQUIRED_L1_TO_L2_GAS_PER_PUBDATA_BYTE, SYSTEM_CONTEXT_ADDRESS, U256,
+// };
+// use zksync_utils::{
+//     bytecode::CompressedBytecodeInfo,
+//     test_utils::LoadnextContractExecutionParams,
+//     {bytecode::hash_bytecode, bytes_to_be_words, h256_to_u256, u256_to_h256},
+// };
+
+// use zksync_contracts::{
+//     get_loadnext_contract, load_contract, SystemContractCode, PLAYGROUND_BLOCK_BOOTLOADER_CODE,
+// };
+
+// use super::utils::{read_many_owners_custom_account_contract, read_nonce_holder_tester};
+// /// Helper struct for tests, that takes care of setting the database and provides some functions to get and set balances.
+// /// Example use:
+// ///```ignore
+// ///      let test_env = VmTestEnv::default();
+// ///      test_env.set_rich_account(address);
+// ///      // To create VM and run a single transaction:
+// ///      test_env.run_vm_or_die(transaction_data);
+// ///      // To create VM:
+// ///      let mut helper = VmTestHelper::new(&test_env);
+// ///      let mut vm = helper.vm();
+// /// ```
+// #[derive(Debug)]
+// pub struct VmTestEnv {
+//     pub block_context: DerivedBlockContext,
+//     pub block_properties: BlockProperties,
+//     pub storage_ptr: Box<StorageView<InMemoryStorage>>,
+// }
+
+// impl VmTestEnv {
+//     /// Creates a new test helper with a bunch of already deployed contracts.
+//     pub fn new_with_contracts(contracts: &[(H160, Vec<u8>)]) -> Self {
+//         let (block_context, block_properties): (DerivedBlockContext, BlockProperties) = {
+//             let (block_context, block_properties) = create_test_block_params();
+//             (block_context.into(), block_properties)
+//         };
+
+//         let mut raw_storage = InMemoryStorage::with_system_contracts(hash_bytecode);
+//         for (address, bytecode) in contracts {
+//             let account = DeployedContract {
+//                 account_id: AccountTreeId::new(*address),
+//                 bytecode: bytecode.clone(),
+//             };
+
+//             insert_contracts(&mut raw_storage, vec![(account, true)]);
+//         }
+
+//         let storage_ptr = Box::new(StorageView::new(raw_storage));
+
+//         VmTestEnv {
+//             block_context,
+//             block_properties,
+//             storage_ptr,
+//         }
+//     }
+
+//     /// Gets the current ETH balance for a given account.
+//     pub fn get_eth_balance(&mut self, address: &H160) -> U256 {
+//         get_eth_balance(address, self.storage_ptr.as_mut())
+//     }
+
+//     /// Sets a large balance for a given account.
+//     pub fn set_rich_account(&mut self, address: &H160) {
+//         let key = storage_key_for_eth_balance(address);
+
+//         self.storage_ptr
+//             .set_value(key, u256_to_h256(U256::from(10u64.pow(19))));
+//     }
+
+//     /// Runs a given transaction in a VM.
+//     // Note: that storage changes will be preserved, but not changed to events etc.
+//     // Strongly suggest to use this function only if this is the only transaction executed within the test.
+//     pub fn run_vm(&mut self, transaction_data: TransactionData) -> (VmExecutionResult, bool) {
+//         let mut oracle_tools = OracleTools::new(self.storage_ptr.as_mut(), HistoryEnabled);
+//         let (result, tx_has_failed) = run_vm_with_raw_tx(
+//             &mut oracle_tools,
+//             self.block_context,
+//             &self.block_properties,
+//             transaction_data,
+//         );
+//         (result, tx_has_failed)
+//     }
+
+//     /// Runs a given transaction in a VM and asserts if it fails.
+//     pub fn run_vm_or_die(&mut self, transaction_data: TransactionData) {
+//         let (result, tx_has_failed) = self.run_vm(transaction_data);
+//         assert!(
+//             !tx_has_failed,
+//             "Transaction failed with: {:?}",
+//             result.revert_reason
+//         );
+//     }
+// }
+
+// impl Default for VmTestEnv {
+//     fn default() -> Self {
+//         VmTestEnv::new_with_contracts(&[])
+//     }
+// }
+
+// /// Helper struct to create a default VM for a given environment.
+// #[derive(Debug)]
+// pub struct VmTestHelper<'a> {
+//     pub oracle_tools: OracleTools<'a, false, HistoryEnabled>,
+//     pub block_context: DerivedBlockContext,
+//     pub block_properties: BlockProperties,
+//     vm_created: bool,
+// }
+
+// impl<'a> VmTestHelper<'a> {
+//     pub fn new(test_env: &'a mut VmTestEnv) -> Self {
+//         let block_context = test_env.block_context;
+//         let block_properties = test_env.block_properties;
+
+//         let oracle_tools = OracleTools::new(test_env.storage_ptr.as_mut(), HistoryEnabled);
+//         VmTestHelper {
+//             oracle_tools,
+//             block_context,
+//             block_properties,
+//             vm_created: false,
+//         }
+//     }
+
+//     /// Creates the VM that can be used in tests.
+//     pub fn vm(&'a mut self) -> Box<VmInstance<'a, HistoryEnabled>> {
+//         assert!(!self.vm_created, "Vm can be created only once");
+//         let vm = init_vm_inner(
+//             &mut self.oracle_tools,
+//             BlockContextMode::NewBlock(self.block_context, Default::default()),
+//             &self.block_properties,
+//             BLOCK_GAS_LIMIT,
+//             &BASE_SYSTEM_CONTRACTS,
+//             TxExecutionMode::VerifyExecute,
+//         );
+//         self.vm_created = true;
+//         vm
+//     }
+// }
+
+// fn run_vm_with_custom_factory_deps<'a, H: HistoryMode>(
+//     oracle_tools: &'a mut OracleTools<'a, false, H>,
+//     block_context: BlockContext,
+//     block_properties: &'a BlockProperties,
+//     encoded_tx: Vec<U256>,
+//     predefined_overhead: u32,
+//     expected_error: Option<TxRevertReason>,
+// ) {
+//     let mut base_system_contracts = BASE_SYSTEM_CONTRACTS.clone();
+//     base_system_contracts.bootloader = PLAYGROUND_BLOCK_BOOTLOADER_CODE.clone();
+//     let mut vm = init_vm_inner(
+//         oracle_tools,
+//         BlockContextMode::OverrideCurrent(block_context.into()),
+//         block_properties,
+//         BLOCK_GAS_LIMIT,
+//         &base_system_contracts,
+//         TxExecutionMode::VerifyExecute,
+//     );
+
+//     vm.bootloader_state.add_tx_data(encoded_tx.len());
+//     vm.state.memory.populate_page(
+//         BOOTLOADER_HEAP_PAGE as usize,
+//         get_bootloader_memory_for_encoded_tx(
+//             encoded_tx,
+//             0,
+//             TxExecutionMode::VerifyExecute,
+//             0,
+//             0,
+//             predefined_overhead,
+//             u32::MAX,
+//             0,
+//             vec![],
+//         ),
+//         Timestamp(0),
+//     );
+
+//     let result = vm.execute_next_tx(u32::MAX, false).err();
+
+//     assert_eq!(expected_error, result);
+// }
+
+// fn get_balance(token_id: AccountTreeId, account: &Address, main_storage: StoragePtr) -> U256 {
+//     let key = storage_key_for_standard_token_balance(token_id, account);
+//     h256_to_u256(main_storage.borrow_mut().read_value(&key))
+// }
+
+// fn get_eth_balance(account: &Address, main_storage: &mut StorageView<InMemoryStorage>) -> U256 {
+//     let key =
+//         storage_key_for_standard_token_balance(AccountTreeId::new(L2_ETH_TOKEN_ADDRESS), account);
+//     h256_to_u256(main_storage.read_value(&key))
+// }
+
+// #[test]
+// fn test_dummy_bootloader() {
+//     let mut vm_test_env = VmTestEnv::default();
+//     let mut oracle_tools = OracleTools::new(vm_test_env.storage_ptr.as_mut(), HistoryEnabled);
+//     let mut base_system_contracts = BASE_SYSTEM_CONTRACTS.clone();
+//     let bootloader_code = read_bootloader_test_code("dummy");
+//     let bootloader_hash = hash_bytecode(&bootloader_code);
+
+//     base_system_contracts.bootloader = SystemContractCode {
+//         code: bytes_to_be_words(bootloader_code),
+//         hash: bootloader_hash,
+//     };
+
+//     let mut vm = init_vm_inner(
+//         &mut oracle_tools,
+//         BlockContextMode::NewBlock(vm_test_env.block_context, Default::default()),
+//         &vm_test_env.block_properties,
+//         BLOCK_GAS_LIMIT,
+//         &base_system_contracts,
+//         TxExecutionMode::VerifyExecute,
+//     );
+
+//     let VmBlockResult {
+//         full_result: res, ..
+//     } = vm.execute_till_block_end(BootloaderJobType::BlockPostprocessing);
+
+//     // Dummy bootloader should not panic
+//     assert!(res.revert_reason.is_none());
+
+//     let correct_first_cell = U256::from_str_radix("123123123", 16).unwrap();
+
+//     verify_required_memory(
+//         &vm.state,
+//         vec![(correct_first_cell, BOOTLOADER_HEAP_PAGE, 0)],
+//     );
+// }
+
+// #[test]
+// fn test_bootloader_out_of_gas() {
+//     let mut vm_test_env = VmTestEnv::default();
+//     let mut oracle_tools = OracleTools::new(vm_test_env.storage_ptr.as_mut(), HistoryEnabled);
+
+//     let mut base_system_contracts = BASE_SYSTEM_CONTRACTS.clone();
+
+//     let bootloader_code = read_bootloader_test_code("dummy");
+//     let bootloader_hash = hash_bytecode(&bootloader_code);
+
+//     base_system_contracts.bootloader = SystemContractCode {
+//         code: bytes_to_be_words(bootloader_code),
+//         hash: bootloader_hash,
+//     };
+
+//     // init vm with only 10 ergs
+//     let mut vm = init_vm_inner(
+//         &mut oracle_tools,
+//         BlockContextMode::NewBlock(vm_test_env.block_context, Default::default()),
+//         &vm_test_env.block_properties,
+//         10,
+//         &base_system_contracts,
+//         TxExecutionMode::VerifyExecute,
+//     );
+
+//     let res = vm.execute_block_tip();
+
+//     assert_eq!(res.revert_reason, Some(TxRevertReason::BootloaderOutOfGas));
+// }
+
+// fn verify_required_memory<H: HistoryMode>(
+//     state: &ZkSyncVmState<'_, 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);
+//     }
+// }
+
+// #[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_test_env = VmTestEnv::default();
+
+//     let operator_address = vm_test_env.block_context.context.operator_address;
+//     let base_fee = vm_test_env.block_context.base_fee;
+//     // We deploy here counter contract, because its logic is trivial
+//     let contract_code = read_test_contract();
+//     let contract_code_hash = hash_bytecode(&contract_code);
+//     let tx: Transaction = get_deploy_tx(
+//         H256::random(),
+//         Nonce(0),
+//         &contract_code,
+//         vec![],
+//         &[],
+//         Fee {
+//             gas_limit: U256::from(20000000u32),
+//             max_fee_per_gas: U256::from(base_fee),
+//             max_priority_fee_per_gas: U256::from(0),
+//             gas_per_pubdata_limit: U256::from(MAX_GAS_PER_PUBDATA_BYTE),
+//         },
+//     )
+//     .into();
+//     let tx_data: TransactionData = tx.clone().into();
+
+//     let maximal_fee = tx_data.gas_limit * tx_data.max_fee_per_gas;
+//     let sender_address = tx_data.from();
+
+//     vm_test_env.set_rich_account(&sender_address);
+
+//     let mut vm_helper = VmTestHelper::new(&mut vm_test_env);
+//     let mut vm = vm_helper.vm();
+
+//     push_transaction_to_bootloader_memory(&mut vm, &tx, TxExecutionMode::VerifyExecute, None);
+
+//     let tx_execution_result = vm
+//         .execute_next_tx(u32::MAX, false)
+//         .expect("Bootloader failed while processing transaction");
+
+//     assert_eq!(
+//         tx_execution_result.status,
+//         TxExecutionStatus::Success,
+//         "Transaction wasn't successful"
+//     );
+
+//     let VmBlockResult {
+//         full_result: res, ..
+//     } = vm.execute_till_block_end(BootloaderJobType::TransactionExecution);
+//     // Should not panic
+//     assert!(
+//         res.revert_reason.is_none(),
+//         "Bootloader was not expected to revert: {:?}",
+//         res.revert_reason
+//     );
+
+//     // Both deployment and ordinary nonce should be incremented by one.
+//     let account_nonce_key = get_nonce_key(&sender_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(&contract_code_hash);
+
+//     // The contract should be deployed successfully.
+//     let deployed_address = deployed_address_create(sender_address, U256::zero());
+//     let account_code_key = get_code_key(&deployed_address);
+
+//     let expected_slots = vec![
+//         (u256_to_h256(expected_nonce), account_nonce_key),
+//         (u256_to_h256(U256::from(1u32)), known_codes_key),
+//         (contract_code_hash, account_code_key),
+//     ];
+
+//     verify_required_storage(&vm.state, expected_slots);
+
+//     assert!(!tx_has_failed(&vm.state, 0));
+
+//     let expected_fee =
+//         maximal_fee - U256::from(tx_execution_result.gas_refunded) * U256::from(base_fee);
+//     let operator_balance = get_balance(
+//         AccountTreeId::new(L2_ETH_TOKEN_ADDRESS),
+//         &operator_address,
+//         vm.state.storage.storage.get_ptr(),
+//     );
+
+//     assert_eq!(
+//         operator_balance, expected_fee,
+//         "Operator did not receive his fee"
+//     );
+// }
+
+// fn execute_vm_with_predetermined_refund(
+//     txs: Vec<Transaction>,
+//     refunds: Vec<u32>,
+//     compressed_bytecodes: Vec<Vec<CompressedBytecodeInfo>>,
+// ) -> VmBlockResult {
+//     let mut vm_test_env = VmTestEnv::default();
+//     let block_context = vm_test_env.block_context;
+
+//     for tx in txs.iter() {
+//         let sender_address = tx.initiator_account();
+//         vm_test_env.set_rich_account(&sender_address);
+//     }
+
+//     let mut vm_helper = VmTestHelper::new(&mut vm_test_env);
+//     let mut vm = vm_helper.vm();
+
+//     let codes_for_decommiter = txs
+//         .iter()
+//         .flat_map(|tx| {
+//             tx.execute
+//                 .factory_deps
+//                 .clone()
+//                 .unwrap_or_default()
+//                 .iter()
+//                 .map(|dep| bytecode_to_factory_dep(dep.clone()))
+//                 .collect::<Vec<(U256, Vec<U256>)>>()
+//         })
+//         .collect();
+
+//     vm.state.decommittment_processor.populate(
+//         codes_for_decommiter,
+//         Timestamp(vm.state.local_state.timestamp),
+//     );
+
+//     let memory_with_suggested_refund = get_bootloader_memory(
+//         txs.into_iter().map(Into::into).collect(),
+//         refunds,
+//         compressed_bytecodes,
+//         TxExecutionMode::VerifyExecute,
+//         BlockContextMode::NewBlock(block_context, Default::default()),
+//     );
+
+//     vm.state.memory.populate_page(
+//         BOOTLOADER_HEAP_PAGE as usize,
+//         memory_with_suggested_refund,
+//         Timestamp(0),
+//     );
+
+//     vm.execute_till_block_end(BootloaderJobType::TransactionExecution)
+// }
+
+// #[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_test_env = VmTestEnv::default();
+//     let base_fee = vm_test_env.block_context.base_fee;
+
+//     // We deploy here counter contract, because its logic is trivial
+//     let contract_code = read_test_contract();
+//     let published_bytecode = CompressedBytecodeInfo::from_original(contract_code.clone()).unwrap();
+//     let tx: Transaction = get_deploy_tx(
+//         H256::random(),
+//         Nonce(0),
+//         &contract_code,
+//         vec![],
+//         &[],
+//         Fee {
+//             gas_limit: U256::from(20000000u32),
+//             max_fee_per_gas: U256::from(base_fee),
+//             max_priority_fee_per_gas: U256::from(0),
+//             gas_per_pubdata_limit: U256::from(MAX_GAS_PER_PUBDATA_BYTE),
+//         },
+//     )
+//     .into();
+
+//     let sender_address = tx.initiator_account();
+
+//     // set balance
+//     vm_test_env.set_rich_account(&sender_address);
+
+//     let mut vm_helper = VmTestHelper::new(&mut vm_test_env);
+//     let mut vm = vm_helper.vm();
+
+//     push_transaction_to_bootloader_memory(&mut vm, &tx, TxExecutionMode::VerifyExecute, None);
+
+//     let tx_execution_result = vm
+//         .execute_next_tx(u32::MAX, false)
+//         .expect("Bootloader failed while processing transaction");
+
+//     assert_eq!(
+//         tx_execution_result.status,
+//         TxExecutionStatus::Success,
+//         "Transaction wasn't successful"
+//     );
+
+//     // 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!(
+//         tx_execution_result.operator_suggested_refund > 0,
+//         "The operator's refund is 0"
+//     );
+//     assert!(
+//         tx_execution_result.gas_refunded > 0,
+//         "The final refund is 0"
+//     );
+
+//     let mut result = vm.execute_till_block_end(BootloaderJobType::TransactionExecution);
+//     assert!(
+//         result.full_result.revert_reason.is_none(),
+//         "Bootloader was not expected to revert: {:?}",
+//         result.full_result.revert_reason
+//     );
+
+//     let mut result_with_predetermined_refund = execute_vm_with_predetermined_refund(
+//         vec![tx],
+//         vec![tx_execution_result.operator_suggested_refund],
+//         vec![vec![published_bytecode]],
+//     );
+//     // We need to sort these lists as those are flattened from HashMaps
+//     result.full_result.used_contract_hashes.sort();
+//     result_with_predetermined_refund
+//         .full_result
+//         .used_contract_hashes
+//         .sort();
+
+//     assert_eq!(
+//         result.full_result.events,
+//         result_with_predetermined_refund.full_result.events
+//     );
+//     assert_eq!(
+//         result.full_result.l2_to_l1_logs,
+//         result_with_predetermined_refund.full_result.l2_to_l1_logs
+//     );
+//     assert_eq!(
+//         result.full_result.storage_log_queries,
+//         result_with_predetermined_refund
+//             .full_result
+//             .storage_log_queries
+//     );
+//     assert_eq!(
+//         result.full_result.used_contract_hashes,
+//         result_with_predetermined_refund
+//             .full_result
+//             .used_contract_hashes
+//     );
+// }
+
+// #[derive(Debug, Clone)]
+// enum TransactionRollbackTestInfo {
+//     Rejected(Transaction, TxRevertReason),
+//     Processed(Transaction, bool, TxExecutionStatus),
+// }
+
+// impl TransactionRollbackTestInfo {
+//     fn new_rejected(transaction: Transaction, revert_reason: TxRevertReason) -> Self {
+//         Self::Rejected(transaction, revert_reason)
+//     }
+
+//     fn new_processed(
+//         transaction: Transaction,
+//         should_be_rollbacked: bool,
+//         expected_status: TxExecutionStatus,
+//     ) -> Self {
+//         Self::Processed(transaction, should_be_rollbacked, expected_status)
+//     }
+
+//     fn get_transaction(&self) -> &Transaction {
+//         match self {
+//             TransactionRollbackTestInfo::Rejected(tx, _) => tx,
+//             TransactionRollbackTestInfo::Processed(tx, _, _) => tx,
+//         }
+//     }
+
+//     fn rejection_reason(&self) -> Option<TxRevertReason> {
+//         match self {
+//             TransactionRollbackTestInfo::Rejected(_, revert_reason) => Some(revert_reason.clone()),
+//             TransactionRollbackTestInfo::Processed(_, _, _) => None,
+//         }
+//     }
+
+//     fn should_rollback(&self) -> bool {
+//         match self {
+//             TransactionRollbackTestInfo::Rejected(_, _) => true,
+//             TransactionRollbackTestInfo::Processed(_, x, _) => *x,
+//         }
+//     }
+
+//     fn expected_status(&self) -> TxExecutionStatus {
+//         match self {
+//             TransactionRollbackTestInfo::Rejected(_, _) => {
+//                 panic!("There is no execution status for rejected transaction")
+//             }
+//             TransactionRollbackTestInfo::Processed(_, _, status) => *status,
+//         }
+//     }
+// }
+
+// // Accepts the address of the sender as well as the list of pairs of its transactions
+// // and whether these transactions should succeed.
+// fn execute_vm_with_possible_rollbacks(
+//     sender_address: Address,
+//     transactions: Vec<TransactionRollbackTestInfo>,
+//     block_context: DerivedBlockContext,
+//     block_properties: BlockProperties,
+// ) -> VmExecutionResult {
+//     let mut vm_test_env = VmTestEnv {
+//         block_context,
+//         block_properties,
+//         ..Default::default()
+//     };
+
+//     // Setting infinite balance for the sender.
+//     vm_test_env.set_rich_account(&sender_address);
+
+//     let mut vm_helper = VmTestHelper::new(&mut vm_test_env);
+//     let mut vm = vm_helper.vm();
+
+//     for test_info in transactions {
+//         vm.save_current_vm_as_snapshot();
+//         let vm_state_before_tx = vm.dump_inner_state();
+//         push_transaction_to_bootloader_memory(
+//             &mut vm,
+//             test_info.get_transaction(),
+//             TxExecutionMode::VerifyExecute,
+//             None,
+//         );
+
+//         match vm.execute_next_tx(u32::MAX, false) {
+//             Err(reason) => {
+//                 assert_eq!(test_info.rejection_reason(), Some(reason));
+//             }
+//             Ok(res) => {
+//                 assert_eq!(test_info.rejection_reason(), None);
+//                 assert_eq!(
+//                     res.status,
+//                     test_info.expected_status(),
+//                     "Transaction status is not correct"
+//                 );
+//             }
+//         };
+
+//         if test_info.should_rollback() {
+//             // Some error has occured, we should reject the transaction
+//             vm.rollback_to_latest_snapshot();
+
+//             // vm_state_before_tx.
+//             let state_after_rollback = vm.dump_inner_state();
+//             assert_eq!(
+//                 vm_state_before_tx, state_after_rollback,
+//                 "Did not rollback VM state correctly"
+//             );
+//         }
+//     }
+
+//     let VmBlockResult {
+//         full_result: mut result,
+//         ..
+//     } = vm.execute_till_block_end(BootloaderJobType::BlockPostprocessing);
+//     // Used contract hashes are retrieved in unordered manner.
+//     // However it must be sorted for the comparisons in tests to work
+//     result.used_contract_hashes.sort();
+
+//     result
+// }
+
+// // Sets the signature for an L2 transaction and returns the same transaction
+// // but this different signature.
+// fn change_signature(mut tx: Transaction, signature: Vec<u8>) -> Transaction {
+//     tx.common_data = match tx.common_data {
+//         ExecuteTransactionCommon::L2(mut data) => {
+//             data.signature = signature;
+//             ExecuteTransactionCommon::L2(data)
+//         }
+//         _ => unreachable!(),
+//     };
+
+//     tx
+// }
+
+// #[test]
+// fn test_vm_rollbacks() {
+//     let (block_context, block_properties): (DerivedBlockContext, BlockProperties) = {
+//         let (block_context, block_properties) = create_test_block_params();
+//         (block_context.into(), block_properties)
+//     };
+
+//     let base_fee = U256::from(block_context.base_fee);
+
+//     let sender_private_key = H256::random();
+//     let contract_code = read_test_contract();
+
+//     let tx_nonce_0: Transaction = get_deploy_tx(
+//         sender_private_key,
+//         Nonce(0),
+//         &contract_code,
+//         vec![],
+//         &[],
+//         Fee {
+//             gas_limit: U256::from(12000000u32),
+//             max_fee_per_gas: base_fee,
+//             max_priority_fee_per_gas: U256::zero(),
+//             gas_per_pubdata_limit: U256::from(MAX_GAS_PER_PUBDATA_BYTE),
+//         },
+//     )
+//     .into();
+//     let tx_nonce_1: Transaction = get_deploy_tx(
+//         sender_private_key,
+//         Nonce(1),
+//         &contract_code,
+//         vec![],
+//         &[],
+//         Fee {
+//             gas_limit: U256::from(12000000u32),
+//             max_fee_per_gas: base_fee,
+//             max_priority_fee_per_gas: U256::zero(),
+//             gas_per_pubdata_limit: U256::from(MAX_GAS_PER_PUBDATA_BYTE),
+//         },
+//     )
+//     .into();
+//     let tx_nonce_2: Transaction = get_deploy_tx(
+//         sender_private_key,
+//         Nonce(2),
+//         &contract_code,
+//         vec![],
+//         &[],
+//         Fee {
+//             gas_limit: U256::from(12000000u32),
+//             max_fee_per_gas: base_fee,
+//             max_priority_fee_per_gas: U256::zero(),
+//             gas_per_pubdata_limit: U256::from(MAX_GAS_PER_PUBDATA_BYTE),
+//         },
+//     )
+//     .into();
+
+//     let wrong_signature_length_tx = change_signature(tx_nonce_0.clone(), vec![1u8; 32]);
+//     let wrong_v_tx = change_signature(tx_nonce_0.clone(), vec![1u8; 65]);
+//     let wrong_signature_tx = change_signature(tx_nonce_0.clone(), vec![27u8; 65]);
+
+//     let sender_address = tx_nonce_0.initiator_account();
+
+//     let result_without_rollbacks = execute_vm_with_possible_rollbacks(
+//         sender_address,
+//         vec![
+//             // The nonces are ordered correctly, all the transactions should succeed.
+//             TransactionRollbackTestInfo::new_processed(
+//                 tx_nonce_0.clone(),
+//                 false,
+//                 TxExecutionStatus::Success,
+//             ),
+//             TransactionRollbackTestInfo::new_processed(
+//                 tx_nonce_1.clone(),
+//                 false,
+//                 TxExecutionStatus::Success,
+//             ),
+//             TransactionRollbackTestInfo::new_processed(
+//                 tx_nonce_2.clone(),
+//                 false,
+//                 TxExecutionStatus::Success,
+//             ),
+//         ],
+//         block_context,
+//         block_properties,
+//     );
+
+//     let incorrect_nonce = TxRevertReason::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,
+//         ],
+//     });
+//     let reusing_nonce_twice = TxRevertReason::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,
+//         ],
+//     });
+//     let signature_length_is_incorrect = TxRevertReason::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,
+//         ],
+//     });
+//     let v_is_incorrect = TxRevertReason::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,
+//         ],
+//     });
+//     let signature_is_incorrect = TxRevertReason::ValidationFailed(VmRevertReason::General {
+//         msg: "Account validation returned invalid magic value. Most often this means that the signature is incorrect".to_string(),
+//         data: vec![],
+//     });
+
+//     let result_with_rollbacks = execute_vm_with_possible_rollbacks(
+//         sender_address,
+//         vec![
+//             TransactionRollbackTestInfo::new_rejected(
+//                 wrong_signature_length_tx,
+//                 signature_length_is_incorrect,
+//             ),
+//             TransactionRollbackTestInfo::new_rejected(wrong_v_tx, v_is_incorrect),
+//             TransactionRollbackTestInfo::new_rejected(wrong_signature_tx, signature_is_incorrect),
+//             // The correct nonce is 0, this tx will fail
+//             TransactionRollbackTestInfo::new_rejected(tx_nonce_2.clone(), incorrect_nonce.clone()),
+//             // This tx will succeed
+//             TransactionRollbackTestInfo::new_processed(
+//                 tx_nonce_0.clone(),
+//                 false,
+//                 TxExecutionStatus::Success,
+//             ),
+//             // The correct nonce is 1, this tx will fail
+//             TransactionRollbackTestInfo::new_rejected(
+//                 tx_nonce_0.clone(),
+//                 reusing_nonce_twice.clone(),
+//             ),
+//             // The correct nonce is 1, this tx will fail
+//             TransactionRollbackTestInfo::new_rejected(tx_nonce_2.clone(), incorrect_nonce),
+//             // This tx will succeed
+//             TransactionRollbackTestInfo::new_processed(
+//                 tx_nonce_1,
+//                 false,
+//                 TxExecutionStatus::Success,
+//             ),
+//             // The correct nonce is 2, this tx will fail
+//             TransactionRollbackTestInfo::new_rejected(tx_nonce_0, reusing_nonce_twice.clone()),
+//             // This tx will succeed
+//             TransactionRollbackTestInfo::new_processed(
+//                 tx_nonce_2.clone(),
+//                 false,
+//                 TxExecutionStatus::Success,
+//             ),
+//             // This tx will fail
+//             TransactionRollbackTestInfo::new_rejected(tx_nonce_2, reusing_nonce_twice.clone()),
+//         ],
+//         block_context,
+//         block_properties,
+//     );
+
+//     assert_eq!(result_without_rollbacks, result_with_rollbacks);
+
+//     let loadnext_contract = get_loadnext_contract();
+
+//     let loadnext_constructor_data = encode(&[Token::Uint(U256::from(100))]);
+//     let loadnext_deploy_tx: Transaction = get_deploy_tx(
+//         sender_private_key,
+//         Nonce(0),
+//         &loadnext_contract.bytecode,
+//         loadnext_contract.factory_deps,
+//         &loadnext_constructor_data,
+//         Fee {
+//             gas_limit: U256::from(70000000u32),
+//             max_fee_per_gas: base_fee,
+//             max_priority_fee_per_gas: U256::zero(),
+//             gas_per_pubdata_limit: U256::from(MAX_GAS_PER_PUBDATA_BYTE),
+//         },
+//     )
+//     .into();
+//     let loadnext_contract_address =
+//         get_create_zksync_address(loadnext_deploy_tx.initiator_account(), Nonce(0));
+//     let deploy_loadnext_tx_info = TransactionRollbackTestInfo::new_processed(
+//         loadnext_deploy_tx,
+//         false,
+//         TxExecutionStatus::Success,
+//     );
+
+//     let get_load_next_tx = |params: LoadnextContractExecutionParams, nonce: Nonce| {
+//         // Here we test loadnext with various kinds of operations
+//         let tx: Transaction = mock_loadnext_test_call(
+//             sender_private_key,
+//             nonce,
+//             loadnext_contract_address,
+//             Fee {
+//                 gas_limit: U256::from(100000000u32),
+//                 max_fee_per_gas: base_fee,
+//                 max_priority_fee_per_gas: U256::zero(),
+//                 gas_per_pubdata_limit: U256::from(MAX_GAS_PER_PUBDATA_BYTE),
+//             },
+//             params,
+//         )
+//         .into();
+
+//         tx
+//     };
+
+//     let loadnext_tx_0 = get_load_next_tx(
+//         LoadnextContractExecutionParams {
+//             reads: 100,
+//             writes: 100,
+//             events: 100,
+//             hashes: 500,
+//             recursive_calls: 10,
+//             deploys: 60,
+//         },
+//         Nonce(1),
+//     );
+//     let loadnext_tx_1 = get_load_next_tx(
+//         LoadnextContractExecutionParams {
+//             reads: 100,
+//             writes: 100,
+//             events: 100,
+//             hashes: 500,
+//             recursive_calls: 10,
+//             deploys: 60,
+//         },
+//         Nonce(2),
+//     );
+
+//     let result_without_rollbacks = execute_vm_with_possible_rollbacks(
+//         sender_address,
+//         vec![
+//             deploy_loadnext_tx_info.clone(),
+//             TransactionRollbackTestInfo::new_processed(
+//                 loadnext_tx_0.clone(),
+//                 false,
+//                 TxExecutionStatus::Success,
+//             ),
+//             TransactionRollbackTestInfo::new_processed(
+//                 loadnext_tx_1.clone(),
+//                 false,
+//                 TxExecutionStatus::Success,
+//             ),
+//         ],
+//         block_context,
+//         block_properties,
+//     );
+
+//     let result_with_rollbacks = execute_vm_with_possible_rollbacks(
+//         sender_address,
+//         vec![
+//             deploy_loadnext_tx_info,
+//             TransactionRollbackTestInfo::new_processed(
+//                 loadnext_tx_0.clone(),
+//                 true,
+//                 TxExecutionStatus::Success,
+//             ),
+//             // After the previous tx has been rolled back, this one should succeed
+//             TransactionRollbackTestInfo::new_processed(
+//                 loadnext_tx_0.clone(),
+//                 false,
+//                 TxExecutionStatus::Success,
+//             ),
+//             // The nonce has been bumped up, this transaction should now fail
+//             TransactionRollbackTestInfo::new_rejected(loadnext_tx_0, reusing_nonce_twice.clone()),
+//             TransactionRollbackTestInfo::new_processed(
+//                 loadnext_tx_1.clone(),
+//                 true,
+//                 TxExecutionStatus::Success,
+//             ),
+//             // After the previous tx has been rolled back, this one should succeed
+//             TransactionRollbackTestInfo::new_processed(
+//                 loadnext_tx_1.clone(),
+//                 true,
+//                 TxExecutionStatus::Success,
+//             ),
+//             // After the previous tx has been rolled back, this one should succeed
+//             TransactionRollbackTestInfo::new_processed(
+//                 loadnext_tx_1.clone(),
+//                 false,
+//                 TxExecutionStatus::Success,
+//             ),
+//             // The nonce has been bumped up, this transaction should now fail
+//             TransactionRollbackTestInfo::new_rejected(loadnext_tx_1, reusing_nonce_twice),
+//         ],
+//         block_context,
+//         block_properties,
+//     );
+
+//     assert_eq!(result_without_rollbacks, result_with_rollbacks);
+// }
+
+// // 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: Vec<(DeployedContract, bool)>) {
+//     for (contract, is_account) in contracts {
+//         let deployer_code_key = get_code_key(contract.account_id.address());
+//         raw_storage.set_value(deployer_code_key, hash_bytecode(&contract.bytecode));
+
+//         if is_account {
+//             let is_account_key = get_is_account_key(contract.account_id.address());
+//             raw_storage.set_value(is_account_key, u256_to_h256(1_u32.into()));
+//         }
+
+//         raw_storage.store_factory_dep(hash_bytecode(&contract.bytecode), contract.bytecode);
+//     }
+// }
+
+// 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,
+//         }
+//     }
+// }
+
+// fn get_nonce_holder_test_tx(
+//     nonce: U256,
+//     account_address: Address,
+//     test_mode: NonceHolderTestMode,
+//     block_context: &DerivedBlockContext,
+// ) -> TransactionData {
+//     TransactionData {
+//         tx_type: 113,
+//         from: account_address,
+//         to: account_address,
+//         gas_limit: U256::from(10000000u32),
+//         pubdata_price_limit: U256::from(MAX_GAS_PER_PUBDATA_BYTE),
+//         max_fee_per_gas: U256::from(block_context.base_fee),
+//         max_priority_fee_per_gas: U256::zero(),
+//         nonce,
+//         // 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![12],
+//         signature: vec![test_mode.into()],
+
+//         ..Default::default()
+//     }
+// }
+
+// fn run_vm_with_raw_tx<'a, H: HistoryMode>(
+//     oracle_tools: &'a mut OracleTools<'a, false, H>,
+//     block_context: DerivedBlockContext,
+//     block_properties: &'a BlockProperties,
+//     tx: TransactionData,
+// ) -> (VmExecutionResult, bool) {
+//     let mut base_system_contracts = BASE_SYSTEM_CONTRACTS.clone();
+//     base_system_contracts.bootloader = PLAYGROUND_BLOCK_BOOTLOADER_CODE.clone();
+//     let mut vm = init_vm_inner(
+//         oracle_tools,
+//         BlockContextMode::OverrideCurrent(block_context),
+//         block_properties,
+//         BLOCK_GAS_LIMIT,
+//         &base_system_contracts,
+//         TxExecutionMode::VerifyExecute,
+//     );
+
+//     let block_gas_price_per_pubdata = block_context.context.block_gas_price_per_pubdata();
+
+//     let overhead = tx.overhead_gas(block_gas_price_per_pubdata as u32);
+//     push_raw_transaction_to_bootloader_memory(
+//         &mut vm,
+//         tx,
+//         TxExecutionMode::VerifyExecute,
+//         overhead,
+//         None,
+//     );
+//     let VmBlockResult {
+//         full_result: result,
+//         ..
+//     } = vm.execute_till_block_end(BootloaderJobType::TransactionExecution);
+
+//     (result, tx_has_failed(&vm.state, 0))
+// }
+
+// #[test]
+// fn test_nonce_holder() {
+//     let account_address = H160::random();
+//     let mut vm_test_env =
+//         VmTestEnv::new_with_contracts(&[(account_address, read_nonce_holder_tester())]);
+
+//     vm_test_env.set_rich_account(&account_address);
+
+//     let mut run_nonce_test = |nonce: U256,
+//                               test_mode: NonceHolderTestMode,
+//                               error_message: Option<String>,
+//                               comment: &'static str| {
+//         let tx = get_nonce_holder_test_tx(
+//             nonce,
+//             account_address,
+//             test_mode,
+//             &vm_test_env.block_context,
+//         );
+
+//         let (result, tx_has_failed) = vm_test_env.run_vm(tx);
+//         if let Some(msg) = error_message {
+//             let expected_error =
+//                 TxRevertReason::ValidationFailed(VmRevertReason::General { msg, data: vec![] });
+//             assert_eq!(
+//                 result
+//                     .revert_reason
+//                     .expect("No revert reason")
+//                     .revert_reason
+//                     .to_string(),
+//                 expected_error.to_string(),
+//                 "{}",
+//                 comment
+//             );
+//         } else {
+//             assert!(!tx_has_failed, "{}", comment);
+//         }
+//     };
+
+//     // Test 1: trying to set value under non sequential nonce value.
+//     run_nonce_test(
+//         1u32.into(),
+//         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.into(),
+//         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.into(),
+//         NonceHolderTestMode::SetValueUnderNonce,
+//         None,
+//         "Failed to set value under nonce sequential value",
+//     );
+
+//     // Test 5: migrate to the arbitrary nonce ordering:
+//     run_nonce_test(
+//         2u32.into(),
+//         NonceHolderTestMode::SwitchToArbitraryOrdering,
+//         None,
+//         "Failed to switch to arbitrary ordering",
+//     );
+
+//     // Test 6: increase min nonce by 5
+//     run_nonce_test(
+//         6u32.into(),
+//         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.into(),
+//         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.into(),
+//         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.into(),
+//         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.into(),
+//         NonceHolderTestMode::IncreaseMinNonceBy5,
+//         None,
+//         "Did not allow to use a bumped nonce",
+//     );
+
+//     // Test 6: Do not allow bumping nonce by too much
+//     run_nonce_test(
+//         16u32.into(),
+//         NonceHolderTestMode::IncreaseMinNonceTooMuch,
+//         Some("The value for incrementing the nonce is too high".to_string()),
+//         "Allowed for incrementing min nonce too much",
+//     );
+
+//     // Test 7: Do not allow not setting a nonce as used
+//     run_nonce_test(
+//         16u32.into(),
+//         NonceHolderTestMode::LeaveNonceUnused,
+//         Some("The nonce was not set as used".to_string()),
+//         "Allowed to leave nonce as unused",
+//     );
+// }
+
+// #[test]
+// fn test_l1_tx_execution() {
+//     // In this test, we try to execute a contract deployment from L1
+//     let mut vm_test_env = VmTestEnv::default();
+//     let mut vm_helper = VmTestHelper::new(&mut vm_test_env);
+//     // Here instead of marking code hash via the bootloader means, we will
+//     // using L1->L2 communication, the same it would likely be done during the priority mode.
+//     let contract_code = read_test_contract();
+//     let contract_code_hash = hash_bytecode(&contract_code);
+//     let l1_deploy_tx = get_l1_deploy_tx(&contract_code, &[]);
+//     let l1_deploy_tx_data: TransactionData = l1_deploy_tx.clone().into();
+
+//     let required_l2_to_l1_logs = vec![
+//         L2ToL1Log {
+//             shard_id: 0,
+//             is_service: false,
+//             tx_number_in_block: 0,
+//             sender: SYSTEM_CONTEXT_ADDRESS,
+//             key: u256_to_h256(U256::from(vm_helper.block_context.context.block_timestamp)),
+//             value: Default::default(),
+//         },
+//         L2ToL1Log {
+//             shard_id: 0,
+//             is_service: true,
+//             tx_number_in_block: 0,
+//             sender: BOOTLOADER_ADDRESS,
+//             key: l1_deploy_tx_data.canonical_l1_tx_hash(),
+//             value: u256_to_h256(U256::from(1u32)),
+//         },
+//     ];
+
+//     let sender_address = l1_deploy_tx_data.from();
+
+//     vm_helper.oracle_tools.decommittment_processor.populate(
+//         vec![(
+//             h256_to_u256(contract_code_hash),
+//             bytes_to_be_words(contract_code),
+//         )],
+//         Timestamp(0),
+//     );
+
+//     let mut vm = vm_helper.vm();
+
+//     push_transaction_to_bootloader_memory(
+//         &mut vm,
+//         &l1_deploy_tx,
+//         TxExecutionMode::VerifyExecute,
+//         None,
+//     );
+
+//     let res = vm.execute_next_tx(u32::MAX, false).unwrap();
+
+//     // The code hash of the deployed contract should be marked as republished.
+//     let known_codes_key = get_known_code_key(&contract_code_hash);
+
+//     // The contract should be deployed successfully.
+//     let deployed_address = deployed_address_create(sender_address, U256::zero());
+//     let account_code_key = get_code_key(&deployed_address);
+
+//     let expected_slots = vec![
+//         (u256_to_h256(U256::from(1u32)), known_codes_key),
+//         (contract_code_hash, account_code_key),
+//     ];
+//     assert!(!tx_has_failed(&vm.state, 0));
+
+//     verify_required_storage(&vm.state, expected_slots);
+
+//     assert_eq!(res.result.logs.l2_to_l1_logs, required_l2_to_l1_logs);
+
+//     let tx = get_l1_execute_test_contract_tx(deployed_address, true);
+//     push_transaction_to_bootloader_memory(&mut vm, &tx, TxExecutionMode::VerifyExecute, None);
+
+//     let res = StorageWritesDeduplicator::apply_on_empty_state(
+//         &vm.execute_next_tx(u32::MAX, false)
+//             .unwrap()
+//             .result
+//             .logs
+//             .storage_logs,
+//     );
+//     assert_eq!(res.initial_storage_writes, 0);
+
+//     let tx = get_l1_execute_test_contract_tx(deployed_address, false);
+//     push_transaction_to_bootloader_memory(&mut vm, &tx, TxExecutionMode::VerifyExecute, None);
+//     let res = StorageWritesDeduplicator::apply_on_empty_state(
+//         &vm.execute_next_tx(u32::MAX, false)
+//             .unwrap()
+//             .result
+//             .logs
+//             .storage_logs,
+//     );
+//     assert_eq!(res.initial_storage_writes, 2);
+
+//     let repeated_writes = res.repeated_storage_writes;
+
+//     push_transaction_to_bootloader_memory(&mut vm, &tx, TxExecutionMode::VerifyExecute, None);
+//     let res = StorageWritesDeduplicator::apply_on_empty_state(
+//         &vm.execute_next_tx(u32::MAX, false)
+//             .unwrap()
+//             .result
+//             .logs
+//             .storage_logs,
+//     );
+//     assert_eq!(res.initial_storage_writes, 1);
+//     // We do the same storage write, so it will be deduplicated
+//     assert_eq!(res.repeated_storage_writes, repeated_writes);
+
+//     let mut tx = get_l1_execute_test_contract_tx(deployed_address, false);
+//     tx.execute.value = U256::from(1);
+//     match &mut tx.common_data {
+//         ExecuteTransactionCommon::L1(l1_data) => {
+//             l1_data.to_mint = U256::from(4);
+//         }
+//         _ => unreachable!(),
+//     }
+//     push_transaction_to_bootloader_memory(&mut vm, &tx, TxExecutionMode::VerifyExecute, None);
+//     let execution_result = vm.execute_next_tx(u32::MAX, false).unwrap();
+//     // The method is not payable, so the transaction with non-zero value should fail
+//     assert_eq!(
+//         execution_result.status,
+//         TxExecutionStatus::Failure,
+//         "The transaction should fail"
+//     );
+
+//     let res =
+//         StorageWritesDeduplicator::apply_on_empty_state(&execution_result.result.logs.storage_logs);
+
+//     // There are 2 initial writes here:
+//     // - totalSupply of ETH token
+//     // - balance of the refund recipient
+//     assert_eq!(res.initial_storage_writes, 2);
+// }
+
+// #[test]
+// fn test_invalid_bytecode() {
+//     let mut vm_test_env = VmTestEnv::default();
+
+//     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,
+//             ],
+//         )),
+//     );
+// }
+
+// #[test]
+// fn test_tracing_of_execution_errors() {
+//     // In this test, we are checking that the execution errors are transmitted correctly from the bootloader.
+//     let contract_address = Address::random();
+
+//     let mut vm_test_env =
+//         VmTestEnv::new_with_contracts(&[(contract_address, read_error_contract())]);
+
+//     let private_key = H256::random();
+
+//     let tx = get_error_tx(
+//         private_key,
+//         Nonce(0),
+//         contract_address,
+//         Fee {
+//             gas_limit: U256::from(1000000u32),
+//             max_fee_per_gas: U256::from(10000000000u64),
+//             max_priority_fee_per_gas: U256::zero(),
+//             gas_per_pubdata_limit: U256::from(MAX_GAS_PER_PUBDATA_BYTE),
+//         },
+//     );
+
+//     vm_test_env.set_rich_account(&tx.common_data.initiator_address);
+//     let mut vm_helper = VmTestHelper::new(&mut vm_test_env);
+//     let mut vm = vm_helper.vm();
+
+//     push_transaction_to_bootloader_memory(
+//         &mut vm,
+//         &tx.into(),
+//         TxExecutionMode::VerifyExecute,
+//         None,
+//     );
+
+//     let mut tracer = TransactionResultTracer::new(usize::MAX, false);
+//     assert_eq!(
+//         vm.execute_with_custom_tracer(&mut tracer),
+//         VmExecutionStopReason::VmFinished,
+//         "Tracer should never request stop"
+//     );
+
+//     match tracer.revert_reason {
+//         Some(revert_reason) => {
+//             let revert_reason = VmRevertReason::try_from(&revert_reason as &[u8]).unwrap();
+//             assert_eq!(
+//                 revert_reason,
+//                 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
+//                     ],
+//                 }
+//             )
+//         }
+//         _ => panic!(
+//             "Tracer captured incorrect result {:#?}",
+//             tracer.revert_reason
+//         ),
+//     }
+
+//     let mut vm_helper = VmTestHelper::new(&mut vm_test_env);
+//     let mut vm = vm_helper.vm();
+//     let tx = get_error_tx(
+//         private_key,
+//         Nonce(1),
+//         contract_address,
+//         Fee {
+//             gas_limit: U256::from(1000000u32),
+//             max_fee_per_gas: U256::from(10000000000u64),
+//             max_priority_fee_per_gas: U256::zero(),
+//             gas_per_pubdata_limit: U256::from(MAX_GAS_PER_PUBDATA_BYTE),
+//         },
+//     );
+//     push_transaction_to_bootloader_memory(
+//         &mut vm,
+//         &tx.into(),
+//         TxExecutionMode::VerifyExecute,
+//         None,
+//     );
+
+//     let mut tracer = TransactionResultTracer::new(10, false);
+//     assert_eq!(
+//         vm.execute_with_custom_tracer(&mut tracer),
+//         VmExecutionStopReason::TracerRequestedStop,
+//     );
+//     assert!(tracer.is_limit_reached());
+// }
+
+// /// Checks that `TX_GAS_LIMIT_OFFSET` constant is correct.
+// #[test]
+// fn test_tx_gas_limit_offset() {
+//     let gas_limit = U256::from(999999);
+//     let mut vm_test_env = VmTestEnv::default();
+
+//     let contract_code = read_test_contract();
+//     let tx: Transaction = get_deploy_tx(
+//         H256::random(),
+//         Nonce(0),
+//         &contract_code,
+//         Default::default(),
+//         Default::default(),
+//         Fee {
+//             gas_limit,
+//             ..Default::default()
+//         },
+//     )
+//     .into();
+
+//     let mut vm_helper = VmTestHelper::new(&mut vm_test_env);
+//     let mut vm = vm_helper.vm();
+//     push_transaction_to_bootloader_memory(&mut vm, &tx, TxExecutionMode::VerifyExecute, None);
+
+//     let gas_limit_from_memory = 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);
+// }
+
+// #[test]
+// fn test_is_write_initial_behaviour() {
+//     // In this test, we check result of `is_write_initial` at different stages.
+//     let mut vm_test_env = VmTestEnv::default();
+
+//     let base_fee = vm_test_env.block_context.base_fee;
+//     let account_pk = H256::random();
+//     let contract_code = read_test_contract();
+//     let tx: Transaction = get_deploy_tx(
+//         account_pk,
+//         Nonce(0),
+//         &contract_code,
+//         vec![],
+//         &[],
+//         Fee {
+//             gas_limit: U256::from(20000000u32),
+//             max_fee_per_gas: U256::from(base_fee),
+//             max_priority_fee_per_gas: U256::from(0),
+//             gas_per_pubdata_limit: U256::from(MAX_GAS_PER_PUBDATA_BYTE),
+//         },
+//     )
+//     .into();
+
+//     let sender_address = tx.initiator_account();
+//     let nonce_key = get_nonce_key(&sender_address);
+
+//     // Check that the next write to the nonce key will be initial.
+//     assert!(vm_test_env.storage_ptr.is_write_initial(&nonce_key));
+
+//     // Set balance to be able to pay fee for txs.
+//     vm_test_env.set_rich_account(&sender_address);
+
+//     let mut vm_helper = VmTestHelper::new(&mut vm_test_env);
+//     let mut vm = vm_helper.vm();
+
+//     push_transaction_to_bootloader_memory(&mut vm, &tx, TxExecutionMode::VerifyExecute, None);
+
+//     vm.execute_next_tx(u32::MAX, false)
+//         .expect("Bootloader failed while processing the first transaction");
+//     // Check that `is_write_initial` still returns true for the nonce key.
+//     assert!(vm_test_env.storage_ptr.is_write_initial(&nonce_key));
+// }
+
+// pub fn get_l1_tx_with_custom_bytecode_hash(
+//     bytecode_hash: U256,
+//     block_gas_per_pubdata: u32,
+// ) -> (Vec<U256>, u32) {
+//     let tx: TransactionData = get_l1_execute_test_contract_tx(Default::default(), false).into();
+//     let predefined_overhead =
+//         tx.overhead_gas_with_custom_factory_deps(vec![bytecode_hash], block_gas_per_pubdata);
+//     let tx_bytes = tx.abi_encode_with_custom_factory_deps(vec![bytecode_hash]);
+
+//     (bytes_to_be_words(tx_bytes), predefined_overhead)
+// }
+
+// pub fn get_l1_execute_test_contract_tx(deployed_address: Address, with_panic: bool) -> Transaction {
+//     let sender = H160::random();
+//     get_l1_execute_test_contract_tx_with_sender(
+//         sender,
+//         deployed_address,
+//         with_panic,
+//         U256::zero(),
+//         false,
+//     )
+// }
+
+// pub fn get_l1_tx_with_large_output(sender: Address, deployed_address: Address) -> Transaction {
+//     let test_contract = load_contract(
+//         "etc/contracts-test-data/artifacts-zk/contracts/long-return-data/long-return-data.sol/LongReturnData.json",
+//     );
+
+//     let function = test_contract.function("longReturnData").unwrap();
+
+//     let calldata = function
+//         .encode_input(&[])
+//         .expect("failed to encode parameters");
+
+//     Transaction {
+//         common_data: ExecuteTransactionCommon::L1(L1TxCommonData {
+//             sender,
+//             gas_limit: U256::from(100000000u32),
+//             gas_per_pubdata_limit: REQUIRED_L1_TO_L2_GAS_PER_PUBDATA_BYTE.into(),
+//             ..Default::default()
+//         }),
+//         execute: Execute {
+//             contract_address: deployed_address,
+//             calldata,
+//             value: U256::zero(),
+//             factory_deps: None,
+//         },
+//         received_timestamp_ms: 0,
+//     }
+// }
+
+// #[test]
+// fn test_call_tracer() {
+//     let mut vm_test_env = VmTestEnv::default();
+
+//     let sender = H160::random();
+
+//     let contract_code = read_test_contract();
+//     let contract_code_hash = hash_bytecode(&contract_code);
+//     let l1_deploy_tx = get_l1_deploy_tx(&contract_code, &[]);
+//     let l1_deploy_tx_data: TransactionData = l1_deploy_tx.clone().into();
+
+//     let sender_address_counter = l1_deploy_tx_data.from();
+
+//     vm_test_env.set_rich_account(&sender_address_counter);
+//     let mut vm_helper = VmTestHelper::new(&mut vm_test_env);
+
+//     vm_helper.oracle_tools.decommittment_processor.populate(
+//         vec![(
+//             h256_to_u256(contract_code_hash),
+//             bytes_to_be_words(contract_code),
+//         )],
+//         Timestamp(0),
+//     );
+
+//     let contract_code = read_long_return_data_contract();
+//     let contract_code_hash = hash_bytecode(&contract_code);
+//     let l1_deploy_long_return_data_tx = get_l1_deploy_tx(&contract_code, &[]);
+//     vm_helper.oracle_tools.decommittment_processor.populate(
+//         vec![(
+//             h256_to_u256(contract_code_hash),
+//             bytes_to_be_words(contract_code),
+//         )],
+//         Timestamp(0),
+//     );
+
+//     let tx_data: TransactionData = l1_deploy_long_return_data_tx.clone().into();
+//     let sender_long_return_address = tx_data.from();
+//     // The contract should be deployed successfully.
+//     let deployed_address_long_return_data =
+//         deployed_address_create(sender_long_return_address, U256::zero());
+//     let mut vm = vm_helper.vm();
+
+//     push_transaction_to_bootloader_memory(
+//         &mut vm,
+//         &l1_deploy_tx,
+//         TxExecutionMode::VerifyExecute,
+//         None,
+//     );
+
+//     // The contract should be deployed successfully.
+//     let deployed_address = deployed_address_create(sender_address_counter, U256::zero());
+//     let res = vm.execute_next_tx(u32::MAX, true).unwrap();
+//     let calls = res.call_traces;
+//     let mut create_call = None;
+//     // The first MIMIC call is call to value simulator. All calls goes through it.
+//     // The second MIMIC call is call to Deployer contract.
+//     // And only third level call is construct call to the newly deployed contract And we call it create_call.
+//     for call in &calls {
+//         if let CallType::Call(FarCallOpcode::Mimic) = call.r#type {
+//             for call in &call.calls {
+//                 if let CallType::Call(FarCallOpcode::Mimic) = call.r#type {
+//                     for call in &call.calls {
+//                         if let CallType::Create = call.r#type {
+//                             create_call = Some(call.clone());
+//                         }
+//                     }
+//                 }
+//             }
+//         }
+//     }
+//     let expected = Call {
+//         r#type: CallType::Create,
+//         to: deployed_address,
+//         from: sender_address_counter,
+//         parent_gas: 0,
+//         gas_used: 0,
+//         gas: 0,
+//         value: U256::zero(),
+//         input: vec![],
+//         output: vec![
+//             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, 0,
+//         ],
+//         error: None,
+//         revert_reason: None,
+//         calls: vec![],
+//     };
+//     assert_eq!(create_call.unwrap(), expected);
+
+//     push_transaction_to_bootloader_memory(
+//         &mut vm,
+//         &l1_deploy_long_return_data_tx,
+//         TxExecutionMode::VerifyExecute,
+//         None,
+//     );
+
+//     vm.execute_next_tx(u32::MAX, false).unwrap();
+
+//     let tx = get_l1_execute_test_contract_tx_with_sender(
+//         sender,
+//         deployed_address,
+//         false,
+//         U256::from(1u8),
+//         true,
+//     );
+
+//     let tx_data: TransactionData = tx.clone().into();
+//     push_transaction_to_bootloader_memory(&mut vm, &tx, TxExecutionMode::VerifyExecute, None);
+
+//     let res = vm.execute_next_tx(u32::MAX, true).unwrap();
+//     let calls = res.call_traces;
+
+//     // We don't want to compare gas used, because it's not fully deterministic.
+//     let expected = Call {
+//         r#type: CallType::Call(FarCallOpcode::Mimic),
+//         to: deployed_address,
+//         from: tx_data.from(),
+//         parent_gas: 0,
+//         gas_used: 0,
+//         gas: 0,
+//         value: U256::from(1),
+//         input: tx_data.data,
+//         output: vec![
+//             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, 1,
+//         ],
+//         error: None,
+//         revert_reason: None,
+//         calls: vec![],
+//     };
+
+//     // First loop filter out the bootloaders calls and
+//     // the second loop filters out the calls msg value simulator calls
+//     for call in calls {
+//         if let CallType::Call(FarCallOpcode::Mimic) = call.r#type {
+//             for call in call.calls {
+//                 if let CallType::Call(FarCallOpcode::Mimic) = call.r#type {
+//                     assert_eq!(expected, call);
+//                 }
+//             }
+//         }
+//     }
+
+//     let tx = get_l1_execute_test_contract_tx_with_sender(
+//         sender,
+//         deployed_address,
+//         true,
+//         U256::from(1u8),
+//         true,
+//     );
+
+//     let tx_data: TransactionData = tx.clone().into();
+//     push_transaction_to_bootloader_memory(&mut vm, &tx, TxExecutionMode::VerifyExecute, None);
+
+//     let res = vm.execute_next_tx(u32::MAX, true).unwrap();
+//     let calls = res.call_traces;
+
+//     let expected = Call {
+//         r#type: CallType::Call(FarCallOpcode::Mimic),
+//         to: deployed_address,
+//         from: tx_data.from(),
+//         parent_gas: 257030,
+//         gas_used: 348,
+//         gas: 253008,
+//         value: U256::from(1u8),
+//         input: tx_data.data,
+//         output: vec![],
+//         error: None,
+//         revert_reason: Some("This method always reverts".to_string()),
+//         calls: vec![],
+//     };
+
+//     for call in calls {
+//         if let CallType::Call(FarCallOpcode::Mimic) = call.r#type {
+//             for call in call.calls {
+//                 if let CallType::Call(FarCallOpcode::Mimic) = call.r#type {
+//                     assert_eq!(expected, call);
+//                 }
+//             }
+//         }
+//     }
+
+//     let tx = get_l1_tx_with_large_output(sender, deployed_address_long_return_data);
+
+//     let tx_data: TransactionData = tx.clone().into();
+//     push_transaction_to_bootloader_memory(&mut vm, &tx, TxExecutionMode::VerifyExecute, None);
+
+//     assert_ne!(deployed_address_long_return_data, deployed_address);
+//     let res = vm.execute_next_tx(u32::MAX, true).unwrap();
+//     let calls = res.call_traces;
+//     for call in calls {
+//         if let CallType::Call(FarCallOpcode::Mimic) = call.r#type {
+//             for call in call.calls {
+//                 if let CallType::Call(FarCallOpcode::Mimic) = call.r#type {
+//                     assert_eq!(call.input, tx_data.data);
+//                     assert_eq!(
+//                         call.revert_reason,
+//                         Some("Unknown revert reason".to_string())
+//                     );
+//                 }
+//             }
+//         }
+//     }
+// }
+
+// #[test]
+// fn test_get_used_contracts() {
+//     let mut vm_test_env = VmTestEnv::default();
+
+//     let mut vm_helper = VmTestHelper::new(&mut vm_test_env);
+//     let mut vm = vm_helper.vm();
+
+//     assert!(known_bytecodes_without_aa_code(&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 contract_code_hash = hash_bytecode(&contract_code);
+//     let tx1 = get_l1_deploy_tx(&contract_code, &[]);
+
+//     push_transaction_to_bootloader_memory(&mut vm, &tx1, TxExecutionMode::VerifyExecute, None);
+
+//     let res1 = vm.execute_next_tx(u32::MAX, true).unwrap();
+//     assert_eq!(res1.status, TxExecutionStatus::Success);
+//     assert!(vm
+//         .get_used_contracts()
+//         .contains(&h256_to_u256(contract_code_hash)));
+
+//     assert_eq!(
+//         vm.get_used_contracts()
+//             .into_iter()
+//             .collect::<HashSet<U256>>(),
+//         known_bytecodes_without_aa_code(&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 mut tx2 = tx1;
+//     tx2.execute.contract_address = L1_MESSENGER_ADDRESS;
+
+//     let calldata = vec![1, 2, 3];
+//     let big_calldata: Vec<u8> = calldata
+//         .iter()
+//         .cycle()
+//         .take(calldata.len() * 1024)
+//         .cloned()
+//         .collect();
+
+//     tx2.execute.calldata = big_calldata;
+//     tx2.execute.factory_deps = Some(vec![vec![1; 32]]);
+
+//     push_transaction_to_bootloader_memory(&mut vm, &tx2, TxExecutionMode::VerifyExecute, None);
+
+//     let res2 = vm.execute_next_tx(u32::MAX, false).unwrap();
+
+//     assert_eq!(res2.status, TxExecutionStatus::Failure);
+
+//     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)
+//             .keys()
+//             .contains(&hash_to_u256));
+//         assert!(!vm.get_used_contracts().contains(&hash_to_u256));
+//     }
+// }
+
+// fn known_bytecodes_without_aa_code<H: HistoryMode>(vm: &VmInstance<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
+// }
+
+// #[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_address = H160::random();
+
+//     let (bytecode, contract) = read_many_owners_custom_account_contract();
+
+//     let mut vm_test_env = VmTestEnv::new_with_contracts(&[(account_address, bytecode)]);
+
+//     let beneficiary = H160::random();
+
+//     assert_eq!(vm_test_env.get_eth_balance(&beneficiary), U256::from(0));
+
+//     let private_key = H256::random();
+//     let private_address = PackedEthSignature::address_from_private_key(&private_key).unwrap();
+//     let pk_signer = PrivateKeySigner::new(private_key);
+
+//     vm_test_env.set_rich_account(&account_address);
+//     vm_test_env.set_rich_account(&private_address);
+
+//     let chain_id: u16 = 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_address)])]);
+
+//         // Create a legacy transaction to set the owners.
+//         let raw_tx = TransactionParameters {
+//             nonce: U256::from(0),
+//             to: Some(account_address),
+//             gas: U256::from(100000000),
+//             gas_price: Some(U256::from(10000000)),
+//             value: U256::from(0),
+//             data: encoded_input.unwrap(),
+//             chain_id: chain_id as u64,
+//             transaction_type: None,
+//             access_list: None,
+//             max_fee_per_gas: U256::from(1000000000),
+//             max_priority_fee_per_gas: U256::from(1000000000),
+//         };
+//         let txn = pk_signer.sign_transaction(raw_tx).await.unwrap();
+
+//         let (txn_request, hash) = TransactionRequest::from_bytes(&txn, chain_id).unwrap();
+
+//         let mut l2_tx: L2Tx = L2Tx::from_request(txn_request, 100000).unwrap();
+//         l2_tx.set_input(txn, hash);
+//         let transaction: Transaction = l2_tx.try_into().unwrap();
+//         let transaction_data: TransactionData = transaction.try_into().unwrap();
+
+//         vm_test_env.run_vm_or_die(transaction_data);
+//     }
+
+//     let private_account_balance = vm_test_env.get_eth_balance(&private_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),
+//             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_txn = pk_signer.sign_transaction(aa_raw_tx).await.unwrap();
+
+//         let (aa_txn_request, aa_hash) = TransactionRequest::from_bytes(&aa_txn, 270).unwrap();
+
+//         let mut l2_tx: L2Tx = L2Tx::from_request(aa_txn_request, 100000).unwrap();
+//         l2_tx.set_input(aa_txn, aa_hash);
+//         // Pretend that operator is malicious and sets the initiator to the AA account.
+//         l2_tx.common_data.initiator_address = account_address;
+
+//         let transaction: Transaction = l2_tx.try_into().unwrap();
+
+//         let transaction_data: TransactionData = transaction.try_into().unwrap();
+
+//         vm_test_env.run_vm_or_die(transaction_data);
+//         assert_eq!(
+//             vm_test_env.get_eth_balance(&beneficiary),
+//             U256::from(888000088)
+//         );
+//         // Make sure that the tokens were transfered from the AA account.
+//         assert_eq!(
+//             private_account_balance,
+//             vm_test_env.get_eth_balance(&private_address)
+//         )
+//     }
+
+//     // Now send the 'classic' EIP712 transaction
+//     {
+//         let tx_712 = L2Tx::new(
+//             beneficiary,
+//             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_address,
+//             U256::from(28374938),
+//             None,
+//             Default::default(),
+//         );
+
+//         let transaction_request: TransactionRequest = tx_712.into();
+
+//         let domain = Eip712Domain::new(L2ChainId(chain_id));
+//         let signature = pk_signer
+//             .sign_typed_data(&domain, &transaction_request)
+//             .await
+//             .unwrap();
+//         let encoded_tx = transaction_request.get_signed_bytes(&signature, L2ChainId(chain_id));
+
+//         let (aa_txn_request, aa_hash) =
+//             TransactionRequest::from_bytes(&encoded_tx, chain_id).unwrap();
+
+//         let mut l2_tx: L2Tx = L2Tx::from_request(aa_txn_request, 100000).unwrap();
+//         l2_tx.set_input(encoded_tx, aa_hash);
+
+//         let transaction: Transaction = l2_tx.try_into().unwrap();
+//         let transaction_data: TransactionData = transaction.try_into().unwrap();
+
+//         vm_test_env.run_vm_or_die(transaction_data);
+
+//         assert_eq!(
+//             vm_test_env.get_eth_balance(&beneficiary),
+//             U256::from(916375026)
+//         );
+//         assert_eq!(
+//             private_account_balance,
+//             vm_test_env.get_eth_balance(&private_address)
+//         );
+//     }
+// }
diff --git a/core/multivm_deps/vm_1_3_2/src/tests/mod.rs b/core/multivm_deps/vm_1_3_2/src/tests/mod.rs
new file mode 100644
index 000000000000..af4748e38645
--- /dev/null
+++ b/core/multivm_deps/vm_1_3_2/src/tests/mod.rs
@@ -0,0 +1,4 @@
+// mod bootloader;
+// mod upgrades;
+
+// mod utils;
diff --git a/core/multivm_deps/vm_1_3_2/src/tests/upgrades.rs b/core/multivm_deps/vm_1_3_2/src/tests/upgrades.rs
new file mode 100644
index 000000000000..f80fc6325265
--- /dev/null
+++ b/core/multivm_deps/vm_1_3_2/src/tests/upgrades.rs
@@ -0,0 +1,377 @@
+// use crate::{
+//     test_utils::verify_required_storage,
+//     tests::utils::get_l1_deploy_tx,
+//     utils::{create_test_block_params, BASE_SYSTEM_CONTRACTS, BLOCK_GAS_LIMIT},
+//     vm::tx_has_failed,
+//     vm_with_bootloader::{init_vm_inner, push_transaction_to_bootloader_memory},
+//     vm_with_bootloader::{BlockContextMode, TxExecutionMode},
+//     HistoryEnabled, OracleTools, TxRevertReason,
+// };
+
+// use zk_evm::aux_structures::Timestamp;
+
+// use zksync_types::{
+//     ethabi::Contract,
+//     tx::tx_execution_info::TxExecutionStatus,
+//     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 crate::tests::utils::create_storage_view;
+// 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 storage_view = create_storage_view();
+//     let mut oracle_tools = OracleTools::new(&mut storage_view, HistoryEnabled);
+//     let (block_context, block_properties) = create_test_block_params();
+
+//     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 = get_l1_deploy_tx(&read_test_contract(), &[]);
+
+//     let mut vm = init_vm_inner(
+//         &mut oracle_tools,
+//         BlockContextMode::NewBlock(block_context.into(), Default::default()),
+//         &block_properties,
+//         BLOCK_GAS_LIMIT,
+//         &BASE_SYSTEM_CONTRACTS,
+//         TxExecutionMode::VerifyExecute,
+//     );
+
+//     let expected_error = TxRevertReason::UnexpectedVMBehavior(
+//         "Assertion error: Protocol upgrade tx not first".to_string(),
+//     );
+
+//     // Test 1: there must be only one system transaction in block
+//     vm.save_current_vm_as_snapshot();
+
+//     push_transaction_to_bootloader_memory(
+//         &mut vm,
+//         &protocol_upgrade_transaction,
+//         TxExecutionMode::VerifyExecute,
+//         None,
+//     );
+//     push_transaction_to_bootloader_memory(
+//         &mut vm,
+//         &normal_l1_transaction,
+//         TxExecutionMode::VerifyExecute,
+//         None,
+//     );
+//     push_transaction_to_bootloader_memory(
+//         &mut vm,
+//         &protocol_upgrade_transaction,
+//         TxExecutionMode::VerifyExecute,
+//         None,
+//     );
+
+//     vm.execute_next_tx(u32::MAX, false).unwrap();
+//     vm.execute_next_tx(u32::MAX, false).unwrap();
+//     let res = vm.execute_next_tx(u32::MAX, false);
+//     assert_eq!(res, Err(expected_error.clone()));
+
+//     // Test 2: the protocol upgrade tx must be the first one in block
+//     vm.rollback_to_latest_snapshot();
+
+//     push_transaction_to_bootloader_memory(
+//         &mut vm,
+//         &normal_l1_transaction,
+//         TxExecutionMode::VerifyExecute,
+//         None,
+//     );
+//     push_transaction_to_bootloader_memory(
+//         &mut vm,
+//         &protocol_upgrade_transaction,
+//         TxExecutionMode::VerifyExecute,
+//         None,
+//     );
+
+//     vm.execute_next_tx(u32::MAX, false).unwrap();
+//     let res = vm.execute_next_tx(u32::MAX, false);
+//     assert_eq!(res, Err(expected_error));
+// }
+
+// /// 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 storage_view = create_storage_view();
+
+//     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.set_value(known_code_key, u256_to_h256(1.into()));
+
+//     let mut oracle_tools = OracleTools::new(&mut storage_view, HistoryEnabled);
+//     let (block_context, block_properties) = create_test_block_params();
+
+//     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![],
+//     }]);
+
+//     let mut vm = init_vm_inner(
+//         &mut oracle_tools,
+//         BlockContextMode::NewBlock(block_context.into(), Default::default()),
+//         &block_properties,
+//         BLOCK_GAS_LIMIT,
+//         &BASE_SYSTEM_CONTRACTS,
+//         TxExecutionMode::VerifyExecute,
+//     );
+//     push_transaction_to_bootloader_memory(
+//         &mut vm,
+//         &transaction,
+//         TxExecutionMode::VerifyExecute,
+//         None,
+//     );
+//     let result = vm.execute_next_tx(u32::MAX, false).unwrap();
+//     assert_eq!(
+//         result.status,
+//         TxExecutionStatus::Success,
+//         "The force upgrade was not successful"
+//     );
+//     assert!(!tx_has_failed(&vm.state, 0));
+
+//     let expected_slots = vec![(bytecode_hash, get_code_key(&address_to_deploy))];
+
+//     // Verify that the bytecode has been set correctly
+//     verify_required_storage(&vm.state, expected_slots);
+// }
+
+// /// Here we show how the work with the complex upgrader could be done
+// #[test]
+// fn test_complex_upgrader() {
+//     let mut storage_view = create_storage_view();
+
+//     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.set_value(get_known_code_key(&bytecode_hash), u256_to_h256(1.into()));
+//     storage_view.set_value(
+//         get_known_code_key(&msg_sender_test_hash),
+//         u256_to_h256(1.into()),
+//     );
+//     storage_view.set_value(account_code_key, bytecode_hash);
+
+//     let mut oracle_tools: OracleTools<false, HistoryEnabled> =
+//         OracleTools::new(&mut storage_view, HistoryEnabled);
+//     oracle_tools.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 (block_context, block_properties) = create_test_block_params();
+
+//     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,
+//     );
+
+//     let mut vm = init_vm_inner(
+//         &mut oracle_tools,
+//         BlockContextMode::NewBlock(block_context.into(), Default::default()),
+//         &block_properties,
+//         BLOCK_GAS_LIMIT,
+//         &BASE_SYSTEM_CONTRACTS,
+//         TxExecutionMode::VerifyExecute,
+//     );
+//     push_transaction_to_bootloader_memory(
+//         &mut vm,
+//         &transaction,
+//         TxExecutionMode::VerifyExecute,
+//         None,
+//     );
+//     let result = vm.execute_next_tx(u32::MAX, false).unwrap();
+//     assert_eq!(
+//         result.status,
+//         TxExecutionStatus::Success,
+//         "The force upgrade was not successful"
+//     );
+//     assert!(!tx_has_failed(&vm.state, 0));
+
+//     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.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,
+//     }
+// }
+
+// // 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,
+//     }
+// }
+
+// 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/multivm_deps/vm_1_3_2/src/tests/utils.rs b/core/multivm_deps/vm_1_3_2/src/tests/utils.rs
new file mode 100644
index 000000000000..865f8503701c
--- /dev/null
+++ b/core/multivm_deps/vm_1_3_2/src/tests/utils.rs
@@ -0,0 +1,110 @@
+// //!
+// //! Tests for the bootloader
+// //! The description for each of the tests can be found in the corresponding `.yul` file.
+// //!
+// use zksync_types::{
+//     ethabi::Contract,
+//     Execute, L1TxCommonData, H160, REQUIRED_L1_TO_L2_GAS_PER_PUBDATA_BYTE,
+//     {ethabi::Token, Address, ExecuteTransactionCommon, Transaction, U256},
+// };
+
+// use zksync_contracts::{load_contract, read_bytecode};
+// use zksync_state::{InMemoryStorage, StorageView};
+// use zksync_utils::bytecode::hash_bytecode;
+
+// use crate::test_utils::get_create_execute;
+
+// pub fn read_test_contract() -> Vec<u8> {
+//     read_bytecode("etc/contracts-test-data/artifacts-zk/contracts/counter/counter.sol/Counter.json")
+// }
+
+// pub fn read_long_return_data_contract() -> Vec<u8> {
+//     read_bytecode("etc/contracts-test-data/artifacts-zk/contracts/long-return-data/long-return-data.sol/LongReturnData.json")
+// }
+
+// pub 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 fn read_error_contract() -> Vec<u8> {
+//     read_bytecode(
+//         "etc/contracts-test-data/artifacts-zk/contracts/error/error.sol/SimpleRequire.json",
+//     )
+// }
+
+// pub 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 fn get_l1_execute_test_contract_tx_with_sender(
+//     sender: Address,
+//     deployed_address: Address,
+//     with_panic: bool,
+//     value: U256,
+//     payable: bool,
+// ) -> Transaction {
+//     let execute = execute_test_contract(deployed_address, with_panic, value, payable);
+
+//     Transaction {
+//         common_data: ExecuteTransactionCommon::L1(L1TxCommonData {
+//             sender,
+//             gas_limit: U256::from(200_000_000u32),
+//             gas_per_pubdata_limit: REQUIRED_L1_TO_L2_GAS_PER_PUBDATA_BYTE.into(),
+//             to_mint: value,
+//             ..Default::default()
+//         }),
+//         execute,
+//         received_timestamp_ms: 0,
+//     }
+// }
+
+// fn execute_test_contract(
+//     address: Address,
+//     with_panic: bool,
+//     value: U256,
+//     payable: bool,
+// ) -> Execute {
+//     let test_contract = load_contract(
+//         "etc/contracts-test-data/artifacts-zk/contracts/counter/counter.sol/Counter.json",
+//     );
+
+//     let function = if payable {
+//         test_contract
+//             .function("incrementWithRevertPayable")
+//             .unwrap()
+//     } else {
+//         test_contract.function("incrementWithRevert").unwrap()
+//     };
+
+//     let calldata = function
+//         .encode_input(&[Token::Uint(U256::from(1u8)), Token::Bool(with_panic)])
+//         .expect("failed to encode parameters");
+
+//     Execute {
+//         contract_address: address,
+//         calldata,
+//         value,
+//         factory_deps: None,
+//     }
+// }
+
+// pub fn get_l1_deploy_tx(code: &[u8], calldata: &[u8]) -> Transaction {
+//     let execute = get_create_execute(code, calldata);
+
+//     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,
+//         received_timestamp_ms: 0,
+//     }
+// }
+
+// pub fn create_storage_view() -> StorageView<InMemoryStorage> {
+//     let raw_storage = InMemoryStorage::with_system_contracts(hash_bytecode);
+//     StorageView::new(raw_storage)
+// }
diff --git a/core/lib/vm/src/transaction_data.rs b/core/multivm_deps/vm_1_3_2/src/transaction_data.rs
similarity index 95%
rename from core/lib/vm/src/transaction_data.rs
rename to core/multivm_deps/vm_1_3_2/src/transaction_data.rs
index 77a47957580e..204aca4ab460 100644
--- a/core/lib/vm/src/transaction_data.rs
+++ b/core/multivm_deps/vm_1_3_2/src/transaction_data.rs
@@ -35,6 +35,7 @@ pub struct TransactionData {
     // 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 factory_deps: Vec<Vec<u8>>,
     pub paymaster_input: Vec<u8>,
     pub reserved_dynamic: Vec<u8>,
@@ -221,47 +222,9 @@ impl TransactionData {
     }
 
     pub fn trusted_gas_limit(&self, _block_gas_price_per_pubdata: u32) -> u32 {
+        // TODO (EVM-66): correctly calculate the trusted gas limit for a transaction
         self.gas_limit.as_u32()
     }
-
-    #[cfg(test)]
-    pub(crate) fn overhead_gas_with_custom_factory_deps(
-        &self,
-        factory_deps_hashes: Vec<U256>,
-        block_gas_per_pubdata: u32,
-    ) -> u32 {
-        let total_gas_limit = self.gas_limit.as_u32();
-        let gas_per_pubdata_byte_limit =
-            self.effective_gas_price_per_pubdata(block_gas_per_pubdata);
-        let encoded_len = encoding_len(
-            self.data.len() as u64,
-            self.signature.len() as u64,
-            factory_deps_hashes.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_per_pubdata_byte_limit,
-            encoded_len,
-            coeficients,
-        )
-    }
-
-    #[cfg(test)]
-    pub(crate) fn canonical_l1_tx_hash(&self) -> zksync_types::H256 {
-        use zksync_types::web3::signing::keccak256;
-
-        if !is_l1_tx_type(self.tx_type) {
-            panic!("Trying to get L1 tx hash for non-L1 tx");
-        }
-
-        let encoded_bytes = self.clone().abi_encode();
-
-        zksync_types::H256(keccak256(&encoded_bytes))
-    }
 }
 
 pub fn derive_overhead(
@@ -298,6 +261,7 @@ pub fn derive_overhead(
     // 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(),
@@ -430,6 +394,7 @@ pub fn get_amortized_overhead(
             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
@@ -624,6 +589,7 @@ mod tests {
             // 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],
diff --git a/core/lib/vm/src/utils.rs b/core/multivm_deps/vm_1_3_2/src/utils.rs
similarity index 97%
rename from core/lib/vm/src/utils.rs
rename to core/multivm_deps/vm_1_3_2/src/utils.rs
index fb0d9dd5e67b..c0bfe1d4c6d6 100644
--- a/core/lib/vm/src/utils.rs
+++ b/core/multivm_deps/vm_1_3_2/src/utils.rs
@@ -13,6 +13,7 @@ use zk_evm::{
 };
 use zksync_config::constants::ZKPORTER_IS_AVAILABLE;
 use zksync_contracts::{read_zbin_bytecode, BaseSystemContracts};
+use zksync_state::WriteStorage;
 use zksync_types::{Address, H160, MAX_L2_TX_GAS_LIMIT, U256};
 use zksync_utils::h256_to_u256;
 
@@ -225,8 +226,12 @@ pub fn read_bootloader_test_code(test: &str) -> Vec<u8> {
     ))
 }
 
-pub(crate) fn calculate_computational_gas_used<T: PubdataSpentTracer<H>, H: HistoryMode>(
-    vm: &VmInstance<'_, H>,
+pub(crate) fn calculate_computational_gas_used<
+    S: WriteStorage,
+    T: PubdataSpentTracer<H>,
+    H: HistoryMode,
+>(
+    vm: &VmInstance<S, H>,
     tracer: &T,
     gas_remaining_before: u32,
     spent_pubdata_counter_before: u32,
@@ -239,7 +244,7 @@ pub(crate) fn calculate_computational_gas_used<T: PubdataSpentTracer<H>, H: Hist
     total_gas_used
         .checked_sub(gas_used_on_pubdata)
         .unwrap_or_else(|| {
-            vlog::error!(
+            tracing::error!(
                 "Gas used on pubdata is greater than total gas used. On pubdata: {}, total: {}",
                 gas_used_on_pubdata,
                 total_gas_used
diff --git a/core/multivm_deps/vm_1_3_2/src/vm.rs b/core/multivm_deps/vm_1_3_2/src/vm.rs
new file mode 100644
index 000000000000..92c2a09f64be
--- /dev/null
+++ b/core/multivm_deps/vm_1_3_2/src/vm.rs
@@ -0,0 +1,971 @@
+use std::convert::TryFrom;
+use std::fmt::Debug;
+
+use zk_evm::aux_structures::Timestamp;
+use zk_evm::vm_state::{PrimitiveValue, VmLocalState, VmState};
+use zk_evm::witness_trace::DummyTracer;
+use zk_evm::zkevm_opcode_defs::decoding::{AllowedPcOrImm, EncodingModeProduction, VmEncodingMode};
+use zk_evm::zkevm_opcode_defs::definitions::RET_IMPLICIT_RETURNDATA_PARAMS_REGISTER;
+use zksync_config::constants::MAX_TXS_IN_BLOCK;
+use zksync_state::WriteStorage;
+use zksync_types::l2_to_l1_log::L2ToL1Log;
+use zksync_types::tx::tx_execution_info::{TxExecutionStatus, VmExecutionLogs};
+use zksync_types::vm_trace::{Call, VmExecutionTrace, VmTrace};
+use zksync_types::{L1BatchNumber, StorageLogQuery, VmEvent, U256};
+
+use crate::bootloader_state::BootloaderState;
+use crate::errors::{TxRevertReason, VmRevertReason, VmRevertReasonParsingResult};
+use crate::event_sink::InMemoryEventSink;
+use crate::events::merge_events;
+use crate::history_recorder::{HistoryEnabled, HistoryMode};
+use crate::memory::SimpleMemory;
+use crate::oracles::decommitter::DecommitterOracle;
+use crate::oracles::precompile::PrecompilesProcessorWithHistory;
+use crate::oracles::storage::StorageOracle;
+use crate::oracles::tracer::{
+    BootloaderTracer, ExecutionEndTracer, OneTxTracer, PendingRefundTracer, PubdataSpentTracer,
+    StorageInvocationTracer, TransactionResultTracer, ValidationError, ValidationTracer,
+    ValidationTracerParams,
+};
+use crate::oracles::OracleWithHistory;
+use crate::utils::{
+    calculate_computational_gas_used, dump_memory_page_using_primitive_value,
+    precompile_calls_count_after_timestamp,
+};
+use crate::vm_with_bootloader::{
+    BootloaderJobType, DerivedBlockContext, TxExecutionMode, BOOTLOADER_HEAP_PAGE,
+    OPERATOR_REFUNDS_OFFSET,
+};
+
+pub type ZkSyncVmState<S, H> = VmState<
+    StorageOracle<S, H>,
+    SimpleMemory<H>,
+    InMemoryEventSink<H>,
+    PrecompilesProcessorWithHistory<false, H>,
+    DecommitterOracle<S, false, H>,
+    DummyTracer,
+>;
+pub 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;
+// The slot that is used for tracking vm hooks
+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) 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,
+    )
+}
+
+#[derive(Debug)]
+pub struct VmInstance<S: WriteStorage, H: HistoryMode> {
+    pub gas_limit: u32,
+    pub state: ZkSyncVmState<S, H>,
+    pub execution_mode: TxExecutionMode,
+    pub block_context: DerivedBlockContext,
+    pub(crate) bootloader_state: BootloaderState,
+
+    pub snapshots: Vec<VmSnapshot>,
+}
+
+/// This structure stores data that accumulates during the VM run.
+#[derive(Debug, PartialEq)]
+pub struct VmExecutionResult {
+    pub events: Vec<VmEvent>,
+    pub storage_log_queries: Vec<StorageLogQuery>,
+    pub used_contract_hashes: Vec<U256>,
+    pub l2_to_l1_logs: Vec<L2ToL1Log>,
+    pub return_data: Vec<u8>,
+
+    /// Value denoting the amount of gas spent withing VM invocation.
+    /// Note that return value represents the difference between the amount of gas
+    /// available to VM before and after execution.
+    ///
+    /// It means, that depending on the context, `gas_used` may represent different things.
+    /// If VM is continuously invoked and interrupted after each tx, this field may represent the
+    /// amount of gas spent by a single transaction.
+    ///
+    /// To understand, which value does `gas_used` represent, see the documentation for the method
+    /// that you use to get `VmExecutionResult` object.
+    ///
+    /// Side note: this may sound confusing, but this arises from the nature of the bootloader: for it,
+    /// processing multiple transactions is a single action. We *may* intrude and stop VM once transaction
+    /// is executed, but it's not enforced. So best we can do is to calculate the amount of gas before and
+    /// after the invocation, leaving the interpretation of this value to the user.
+    pub gas_used: u32,
+    /// This value also depends on the context, the same as `gas_used`.
+    pub computational_gas_used: u32,
+    pub contracts_used: usize,
+    pub revert_reason: Option<VmRevertReasonParsingResult>,
+    pub trace: VmTrace,
+    pub total_log_queries: usize,
+    pub cycles_used: u32,
+}
+
+impl VmExecutionResult {
+    pub fn error_message(&self) -> Option<String> {
+        self.revert_reason
+            .as_ref()
+            .map(|result| result.revert_reason.to_string())
+    }
+}
+
+#[derive(Debug, PartialEq)]
+pub struct VmBlockResult {
+    /// Result for the whole block execution.
+    pub full_result: VmExecutionResult,
+    /// Result for the block tip execution.
+    pub block_tip_result: VmPartialExecutionResult,
+}
+
+#[derive(Debug, Clone, PartialEq)]
+pub struct VmPartialExecutionResult {
+    pub logs: VmExecutionLogs,
+    pub revert_reason: Option<TxRevertReason>,
+    pub contracts_used: usize,
+    pub cycles_used: u32,
+    pub computational_gas_used: u32,
+}
+
+#[derive(Debug, Clone, PartialEq)]
+pub struct VmTxExecutionResult {
+    pub status: TxExecutionStatus,
+    pub result: VmPartialExecutionResult,
+    pub call_traces: Vec<Call>,
+    // Gas refunded to the user at the end of the transaction
+    pub gas_refunded: u32,
+    // Gas proposed by the operator to be refunded, before the postOp call.
+    // This value is needed to correctly recover memory of the bootloader.
+    pub operator_suggested_refund: u32,
+}
+
+#[derive(Debug, Clone, Copy, PartialEq)]
+pub enum VmExecutionStopReason {
+    VmFinished,
+    TracerRequestedStop,
+}
+
+use crate::utils::VmExecutionResult as NewVmExecutionResult;
+
+fn vm_may_have_ended_inner<S: WriteStorage, H: HistoryMode>(
+    vm: &ZkSyncVmState<S, H>,
+) -> Option<NewVmExecutionResult> {
+    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(NewVmExecutionResult::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(NewVmExecutionResult::Panic)
+            } else {
+                let returndata = dump_memory_page_using_primitive_value(&vm.memory, r1);
+                Some(NewVmExecutionResult::Revert(returndata))
+            }
+        }
+        (_, a) => Some(NewVmExecutionResult::MostLikelyDidNotFinish(
+            current_address,
+            a as u16,
+        )),
+    }
+}
+
+// This method returns `VmExecutionResult` struct, but some of the fields are left empty.
+//
+// `gas_before` argument is used to calculate the amount of gas spent by transaction.
+// It is required because the same VM instance is continuously used to apply several transactions.
+fn vm_may_have_ended<H: HistoryMode, S: WriteStorage>(
+    vm: &VmInstance<S, H>,
+    gas_before: u32,
+) -> Option<VmExecutionResult> {
+    let basic_execution_result = vm_may_have_ended_inner(&vm.state)?;
+
+    let gas_used = gas_before
+        .checked_sub(vm.gas_remaining())
+        .expect("underflow");
+
+    match basic_execution_result {
+        NewVmExecutionResult::Ok(data) => {
+            Some(VmExecutionResult {
+                // The correct `events` value for this field should be set separately
+                // later on based on the information inside the event_sink oracle.
+                events: vec![],
+                storage_log_queries: vm.state.storage.get_final_log_queries(),
+                used_contract_hashes: vm.get_used_contracts(),
+                l2_to_l1_logs: vec![],
+                return_data: data,
+                gas_used,
+                // The correct `computational_gas_used` value for this field should be set separately later.
+                computational_gas_used: 0,
+                contracts_used: vm
+                    .state
+                    .decommittment_processor
+                    .get_used_bytecode_hashes()
+                    .len(),
+                revert_reason: None,
+                trace: VmTrace::ExecutionTrace(VmExecutionTrace::default()),
+                total_log_queries: vm.state.event_sink.get_log_queries()
+                    + vm.state.precompiles_processor.get_timestamp_history().len()
+                    + vm.state.storage.get_final_log_queries().len(),
+                cycles_used: vm.state.local_state.monotonic_cycle_counter,
+            })
+        }
+        NewVmExecutionResult::Revert(data) => {
+            let revert_reason = VmRevertReasonParsingResult::new(
+                TxRevertReason::parse_error(data.as_slice()),
+                data,
+            );
+
+            // Check if error indicates a bug in server/vm/bootloader.
+            if matches!(
+                revert_reason.revert_reason,
+                TxRevertReason::UnexpectedVMBehavior(_)
+            ) {
+                tracing::error!(
+                    "Observed error that should never happen: {:?}. Full VM data: {:?}",
+                    revert_reason,
+                    vm
+                );
+            }
+
+            Some(VmExecutionResult {
+                events: vec![],
+                storage_log_queries: vm.state.storage.get_final_log_queries(),
+                used_contract_hashes: vm.get_used_contracts(),
+                l2_to_l1_logs: vec![],
+                return_data: vec![],
+                gas_used,
+                // The correct `computational_gas_used` value for this field should be set separately later.
+                computational_gas_used: 0,
+                contracts_used: vm
+                    .state
+                    .decommittment_processor
+                    .get_used_bytecode_hashes()
+                    .len(),
+                revert_reason: Some(revert_reason),
+                trace: VmTrace::ExecutionTrace(VmExecutionTrace::default()),
+                total_log_queries: vm.state.event_sink.get_log_queries()
+                    + vm.state.precompiles_processor.get_timestamp_history().len()
+                    + vm.state.storage.get_final_log_queries().len(),
+                cycles_used: vm.state.local_state.monotonic_cycle_counter,
+            })
+        }
+        // Panic is effectively the same as Revert, but has different nature.
+        NewVmExecutionResult::Panic => Some(VmExecutionResult {
+            events: vec![],
+            storage_log_queries: vec![],
+            used_contract_hashes: vec![],
+            l2_to_l1_logs: vec![],
+            return_data: vec![],
+            gas_used,
+            // The correct `computational_gas_used` value for this field should be set separately later.
+            computational_gas_used: 0,
+            contracts_used: vm
+                .state
+                .decommittment_processor
+                .get_used_bytecode_hashes()
+                .len(),
+            revert_reason: Some(VmRevertReasonParsingResult {
+                revert_reason: TxRevertReason::Unknown(VmRevertReason::VmError),
+                original_data: vec![],
+            }),
+            trace: VmTrace::ExecutionTrace(VmExecutionTrace::default()),
+            total_log_queries: vm.state.event_sink.get_log_queries()
+                + vm.state.precompiles_processor.get_timestamp_history().len()
+                + vm.state.storage.get_final_log_queries().len(),
+            cycles_used: vm.state.local_state.monotonic_cycle_counter,
+        }),
+        NewVmExecutionResult::MostLikelyDidNotFinish(_, _) => {
+            // The execution has not ended yet. It should either continue
+            // or throw Out-of-gas error.
+            None
+        }
+    }
+}
+
+/// A snapshot of the VM that holds enough information to
+/// rollback the VM to some historical state.
+#[derive(Debug, Clone)]
+pub struct VmSnapshot {
+    local_state: VmLocalState,
+    bootloader_state: BootloaderState,
+}
+
+impl<H: HistoryMode, S: WriteStorage> VmInstance<S, H> {
+    fn has_ended(&self) -> bool {
+        match vm_may_have_ended_inner(&self.state) {
+            None | Some(NewVmExecutionResult::MostLikelyDidNotFinish(_, _)) => false,
+            Some(
+                NewVmExecutionResult::Ok(_)
+                | NewVmExecutionResult::Revert(_)
+                | NewVmExecutionResult::Panic,
+            ) => true,
+        }
+    }
+
+    fn revert_reason(&self) -> Option<VmRevertReasonParsingResult> {
+        match vm_may_have_ended_inner(&self.state) {
+            None
+            | Some(
+                NewVmExecutionResult::MostLikelyDidNotFinish(_, _) | NewVmExecutionResult::Ok(_),
+            ) => None,
+            Some(NewVmExecutionResult::Revert(data)) => {
+                let revert_reason = VmRevertReasonParsingResult::new(
+                    TxRevertReason::parse_error(data.as_slice()),
+                    data,
+                );
+
+                // Check if error indicates a bug in server/vm/bootloader.
+                if matches!(
+                    revert_reason.revert_reason,
+                    TxRevertReason::UnexpectedVMBehavior(_)
+                ) {
+                    tracing::error!(
+                        "Observed error that should never happen: {:?}. Full VM data: {:?}",
+                        revert_reason,
+                        self
+                    );
+                }
+
+                Some(revert_reason)
+            }
+            Some(NewVmExecutionResult::Panic) => Some(VmRevertReasonParsingResult {
+                revert_reason: TxRevertReason::Unknown(VmRevertReason::VmError),
+                original_data: vec![],
+            }),
+        }
+    }
+
+    /// Removes the latest snapshot without rollbacking to it.
+    /// This function expects that there is at least one snapshot present.
+    pub fn pop_snapshot_no_rollback(&mut self) {
+        self.snapshots.pop().unwrap();
+    }
+
+    /// 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
+    }
+
+    /// Returns the amount of gas consumed by the VM so far (based on the `gas_limit` provided
+    /// to initiate the virtual machine).
+    ///
+    /// 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 fn gas_consumed(&self) -> u32 {
+        self.gas_limit
+            .checked_sub(self.gas_remaining())
+            .expect("underflow")
+    }
+
+    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(L1BatchNumber(self.block_context.context.block_number)))
+            .collect();
+        (
+            events,
+            l1_messages.into_iter().map(L2ToL1Log::from).collect(),
+        )
+    }
+
+    fn collect_execution_logs_after_timestamp(&self, from_timestamp: Timestamp) -> VmExecutionLogs {
+        let storage_logs = self
+            .state
+            .storage
+            .storage_log_queries_after_timestamp(from_timestamp)
+            .to_vec();
+        let storage_logs_count = storage_logs.len();
+        let storage_logs = storage_logs.iter().map(|x| **x).collect();
+
+        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,
+        );
+        VmExecutionLogs {
+            storage_logs,
+            events,
+            l2_to_l1_logs,
+            total_log_queries_count: storage_logs_count
+                + log_queries.len()
+                + precompile_calls_count,
+        }
+    }
+
+    /// Executes VM until the end or tracer says to stop.
+    /// Returns a tuple of `VmExecutionStopReason` and the size of the refund proposed by the operator
+    fn execute_with_custom_tracer_and_refunds<
+        T: ExecutionEndTracer<H>
+            + PendingRefundTracer<H>
+            + PubdataSpentTracer<H>
+            + StorageInvocationTracer<H>,
+    >(
+        &mut self,
+        tracer: &mut T,
+    ) -> (VmExecutionStopReason, u32) {
+        let mut operator_refund = None;
+        let timestamp_initial = Timestamp(self.state.local_state.timestamp);
+        let gas_remaining_before = self.gas_remaining();
+        let spent_pubdata_counter_before = self.state.local_state.spent_pubdata_counter;
+
+        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
+            );
+
+            let timestamp_before_cycle = self.state.local_state.timestamp;
+            self.state
+                .cycle(tracer)
+                .expect("Failed execution VM cycle.");
+
+            if self.has_ended() {
+                return (
+                    VmExecutionStopReason::VmFinished,
+                    operator_refund.unwrap_or_default(),
+                );
+            }
+
+            // 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) = tracer.requested_refund() {
+                assert!(
+                    operator_refund.is_none(),
+                    "Operator was asked for refund two times"
+                );
+
+                let gas_spent_on_pubdata = tracer.gas_spent_on_pubdata(&self.state.local_state)
+                    - spent_pubdata_counter_before;
+                let tx_body_refund =
+                    self.tx_body_refund(timestamp_initial, bootloader_refund, gas_spent_on_pubdata);
+
+                if tx_body_refund < bootloader_refund {
+                    tracing::error!(
+                        "Suggested tx body refund is less than bootloader refund. Tx body refund: {}, bootloader refund: {}",
+                        tx_body_refund,
+                        bootloader_refund
+                    );
+                }
+
+                let refund_to_propose = tx_body_refund
+                    + self.block_overhead_refund(
+                        timestamp_initial,
+                        gas_remaining_before,
+                        gas_spent_on_pubdata,
+                    );
+
+                let current_tx_index = self.bootloader_state.tx_to_execute() - 1;
+                let refund_slot = OPERATOR_REFUNDS_OFFSET + current_tx_index;
+
+                // Writing the refund into memory
+                self.state.memory.memory.write_to_memory(
+                    BOOTLOADER_HEAP_PAGE as usize,
+                    refund_slot,
+                    PrimitiveValue {
+                        value: refund_to_propose.into(),
+                        is_pointer: false,
+                    },
+                    Timestamp(timestamp_before_cycle),
+                );
+                operator_refund = Some(refund_to_propose);
+                tracer.set_refund_as_done();
+
+                let tx_gas_limit = self.get_tx_gas_limit(current_tx_index);
+
+                if tx_gas_limit < bootloader_refund {
+                    tracing::error!(
+                        "Tx gas limit is less than bootloader refund. Tx gas limit: {}, bootloader refund: {}",
+                        tx_gas_limit,
+                        bootloader_refund
+                    );
+                }
+                if tx_gas_limit < refund_to_propose {
+                    tracing::error!(
+                        "Tx gas limit is less than operator refund. Tx gas limit: {}, operator refund: {}",
+                        tx_gas_limit,
+                        refund_to_propose
+                    );
+                }
+
+                metrics::histogram!("vm.refund", bootloader_refund as f64 / tx_gas_limit as f64 * 100.0, "type" => "bootloader");
+                metrics::histogram!("vm.refund", refund_to_propose as f64 / tx_gas_limit as f64 * 100.0, "type" => "operator");
+                metrics::histogram!(
+                    "vm.refund.diff",
+                    (refund_to_propose as f64 - bootloader_refund as f64) / tx_gas_limit as f64
+                        * 100.0
+                );
+            }
+
+            tracer.set_missed_storage_invocations(
+                self.state
+                    .storage
+                    .storage
+                    .get_ptr()
+                    .borrow()
+                    .missed_storage_invocations(),
+            );
+
+            if tracer.should_stop_execution() {
+                return (
+                    VmExecutionStopReason::TracerRequestedStop,
+                    operator_refund.unwrap_or_default(),
+                );
+            }
+        }
+    }
+
+    // Executes VM until the end or tracer says to stop.
+    pub(crate) fn execute_with_custom_tracer<
+        T: ExecutionEndTracer<H>
+            + PendingRefundTracer<H>
+            + PubdataSpentTracer<H>
+            + StorageInvocationTracer<H>,
+    >(
+        &mut self,
+        tracer: &mut T,
+    ) -> VmExecutionStopReason {
+        self.execute_with_custom_tracer_and_refunds(tracer).0
+    }
+
+    /// Executes the VM until the end of the next transaction.
+    /// Panics if there are no new transactions in bootloader.
+    /// Internally uses the OneTxTracer to stop the VM when the last opcode from the transaction is reached.
+    // Err when transaction is rejected.
+    // Ok(status: TxExecutionStatus::Success) when the transaction succeeded
+    // Ok(status: TxExecutionStatus::Failure) when the transaction failed.
+    // Note that failed transactions are considered properly processed and are included in blocks
+    pub fn execute_next_tx(
+        &mut self,
+        validation_computational_gas_limit: u32,
+        with_call_tracer: bool,
+    ) -> Result<VmTxExecutionResult, TxRevertReason> {
+        let tx_index = self.bootloader_state.next_unexecuted_tx() as u32;
+
+        let mut tx_tracer: OneTxTracer<H> =
+            OneTxTracer::new(validation_computational_gas_limit, with_call_tracer);
+
+        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, operator_suggested_refund) =
+            self.execute_with_custom_tracer_and_refunds(&mut tx_tracer);
+        match stop_reason {
+            VmExecutionStopReason::VmFinished => {
+                // Bootloader resulted in panic or revert, this means either the transaction is rejected
+                // (e.g. not enough fee or incorrect signature) or bootloader is out of gas.
+
+                // Collect generated events to show bootloader debug logs.
+                let _ = self.collect_events_and_l1_logs_after_timestamp(timestamp_initial);
+
+                let error = if tx_tracer.is_bootloader_out_of_gas() {
+                    TxRevertReason::BootloaderOutOfGas
+                } else {
+                    self.revert_reason()
+                        .expect("vm ended execution prematurely, but no revert reason is given")
+                        .revert_reason
+                };
+                Err(error)
+            }
+            VmExecutionStopReason::TracerRequestedStop => {
+                if tx_tracer.tx_has_been_processed() {
+                    let tx_execution_status =
+                        TxExecutionStatus::from_has_failed(tx_has_failed(&self.state, tx_index));
+                    let vm_execution_logs =
+                        self.collect_execution_logs_after_timestamp(timestamp_initial);
+
+                    let computational_gas_used = calculate_computational_gas_used(
+                        self,
+                        &tx_tracer,
+                        gas_remaining_before,
+                        spent_pubdata_counter_before,
+                    );
+
+                    Ok(VmTxExecutionResult {
+                        gas_refunded: tx_tracer.refund_gas,
+                        operator_suggested_refund,
+                        status: tx_execution_status,
+                        result: VmPartialExecutionResult {
+                            logs: vm_execution_logs,
+                            // If there is a revert Err is already returned above.
+                            revert_reason: None,
+                            // getting contracts used during this transaction
+                            // at least for now the number returned here is always <= to the number
+                            // of the code hashes actually used by the transaction, since it might've
+                            // reused bytecode hashes from some of the previous ones.
+                            contracts_used: self
+                                .state
+                                .decommittment_processor
+                                .get_decommitted_bytecodes_after_timestamp(timestamp_initial),
+                            cycles_used: self.state.local_state.monotonic_cycle_counter
+                                - cycles_initial,
+                            computational_gas_used,
+                        },
+                        call_traces: tx_tracer.call_traces(),
+                    })
+                } else if tx_tracer.validation_run_out_of_gas() {
+                    Err(TxRevertReason::ValidationFailed(VmRevertReason::General {
+                        msg: format!(
+                            "Took too many computational gas, allowed limit: {}",
+                            validation_computational_gas_limit
+                        ),
+                        data: vec![],
+                    }))
+                } else {
+                    // VM ended up in state
+                    // `stop_reason == VmExecutionStopReason::TracerRequestedStop && !tx_tracer.tx_has_been_processed() && !tx_tracer.validation_run_out_of_gas()`.
+                    // It means that bootloader successfully finished its execution without executing the transaction.
+                    // It is an unexpected situation.
+                    panic!("VM successfully finished executing bootloader but transaction wasn't executed");
+                }
+            }
+        }
+    }
+
+    /// Returns full VM result and partial result produced within the current execution.
+    pub fn execute_till_block_end(&mut self, job_type: BootloaderJobType) -> VmBlockResult {
+        self.execute_till_block_end_with_tracer(
+            job_type,
+            &mut TransactionResultTracer::new(self.execution_mode.invocation_limit(), false),
+        )
+    }
+
+    pub fn execute_till_block_end_with_call_tracer(
+        &mut self,
+        job_type: BootloaderJobType,
+    ) -> VmBlockResult {
+        let mut tracer = TransactionResultTracer::new(self.execution_mode.invocation_limit(), true);
+        let mut block_result = self.execute_till_block_end_with_tracer(job_type, &mut tracer);
+        block_result.full_result.trace = VmTrace::CallTrace(tracer.call_trace().unwrap());
+        block_result
+    }
+
+    fn execute_till_block_end_with_tracer(
+        &mut self,
+        job_type: BootloaderJobType,
+        tx_result_tracer: &mut TransactionResultTracer<H>,
+    ) -> VmBlockResult {
+        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_custom_tracer(tx_result_tracer);
+        match stop_reason {
+            VmExecutionStopReason::VmFinished => {
+                let mut full_result = vm_may_have_ended(self, gas_remaining_before).unwrap();
+
+                let computational_gas_used = calculate_computational_gas_used(
+                    self,
+                    tx_result_tracer,
+                    gas_remaining_before,
+                    spent_pubdata_counter_before,
+                );
+
+                if job_type == BootloaderJobType::TransactionExecution
+                    && tx_has_failed(&self.state, 0)
+                    && full_result.revert_reason.is_none()
+                {
+                    let revert_reason = tx_result_tracer
+                        .revert_reason
+                        .clone()
+                        .map(|reason| {
+                            let vm_revert_reason = VmRevertReason::try_from(reason.as_slice())
+                                .unwrap_or_else(|_| VmRevertReason::Unknown {
+                                    function_selector: vec![],
+                                    data: reason.clone(),
+                                });
+
+                            VmRevertReasonParsingResult {
+                                revert_reason: TxRevertReason::TxReverted(vm_revert_reason),
+                                original_data: reason,
+                            }
+                        })
+                        .unwrap_or_else(|| VmRevertReasonParsingResult {
+                            revert_reason: TxRevertReason::TxReverted(VmRevertReason::General {
+                                msg: "Transaction reverted with empty reason. Possibly out of gas"
+                                    .to_string(),
+                                data: vec![],
+                            }),
+                            original_data: vec![],
+                        });
+
+                    full_result.revert_reason = Some(revert_reason);
+                }
+
+                let block_tip_result = VmPartialExecutionResult {
+                    logs: self.collect_execution_logs_after_timestamp(timestamp_initial),
+                    revert_reason: full_result.revert_reason.clone().map(|r| r.revert_reason),
+                    contracts_used: self
+                        .state
+                        .decommittment_processor
+                        .get_decommitted_bytecodes_after_timestamp(timestamp_initial),
+                    cycles_used: self.state.local_state.monotonic_cycle_counter - cycles_initial,
+                    computational_gas_used,
+                };
+
+                // Collecting `block_tip_result` needs logs with timestamp, so we drain events for the `full_result`
+                // after because draining will drop timestamps.
+                let (_full_history, raw_events, l1_messages) = self.state.event_sink.flatten();
+                full_result.events = merge_events(raw_events)
+                    .into_iter()
+                    .map(|e| {
+                        e.into_vm_event(L1BatchNumber(self.block_context.context.block_number))
+                    })
+                    .collect();
+                full_result.l2_to_l1_logs = l1_messages.into_iter().map(L2ToL1Log::from).collect();
+                full_result.computational_gas_used = block_tip_result.computational_gas_used;
+                VmBlockResult {
+                    full_result,
+                    block_tip_result,
+                }
+            }
+            VmExecutionStopReason::TracerRequestedStop => {
+                metrics::increment_counter!("runtime_context.execution.dropped");
+
+                if tx_result_tracer.is_limit_reached() {
+                    VmBlockResult {
+                        // Normally tracer should never stop, but if it's transaction call and it consumes
+                        // too much requests to memory, we stop execution and return error.
+                        full_result: VmExecutionResult {
+                            events: vec![],
+                            storage_log_queries: vec![],
+                            used_contract_hashes: vec![],
+                            l2_to_l1_logs: vec![],
+                            return_data: vec![],
+                            gas_used: 0,
+                            computational_gas_used: 0,
+                            contracts_used: 0,
+                            revert_reason: Some(VmRevertReasonParsingResult {
+                                revert_reason: TxRevertReason::MissingInvocationLimitReached,
+                                original_data: vec![],
+                            }),
+                            trace: VmTrace::ExecutionTrace(VmExecutionTrace::default()),
+                            total_log_queries: 0,
+                            cycles_used: 0,
+                        },
+                        block_tip_result: VmPartialExecutionResult {
+                            logs: Default::default(),
+                            revert_reason: Some(TxRevertReason::MissingInvocationLimitReached),
+                            contracts_used: 0,
+                            cycles_used: 0,
+                            computational_gas_used: 0,
+                        },
+                    }
+                } else {
+                    unreachable!(
+                        "Tracer should never stop execution, except MissingInvocationLimitReached"
+                    );
+                }
+            }
+        }
+    }
+
+    /// Unlike `execute_till_block_end` methods returns only result for the block tip execution.
+    pub fn execute_block_tip(&mut self) -> VmPartialExecutionResult {
+        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 mut bootloader_tracer: BootloaderTracer<H> = BootloaderTracer::default();
+
+        let stop_reason = self.execute_with_custom_tracer(&mut bootloader_tracer);
+        let revert_reason = match stop_reason {
+            VmExecutionStopReason::VmFinished => {
+                // Bootloader panicked or reverted.
+                let revert_reason = if bootloader_tracer.is_bootloader_out_of_gas() {
+                    TxRevertReason::BootloaderOutOfGas
+                } else {
+                    self.revert_reason()
+                        .expect("vm ended execution prematurely, but no revert reason is given")
+                        .revert_reason
+                };
+                Some(revert_reason)
+            }
+            VmExecutionStopReason::TracerRequestedStop => {
+                // Bootloader finished successfully.
+                None
+            }
+        };
+
+        let computational_gas_used = calculate_computational_gas_used(
+            self,
+            &bootloader_tracer,
+            gas_remaining_before,
+            spent_pubdata_counter_before,
+        );
+        VmPartialExecutionResult {
+            logs: self.collect_execution_logs_after_timestamp(timestamp_initial),
+            revert_reason,
+            contracts_used: self
+                .state
+                .decommittment_processor
+                .get_decommitted_bytecodes_after_timestamp(timestamp_initial),
+            cycles_used: self.state.local_state.monotonic_cycle_counter - cycles_initial,
+            computational_gas_used,
+        }
+    }
+
+    pub fn execute_validation(
+        &mut self,
+        validation_params: ValidationTracerParams,
+    ) -> Result<(), ValidationError> {
+        let mut validation_tracer: ValidationTracer<S, H> = ValidationTracer::new(
+            self.state.storage.storage.inner().get_ptr(),
+            validation_params,
+        );
+
+        let stop_reason = self.execute_with_custom_tracer(&mut validation_tracer);
+
+        match (stop_reason, validation_tracer.validation_error) {
+            (VmExecutionStopReason::VmFinished, _) => {
+                // The tx should only end in case of a revert, so it is safe to unwrap here
+                Err(ValidationError::FailedTx(self.revert_reason().unwrap()))
+            }
+            (VmExecutionStopReason::TracerRequestedStop, Some(err)) => {
+                Err(ValidationError::ViolatedRule(err))
+            }
+            (VmExecutionStopReason::TracerRequestedStop, None) => Ok(()),
+        }
+    }
+
+    /// Returns the keys of contracts that are already loaded (known) by bootloader.
+    pub(crate) fn get_used_contracts(&self) -> Vec<U256> {
+        self.state
+            .decommittment_processor
+            .decommitted_code_hashes
+            .inner()
+            .keys()
+            .cloned()
+            .collect()
+    }
+
+    pub fn number_of_updated_storage_slots(&self) -> usize {
+        self.state
+            .storage
+            .storage
+            .inner()
+            .get_ptr()
+            .borrow_mut()
+            .modified_storage_keys()
+            .len()
+    }
+}
+
+impl<S: WriteStorage> VmInstance<S, HistoryEnabled> {
+    /// Saves the snapshot of the current state of the VM that can be used
+    /// to roll back its state later on.
+    pub fn save_current_vm_as_snapshot(&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.clone(),
+        });
+    }
+
+    fn rollback_to_snapshot(&mut self, snapshot: VmSnapshot) {
+        let VmSnapshot {
+            local_state,
+            bootloader_state,
+        } = snapshot;
+
+        let timestamp = Timestamp(local_state.timestamp);
+
+        tracing::trace!("Rolling back decomitter");
+        self.state
+            .decommittment_processor
+            .rollback_to_timestamp(timestamp);
+
+        tracing::trace!("Rolling back event_sink");
+        self.state.event_sink.rollback_to_timestamp(timestamp);
+
+        tracing::trace!("Rolling back storage");
+        self.state.storage.rollback_to_timestamp(timestamp);
+
+        tracing::trace!("Rolling back memory");
+        self.state.memory.rollback_to_timestamp(timestamp);
+
+        tracing::trace!("Rolling back precompiles_processor");
+        self.state
+            .precompiles_processor
+            .rollback_to_timestamp(timestamp);
+        self.state.local_state = local_state;
+        self.bootloader_state = bootloader_state;
+    }
+
+    /// Rollbacks the state of the VM to the state of the latest snapshot.
+    pub fn rollback_to_latest_snapshot(&mut self) {
+        let snapshot = self.snapshots.last().cloned().unwrap();
+        self.rollback_to_snapshot(snapshot);
+    }
+
+    /// Rollbacks the state of the VM to the state of the latest snapshot.
+    /// Removes that snapshot from the list.
+    pub fn rollback_to_latest_snapshot_popping(&mut self) {
+        let snapshot = self.snapshots.pop().unwrap();
+        self.rollback_to_snapshot(snapshot);
+    }
+}
+
+// Reads the bootloader memory and checks whether the execution step of the transaction
+// has failed.
+pub(crate) fn tx_has_failed<H: HistoryMode, S: WriteStorage>(
+    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/vm/src/vm_with_bootloader.rs b/core/multivm_deps/vm_1_3_2/src/vm_with_bootloader.rs
similarity index 95%
rename from core/lib/vm/src/vm_with_bootloader.rs
rename to core/multivm_deps/vm_1_3_2/src/vm_with_bootloader.rs
index bf5237e363e1..89243da0cd92 100644
--- a/core/lib/vm/src/vm_with_bootloader.rs
+++ b/core/multivm_deps/vm_1_3_2/src/vm_with_bootloader.rs
@@ -26,6 +26,7 @@ use zksync_utils::{
 };
 
 use itertools::Itertools;
+use zksync_state::WriteStorage;
 
 use crate::{
     bootloader_state::BootloaderState,
@@ -38,6 +39,8 @@ use crate::{
     OracleTools, VmInstance,
 };
 
+// TODO (SMA-1703): move these to config and make them programmatically generatable.
+// fill these values in the similar fasion as other overhead-related constants
 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;
@@ -212,13 +215,13 @@ impl Default for TxExecutionMode {
     }
 }
 
-pub fn init_vm<'a, H: HistoryMode>(
-    oracle_tools: &'a mut OracleTools<'a, false, H>,
+pub fn init_vm<S: WriteStorage, H: HistoryMode>(
+    oracle_tools: OracleTools<S, false, H>,
     block_context: BlockContextMode,
-    block_properties: &'a BlockProperties,
+    block_properties: BlockProperties,
     execution_mode: TxExecutionMode,
     base_system_contract: &BaseSystemContracts,
-) -> Box<VmInstance<'a, H>> {
+) -> Box<VmInstance<S, H>> {
     init_vm_with_gas_limit(
         oracle_tools,
         block_context,
@@ -229,14 +232,14 @@ pub fn init_vm<'a, H: HistoryMode>(
     )
 }
 
-pub fn init_vm_with_gas_limit<'a, H: HistoryMode>(
-    oracle_tools: &'a mut OracleTools<'a, false, H>,
+pub fn init_vm_with_gas_limit<S: WriteStorage, H: HistoryMode>(
+    oracle_tools: OracleTools<S, false, H>,
     block_context: BlockContextMode,
-    block_properties: &'a BlockProperties,
+    block_properties: BlockProperties,
     execution_mode: TxExecutionMode,
     base_system_contract: &BaseSystemContracts,
     gas_limit: u32,
-) -> Box<VmInstance<'a, H>> {
+) -> Box<VmInstance<S, H>> {
     init_vm_inner(
         oracle_tools,
         block_context,
@@ -324,14 +327,14 @@ impl BlockContextMode {
 
 // This method accepts a custom bootloader code.
 // It should be used only in tests.
-pub fn init_vm_inner<'a, H: HistoryMode>(
-    oracle_tools: &'a mut OracleTools<'a, false, H>,
+pub fn init_vm_inner<S: WriteStorage, H: HistoryMode>(
+    mut oracle_tools: OracleTools<S, false, H>,
     block_context: BlockContextMode,
-    block_properties: &'a BlockProperties,
+    block_properties: BlockProperties,
     gas_limit: u32,
     base_system_contract: &BaseSystemContracts,
     execution_mode: TxExecutionMode,
-) -> Box<VmInstance<'a, H>> {
+) -> Box<VmInstance<S, H>> {
     let start = Instant::now();
 
     oracle_tools.decommittment_processor.populate(
@@ -419,8 +422,8 @@ pub fn get_bootloader_memory(
     memory
 }
 
-pub fn push_transaction_to_bootloader_memory<H: HistoryMode>(
-    vm: &mut VmInstance<H>,
+pub fn push_transaction_to_bootloader_memory<H: HistoryMode, S: WriteStorage>(
+    vm: &mut VmInstance<S, H>,
     tx: &Transaction,
     execution_mode: TxExecutionMode,
     explicit_compressed_bytecodes: Option<Vec<CompressedBytecodeInfo>>,
@@ -437,8 +440,8 @@ pub fn push_transaction_to_bootloader_memory<H: HistoryMode>(
     );
 }
 
-pub fn push_raw_transaction_to_bootloader_memory<H: HistoryMode>(
-    vm: &mut VmInstance<H>,
+pub fn push_raw_transaction_to_bootloader_memory<H: HistoryMode, S: WriteStorage>(
+    vm: &mut VmInstance<S, H>,
     tx: TransactionData,
     execution_mode: TxExecutionMode,
     predefined_overhead: u32,
@@ -617,18 +620,18 @@ pub(crate) fn get_bootloader_memory_for_encoded_tx(
     memory
 }
 
-fn get_default_local_state<'a, H: HistoryMode>(
-    tools: &'a mut OracleTools<'a, false, H>,
-    block_properties: &'a BlockProperties,
+fn get_default_local_state<S: WriteStorage, H: HistoryMode>(
+    tools: OracleTools<S, false, H>,
+    block_properties: BlockProperties,
     gas_limit: u32,
-) -> ZkSyncVmState<'a, H> {
+) -> ZkSyncVmState<S, H> {
     let mut vm = VmState::empty_state(
-        &mut tools.storage,
-        &mut tools.memory,
-        &mut tools.event_sink,
-        &mut tools.precompiles_processor,
-        &mut tools.decommittment_processor,
-        &mut tools.witness_tracer,
+        tools.storage,
+        tools.memory,
+        tools.event_sink,
+        tools.precompiles_processor,
+        tools.decommittment_processor,
+        tools.witness_tracer,
         block_properties,
     );
     // Override ergs limit for the initial frame.
diff --git a/core/multivm_deps/vm_m5/Cargo.toml b/core/multivm_deps/vm_m5/Cargo.toml
index 34fd8477b486..e9f20ea9d319 100644
--- a/core/multivm_deps/vm_m5/Cargo.toml
+++ b/core/multivm_deps/vm_m5/Cargo.toml
@@ -4,28 +4,28 @@ version = "0.1.0"
 edition = "2018"
 authors = ["The Matter Labs Team <hello@matterlabs.dev>"]
 homepage = "https://zksync.io/"
-repository = "https://github.com/matter-labs/zksync-era"
+repository = "https://github.com/matter-labs/zksync-2"
 license = "Apache-2.0"
 keywords = ["blockchain", "zksync"]
 categories = ["cryptography"]
 
 [dependencies]
-zksync_crypto = { path = "../../lib/crypto", version = "1.0" }
-zksync_types = { path = "../../lib/types", version = "1.0" }
-zksync_utils = { path = "../../lib/utils", version = "1.0" }
-zksync_config = { path = "../../lib/config", version = "1.0" }
-zksync_state = { path = "../../lib/state", version = "1.0" }
-zksync_storage = { path = "../../lib/storage", version = "1.0" }
+zksync_crypto = { path = "../../lib/crypto" }
+zksync_types = { path = "../../lib/types" }
+zksync_utils = { path = "../../lib/utils" }
+zksync_config = { path = "../../lib/config" }
+zksync_state = { path = "../../lib/state" }
+zksync_storage = { path = "../../lib/storage" }
 
-zk_evm = { git = "https://github.com/matter-labs/era-zk_evm.git", branch = "v1.3.1" }
+zk_evm = { git = "https://github.com/matter-labs/era-zk_evm.git", tag = "v1.3.1-rc0" }
 zksync_contracts = { path = "../../lib/contracts" }
 
 hex = "0.4"
 thiserror = "1.0"
 itertools = "0.10"
 once_cell = "1.7"
-vlog = { path = "../../lib/vlog", version = "1.0" }
-metrics = "0.20"
+vlog = { path = "../../lib/vlog" }
+metrics = "0.21"
 
 tracing = "0.1"
 
diff --git a/core/multivm_deps/vm_m5/src/bootloader_state.rs b/core/multivm_deps/vm_m5/src/bootloader_state.rs
index 40d53c047c7e..33ef26961bfb 100644
--- a/core/multivm_deps/vm_m5/src/bootloader_state.rs
+++ b/core/multivm_deps/vm_m5/src/bootloader_state.rs
@@ -66,6 +66,7 @@ impl BootloaderState {
 
     /// Returns the size of the transaction with given index.
     /// Panics if there is no such transaction.
+    /// Use it after TODO (SMA-1715): make users pay for the overhead
     #[allow(dead_code)]
     pub(crate) fn get_tx_size(&self, tx_index: usize) -> usize {
         self.tx_sizes[tx_index]
diff --git a/core/multivm_deps/vm_m5/src/errors/vm_revert_reason.rs b/core/multivm_deps/vm_m5/src/errors/vm_revert_reason.rs
index a38b99935e92..e8686cb75f41 100644
--- a/core/multivm_deps/vm_m5/src/errors/vm_revert_reason.rs
+++ b/core/multivm_deps/vm_m5/src/errors/vm_revert_reason.rs
@@ -99,7 +99,7 @@ impl TryFrom<&[u8]> for VmRevertReason {
                     function_selector: function_selector.to_vec(),
                     data: error_data.to_vec(),
                 };
-                vlog::warn!("Unsupported error type: {}", result);
+                tracing::warn!("Unsupported error type: {}", result);
                 Ok(result)
             }
         }
diff --git a/core/multivm_deps/vm_m5/src/glue.rs b/core/multivm_deps/vm_m5/src/glue.rs
index 5897f55f790c..6ba7f0f4a478 100644
--- a/core/multivm_deps/vm_m5/src/glue.rs
+++ b/core/multivm_deps/vm_m5/src/glue.rs
@@ -24,17 +24,15 @@ impl<T> GlueFrom<T> for T {
     }
 }
 
-impl GlueFrom<zk_evm::aux_structures::Timestamp>
-    for zksync_types::zk_evm::aux_structures::Timestamp
-{
+impl GlueFrom<zk_evm::aux_structures::Timestamp> for zksync_types::Timestamp {
     fn glue_from(timestamp: zk_evm::aux_structures::Timestamp) -> Self {
-        zksync_types::zk_evm::aux_structures::Timestamp(timestamp.0)
+        zksync_types::Timestamp(timestamp.0)
     }
 }
 
-impl GlueFrom<zk_evm::aux_structures::LogQuery> for zksync_types::zk_evm::aux_structures::LogQuery {
+impl GlueFrom<zk_evm::aux_structures::LogQuery> for zksync_types::LogQuery {
     fn glue_from(query: zk_evm::aux_structures::LogQuery) -> Self {
-        zksync_types::zk_evm::aux_structures::LogQuery {
+        zksync_types::LogQuery {
             address: query.address,
             key: query.key,
             written_value: query.written_value,
@@ -50,16 +48,14 @@ impl GlueFrom<zk_evm::aux_structures::LogQuery> for zksync_types::zk_evm::aux_st
     }
 }
 
-impl GlueFrom<zksync_types::zk_evm::aux_structures::Timestamp>
-    for zk_evm::aux_structures::Timestamp
-{
-    fn glue_from(timestamp: zksync_types::zk_evm::aux_structures::Timestamp) -> Self {
+impl GlueFrom<zksync_types::Timestamp> for zk_evm::aux_structures::Timestamp {
+    fn glue_from(timestamp: zksync_types::Timestamp) -> Self {
         zk_evm::aux_structures::Timestamp(timestamp.0)
     }
 }
 
-impl GlueFrom<zksync_types::zk_evm::aux_structures::LogQuery> for zk_evm::aux_structures::LogQuery {
-    fn glue_from(query: zksync_types::zk_evm::aux_structures::LogQuery) -> Self {
+impl GlueFrom<zksync_types::LogQuery> for zk_evm::aux_structures::LogQuery {
+    fn glue_from(query: zksync_types::LogQuery) -> Self {
         zk_evm::aux_structures::LogQuery {
             address: query.address,
             key: query.key,
@@ -76,11 +72,9 @@ impl GlueFrom<zksync_types::zk_evm::aux_structures::LogQuery> for zk_evm::aux_st
     }
 }
 
-impl GlueFrom<zk_evm::reference_impls::event_sink::EventMessage>
-    for zksync_types::zk_evm::reference_impls::event_sink::EventMessage
-{
+impl GlueFrom<zk_evm::reference_impls::event_sink::EventMessage> for zksync_types::EventMessage {
     fn glue_from(event: zk_evm::reference_impls::event_sink::EventMessage) -> Self {
-        zksync_types::zk_evm::reference_impls::event_sink::EventMessage {
+        zksync_types::EventMessage {
             shard_id: event.shard_id,
             is_first: event.is_first,
             tx_number_in_block: event.tx_number_in_block,
diff --git a/core/multivm_deps/vm_m5/src/history_recorder.rs b/core/multivm_deps/vm_m5/src/history_recorder.rs
index 1f673675957f..8631c0c35036 100644
--- a/core/multivm_deps/vm_m5/src/history_recorder.rs
+++ b/core/multivm_deps/vm_m5/src/history_recorder.rs
@@ -3,7 +3,7 @@ use std::{
     hash::{BuildHasherDefault, Hash, Hasher},
 };
 
-use crate::storage::StoragePtr;
+use crate::storage::{Storage, StoragePtr};
 
 use zk_evm::{
     aux_structures::Timestamp,
@@ -570,21 +570,21 @@ impl HistoryRecorder<MemoryWrapper> {
 
 #[derive(Debug)]
 
-pub struct StorageWrapper<'a> {
-    storage_ptr: StoragePtr<'a>,
+pub struct StorageWrapper<S> {
+    storage_ptr: StoragePtr<S>,
 }
 
-impl<'a> StorageWrapper<'a> {
-    pub fn new(storage_ptr: StoragePtr<'a>) -> Self {
+impl<S: Storage> StorageWrapper<S> {
+    pub fn new(storage_ptr: StoragePtr<S>) -> Self {
         Self { storage_ptr }
     }
 
-    pub fn get_ptr(&self) -> StoragePtr<'a> {
+    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().get_value(key))
+        h256_to_u256(self.storage_ptr.as_ref().borrow_mut().get_value(key))
     }
 }
 
@@ -594,7 +594,7 @@ pub struct StorageHistoryRecord {
     pub value: U256,
 }
 
-impl<'a> WithHistory for StorageWrapper<'a> {
+impl<S: Storage> WithHistory for StorageWrapper<S> {
     type HistoryRecord = StorageHistoryRecord;
     type ReturnValue = U256;
 
@@ -617,7 +617,7 @@ impl<'a> WithHistory for StorageWrapper<'a> {
     }
 }
 
-impl<'a> HistoryRecorder<StorageWrapper<'a>> {
+impl<S: Storage> HistoryRecorder<StorageWrapper<S>> {
     pub fn read_from_storage(&self, key: &StorageKey) -> U256 {
         self.inner.read_from_storage(key)
     }
@@ -629,7 +629,7 @@ impl<'a> HistoryRecorder<StorageWrapper<'a>> {
     /// 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<'a> {
+    pub fn get_ptr(&self) -> StoragePtr<S> {
         self.inner.get_ptr()
     }
 }
diff --git a/core/multivm_deps/vm_m5/src/oracle_tools.rs b/core/multivm_deps/vm_m5/src/oracle_tools.rs
index 3df462d554af..a3d368457987 100644
--- a/core/multivm_deps/vm_m5/src/oracle_tools.rs
+++ b/core/multivm_deps/vm_m5/src/oracle_tools.rs
@@ -1,9 +1,7 @@
 use crate::memory::SimpleMemory;
 use crate::vm::MultiVMSubversion;
-use std::cell::RefCell;
 
 use std::fmt::Debug;
-use std::rc::Rc;
 
 use crate::event_sink::InMemoryEventSink;
 use crate::oracles::decommitter::DecommitterOracle;
@@ -13,28 +11,26 @@ use crate::storage::{Storage, StoragePtr};
 use zk_evm::witness_trace::DummyTracer;
 
 #[derive(Debug)]
-pub struct OracleTools<'a, const B: bool> {
-    pub storage: StorageOracle<'a>,
+pub struct OracleTools<const B: bool, S: Storage> {
+    pub storage: StorageOracle<S>,
     pub memory: SimpleMemory,
     pub event_sink: InMemoryEventSink,
     pub precompiles_processor: PrecompilesProcessorWithHistory<B>,
-    pub decommittment_processor: DecommitterOracle<'a, B>,
+    pub decommittment_processor: DecommitterOracle<S, B>,
     pub witness_tracer: DummyTracer,
-    pub storage_view: StoragePtr<'a>,
+    pub storage_view: StoragePtr<S>,
 }
 
-impl<'a> OracleTools<'a, false> {
-    pub fn new(storage_view: &'a mut dyn Storage, refund_state: MultiVMSubversion) -> Self {
-        let pointer: Rc<RefCell<&'a mut dyn Storage>> = Rc::new(RefCell::new(storage_view));
-
+impl<S: Storage> OracleTools<false, S> {
+    pub fn new(storage_pointer: StoragePtr<S>, refund_state: MultiVMSubversion) -> Self {
         Self {
-            storage: StorageOracle::new(pointer.clone(), refund_state),
+            storage: StorageOracle::new(storage_pointer.clone(), refund_state),
             memory: SimpleMemory::default(),
             event_sink: InMemoryEventSink::default(),
             precompiles_processor: PrecompilesProcessorWithHistory::default(),
-            decommittment_processor: DecommitterOracle::new(pointer.clone()),
+            decommittment_processor: DecommitterOracle::new(storage_pointer.clone()),
             witness_tracer: DummyTracer {},
-            storage_view: pointer,
+            storage_view: storage_pointer,
         }
     }
 }
diff --git a/core/multivm_deps/vm_m5/src/oracles/decommitter.rs b/core/multivm_deps/vm_m5/src/oracles/decommitter.rs
index a431c6f003bf..4498869d03e7 100644
--- a/core/multivm_deps/vm_m5/src/oracles/decommitter.rs
+++ b/core/multivm_deps/vm_m5/src/oracles/decommitter.rs
@@ -1,7 +1,7 @@
 use std::collections::HashMap;
 
 use crate::history_recorder::HistoryRecorder;
-use crate::storage::StoragePtr;
+use crate::storage::{Storage, StoragePtr};
 
 use zk_evm::abstractions::MemoryType;
 use zk_evm::aux_structures::Timestamp;
@@ -9,6 +9,7 @@ use zk_evm::{
     abstractions::{DecommittmentProcessor, Memory},
     aux_structures::{DecommittmentQuery, MemoryIndex, MemoryLocation, MemoryPage, MemoryQuery},
 };
+
 use zksync_types::U256;
 use zksync_utils::bytecode::bytecode_len_in_words;
 use zksync_utils::{bytes_to_be_words, u256_to_h256};
@@ -16,9 +17,9 @@ use zksync_utils::{bytes_to_be_words, u256_to_h256};
 use super::OracleWithHistory;
 
 #[derive(Debug)]
-pub struct DecommitterOracle<'a, const B: bool> {
+pub struct DecommitterOracle<S, const B: bool> {
     /// Pointer that enables to read contract bytecodes from the database.
-    storage: StoragePtr<'a>,
+    storage: StoragePtr<S>,
     /// The cache of bytecodes that the bootloader "knows", but that are not necessarily in the database.
     pub known_bytecodes: HistoryRecorder<HashMap<U256, Vec<U256>>>,
     /// Stores pages of memory where certain code hashes have already been decommitted.
@@ -27,8 +28,8 @@ pub struct DecommitterOracle<'a, const B: bool> {
     decommitment_requests: HistoryRecorder<Vec<()>>,
 }
 
-impl<'a, const B: bool> DecommitterOracle<'a, B> {
-    pub fn new(storage: StoragePtr<'a>) -> Self {
+impl<S: Storage, const B: bool> DecommitterOracle<S, B> {
+    pub fn new(storage: StoragePtr<S>) -> Self {
         Self {
             storage,
             known_bytecodes: Default::default(),
@@ -48,6 +49,7 @@ impl<'a, const B: bool> DecommitterOracle<'a, B> {
                 // code hash which we didn't previously claim to know the preimage of.
                 let value = self
                     .storage
+                    .as_ref()
                     .borrow_mut()
                     .load_factory_dep(u256_to_h256(hash))
                     .expect("Trying to decode unexisting hash");
@@ -100,12 +102,12 @@ impl<'a, const B: bool> DecommitterOracle<'a, B> {
         &self.decommitted_code_hashes
     }
 
-    pub fn get_storage(&self) -> StoragePtr<'a> {
+    pub fn get_storage(&self) -> StoragePtr<S> {
         self.storage.clone()
     }
 }
 
-impl<'a, const B: bool> OracleWithHistory for DecommitterOracle<'a, B> {
+impl<S: Storage, const B: bool> OracleWithHistory for DecommitterOracle<S, B> {
     fn rollback_to_timestamp(&mut self, timestamp: Timestamp) {
         self.decommitted_code_hashes
             .rollback_to_timestamp(timestamp);
@@ -120,7 +122,7 @@ impl<'a, const B: bool> OracleWithHistory for DecommitterOracle<'a, B> {
     }
 }
 
-impl<'a, const B: bool> DecommittmentProcessor for DecommitterOracle<'a, B> {
+impl<S: Storage, const B: bool> DecommittmentProcessor for DecommitterOracle<S, B> {
     fn decommit_into_memory<M: Memory>(
         &mut self,
         monotonic_cycle_counter: u32,
diff --git a/core/multivm_deps/vm_m5/src/oracles/storage.rs b/core/multivm_deps/vm_m5/src/oracles/storage.rs
index cb9fb8f7b8ab..ac0a431a1cf4 100644
--- a/core/multivm_deps/vm_m5/src/oracles/storage.rs
+++ b/core/multivm_deps/vm_m5/src/oracles/storage.rs
@@ -1,7 +1,7 @@
 use std::collections::HashMap;
 
 use crate::glue::GlueInto;
-use crate::storage::StoragePtr;
+use crate::storage::{Storage, StoragePtr};
 
 use crate::history_recorder::{
     AppDataFrameManagerWithHistory, HashMapHistoryEvent, HistoryRecorder, StorageWrapper,
@@ -15,6 +15,7 @@ use zk_evm::{
     aux_structures::{LogQuery, Timestamp},
     reference_impls::event_sink::ApplicationData,
 };
+
 use zksync_types::utils::storage_key_for_eth_balance;
 use zksync_types::{
     AccountTreeId, Address, StorageKey, StorageLogQuery, StorageLogQueryType, BOOTLOADER_ADDRESS,
@@ -35,11 +36,11 @@ pub fn storage_key_of_log(query: &LogQuery) -> StorageKey {
 }
 
 #[derive(Debug)]
-pub struct StorageOracle<'a> {
+pub struct StorageOracle<S: Storage> {
     // 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 storage: HistoryRecorder<StorageWrapper<'a>>,
+    pub storage: HistoryRecorder<StorageWrapper<S>>,
 
     pub frames_stack: AppDataFrameManagerWithHistory<StorageLogQuery>,
 
@@ -51,7 +52,7 @@ pub struct StorageOracle<'a> {
     pub refund_state: MultiVMSubversion,
 }
 
-impl<'a> OracleWithHistory for StorageOracle<'a> {
+impl<S: Storage> OracleWithHistory for StorageOracle<S> {
     fn rollback_to_timestamp(&mut self, timestamp: Timestamp) {
         self.frames_stack.rollback_to_timestamp(timestamp);
         self.storage.rollback_to_timestamp(timestamp);
@@ -65,8 +66,8 @@ impl<'a> OracleWithHistory for StorageOracle<'a> {
     }
 }
 
-impl<'a> StorageOracle<'a> {
-    pub fn new(storage: StoragePtr<'a>, refund_state: MultiVMSubversion) -> Self {
+impl<S: Storage> StorageOracle<S> {
+    pub fn new(storage: StoragePtr<S>, refund_state: MultiVMSubversion) -> Self {
         Self {
             storage: HistoryRecorder::from_inner(StorageWrapper::new(storage)),
             frames_stack: Default::default(),
@@ -158,6 +159,7 @@ impl<'a> StorageOracle<'a> {
     }
 
     // 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);
 
@@ -174,7 +176,7 @@ impl<'a> StorageOracle<'a> {
     }
 }
 
-impl<'a> VmStorageOracle for StorageOracle<'a> {
+impl<S: Storage> VmStorageOracle for StorageOracle<S> {
     // 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(
@@ -182,7 +184,7 @@ impl<'a> VmStorageOracle for StorageOracle<'a> {
         _monotonic_cycle_counter: u32,
         query: LogQuery,
     ) -> LogQuery {
-        // vlog::trace!(
+        // tracing::trace!(
         //     "execute partial query cyc {:?} addr {:?} key {:?}, rw {:?}, wr {:?}, tx {:?}",
         //     _monotonic_cycle_counter,
         //     query.address,
@@ -251,7 +253,7 @@ impl<'a> VmStorageOracle for StorageOracle<'a> {
                 let read_value = match query.log_type {
                     StorageLogQueryType::Read => {
                         // Having Read logs in rollback is not possible
-                        vlog::warn!("Read log in rollback queue {:?}", query);
+                        tracing::warn!("Read log in rollback queue {:?}", query);
                         continue;
                     }
                     StorageLogQueryType::InitialWrite | StorageLogQueryType::RepeatedWrite => {
@@ -296,6 +298,8 @@ impl<'a> VmStorageOracle for StorageOracle<'a> {
 }
 
 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::zkevm_opcode_defs::system_params::INITIAL_STORAGE_WRITE_PUBDATA_BYTES as u32
     } else {
diff --git a/core/multivm_deps/vm_m5/src/oracles/tracer.rs b/core/multivm_deps/vm_m5/src/oracles/tracer.rs
index 4104c8100be3..73a9721f0f81 100644
--- a/core/multivm_deps/vm_m5/src/oracles/tracer.rs
+++ b/core/multivm_deps/vm_m5/src/oracles/tracer.rs
@@ -1,3 +1,4 @@
+use std::fmt::Debug;
 use std::{
     collections::HashSet,
     fmt::{self, Display},
@@ -12,6 +13,7 @@ use crate::{
     vm_with_bootloader::BOOTLOADER_HEAP_PAGE,
 };
 // use zk_evm::testing::memory::SimpleMemory;
+use crate::storage::Storage;
 use zk_evm::{
     abstractions::{
         AfterDecodingData, AfterExecutionData, BeforeExecutionData, Tracer, VmLocalStateData,
@@ -24,6 +26,7 @@ use zk_evm::{
         LogOpcode, Opcode, RetOpcode, UMAOpcode,
     },
 };
+
 use zksync_types::{
     get_code_key, web3::signing::keccak256, AccountTreeId, Address, StorageKey,
     ACCOUNT_CODE_STORAGE_ADDRESS, BOOTLOADER_ADDRESS, CONTRACT_DEPLOYER_ADDRESS, H256,
@@ -182,7 +185,7 @@ fn touches_allowed_context(address: Address, key: U256) -> bool {
     key == U256::from(0u32)
 }
 
-fn is_constant_code_hash(address: Address, key: U256, storage: StoragePtr<'_>) -> bool {
+fn is_constant_code_hash<S: Storage>(address: Address, key: U256, storage: StoragePtr<S>) -> bool {
     if address != ACCOUNT_CODE_STORAGE_ADDRESS {
         // Not a code hash
         return false;
@@ -206,9 +209,9 @@ fn valid_eth_token_call(address: Address, msg_sender: Address) -> bool {
 /// Tracer that is used to ensure that the validation adheres to all the rules
 /// to prevent DDoS attacks on the server.
 #[derive(Clone)]
-pub struct ValidationTracer<'a> {
+pub struct ValidationTracer<S> {
     // A copy of it should be used in the Storage oracle
-    pub storage: StoragePtr<'a>,
+    pub storage: StoragePtr<S>,
     pub validation_mode: ValidationTracerMode,
     pub auxilary_allowed_slots: HashSet<H256>,
     pub validation_error: Option<ViolatedValidationRule>,
@@ -221,7 +224,7 @@ pub struct ValidationTracer<'a> {
     trusted_address_slots: HashSet<(Address, U256)>,
 }
 
-impl fmt::Debug for ValidationTracer<'_> {
+impl<S> fmt::Debug for ValidationTracer<S> {
     fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
         f.debug_struct("ValidationTracer")
             .field("storage", &"StoragePtr")
@@ -260,8 +263,8 @@ pub struct NewTrustedValidationItems {
 
 type ValidationRoundResult = Result<NewTrustedValidationItems, ViolatedValidationRule>;
 
-impl<'a> ValidationTracer<'a> {
-    pub fn new(storage: StoragePtr<'a>, params: ValidationTracerParams) -> Self {
+impl<S: Storage> ValidationTracer<S> {
+    pub fn new(storage: StoragePtr<S>, params: ValidationTracerParams) -> Self {
         ValidationTracer {
             storage,
             validation_error: None,
@@ -426,6 +429,7 @@ impl<'a> ValidationTracer<'a> {
                         return Err(ViolatedValidationRule::TouchedUnallowedContext);
                     }
                     ContextOpcode::ErgsLeft => {
+                        // TODO (SMA-1168): implement the correct restrictions for the gas left opcode.
                     }
                     _ => {}
                 }
@@ -461,7 +465,7 @@ impl<'a> ValidationTracer<'a> {
     }
 }
 
-impl Tracer for ValidationTracer<'_> {
+impl<S: Storage> Tracer for ValidationTracer<S> {
     const CALL_BEFORE_EXECUTION: bool = true;
 
     type SupportedMemory = SimpleMemory;
@@ -536,14 +540,14 @@ fn get_calldata_page_via_abi(far_call_abi: &FarCallABI, base_page: MemoryPage) -
     }
 }
 
-impl ExecutionEndTracer for ValidationTracer<'_> {
+impl<S: Storage> ExecutionEndTracer for ValidationTracer<S> {
     fn should_stop_execution(&self) -> bool {
         self.should_stop_execution || self.validation_error.is_some()
     }
 }
 
-impl PendingRefundTracer for ValidationTracer<'_> {}
-impl PubdataSpentTracer for ValidationTracer<'_> {}
+impl<S: Storage> PendingRefundTracer for ValidationTracer<S> {}
+impl<S: Storage> PubdataSpentTracer for ValidationTracer<S> {}
 
 /// Allows any opcodes, but tells the VM to end the execution once the tx is over.
 #[derive(Debug, Clone, Default)]
@@ -846,5 +850,5 @@ fn print_debug_if_needed(hook: &VmHook, state: &VmLocalStateData<'_>, memory: &S
         _ => return,
     };
 
-    vlog::trace!("{}", log);
+    tracing::trace!("{}", log);
 }
diff --git a/core/multivm_deps/vm_m5/src/pubdata_utils.rs b/core/multivm_deps/vm_m5/src/pubdata_utils.rs
index af5ea6d4dc97..f2e1f94082bd 100644
--- a/core/multivm_deps/vm_m5/src/pubdata_utils.rs
+++ b/core/multivm_deps/vm_m5/src/pubdata_utils.rs
@@ -1,15 +1,17 @@
 use crate::glue::GlueInto;
 use crate::oracles::storage::storage_key_of_log;
+use crate::storage::Storage;
 use crate::utils::collect_storage_log_queries_after_timestamp;
 use crate::VmInstance;
 use std::collections::HashMap;
 use zk_evm::aux_structures::Timestamp;
+
 use zksync_types::event::{extract_long_l2_to_l1_messages, extract_published_bytecodes};
 use zksync_types::zkevm_test_harness::witness::sort_storage_access::sort_storage_access_queries;
 use zksync_types::{StorageKey, PUBLISH_BYTECODE_OVERHEAD, SYSTEM_CONTEXT_ADDRESS};
 use zksync_utils::bytecode::bytecode_len_in_bytes;
 
-impl<'a> VmInstance<'a> {
+impl<'a, S: Storage> VmInstance<'a, S> {
     pub fn pubdata_published(&self, from_timestamp: Timestamp) -> u32 {
         let storage_writes_pubdata_published = self.pubdata_published_for_writes(from_timestamp);
 
diff --git a/core/multivm_deps/vm_m5/src/refunds.rs b/core/multivm_deps/vm_m5/src/refunds.rs
index 78db47bbfad2..1764d5ec2503 100644
--- a/core/multivm_deps/vm_m5/src/refunds.rs
+++ b/core/multivm_deps/vm_m5/src/refunds.rs
@@ -1,12 +1,14 @@
+use crate::storage::Storage;
 use crate::vm_with_bootloader::{
     eth_price_per_pubdata_byte, BOOTLOADER_HEAP_PAGE, TX_GAS_LIMIT_OFFSET,
 };
 use crate::VmInstance;
 use zk_evm::aux_structures::Timestamp;
+
 use zksync_types::U256;
 use zksync_utils::ceil_div_u256;
 
-impl<'a> VmInstance<'a> {
+impl<'a, S: Storage> VmInstance<'a, S> {
     pub(crate) fn tx_body_refund(
         &self,
         from_timestamp: Timestamp,
@@ -20,7 +22,7 @@ impl<'a> VmInstance<'a> {
         let gas_spent_on_computation = total_gas_spent
             .checked_sub(gas_spent_on_pubdata)
             .unwrap_or_else(|| {
-                vlog::error!(
+                tracing::error!(
                     "Gas spent on pubdata is greater than total gas spent. On pubdata: {}, total: {}",
                     gas_spent_on_pubdata,
                     total_gas_spent
@@ -51,7 +53,7 @@ impl<'a> VmInstance<'a> {
             + 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(|| {
-            vlog::error!(
+            tracing::error!(
                 "Fair fee is greater than pre paid. Fair fee: {} wei, pre paid: {} wei",
                 fair_fee_eth,
                 pre_paid_eth
@@ -71,13 +73,14 @@ impl<'a> VmInstance<'a> {
         _gas_remaining_before: u32,
         _gas_spent_on_pubdata: u32,
     ) -> u32 {
+        // TODO (SMA-1715): Make users pay for the block overhead
         0
 
         // let pubdata_published = self.pubdata_published(from_timestamp);
         //
         // let total_gas_spent = gas_remaining_before - self.gas_remaining();
         // let gas_spent_on_computation = total_gas_spent.checked_sub(gas_spent_on_pubdata).unwrap_or_else(|| {
-        //     vlog::error!("Gas spent on pubdata is greater than total gas spent. On pubdata: {}, total: {}", gas_spent_on_pubdata, total_gas_spent);
+        //     tracing::error!("Gas spent on pubdata is greater than total gas spent. On pubdata: {}, total: {}", gas_spent_on_pubdata, total_gas_spent);
         //     0
         // });
         // let (_, l2_to_l1_logs) = self.collect_events_and_l1_logs_after_timestamp(from_timestamp);
@@ -108,9 +111,9 @@ impl<'a> VmInstance<'a> {
         //     predefined_overhead - actual_overhead
         // } else {
         //     // This should never happen but potential mistakes at the early stage should not bring the server down.
-        //
+        //     // TODO (SMA-1700): log addition information (e.g overhead for each of criteria: pubdata, single-instance circuits capacity etc)
         //     //   to make debugging easier.
-        //     vlog::error!(
+        //     tracing::error!(
         //         "Actual overhead is greater than predefined one, actual: {}, predefined: {}",
         //         actual_overhead,
         //         predefined_overhead
@@ -119,6 +122,7 @@ impl<'a> VmInstance<'a> {
         // }
     }
 
+    // TODO (SMA-1715): Make users pay for the block overhead
     #[allow(dead_code)]
     fn actual_overhead_gas(
         _gas_per_pubdata_byte_limit: u32,
diff --git a/core/multivm_deps/vm_m5/src/storage.rs b/core/multivm_deps/vm_m5/src/storage.rs
index 09bd611e91a3..0dac2dbf4473 100644
--- a/core/multivm_deps/vm_m5/src/storage.rs
+++ b/core/multivm_deps/vm_m5/src/storage.rs
@@ -6,7 +6,7 @@ use std::rc::Rc;
 use zksync_state::{ReadStorage, StorageView, WriteStorage};
 use zksync_types::{StorageKey, StorageValue, H256};
 
-pub trait Storage: Debug + Sync + Send {
+pub trait Storage: Debug {
     fn get_value(&mut self, key: &StorageKey) -> StorageValue;
     // Returns the original value.
     fn set_value(&mut self, key: &StorageKey, value: StorageValue) -> StorageValue;
@@ -18,7 +18,7 @@ pub trait Storage: Debug + Sync + Send {
     fn get_modified_storage_keys(&self) -> &HashMap<StorageKey, StorageValue>;
 }
 
-impl<S: ReadStorage + Debug + Send + Sync> Storage for StorageView<S> {
+impl<S: ReadStorage + Debug> Storage for StorageView<S> {
     fn get_value(&mut self, key: &StorageKey) -> StorageValue {
         ReadStorage::read_value(self, key)
     }
@@ -45,4 +45,4 @@ impl<S: ReadStorage + Debug + Send + Sync> Storage for StorageView<S> {
     }
 }
 
-pub type StoragePtr<'a> = Rc<RefCell<&'a mut dyn Storage>>;
+pub type StoragePtr<S> = Rc<RefCell<S>>;
diff --git a/core/multivm_deps/vm_m5/src/test_utils.rs b/core/multivm_deps/vm_m5/src/test_utils.rs
index 907dcae8f0fc..13cb91a57829 100644
--- a/core/multivm_deps/vm_m5/src/test_utils.rs
+++ b/core/multivm_deps/vm_m5/src/test_utils.rs
@@ -12,6 +12,7 @@ use itertools::Itertools;
 use zk_evm::{
     aux_structures::Timestamp, reference_impls::event_sink::ApplicationData, vm_state::VmLocalState,
 };
+use zksync_contracts::test_contracts::LoadnextContractExecutionParams;
 use zksync_contracts::{deployer_contract, get_loadnext_contract, load_contract};
 use zksync_types::{
     ethabi::{Address, Token},
@@ -22,10 +23,10 @@ use zksync_types::{
     CONTRACT_DEPLOYER_ADDRESS, H256, U256,
 };
 use zksync_utils::{
-    address_to_h256, bytecode::hash_bytecode, h256_to_account_address,
-    test_utils::LoadnextContractExecutionParams, u256_to_h256,
+    address_to_h256, bytecode::hash_bytecode, h256_to_account_address, u256_to_h256,
 };
 
+use crate::storage::Storage;
 /// The tests here help us with the testing the VM
 use crate::{
     event_sink::InMemoryEventSink,
@@ -90,7 +91,7 @@ pub struct VmInstanceInnerState {
     local_state: VmLocalState,
 }
 
-impl<'a> VmInstance<'a> {
+impl<'a, S: Storage> VmInstance<'a, S> {
     /// This method is mostly to be used in tests. It dumps the inner state of all the oracles and the VM itself.
     pub fn dump_inner_state(&self) -> VmInstanceInnerState {
         let event_sink = self.state.event_sink.clone();
diff --git a/core/multivm_deps/vm_m5/src/transaction_data.rs b/core/multivm_deps/vm_m5/src/transaction_data.rs
index 578d254547ee..a49599af3381 100644
--- a/core/multivm_deps/vm_m5/src/transaction_data.rs
+++ b/core/multivm_deps/vm_m5/src/transaction_data.rs
@@ -35,6 +35,7 @@ pub struct TransactionData {
     // 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 factory_deps: Vec<Vec<u8>>,
     pub paymaster_input: Vec<u8>,
     pub reserved_dynamic: Vec<u8>,
@@ -164,6 +165,7 @@ impl TransactionData {
 
     pub fn overhead_gas(&self) -> u32 {
         if self.tx_type != L1_TX_TYPE {
+            // TODO (SMA-1715): Make users pay for the block overhead
             return 0;
         }
 
@@ -473,6 +475,7 @@ mod tests {
             // 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],
diff --git a/core/multivm_deps/vm_m5/src/vm.rs b/core/multivm_deps/vm_m5/src/vm.rs
index 1e4ddc2dc031..d8244f203534 100644
--- a/core/multivm_deps/vm_m5/src/vm.rs
+++ b/core/multivm_deps/vm_m5/src/vm.rs
@@ -7,11 +7,11 @@ use zk_evm::witness_trace::DummyTracer;
 use zk_evm::zkevm_opcode_defs::decoding::{AllowedPcOrImm, EncodingModeProduction, VmEncodingMode};
 use zk_evm::zkevm_opcode_defs::definitions::RET_IMPLICIT_RETURNDATA_PARAMS_REGISTER;
 use zksync_config::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::vm_trace::VmExecutionTrace;
 use zksync_types::{L1BatchNumber, StorageLogQuery, VmEvent, U256};
-use zksync_utils::bytes_to_be_words;
 
 use crate::bootloader_state::BootloaderState;
 use crate::errors::{TxRevertReason, VmRevertReason, VmRevertReasonParsingResult};
@@ -27,6 +27,7 @@ use crate::oracles::tracer::{
     TransactionResultTracer, ValidationError, ValidationTracer, ValidationTracerParams,
 };
 use crate::oracles::OracleWithHistory;
+use crate::storage::Storage;
 use crate::utils::{
     collect_log_queries_after_timestamp, collect_storage_log_queries_after_timestamp,
     dump_memory_page_using_primitive_value, precompile_calls_count_after_timestamp,
@@ -35,15 +36,14 @@ use crate::vm_with_bootloader::{
     BootloaderJobType, DerivedBlockContext, TxExecutionMode, BOOTLOADER_HEAP_PAGE,
     OPERATOR_REFUNDS_OFFSET,
 };
-use crate::Word;
 
-pub type ZkSyncVmState<'a> = VmState<
+pub type ZkSyncVmState<'a, S> = VmState<
     'a,
-    StorageOracle<'a>,
+    StorageOracle<S>,
     SimpleMemory,
     InMemoryEventSink,
     PrecompilesProcessorWithHistory<false>,
-    DecommitterOracle<'a, false>,
+    DecommitterOracle<S, false>,
     DummyTracer,
 >;
 
@@ -70,7 +70,7 @@ pub(crate) fn get_vm_hook_params(memory: &SimpleMemory) -> Vec<U256> {
 /// E.g., initially they were completely disabled.
 ///
 /// This enum allows to execute blocks with the same VM but different support for refunds.
-#[derive(Debug)]
+#[derive(Debug, Copy, Clone)]
 pub enum MultiVMSubversion {
     /// Initial VM M5 version, refunds are fully disabled.
     V1,
@@ -79,9 +79,9 @@ pub enum MultiVMSubversion {
 }
 
 #[derive(Debug)]
-pub struct VmInstance<'a> {
+pub struct VmInstance<'a, S: Storage> {
     pub gas_limit: u32,
-    pub state: ZkSyncVmState<'a>,
+    pub state: ZkSyncVmState<'a, S>,
     pub execution_mode: TxExecutionMode,
     pub block_context: DerivedBlockContext,
     pub(crate) bootloader_state: BootloaderState,
@@ -99,7 +99,7 @@ pub struct VmExecutionResult {
     pub storage_log_queries: Vec<StorageLogQuery>,
     pub used_contract_hashes: Vec<U256>,
     pub l2_to_l1_logs: Vec<L2ToL1Log>,
-    pub return_data: Vec<Word>,
+    pub return_data: Vec<u8>,
 
     /// Value denoting the amount of gas spent withing VM invocation.
     /// Note that return value represents the difference between the amount of gas
@@ -167,13 +167,13 @@ pub enum VmExecutionStopReason {
 
 use crate::utils::VmExecutionResult as NewVmExecutionResult;
 
-fn vm_may_have_ended_inner<const B: bool>(
+fn vm_may_have_ended_inner<const B: bool, S: Storage>(
     vm: &VmState<
-        StorageOracle,
+        StorageOracle<S>,
         SimpleMemory,
         InMemoryEventSink,
         PrecompilesProcessorWithHistory<B>,
-        DecommitterOracle<B>,
+        DecommitterOracle<S, B>,
         DummyTracer,
     >,
 ) -> Option<NewVmExecutionResult> {
@@ -213,16 +213,13 @@ fn vm_may_have_ended_inner<const B: bool>(
 //
 // `gas_before` argument is used to calculate the amount of gas spent by transaction.
 // It is required because the same VM instance is continuously used to apply several transactions.
-fn vm_may_have_ended(vm: &VmInstance, gas_before: u32) -> Option<VmExecutionResult> {
+fn vm_may_have_ended<S: Storage>(vm: &VmInstance<S>, gas_before: u32) -> Option<VmExecutionResult> {
     let basic_execution_result = vm_may_have_ended_inner(&vm.state)?;
 
     let gas_used = gas_before - vm.gas_remaining();
 
     match basic_execution_result {
-        NewVmExecutionResult::Ok(mut data) => {
-            while data.len() % 32 != 0 {
-                data.push(0)
-            }
+        NewVmExecutionResult::Ok(data) => {
             Some(VmExecutionResult {
                 // The correct `events` value for this field should be set separately
                 // later on based on the information inside the event_sink oracle.
@@ -230,7 +227,7 @@ fn vm_may_have_ended(vm: &VmInstance, gas_before: u32) -> Option<VmExecutionResu
                 storage_log_queries: vm.get_final_log_queries(),
                 used_contract_hashes: vm.get_used_contracts(),
                 l2_to_l1_logs: vec![],
-                return_data: bytes_to_be_words(data),
+                return_data: data,
                 gas_used,
                 contracts_used: vm
                     .state
@@ -256,7 +253,7 @@ fn vm_may_have_ended(vm: &VmInstance, gas_before: u32) -> Option<VmExecutionResu
                 revert_reason.revert_reason,
                 TxRevertReason::UnexpectedVMBehavior(_)
             ) {
-                vlog::error!(
+                tracing::error!(
                     "Observed error that should never happen: {:?}. Full VM data: {:?}",
                     revert_reason,
                     vm
@@ -322,7 +319,7 @@ pub struct VmSnapshot {
     bootloader_state: BootloaderState,
 }
 
-impl<'a> VmInstance<'a> {
+impl<'a, S: Storage> VmInstance<'a, S> {
     fn has_ended(&self) -> bool {
         match vm_may_have_ended_inner(&self.state) {
             None | Some(NewVmExecutionResult::MostLikelyDidNotFinish(_, _)) => false,
@@ -351,7 +348,7 @@ impl<'a> VmInstance<'a> {
                     revert_reason.revert_reason,
                     TxRevertReason::UnexpectedVMBehavior(_)
                 ) {
-                    vlog::error!(
+                    tracing::error!(
                         "Observed error that should never happen: {:?}. Full VM data: {:?}",
                         revert_reason,
                         self
@@ -389,21 +386,21 @@ impl<'a> VmInstance<'a> {
 
         let timestamp = Timestamp(local_state.timestamp);
 
-        vlog::trace!("Rolling back decomitter");
+        tracing::trace!("Rolling back decomitter");
         self.state
             .decommittment_processor
             .rollback_to_timestamp(timestamp);
 
-        vlog::trace!("Rolling back event_sink");
+        tracing::trace!("Rolling back event_sink");
         self.state.event_sink.rollback_to_timestamp(timestamp);
 
-        vlog::trace!("Rolling back storage");
+        tracing::trace!("Rolling back storage");
         self.state.storage.rollback_to_timestamp(timestamp);
 
-        vlog::trace!("Rolling back memory");
+        tracing::trace!("Rolling back memory");
         self.state.memory.rollback_to_timestamp(timestamp);
 
-        vlog::trace!("Rolling back precompiles_processor");
+        tracing::trace!("Rolling back precompiles_processor");
         self.state
             .precompiles_processor
             .rollback_to_timestamp(timestamp);
@@ -462,11 +459,7 @@ impl<'a> VmInstance<'a> {
             events,
             l1_messages
                 .into_iter()
-                .map(|log| {
-                    L2ToL1Log::from(GlueInto::<
-                        zksync_types::zk_evm::reference_impls::event_sink::EventMessage,
-                    >::glue_into(log))
-                })
+                .map(|log| L2ToL1Log::from(GlueInto::<zksync_types::EventMessage>::glue_into(log)))
                 .collect(),
         )
     }
@@ -568,7 +561,7 @@ impl<'a> VmInstance<'a> {
                         );
 
                         if tx_body_refund < bootloader_refund {
-                            vlog::error!(
+                            tracing::error!(
                         "Suggested tx body refund is less than bootloader refund. Tx body refund: {}, bootloader refund: {}",
                         tx_body_refund,
                         bootloader_refund
@@ -750,9 +743,7 @@ impl<'a> VmInstance<'a> {
                 full_result.l2_to_l1_logs = l1_messages
                     .into_iter()
                     .map(|log| {
-                        L2ToL1Log::from(GlueInto::<
-                            zksync_types::zk_evm::reference_impls::event_sink::EventMessage,
-                        >::glue_into(log))
+                        L2ToL1Log::from(GlueInto::<zksync_types::EventMessage>::glue_into(log))
                     })
                     .collect();
                 VmBlockResult {
@@ -867,7 +858,7 @@ impl<'a> VmInstance<'a> {
 
 // Reads the bootloader memory and checks whether the execution step of the transaction
 // has failed.
-pub(crate) fn tx_has_failed(state: &ZkSyncVmState<'_>, tx_id: u32) -> bool {
+pub(crate) fn tx_has_failed<S: Storage>(state: &ZkSyncVmState<'_, S>, tx_id: u32) -> bool {
     let mem_slot = RESULT_SUCCESS_FIRST_SLOT + tx_id;
     let mem_value = state
         .memory
diff --git a/core/multivm_deps/vm_m5/src/vm_with_bootloader.rs b/core/multivm_deps/vm_m5/src/vm_with_bootloader.rs
index 5f9546f39ff8..2addd7fe99b6 100644
--- a/core/multivm_deps/vm_m5/src/vm_with_bootloader.rs
+++ b/core/multivm_deps/vm_m5/src/vm_with_bootloader.rs
@@ -21,6 +21,7 @@ use zksync_utils::{
     address_to_u256, bytecode::hash_bytecode, bytes_to_be_words, h256_to_u256, misc::ceil_div,
 };
 
+use crate::storage::Storage;
 use crate::{
     bootloader_state::BootloaderState,
     oracles::OracleWithHistory,
@@ -32,6 +33,8 @@ use crate::{
     OracleTools, VmInstance,
 };
 
+// TODO (SMA-1703): move these to config and make them programmatically generatable.
+// fill these values in the similar fasion as other overhead-related constants
 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;
@@ -174,14 +177,14 @@ impl Default for TxExecutionMode {
     }
 }
 
-pub fn init_vm<'a>(
+pub fn init_vm<'a, S: Storage>(
     refund_state: MultiVMSubversion,
-    oracle_tools: &'a mut OracleTools<'a, false>,
+    oracle_tools: &'a mut OracleTools<false, S>,
     block_context: BlockContextMode,
     block_properties: &'a BlockProperties,
     execution_mode: TxExecutionMode,
     base_system_contract: &BaseSystemContracts,
-) -> Box<VmInstance<'a>> {
+) -> Box<VmInstance<'a, S>> {
     init_vm_with_gas_limit(
         refund_state,
         oracle_tools,
@@ -193,15 +196,15 @@ pub fn init_vm<'a>(
     )
 }
 
-pub fn init_vm_with_gas_limit<'a>(
+pub fn init_vm_with_gas_limit<'a, S: Storage>(
     refund_state: MultiVMSubversion,
-    oracle_tools: &'a mut OracleTools<'a, false>,
+    oracle_tools: &'a mut OracleTools<false, S>,
     block_context: BlockContextMode,
     block_properties: &'a BlockProperties,
     execution_mode: TxExecutionMode,
     base_system_contract: &BaseSystemContracts,
     gas_limit: u32,
-) -> Box<VmInstance<'a>> {
+) -> Box<VmInstance<'a, S>> {
     init_vm_inner(
         refund_state,
         oracle_tools,
@@ -290,15 +293,15 @@ impl BlockContextMode {
 
 // This method accepts a custom bootloader code.
 // It should be used only in tests.
-pub fn init_vm_inner<'a>(
+pub fn init_vm_inner<'a, S: Storage>(
     refund_state: MultiVMSubversion,
-    oracle_tools: &'a mut OracleTools<'a, false>,
+    oracle_tools: &'a mut OracleTools<false, S>,
     block_context: BlockContextMode,
     block_properties: &'a BlockProperties,
     gas_limit: u32,
     base_system_contract: &BaseSystemContracts,
     execution_mode: TxExecutionMode,
-) -> Box<VmInstance<'a>> {
+) -> Box<VmInstance<'a, S>> {
     let start = Instant::now();
 
     oracle_tools.decommittment_processor.populate(
@@ -368,8 +371,8 @@ pub fn get_bootloader_memory(
     memory
 }
 
-pub fn push_transaction_to_bootloader_memory(
-    vm: &mut VmInstance,
+pub fn push_transaction_to_bootloader_memory<S: Storage>(
+    vm: &mut VmInstance<S>,
     tx: &Transaction,
     execution_mode: TxExecutionMode,
 ) {
@@ -378,8 +381,8 @@ pub fn push_transaction_to_bootloader_memory(
     push_raw_transaction_to_bootloader_memory(vm, tx, execution_mode, overhead);
 }
 
-pub fn push_raw_transaction_to_bootloader_memory(
-    vm: &mut VmInstance,
+pub fn push_raw_transaction_to_bootloader_memory<S: Storage>(
+    vm: &mut VmInstance<S>,
     tx: TransactionData,
     execution_mode: TxExecutionMode,
     predefined_overhead: u32,
@@ -472,11 +475,11 @@ pub(crate) fn get_bootloader_memory_for_encoded_tx(
     memory
 }
 
-fn get_default_local_state<'a>(
-    tools: &'a mut OracleTools<'a, false>,
+fn get_default_local_state<'a, S: Storage>(
+    tools: &'a mut OracleTools<false, S>,
     block_properties: &'a BlockProperties,
     gas_limit: u32,
-) -> ZkSyncVmState<'a> {
+) -> ZkSyncVmState<'a, S> {
     let mut vm = VmState::empty_state(
         &mut tools.storage,
         &mut tools.memory,
diff --git a/core/multivm_deps/vm_m6/Cargo.toml b/core/multivm_deps/vm_m6/Cargo.toml
index 756da12ff412..3333de9f8595 100644
--- a/core/multivm_deps/vm_m6/Cargo.toml
+++ b/core/multivm_deps/vm_m6/Cargo.toml
@@ -10,23 +10,23 @@ keywords = ["blockchain", "zksync"]
 categories = ["cryptography"]
 
 [dependencies]
-zkevm-assembly = { git = "https://github.com/matter-labs/era-zkEVM-assembly.git", branch = "v1.3.1" }
-zksync_crypto = { path = "../../lib/crypto", version = "1.0" }
-zksync_types = { path = "../../lib/types", version = "1.0" }
-zksync_utils = { path = "../../lib/utils", version = "1.0" }
-zksync_config = { path = "../../lib/config", version = "1.0" }
-zksync_state = {path = "../../lib/state", version = "1.0" }
-zksync_storage = {path = "../../lib/storage", version = "1.0" }
+zkevm-assembly = { git = "https://github.com/matter-labs/era-zkEVM-assembly.git", tag = "v1.3.1-rc0" }
+zksync_crypto = { path = "../../lib/crypto" }
+zksync_types = { path = "../../lib/types" }
+zksync_utils = { path = "../../lib/utils" }
+zksync_config = { path = "../../lib/config" }
+zksync_state = { path = "../../lib/state" }
+zksync_storage = { path = "../../lib/storage" }
 
-zk_evm = {git = "https://github.com/matter-labs/era-zk_evm.git", branch = "v1.3.1"}
+zk_evm = { git = "https://github.com/matter-labs/era-zk_evm.git", tag = "v1.3.1-rc0" }
 zksync_contracts = { path = "../../lib/contracts" }
 
 hex = "0.4"
 thiserror = "1.0"
 itertools = "0.10"
 once_cell = "1.7"
-vlog = { path = "../../lib/vlog", version = "1.0" }
-metrics = "0.20"
+vlog = { path = "../../lib/vlog" }
+metrics = "0.21"
 
 tracing = "0.1"
 
diff --git a/core/multivm_deps/vm_m6/src/bootloader_state.rs b/core/multivm_deps/vm_m6/src/bootloader_state.rs
index 2ecb845dfa64..8832a59dc50e 100644
--- a/core/multivm_deps/vm_m6/src/bootloader_state.rs
+++ b/core/multivm_deps/vm_m6/src/bootloader_state.rs
@@ -69,6 +69,7 @@ impl BootloaderState {
 
     /// Returns the size of the transaction with given index.
     /// Panics if there is no such transaction.
+    /// Use it after TODO (SMA-1715): make users pay for the overhead
     #[allow(dead_code)]
     pub(crate) fn get_tx_size(&self, tx_index: usize) -> usize {
         self.tx_sizes[tx_index]
diff --git a/core/multivm_deps/vm_m6/src/errors/vm_revert_reason.rs b/core/multivm_deps/vm_m6/src/errors/vm_revert_reason.rs
index 93d6cd370705..f8e9d704ff87 100644
--- a/core/multivm_deps/vm_m6/src/errors/vm_revert_reason.rs
+++ b/core/multivm_deps/vm_m6/src/errors/vm_revert_reason.rs
@@ -32,8 +32,8 @@ pub enum VmRevertReason {
 
 impl VmRevertReason {
     const GENERAL_ERROR_SELECTOR: &'static [u8] = &[0x08, 0xc3, 0x79, 0xa0];
-    fn parse_general_error(original_bytes: &[u8]) -> Result<Self, VmRevertReasonParsingError> {
-        let bytes = &original_bytes[4..];
+    fn parse_general_error(raw_bytes: &[u8]) -> Result<Self, VmRevertReasonParsingError> {
+        let bytes = &raw_bytes[4..];
         if bytes.len() < 32 {
             return Err(VmRevertReasonParsingError::InputIsTooShort(bytes.to_vec()));
         }
@@ -65,7 +65,7 @@ impl VmRevertReason {
         let raw_data = &data[32..32 + string_length];
         Ok(Self::General {
             msg: String::from_utf8_lossy(raw_data).to_string(),
-            data: original_bytes.to_vec(),
+            data: raw_bytes.to_vec(),
         })
     }
 
@@ -118,7 +118,7 @@ impl TryFrom<&[u8]> for VmRevertReason {
                     function_selector: function_selector.to_vec(),
                     data: bytes.to_vec(),
                 };
-                vlog::warn!("Unsupported error type: {}", result);
+                tracing::warn!("Unsupported error type: {}", result);
                 Ok(result)
             }
         }
diff --git a/core/multivm_deps/vm_m6/src/glue.rs b/core/multivm_deps/vm_m6/src/glue.rs
index 5bf70ecc77d8..a36ec390bf6e 100644
--- a/core/multivm_deps/vm_m6/src/glue.rs
+++ b/core/multivm_deps/vm_m6/src/glue.rs
@@ -24,17 +24,15 @@ impl<T> GlueFrom<T> for T {
     }
 }
 
-impl GlueFrom<zk_evm::aux_structures::Timestamp>
-    for zksync_types::zk_evm::aux_structures::Timestamp
-{
+impl GlueFrom<zk_evm::aux_structures::Timestamp> for zksync_types::Timestamp {
     fn glue_from(timestamp: zk_evm::aux_structures::Timestamp) -> Self {
-        zksync_types::zk_evm::aux_structures::Timestamp(timestamp.0)
+        zksync_types::Timestamp(timestamp.0)
     }
 }
 
-impl GlueFrom<zk_evm::aux_structures::LogQuery> for zksync_types::zk_evm::aux_structures::LogQuery {
+impl GlueFrom<zk_evm::aux_structures::LogQuery> for zksync_types::LogQuery {
     fn glue_from(query: zk_evm::aux_structures::LogQuery) -> Self {
-        zksync_types::zk_evm::aux_structures::LogQuery {
+        zksync_types::LogQuery {
             address: query.address,
             key: query.key,
             written_value: query.written_value,
@@ -50,16 +48,14 @@ impl GlueFrom<zk_evm::aux_structures::LogQuery> for zksync_types::zk_evm::aux_st
     }
 }
 
-impl GlueFrom<zksync_types::zk_evm::aux_structures::Timestamp>
-    for zk_evm::aux_structures::Timestamp
-{
-    fn glue_from(timestamp: zksync_types::zk_evm::aux_structures::Timestamp) -> Self {
+impl GlueFrom<zksync_types::Timestamp> for zk_evm::aux_structures::Timestamp {
+    fn glue_from(timestamp: zksync_types::Timestamp) -> Self {
         zk_evm::aux_structures::Timestamp(timestamp.0)
     }
 }
 
-impl GlueFrom<zksync_types::zk_evm::aux_structures::LogQuery> for zk_evm::aux_structures::LogQuery {
-    fn glue_from(query: zksync_types::zk_evm::aux_structures::LogQuery) -> Self {
+impl GlueFrom<zksync_types::LogQuery> for zk_evm::aux_structures::LogQuery {
+    fn glue_from(query: zksync_types::LogQuery) -> Self {
         zk_evm::aux_structures::LogQuery {
             address: query.address,
             key: query.key,
@@ -76,11 +72,9 @@ impl GlueFrom<zksync_types::zk_evm::aux_structures::LogQuery> for zk_evm::aux_st
     }
 }
 
-impl GlueFrom<zk_evm::reference_impls::event_sink::EventMessage>
-    for zksync_types::zk_evm::reference_impls::event_sink::EventMessage
-{
+impl GlueFrom<zk_evm::reference_impls::event_sink::EventMessage> for zksync_types::EventMessage {
     fn glue_from(event: zk_evm::reference_impls::event_sink::EventMessage) -> Self {
-        zksync_types::zk_evm::reference_impls::event_sink::EventMessage {
+        zksync_types::EventMessage {
             shard_id: event.shard_id,
             is_first: event.is_first,
             tx_number_in_block: event.tx_number_in_block,
@@ -91,9 +85,7 @@ impl GlueFrom<zk_evm::reference_impls::event_sink::EventMessage>
     }
 }
 
-impl GlueFrom<zk_evm::zkevm_opcode_defs::FarCallOpcode>
-    for zksync_types::zk_evm::zkevm_opcode_defs::FarCallOpcode
-{
+impl GlueFrom<zk_evm::zkevm_opcode_defs::FarCallOpcode> for zksync_types::FarCallOpcode {
     fn glue_from(value: zk_evm::zkevm_opcode_defs::FarCallOpcode) -> Self {
         match value {
             zk_evm::zkevm_opcode_defs::FarCallOpcode::Normal => Self::Normal,
@@ -103,14 +95,12 @@ impl GlueFrom<zk_evm::zkevm_opcode_defs::FarCallOpcode>
     }
 }
 
-impl GlueFrom<zksync_types::zk_evm::zkevm_opcode_defs::FarCallOpcode>
-    for zk_evm::zkevm_opcode_defs::FarCallOpcode
-{
-    fn glue_from(value: zksync_types::zk_evm::zkevm_opcode_defs::FarCallOpcode) -> Self {
+impl GlueFrom<zksync_types::FarCallOpcode> for zk_evm::zkevm_opcode_defs::FarCallOpcode {
+    fn glue_from(value: zksync_types::FarCallOpcode) -> Self {
         match value {
-            zksync_types::zk_evm::zkevm_opcode_defs::FarCallOpcode::Normal => Self::Normal,
-            zksync_types::zk_evm::zkevm_opcode_defs::FarCallOpcode::Delegate => Self::Delegate,
-            zksync_types::zk_evm::zkevm_opcode_defs::FarCallOpcode::Mimic => Self::Mimic,
+            zksync_types::FarCallOpcode::Normal => Self::Normal,
+            zksync_types::FarCallOpcode::Delegate => Self::Delegate,
+            zksync_types::FarCallOpcode::Mimic => Self::Mimic,
         }
     }
 }
diff --git a/core/multivm_deps/vm_m6/src/history_recorder.rs b/core/multivm_deps/vm_m6/src/history_recorder.rs
index b3ae1e756765..f697da5b23bd 100644
--- a/core/multivm_deps/vm_m6/src/history_recorder.rs
+++ b/core/multivm_deps/vm_m6/src/history_recorder.rs
@@ -4,7 +4,7 @@ use std::{
     hash::{BuildHasherDefault, Hash, Hasher},
 };
 
-use crate::storage::StoragePtr;
+use crate::storage::{Storage, StoragePtr};
 
 use zk_evm::{
     aux_structures::Timestamp,
@@ -654,16 +654,16 @@ impl<H: HistoryMode> HistoryRecorder<MemoryWrapper, H> {
 }
 
 #[derive(Debug)]
-pub struct StorageWrapper<'a> {
-    storage_ptr: StoragePtr<'a>,
+pub struct StorageWrapper<S> {
+    storage_ptr: StoragePtr<S>,
 }
 
-impl<'a> StorageWrapper<'a> {
-    pub fn new(storage_ptr: StoragePtr<'a>) -> Self {
+impl<S: Storage> StorageWrapper<S> {
+    pub fn new(storage_ptr: StoragePtr<S>) -> Self {
         Self { storage_ptr }
     }
 
-    pub fn get_ptr(&self) -> StoragePtr<'a> {
+    pub fn get_ptr(&self) -> StoragePtr<S> {
         self.storage_ptr.clone()
     }
 
@@ -678,7 +678,7 @@ pub struct StorageHistoryRecord {
     pub value: U256,
 }
 
-impl<'a> WithHistory for StorageWrapper<'a> {
+impl<S: Storage> WithHistory for StorageWrapper<S> {
     type HistoryRecord = StorageHistoryRecord;
     type ReturnValue = U256;
 
@@ -701,7 +701,7 @@ impl<'a> WithHistory for StorageWrapper<'a> {
     }
 }
 
-impl<'a, H: HistoryMode> HistoryRecorder<StorageWrapper<'a>, H> {
+impl<S: Storage, H: HistoryMode> HistoryRecorder<StorageWrapper<S>, H> {
     pub fn read_from_storage(&self, key: &StorageKey) -> U256 {
         self.inner.read_from_storage(key)
     }
@@ -713,7 +713,7 @@ impl<'a, H: HistoryMode> HistoryRecorder<StorageWrapper<'a>, H> {
     /// 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<'a> {
+    pub fn get_ptr(&self) -> StoragePtr<S> {
         self.inner.get_ptr()
     }
 }
diff --git a/core/multivm_deps/vm_m6/src/oracle_tools.rs b/core/multivm_deps/vm_m6/src/oracle_tools.rs
index b1f8c4de2913..14c7aededb63 100644
--- a/core/multivm_deps/vm_m6/src/oracle_tools.rs
+++ b/core/multivm_deps/vm_m6/src/oracle_tools.rs
@@ -1,8 +1,6 @@
 use crate::memory::SimpleMemory;
-use std::cell::RefCell;
 
 use std::fmt::Debug;
-use std::rc::Rc;
 
 use crate::event_sink::InMemoryEventSink;
 use crate::history_recorder::HistoryMode;
@@ -10,7 +8,7 @@ use crate::oracles::{
     decommitter::DecommitterOracle, precompile::PrecompilesProcessorWithHistory,
     storage::StorageOracle,
 };
-use crate::storage::Storage;
+use crate::storage::{Storage, StoragePtr};
 use zk_evm::witness_trace::DummyTracer;
 
 /// zkEVM requires a bunch of objects implementing given traits to work.
@@ -20,25 +18,23 @@ use zk_evm::witness_trace::DummyTracer;
 /// that also support additional features (like rollbacks & history).
 /// The OracleTools struct, holds all these things together in one place.
 #[derive(Debug)]
-pub struct OracleTools<'a, const B: bool, H: HistoryMode> {
-    pub storage: StorageOracle<'a, H>,
+pub struct OracleTools<const B: bool, S: Storage, H: HistoryMode> {
+    pub storage: StorageOracle<S, H>,
     pub memory: SimpleMemory<H>,
     pub event_sink: InMemoryEventSink<H>,
     pub precompiles_processor: PrecompilesProcessorWithHistory<B, H>,
-    pub decommittment_processor: DecommitterOracle<'a, B, H>,
+    pub decommittment_processor: DecommitterOracle<B, S, H>,
     pub witness_tracer: DummyTracer,
 }
 
-impl<'a, H: HistoryMode> OracleTools<'a, false, H> {
-    pub fn new(storage_view: &'a mut dyn Storage, _: H) -> Self {
-        let pointer: Rc<RefCell<&'a mut dyn Storage>> = Rc::new(RefCell::new(storage_view));
-
+impl<S: Storage, H: HistoryMode> OracleTools<false, S, H> {
+    pub fn new(storage_view: StoragePtr<S>, _: H) -> Self {
         Self {
-            storage: StorageOracle::new(pointer.clone()),
+            storage: StorageOracle::new(storage_view.clone()),
             memory: Default::default(),
             event_sink: Default::default(),
             precompiles_processor: Default::default(),
-            decommittment_processor: DecommitterOracle::new(pointer.clone()),
+            decommittment_processor: DecommitterOracle::new(storage_view),
             witness_tracer: DummyTracer {},
         }
     }
diff --git a/core/multivm_deps/vm_m6/src/oracles/decommitter.rs b/core/multivm_deps/vm_m6/src/oracles/decommitter.rs
index 8001f7df69a1..ee2c551f5f53 100644
--- a/core/multivm_deps/vm_m6/src/oracles/decommitter.rs
+++ b/core/multivm_deps/vm_m6/src/oracles/decommitter.rs
@@ -1,7 +1,7 @@
 use std::collections::HashMap;
 
 use crate::history_recorder::{HistoryEnabled, HistoryMode, HistoryRecorder, WithHistory};
-use crate::storage::StoragePtr;
+use crate::storage::{Storage, StoragePtr};
 
 use zk_evm::abstractions::MemoryType;
 use zk_evm::aux_structures::Timestamp;
@@ -18,9 +18,9 @@ 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<'a, const B: bool, H: HistoryMode> {
+pub struct DecommitterOracle<const B: bool, S: Storage, H: HistoryMode> {
     /// Pointer that enables to read contract bytecodes from the database.
-    storage: StoragePtr<'a>,
+    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>,
@@ -32,8 +32,8 @@ pub struct DecommitterOracle<'a, const B: bool, H: HistoryMode> {
     decommitment_requests: HistoryRecorder<Vec<()>, H>,
 }
 
-impl<'a, const B: bool, H: HistoryMode> DecommitterOracle<'a, B, H> {
-    pub fn new(storage: StoragePtr<'a>) -> Self {
+impl<S: Storage, const B: bool, H: HistoryMode> DecommitterOracle<B, S, H> {
+    pub fn new(storage: StoragePtr<S>) -> Self {
         Self {
             storage,
             known_bytecodes: Default::default(),
@@ -99,7 +99,7 @@ impl<'a, const B: bool, H: HistoryMode> DecommitterOracle<'a, B, H> {
     }
 
     /// Returns the storage handle. Used only in tests.
-    pub fn get_storage(&self) -> StoragePtr<'a> {
+    pub fn get_storage(&self) -> StoragePtr<S> {
         self.storage.clone()
     }
 
@@ -149,7 +149,7 @@ impl<'a, const B: bool, H: HistoryMode> DecommitterOracle<'a, B, H> {
     }
 }
 
-impl<'a, const B: bool> OracleWithHistory for DecommitterOracle<'a, B, HistoryEnabled> {
+impl<S: Storage, 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);
@@ -158,7 +158,9 @@ impl<'a, const B: bool> OracleWithHistory for DecommitterOracle<'a, B, HistoryEn
     }
 }
 
-impl<'a, const B: bool, H: HistoryMode> DecommittmentProcessor for DecommitterOracle<'a, B, H> {
+impl<S: Storage, 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,
diff --git a/core/multivm_deps/vm_m6/src/oracles/storage.rs b/core/multivm_deps/vm_m6/src/oracles/storage.rs
index a3391025b0f1..706bb1319c93 100644
--- a/core/multivm_deps/vm_m6/src/oracles/storage.rs
+++ b/core/multivm_deps/vm_m6/src/oracles/storage.rs
@@ -1,7 +1,7 @@
 use std::collections::HashMap;
 
 use crate::glue::GlueInto;
-use crate::storage::StoragePtr;
+use crate::storage::{Storage, StoragePtr};
 
 use crate::history_recorder::{
     AppDataFrameManagerWithHistory, HashMapHistoryEvent, HistoryEnabled, HistoryMode,
@@ -34,11 +34,11 @@ pub fn storage_key_of_log(query: &LogQuery) -> StorageKey {
 }
 
 #[derive(Debug)]
-pub struct StorageOracle<'a, H: HistoryMode> {
+pub struct StorageOracle<S: Storage, 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 storage: HistoryRecorder<StorageWrapper<'a>, H>,
+    pub storage: HistoryRecorder<StorageWrapper<S>, H>,
 
     pub frames_stack: AppDataFrameManagerWithHistory<StorageLogQuery, H>,
 
@@ -49,7 +49,7 @@ pub struct StorageOracle<'a, H: HistoryMode> {
     pub paid_changes: HistoryRecorder<HashMap<StorageKey, u32>, HistoryEnabled>,
 }
 
-impl OracleWithHistory for StorageOracle<'_, HistoryEnabled> {
+impl<S: Storage> 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);
@@ -57,8 +57,8 @@ impl OracleWithHistory for StorageOracle<'_, HistoryEnabled> {
     }
 }
 
-impl<'a, H: HistoryMode> StorageOracle<'a, H> {
-    pub fn new(storage: StoragePtr<'a>) -> Self {
+impl<S: Storage, H: HistoryMode> StorageOracle<S, H> {
+    pub fn new(storage: StoragePtr<S>) -> Self {
         Self {
             storage: HistoryRecorder::from_inner(StorageWrapper::new(storage)),
             frames_stack: Default::default(),
@@ -148,6 +148,7 @@ impl<'a, H: HistoryMode> StorageOracle<'a, H> {
     }
 
     // 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);
 
@@ -173,7 +174,7 @@ impl<'a, H: HistoryMode> StorageOracle<'a, H> {
 
     pub fn get_history_size(&self) -> usize {
         let storage_size = self.storage.borrow_history(|h| h.len(), 0)
-            * std::mem::size_of::<<StorageWrapper as WithHistory>::HistoryRecord>();
+            * 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>();
@@ -181,7 +182,7 @@ impl<'a, H: HistoryMode> StorageOracle<'a, H> {
     }
 }
 
-impl<H: HistoryMode> VmStorageOracle for StorageOracle<'_, H> {
+impl<S: Storage, 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(
@@ -189,7 +190,7 @@ impl<H: HistoryMode> VmStorageOracle for StorageOracle<'_, H> {
         _monotonic_cycle_counter: u32,
         query: LogQuery,
     ) -> LogQuery {
-        // vlog::trace!(
+        // tracing::trace!(
         //     "execute partial query cyc {:?} addr {:?} key {:?}, rw {:?}, wr {:?}, tx {:?}",
         //     _monotonic_cycle_counter,
         //     query.address,
@@ -255,7 +256,7 @@ impl<H: HistoryMode> VmStorageOracle for StorageOracle<'_, H> {
                 let read_value = match query.log_type {
                     StorageLogQueryType::Read => {
                         // Having Read logs in rollback is not possible
-                        vlog::warn!("Read log in rollback queue {:?}", query);
+                        tracing::warn!("Read log in rollback queue {:?}", query);
                         continue;
                     }
                     StorageLogQueryType::InitialWrite | StorageLogQueryType::RepeatedWrite => {
@@ -298,6 +299,8 @@ impl<H: HistoryMode> VmStorageOracle for StorageOracle<'_, H> {
 //   - 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::zkevm_opcode_defs::system_params::INITIAL_STORAGE_WRITE_PUBDATA_BYTES as u32
     } else {
diff --git a/core/multivm_deps/vm_m6/src/oracles/tracer/mod.rs b/core/multivm_deps/vm_m6/src/oracles/tracer/mod.rs
index f4a3dcda1b5f..39b5bd2fceb0 100644
--- a/core/multivm_deps/vm_m6/src/oracles/tracer/mod.rs
+++ b/core/multivm_deps/vm_m6/src/oracles/tracer/mod.rs
@@ -11,7 +11,9 @@ mod validation;
 pub use bootloader::BootloaderTracer;
 pub use call::CallTracer;
 pub use one_tx::OneTxTracer;
-pub use validation::{ValidationError, ValidationTracer, ValidationTracerParams};
+pub use validation::{
+    ValidationError, ValidationTracer, ValidationTracerParams, ViolatedValidationRule,
+};
 
 pub(crate) use transaction_result::TransactionResultTracer;
 
diff --git a/core/multivm_deps/vm_m6/src/oracles/tracer/utils.rs b/core/multivm_deps/vm_m6/src/oracles/tracer/utils.rs
index c500a213cced..1d994c3254de 100644
--- a/core/multivm_deps/vm_m6/src/oracles/tracer/utils.rs
+++ b/core/multivm_deps/vm_m6/src/oracles/tracer/utils.rs
@@ -144,7 +144,7 @@ pub(crate) fn print_debug_if_needed<H: HistoryMode>(
         _ => return,
     };
 
-    vlog::trace!("{}", log);
+    tracing::trace!("{}", log);
 }
 
 pub(crate) fn computational_gas_price(
diff --git a/core/multivm_deps/vm_m6/src/oracles/tracer/validation.rs b/core/multivm_deps/vm_m6/src/oracles/tracer/validation.rs
index 0c338b20fb95..ebf45993b4c1 100644
--- a/core/multivm_deps/vm_m6/src/oracles/tracer/validation.rs
+++ b/core/multivm_deps/vm_m6/src/oracles/tracer/validation.rs
@@ -20,12 +20,13 @@ use zk_evm::{
 };
 
 use crate::oracles::tracer::{utils::get_calldata_page_via_abi, StorageInvocationTracer};
-use crate::storage::StoragePtr;
+use crate::storage::{Storage, StoragePtr};
 use zksync_config::constants::{
     ACCOUNT_CODE_STORAGE_ADDRESS, BOOTLOADER_ADDRESS, CONTRACT_DEPLOYER_ADDRESS,
     KECCAK256_PRECOMPILE_ADDRESS, L2_ETH_TOKEN_ADDRESS, MSG_VALUE_SIMULATOR_ADDRESS,
     SYSTEM_CONTEXT_ADDRESS,
 };
+
 use zksync_types::{
     get_code_key, web3::signing::keccak256, AccountTreeId, Address, StorageKey, H256, U256,
 };
@@ -106,7 +107,7 @@ fn touches_allowed_context(address: Address, key: U256) -> bool {
     key == U256::from(0u32)
 }
 
-fn is_constant_code_hash(address: Address, key: U256, storage: StoragePtr<'_>) -> bool {
+fn is_constant_code_hash<S: Storage>(address: Address, key: U256, storage: StoragePtr<S>) -> bool {
     if address != ACCOUNT_CODE_STORAGE_ADDRESS {
         // Not a code hash
         return false;
@@ -130,9 +131,9 @@ fn valid_eth_token_call(address: Address, msg_sender: Address) -> bool {
 /// Tracer that is used to ensure that the validation adheres to all the rules
 /// to prevent DDoS attacks on the server.
 #[derive(Clone)]
-pub struct ValidationTracer<'a, H> {
+pub struct ValidationTracer<S, H> {
     // A copy of it should be used in the Storage oracle
-    pub storage: StoragePtr<'a>,
+    pub storage: StoragePtr<S>,
     pub validation_mode: ValidationTracerMode,
     pub auxilary_allowed_slots: HashSet<H256>,
     pub validation_error: Option<ViolatedValidationRule>,
@@ -149,7 +150,7 @@ pub struct ValidationTracer<'a, H> {
     _marker: PhantomData<H>,
 }
 
-impl<H: HistoryMode> fmt::Debug for ValidationTracer<'_, H> {
+impl<S, H: HistoryMode> fmt::Debug for ValidationTracer<S, H> {
     fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
         f.debug_struct("ValidationTracer")
             .field("storage", &"StoragePtr")
@@ -190,8 +191,8 @@ pub struct NewTrustedValidationItems {
 
 type ValidationRoundResult = Result<NewTrustedValidationItems, ViolatedValidationRule>;
 
-impl<'a, H: HistoryMode> ValidationTracer<'a, H> {
-    pub fn new(storage: StoragePtr<'a>, params: ValidationTracerParams) -> Self {
+impl<S: Storage, H: HistoryMode> ValidationTracer<S, H> {
+    pub fn new(storage: StoragePtr<S>, params: ValidationTracerParams) -> Self {
         ValidationTracer {
             storage,
             validation_error: None,
@@ -366,6 +367,7 @@ impl<'a, H: HistoryMode> ValidationTracer<'a, H> {
                         return Err(ViolatedValidationRule::TouchedUnallowedContext);
                     }
                     ContextOpcode::ErgsLeft => {
+                        // TODO (SMA-1168): implement the correct restrictions for the gas left opcode.
                     }
                     _ => {}
                 }
@@ -401,7 +403,7 @@ impl<'a, H: HistoryMode> ValidationTracer<'a, H> {
     }
 }
 
-impl<H: HistoryMode> Tracer for ValidationTracer<'_, H> {
+impl<S: Storage, H: HistoryMode> Tracer for ValidationTracer<S, H> {
     const CALL_BEFORE_EXECUTION: bool = true;
 
     type SupportedMemory = SimpleMemory<H>;
@@ -470,13 +472,13 @@ impl<H: HistoryMode> Tracer for ValidationTracer<'_, H> {
     }
 }
 
-impl<H: HistoryMode> ExecutionEndTracer<H> for ValidationTracer<'_, H> {
+impl<S: Storage, H: HistoryMode> ExecutionEndTracer<H> for ValidationTracer<S, H> {
     fn should_stop_execution(&self) -> bool {
         self.should_stop_execution || self.validation_error.is_some()
     }
 }
 
-impl<H: HistoryMode> PendingRefundTracer<H> for ValidationTracer<'_, H> {}
-impl<H: HistoryMode> PubdataSpentTracer<H> for ValidationTracer<'_, H> {}
+impl<S: Storage, H: HistoryMode> PendingRefundTracer<H> for ValidationTracer<S, H> {}
+impl<S: Storage, H: HistoryMode> PubdataSpentTracer<H> for ValidationTracer<S, H> {}
 
-impl<H: HistoryMode> StorageInvocationTracer<H> for ValidationTracer<'_, H> {}
+impl<S: Storage, H: HistoryMode> StorageInvocationTracer<H> for ValidationTracer<S, H> {}
diff --git a/core/multivm_deps/vm_m6/src/pubdata_utils.rs b/core/multivm_deps/vm_m6/src/pubdata_utils.rs
index 815514ebf0b1..8f7348b53f29 100644
--- a/core/multivm_deps/vm_m6/src/pubdata_utils.rs
+++ b/core/multivm_deps/vm_m6/src/pubdata_utils.rs
@@ -1,6 +1,7 @@
 use crate::glue::GlueInto;
 use crate::history_recorder::HistoryMode;
 use crate::oracles::storage::storage_key_of_log;
+use crate::storage::Storage;
 use crate::utils::collect_storage_log_queries_after_timestamp;
 use crate::VmInstance;
 use std::collections::HashMap;
@@ -10,7 +11,7 @@ use zksync_types::zkevm_test_harness::witness::sort_storage_access::sort_storage
 use zksync_types::{StorageKey, PUBLISH_BYTECODE_OVERHEAD, SYSTEM_CONTEXT_ADDRESS};
 use zksync_utils::bytecode::bytecode_len_in_bytes;
 
-impl<H: HistoryMode> VmInstance<'_, H> {
+impl<H: HistoryMode, S: Storage> VmInstance<'_, S, H> {
     pub fn pubdata_published(&self, from_timestamp: Timestamp) -> u32 {
         let storage_writes_pubdata_published = self.pubdata_published_for_writes(from_timestamp);
 
diff --git a/core/multivm_deps/vm_m6/src/refunds.rs b/core/multivm_deps/vm_m6/src/refunds.rs
index f811274f0fc9..d61e46c4520d 100644
--- a/core/multivm_deps/vm_m6/src/refunds.rs
+++ b/core/multivm_deps/vm_m6/src/refunds.rs
@@ -1,4 +1,5 @@
 use crate::history_recorder::HistoryMode;
+use crate::storage::Storage;
 use crate::vm_with_bootloader::{
     eth_price_per_pubdata_byte, BOOTLOADER_HEAP_PAGE, TX_GAS_LIMIT_OFFSET,
 };
@@ -7,7 +8,7 @@ use zk_evm::aux_structures::Timestamp;
 use zksync_types::U256;
 use zksync_utils::ceil_div_u256;
 
-impl<H: HistoryMode> VmInstance<'_, H> {
+impl<H: HistoryMode, S: Storage> VmInstance<'_, S, H> {
     pub(crate) fn tx_body_refund(
         &self,
         from_timestamp: Timestamp,
@@ -21,7 +22,7 @@ impl<H: HistoryMode> VmInstance<'_, H> {
         let gas_spent_on_computation = total_gas_spent
             .checked_sub(gas_spent_on_pubdata)
             .unwrap_or_else(|| {
-                vlog::error!(
+                tracing::error!(
                     "Gas spent on pubdata is greater than total gas spent. On pubdata: {}, total: {}",
                     gas_spent_on_pubdata,
                     total_gas_spent
@@ -52,7 +53,7 @@ impl<H: HistoryMode> VmInstance<'_, H> {
             + 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(|| {
-            vlog::error!(
+            tracing::error!(
                 "Fair fee is greater than pre paid. Fair fee: {} wei, pre paid: {} wei",
                 fair_fee_eth,
                 pre_paid_eth
@@ -72,13 +73,14 @@ impl<H: HistoryMode> VmInstance<'_, H> {
         _gas_remaining_before: u32,
         _gas_spent_on_pubdata: u32,
     ) -> u32 {
+        // TODO (SMA-1715): Make users pay for the block overhead
         0
 
         // let pubdata_published = self.pubdata_published(from_timestamp);
         //
         // let total_gas_spent = gas_remaining_before - self.gas_remaining();
         // let gas_spent_on_computation = total_gas_spent.checked_sub(gas_spent_on_pubdata).unwrap_or_else(|| {
-        //     vlog::error!("Gas spent on pubdata is greater than total gas spent. On pubdata: {}, total: {}", gas_spent_on_pubdata, total_gas_spent);
+        //     tracing::error!("Gas spent on pubdata is greater than total gas spent. On pubdata: {}, total: {}", gas_spent_on_pubdata, total_gas_spent);
         //     0
         // });
         // let (_, l2_to_l1_logs) = self.collect_events_and_l1_logs_after_timestamp(from_timestamp);
@@ -109,9 +111,9 @@ impl<H: HistoryMode> VmInstance<'_, H> {
         //     predefined_overhead - actual_overhead
         // } else {
         //     // This should never happen but potential mistakes at the early stage should not bring the server down.
-        //
+        //     // TODO (SMA-1700): log addition information (e.g overhead for each of criteria: pubdata, single-instance circuits capacity etc)
         //     //   to make debugging easier.
-        //     vlog::error!(
+        //     tracing::error!(
         //         "Actual overhead is greater than predefined one, actual: {}, predefined: {}",
         //         actual_overhead,
         //         predefined_overhead
@@ -120,6 +122,7 @@ impl<H: HistoryMode> VmInstance<'_, H> {
         // }
     }
 
+    // TODO (SMA-1715): Make users pay for the block overhead
     #[allow(dead_code)]
     fn actual_overhead_gas(
         _gas_per_pubdata_byte_limit: u32,
diff --git a/core/multivm_deps/vm_m6/src/storage.rs b/core/multivm_deps/vm_m6/src/storage.rs
index 868904c3bbd9..67dea9c820cc 100644
--- a/core/multivm_deps/vm_m6/src/storage.rs
+++ b/core/multivm_deps/vm_m6/src/storage.rs
@@ -6,7 +6,7 @@ use std::rc::Rc;
 use zksync_state::{ReadStorage, StorageView, WriteStorage};
 use zksync_types::{get_known_code_key, StorageKey, StorageValue, H256};
 
-pub trait Storage: Debug + Sync + Send {
+pub trait Storage: Debug {
     /// Returns a value from a given key. If value never existed, returns 0.
     fn get_value(&mut self, key: &StorageKey) -> StorageValue;
     // Sets the new value under a given key - returns the original value.
@@ -24,7 +24,7 @@ pub trait Storage: Debug + Sync + Send {
 
     /// Returns whether a bytecode hash is "known", i.e. whether
     /// it has been published on L1
-    fn is_bytecode_known(&mut self, bytecode_hash: &H256) -> bool {
+    fn is_bytecode_exists(&mut self, bytecode_hash: &H256) -> bool {
         let code_key = get_known_code_key(bytecode_hash);
         self.get_value(&code_key) != H256::zero()
     }
@@ -32,7 +32,7 @@ pub trait Storage: Debug + Sync + Send {
     fn missed_storage_invocations(&self) -> usize;
 }
 
-impl<S: ReadStorage + Debug + Send + Sync> Storage for StorageView<S> {
+impl<S: ReadStorage + Debug> Storage for StorageView<S> {
     fn get_value(&mut self, key: &StorageKey) -> StorageValue {
         ReadStorage::read_value(self, key)
     }
@@ -59,4 +59,4 @@ impl<S: ReadStorage + Debug + Send + Sync> Storage for StorageView<S> {
     }
 }
 
-pub type StoragePtr<'a> = Rc<RefCell<&'a mut dyn Storage>>;
+pub type StoragePtr<S> = Rc<RefCell<S>>;
diff --git a/core/multivm_deps/vm_m6/src/test_utils.rs b/core/multivm_deps/vm_m6/src/test_utils.rs
index 9404f4359b22..b196ed9e357f 100644
--- a/core/multivm_deps/vm_m6/src/test_utils.rs
+++ b/core/multivm_deps/vm_m6/src/test_utils.rs
@@ -10,6 +10,7 @@ use std::collections::HashMap;
 
 use itertools::Itertools;
 use zk_evm::{aux_structures::Timestamp, vm_state::VmLocalState};
+use zksync_contracts::test_contracts::LoadnextContractExecutionParams;
 use zksync_contracts::{deployer_contract, get_loadnext_contract, load_contract};
 use zksync_types::{
     ethabi::{Address, Token},
@@ -20,10 +21,10 @@ use zksync_types::{
     CONTRACT_DEPLOYER_ADDRESS, H256, U256,
 };
 use zksync_utils::{
-    address_to_h256, bytecode::hash_bytecode, h256_to_account_address,
-    test_utils::LoadnextContractExecutionParams, u256_to_h256,
+    address_to_h256, bytecode::hash_bytecode, h256_to_account_address, u256_to_h256,
 };
 
+use crate::storage::Storage;
 /// The tests here help us with the testing the VM
 use crate::{
     event_sink::InMemoryEventSink,
@@ -90,7 +91,7 @@ pub struct VmInstanceInnerState<H: HistoryMode> {
     local_state: VmLocalState,
 }
 
-impl<H: HistoryMode> VmInstance<'_, H> {
+impl<H: HistoryMode, S: Storage> VmInstance<'_, S, H> {
     /// This method is mostly to be used in tests. It dumps the inner state of all the oracles and the VM itself.
     pub fn dump_inner_state(&self) -> VmInstanceInnerState<H> {
         let event_sink = self.state.event_sink.clone();
diff --git a/core/multivm_deps/vm_m6/src/transaction_data.rs b/core/multivm_deps/vm_m6/src/transaction_data.rs
index c374b34c1c9d..a04641b3a995 100644
--- a/core/multivm_deps/vm_m6/src/transaction_data.rs
+++ b/core/multivm_deps/vm_m6/src/transaction_data.rs
@@ -1,6 +1,7 @@
 use zk_evm::zkevm_opcode_defs::system_params::MAX_TX_ERGS_LIMIT;
 use zksync_types::ethabi::{encode, Address, Token};
 use zksync_types::fee::encoding_len;
+use zksync_types::l1::is_l1_tx_type;
 use zksync_types::{l2::TransactionType, ExecuteTransactionCommon, Transaction, U256};
 use zksync_types::{MAX_L2_TX_GAS_LIMIT, MAX_TXS_IN_BLOCK};
 use zksync_utils::{address_to_h256, ceil_div_u256};
@@ -35,6 +36,7 @@ pub struct TransactionData {
     // 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 factory_deps: Vec<Vec<u8>>,
     pub paymaster_input: Vec<u8>,
     pub reserved_dynamic: Vec<u8>,
@@ -191,7 +193,7 @@ impl TransactionData {
     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 self.tx_type == L1_TX_TYPE {
+        if is_l1_tx_type(self.tx_type) {
             self.pubdata_price_limit.as_u32()
         } else {
             block_gas_price_per_pubdata
@@ -221,6 +223,7 @@ impl TransactionData {
     }
 
     pub fn trusted_gas_limit(&self, _block_gas_price_per_pubdata: u32) -> u32 {
+        // TODO (EVM-66): correctly calculate the trusted gas limit for a transaction
         self.gas_limit.as_u32()
     }
 }
@@ -259,6 +262,7 @@ pub fn derive_overhead(
     // 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(),
@@ -391,6 +395,8 @@ pub fn get_amortized_overhead(
             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
@@ -584,6 +590,7 @@ mod tests {
             // 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],
diff --git a/core/multivm_deps/vm_m6/src/utils.rs b/core/multivm_deps/vm_m6/src/utils.rs
index 3718761cc107..cac347f00a67 100644
--- a/core/multivm_deps/vm_m6/src/utils.rs
+++ b/core/multivm_deps/vm_m6/src/utils.rs
@@ -6,6 +6,7 @@ use crate::{
 };
 use once_cell::sync::Lazy;
 
+use crate::storage::Storage;
 use zk_evm::block_properties::BlockProperties;
 use zk_evm::{
     aux_structures::{LogQuery, MemoryPage, Timestamp},
@@ -261,8 +262,12 @@ pub fn read_bootloader_test_code(test: &str) -> Vec<u8> {
     ))
 }
 
-pub(crate) fn calculate_computational_gas_used<T: PubdataSpentTracer<H>, H: HistoryMode>(
-    vm: &VmInstance<'_, H>,
+pub(crate) fn calculate_computational_gas_used<
+    S: Storage,
+    T: PubdataSpentTracer<H>,
+    H: HistoryMode,
+>(
+    vm: &VmInstance<'_, S, H>,
     tracer: &T,
     gas_remaining_before: u32,
     spent_pubdata_counter_before: u32,
@@ -275,7 +280,7 @@ pub(crate) fn calculate_computational_gas_used<T: PubdataSpentTracer<H>, H: Hist
     total_gas_used
         .checked_sub(gas_used_on_pubdata)
         .unwrap_or_else(|| {
-            vlog::error!(
+            tracing::error!(
                 "Gas used on pubdata is greater than total gas used. On pubdata: {}, total: {}",
                 gas_used_on_pubdata,
                 total_gas_used
diff --git a/core/multivm_deps/vm_m6/src/vm.rs b/core/multivm_deps/vm_m6/src/vm.rs
index d878122093a4..543d58a3fefe 100644
--- a/core/multivm_deps/vm_m6/src/vm.rs
+++ b/core/multivm_deps/vm_m6/src/vm.rs
@@ -11,7 +11,6 @@ use zksync_types::l2_to_l1_log::L2ToL1Log;
 use zksync_types::tx::tx_execution_info::{TxExecutionStatus, VmExecutionLogs};
 use zksync_types::vm_trace::{Call, VmExecutionTrace, VmTrace};
 use zksync_types::{L1BatchNumber, StorageLogQuery, VmEvent, U256};
-use zksync_utils::bytes_to_be_words;
 
 use crate::bootloader_state::BootloaderState;
 use crate::errors::{TxRevertReason, VmRevertReason, VmRevertReasonParsingResult};
@@ -29,6 +28,7 @@ use crate::oracles::tracer::{
     ValidationTracerParams,
 };
 use crate::oracles::OracleWithHistory;
+use crate::storage::Storage;
 use crate::utils::{
     calculate_computational_gas_used, collect_log_queries_after_timestamp,
     collect_storage_log_queries_after_timestamp, dump_memory_page_using_primitive_value,
@@ -38,15 +38,14 @@ use crate::vm_with_bootloader::{
     BootloaderJobType, DerivedBlockContext, TxExecutionMode, BOOTLOADER_HEAP_PAGE,
     OPERATOR_REFUNDS_OFFSET,
 };
-use crate::Word;
 
-pub type ZkSyncVmState<'a, H> = VmState<
+pub type ZkSyncVmState<'a, S, H> = VmState<
     'a,
-    StorageOracle<'a, H>,
+    StorageOracle<S, H>,
     SimpleMemory<H>,
     InMemoryEventSink<H>,
     PrecompilesProcessorWithHistory<false, H>,
-    DecommitterOracle<'a, false, H>,
+    DecommitterOracle<false, S, H>,
     DummyTracer,
 >;
 
@@ -73,7 +72,7 @@ pub(crate) fn get_vm_hook_params<H: HistoryMode>(memory: &SimpleMemory<H>) -> Ve
 /// E.g., initially they were completely disabled.
 ///
 /// This enum allows to execute blocks with the same VM but different support for refunds.
-#[derive(Debug)]
+#[derive(Debug, Copy, Clone)]
 pub enum MultiVMSubversion {
     /// Initial VM M6 version.
     V1,
@@ -82,9 +81,9 @@ pub enum MultiVMSubversion {
 }
 
 #[derive(Debug)]
-pub struct VmInstance<'a, H: HistoryMode> {
+pub struct VmInstance<'a, S: Storage, H: HistoryMode> {
     pub gas_limit: u32,
-    pub state: ZkSyncVmState<'a, H>,
+    pub state: ZkSyncVmState<'a, S, H>,
     pub execution_mode: TxExecutionMode,
     pub block_context: DerivedBlockContext,
     pub(crate) bootloader_state: BootloaderState,
@@ -100,7 +99,7 @@ pub struct VmExecutionResult {
     pub storage_log_queries: Vec<StorageLogQuery>,
     pub used_contract_hashes: Vec<U256>,
     pub l2_to_l1_logs: Vec<L2ToL1Log>,
-    pub return_data: Vec<Word>,
+    pub return_data: Vec<u8>,
 
     /// Value denoting the amount of gas spent withing VM invocation.
     /// Note that return value represents the difference between the amount of gas
@@ -172,7 +171,9 @@ pub enum VmExecutionStopReason {
 
 use crate::utils::VmExecutionResult as NewVmExecutionResult;
 
-fn vm_may_have_ended_inner<H: HistoryMode>(vm: &ZkSyncVmState<H>) -> Option<NewVmExecutionResult> {
+fn vm_may_have_ended_inner<H: HistoryMode, S: Storage>(
+    vm: &ZkSyncVmState<S, H>,
+) -> Option<NewVmExecutionResult> {
     let execution_has_ended = vm.execution_has_ended();
 
     let r1 = vm.local_state.registers[RET_IMPLICIT_RETURNDATA_PARAMS_REGISTER as usize];
@@ -209,8 +210,8 @@ fn vm_may_have_ended_inner<H: HistoryMode>(vm: &ZkSyncVmState<H>) -> Option<NewV
 //
 // `gas_before` argument is used to calculate the amount of gas spent by transaction.
 // It is required because the same VM instance is continuously used to apply several transactions.
-fn vm_may_have_ended<H: HistoryMode>(
-    vm: &VmInstance<H>,
+fn vm_may_have_ended<H: HistoryMode, S: Storage>(
+    vm: &VmInstance<S, H>,
     gas_before: u32,
 ) -> Option<VmExecutionResult> {
     let basic_execution_result = vm_may_have_ended_inner(&vm.state)?;
@@ -220,10 +221,7 @@ fn vm_may_have_ended<H: HistoryMode>(
         .expect("underflow");
 
     match basic_execution_result {
-        NewVmExecutionResult::Ok(mut data) => {
-            while data.len() % 32 != 0 {
-                data.push(0)
-            }
+        NewVmExecutionResult::Ok(data) => {
             Some(VmExecutionResult {
                 // The correct `events` value for this field should be set separately
                 // later on based on the information inside the event_sink oracle.
@@ -231,7 +229,7 @@ fn vm_may_have_ended<H: HistoryMode>(
                 storage_log_queries: vm.get_final_log_queries(),
                 used_contract_hashes: vm.get_used_contracts(),
                 l2_to_l1_logs: vec![],
-                return_data: bytes_to_be_words(data),
+                return_data: data,
                 gas_used,
                 // The correct `computational_gas_used` value for this field should be set separately later.
                 computational_gas_used: 0,
@@ -259,7 +257,7 @@ fn vm_may_have_ended<H: HistoryMode>(
                 revert_reason.revert_reason,
                 TxRevertReason::UnexpectedVMBehavior(_)
             ) {
-                vlog::error!(
+                tracing::error!(
                     "Observed error that should never happen: {:?}. Full VM data: {:?}",
                     revert_reason,
                     vm
@@ -329,7 +327,7 @@ pub struct VmSnapshot {
     bootloader_state: BootloaderState,
 }
 
-impl<H: HistoryMode> VmInstance<'_, H> {
+impl<H: HistoryMode, S: Storage> VmInstance<'_, S, H> {
     fn has_ended(&self) -> bool {
         match vm_may_have_ended_inner(&self.state) {
             None | Some(NewVmExecutionResult::MostLikelyDidNotFinish(_, _)) => false,
@@ -358,7 +356,7 @@ impl<H: HistoryMode> VmInstance<'_, H> {
                     revert_reason.revert_reason,
                     TxRevertReason::UnexpectedVMBehavior(_)
                 ) {
-                    vlog::error!(
+                    tracing::error!(
                         "Observed error that should never happen: {:?}. Full VM data: {:?}",
                         revert_reason,
                         self
@@ -420,11 +418,7 @@ impl<H: HistoryMode> VmInstance<'_, H> {
             events,
             l1_messages
                 .into_iter()
-                .map(|log| {
-                    L2ToL1Log::from(GlueInto::<
-                        zksync_types::zk_evm::reference_impls::event_sink::EventMessage,
-                    >::glue_into(log))
-                })
+                .map(|log| L2ToL1Log::from(GlueInto::<zksync_types::EventMessage>::glue_into(log)))
                 .collect(),
         )
     }
@@ -507,7 +501,7 @@ impl<H: HistoryMode> VmInstance<'_, H> {
                     self.tx_body_refund(timestamp_initial, bootloader_refund, gas_spent_on_pubdata);
 
                 if tx_body_refund < bootloader_refund {
-                    vlog::error!(
+                    tracing::error!(
                         "Suggested tx body refund is less than bootloader refund. Tx body refund: {}, bootloader refund: {}",
                         tx_body_refund,
                         bootloader_refund
@@ -540,14 +534,14 @@ impl<H: HistoryMode> VmInstance<'_, H> {
                 let tx_gas_limit = self.get_tx_gas_limit(current_tx_index);
 
                 if tx_gas_limit < bootloader_refund {
-                    vlog::error!(
+                    tracing::error!(
                         "Tx gas limit is less than bootloader refund. Tx gas limit: {}, bootloader refund: {}",
                         tx_gas_limit,
                         bootloader_refund
                     );
                 }
                 if tx_gas_limit < refund_to_propose {
-                    vlog::error!(
+                    tracing::error!(
                         "Tx gas limit is less than operator refund. Tx gas limit: {}, operator refund: {}",
                         tx_gas_limit,
                         refund_to_propose
@@ -784,9 +778,7 @@ impl<H: HistoryMode> VmInstance<'_, H> {
                 full_result.l2_to_l1_logs = l1_messages
                     .into_iter()
                     .map(|log| {
-                        L2ToL1Log::from(GlueInto::<
-                            zksync_types::zk_evm::reference_impls::event_sink::EventMessage,
-                        >::glue_into(log))
+                        L2ToL1Log::from(GlueInto::<zksync_types::EventMessage>::glue_into(log))
                     })
                     .collect();
                 full_result.computational_gas_used = block_tip_result.computational_gas_used;
@@ -885,7 +877,7 @@ impl<H: HistoryMode> VmInstance<'_, H> {
         &mut self,
         validation_params: ValidationTracerParams,
     ) -> Result<(), ValidationError> {
-        let mut validation_tracer: ValidationTracer<H> = ValidationTracer::new(
+        let mut validation_tracer: ValidationTracer<S, H> = ValidationTracer::new(
             self.state.storage.storage.inner().get_ptr(),
             validation_params,
         );
@@ -942,7 +934,7 @@ impl<H: HistoryMode> VmInstance<'_, H> {
     }
 }
 
-impl VmInstance<'_, HistoryEnabled> {
+impl<S: Storage> VmInstance<'_, S, HistoryEnabled> {
     /// Saves the snapshot of the current state of the VM that can be used
     /// to roll back its state later on.
     pub fn save_current_vm_as_snapshot(&mut self) {
@@ -965,21 +957,21 @@ impl VmInstance<'_, HistoryEnabled> {
 
         let timestamp = Timestamp(local_state.timestamp);
 
-        vlog::trace!("Rolling back decomitter");
+        tracing::trace!("Rolling back decomitter");
         self.state
             .decommittment_processor
             .rollback_to_timestamp(timestamp);
 
-        vlog::trace!("Rolling back event_sink");
+        tracing::trace!("Rolling back event_sink");
         self.state.event_sink.rollback_to_timestamp(timestamp);
 
-        vlog::trace!("Rolling back storage");
+        tracing::trace!("Rolling back storage");
         self.state.storage.rollback_to_timestamp(timestamp);
 
-        vlog::trace!("Rolling back memory");
+        tracing::trace!("Rolling back memory");
         self.state.memory.rollback_to_timestamp(timestamp);
 
-        vlog::trace!("Rolling back precompiles_processor");
+        tracing::trace!("Rolling back precompiles_processor");
         self.state
             .precompiles_processor
             .rollback_to_timestamp(timestamp);
@@ -1003,7 +995,10 @@ impl VmInstance<'_, HistoryEnabled> {
 
 // Reads the bootloader memory and checks whether the execution step of the transaction
 // has failed.
-pub(crate) fn tx_has_failed<H: HistoryMode>(state: &ZkSyncVmState<'_, H>, tx_id: u32) -> bool {
+pub(crate) fn tx_has_failed<H: HistoryMode, S: Storage>(
+    state: &ZkSyncVmState<'_, S, H>,
+    tx_id: u32,
+) -> bool {
     let mem_slot = RESULT_SUCCESS_FIRST_SLOT + tx_id;
     let mem_value = state
         .memory
diff --git a/core/multivm_deps/vm_m6/src/vm_with_bootloader.rs b/core/multivm_deps/vm_m6/src/vm_with_bootloader.rs
index 011352c701cc..c4834a0160cf 100644
--- a/core/multivm_deps/vm_m6/src/vm_with_bootloader.rs
+++ b/core/multivm_deps/vm_m6/src/vm_with_bootloader.rs
@@ -24,6 +24,7 @@ use zksync_utils::{
     misc::ceil_div,
 };
 
+use crate::storage::Storage;
 use crate::{
     bootloader_state::BootloaderState,
     history_recorder::HistoryMode,
@@ -35,6 +36,8 @@ use crate::{
     OracleTools, VmInstance,
 };
 
+// TODO (SMA-1703): move these to config and make them programmatically generatable.
+// fill these values in the similar fasion as other overhead-related constants
 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;
@@ -209,14 +212,14 @@ impl Default for TxExecutionMode {
     }
 }
 
-pub fn init_vm<'a, H: HistoryMode>(
+pub fn init_vm<'a, S: Storage, H: HistoryMode>(
     vm_subversion: MultiVMSubversion,
-    oracle_tools: &'a mut OracleTools<'a, false, H>,
+    oracle_tools: &'a mut OracleTools<false, S, H>,
     block_context: BlockContextMode,
     block_properties: &'a BlockProperties,
     execution_mode: TxExecutionMode,
     base_system_contract: &BaseSystemContracts,
-) -> Box<VmInstance<'a, H>> {
+) -> Box<VmInstance<'a, S, H>> {
     init_vm_with_gas_limit(
         vm_subversion,
         oracle_tools,
@@ -228,15 +231,15 @@ pub fn init_vm<'a, H: HistoryMode>(
     )
 }
 
-pub fn init_vm_with_gas_limit<'a, H: HistoryMode>(
+pub fn init_vm_with_gas_limit<'a, S: Storage, H: HistoryMode>(
     vm_subversion: MultiVMSubversion,
-    oracle_tools: &'a mut OracleTools<'a, false, H>,
+    oracle_tools: &'a mut OracleTools<false, S, H>,
     block_context: BlockContextMode,
     block_properties: &'a BlockProperties,
     execution_mode: TxExecutionMode,
     base_system_contract: &BaseSystemContracts,
     gas_limit: u32,
-) -> Box<VmInstance<'a, H>> {
+) -> Box<VmInstance<'a, S, H>> {
     init_vm_inner(
         vm_subversion,
         oracle_tools,
@@ -325,15 +328,15 @@ impl BlockContextMode {
 
 // This method accepts a custom bootloader code.
 // It should be used only in tests.
-pub fn init_vm_inner<'a, H: HistoryMode>(
+pub fn init_vm_inner<'a, S: Storage, H: HistoryMode>(
     vm_subversion: MultiVMSubversion,
-    oracle_tools: &'a mut OracleTools<'a, false, H>,
+    oracle_tools: &'a mut OracleTools<false, S, H>,
     block_context: BlockContextMode,
     block_properties: &'a BlockProperties,
     gas_limit: u32,
     base_system_contract: &BaseSystemContracts,
     execution_mode: TxExecutionMode,
-) -> Box<VmInstance<'a, H>> {
+) -> Box<VmInstance<'a, S, H>> {
     let start = Instant::now();
 
     oracle_tools.decommittment_processor.populate(
@@ -495,8 +498,8 @@ fn get_bootloader_memory_v2(
     memory
 }
 
-pub fn push_transaction_to_bootloader_memory<H: HistoryMode>(
-    vm: &mut VmInstance<H>,
+pub fn push_transaction_to_bootloader_memory<S: Storage, H: HistoryMode>(
+    vm: &mut VmInstance<S, H>,
     tx: &Transaction,
     execution_mode: TxExecutionMode,
     explicit_compressed_bytecodes: Option<Vec<CompressedBytecodeInfo>>,
@@ -513,8 +516,8 @@ pub fn push_transaction_to_bootloader_memory<H: HistoryMode>(
     );
 }
 
-pub fn push_raw_transaction_to_bootloader_memory<H: HistoryMode>(
-    vm: &mut VmInstance<H>,
+pub fn push_raw_transaction_to_bootloader_memory<S: Storage, H: HistoryMode>(
+    vm: &mut VmInstance<S, H>,
     tx: TransactionData,
     execution_mode: TxExecutionMode,
     predefined_overhead: u32,
@@ -539,8 +542,8 @@ pub fn push_raw_transaction_to_bootloader_memory<H: HistoryMode>(
 }
 
 /// Contains a bug in the bytecode compression.
-fn push_raw_transaction_to_bootloader_memory_v1<H: HistoryMode>(
-    vm: &mut VmInstance<H>,
+fn push_raw_transaction_to_bootloader_memory_v1<S: Storage, H: HistoryMode>(
+    vm: &mut VmInstance<S, H>,
     tx: TransactionData,
     execution_mode: TxExecutionMode,
     predefined_overhead: u32,
@@ -571,7 +574,7 @@ fn push_raw_transaction_to_bootloader_memory_v1<H: HistoryMode>(
                     .storage
                     .get_ptr()
                     .borrow_mut()
-                    .is_bytecode_known(&hash_bytecode(bytecode))
+                    .is_bytecode_exists(&hash_bytecode(bytecode))
                 {
                     return None;
                 }
@@ -623,8 +626,8 @@ fn push_raw_transaction_to_bootloader_memory_v1<H: HistoryMode>(
 }
 
 // Bytecode compression bug fixed
-fn push_raw_transaction_to_bootloader_memory_v2<H: HistoryMode>(
-    vm: &mut VmInstance<H>,
+fn push_raw_transaction_to_bootloader_memory_v2<S: Storage, H: HistoryMode>(
+    vm: &mut VmInstance<S, H>,
     tx: TransactionData,
     execution_mode: TxExecutionMode,
     predefined_overhead: u32,
@@ -655,7 +658,7 @@ fn push_raw_transaction_to_bootloader_memory_v2<H: HistoryMode>(
                     .storage
                     .get_ptr()
                     .borrow_mut()
-                    .is_bytecode_known(&hash_bytecode(bytecode))
+                    .is_bytecode_exists(&hash_bytecode(bytecode))
                 {
                     return None;
                 }
@@ -801,11 +804,11 @@ pub(crate) fn get_bootloader_memory_for_encoded_tx(
     memory
 }
 
-fn get_default_local_state<'a, H: HistoryMode>(
-    tools: &'a mut OracleTools<'a, false, H>,
+fn get_default_local_state<'a, S: Storage, H: HistoryMode>(
+    tools: &'a mut OracleTools<false, S, H>,
     block_properties: &'a BlockProperties,
     gas_limit: u32,
-) -> ZkSyncVmState<'a, H> {
+) -> ZkSyncVmState<'a, S, H> {
     let mut vm = VmState::empty_state(
         &mut tools.storage,
         &mut tools.memory,
diff --git a/core/tests/cross_external_nodes_checker/Cargo.toml b/core/tests/cross_external_nodes_checker/Cargo.toml
index 74763b9d4af7..4f8285aef5a5 100644
--- a/core/tests/cross_external_nodes_checker/Cargo.toml
+++ b/core/tests/cross_external_nodes_checker/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "cross_external_nodes_checker"
-version = "1.0.0"
+version = "0.1.0"
 edition = "2018"
 authors = ["The Matter Labs Team <hello@matterlabs.dev>"]
 homepage = "https://zksync.io/"
@@ -11,10 +11,10 @@ categories = ["cryptography"]
 publish = false # We don't want to publish our binaries.
 
 [dependencies]
-zksync_types = { path = "../../lib/types", version = "1.0" }
-zksync_web3_decl = { path = "../../lib/web3_decl", version = "1.0" }
-zksync_utils = { path = "../../lib/utils", version = "1.0" }
-vlog = { path = "../../lib/vlog", version = "1.0" }
+zksync_types = { path = "../../lib/types" }
+zksync_web3_decl = { path = "../../lib/web3_decl" }
+zksync_utils = { path = "../../lib/utils" }
+vlog = { path = "../../lib/vlog" }
 serde_json = "1.0"
 
 anyhow = "1.0"
@@ -23,3 +23,4 @@ futures = "0.3"
 envy = "0.4"
 serde = { version = "1.0" }
 ctrlc = { version = "3.1" }
+tracing = "0.1"
diff --git a/core/tests/cross_external_nodes_checker/src/checker.rs b/core/tests/cross_external_nodes_checker/src/checker.rs
index 215b8c802b56..049553612bc5 100644
--- a/core/tests/cross_external_nodes_checker/src/checker.rs
+++ b/core/tests/cross_external_nodes_checker/src/checker.rs
@@ -88,7 +88,7 @@ impl Checker {
             finish_miniblock: config.finish_miniblock.map(|n| n.into()),
             instance_poll_period: config.instance_poll_period.unwrap_or(10),
             divergences: HashMap::new(),
-            log_check_interval: 1,
+            log_check_interval: 1, // TODO (BFT-192): make configurable if we want to keep it.
             next_batch_to_check: last_checked_batch,
             max_transactions_to_check: config.max_transactions_to_check,
         }
@@ -114,24 +114,25 @@ impl Checker {
         (main_node_client, instance_clients)
     }
 
-    pub async fn run(mut self, stop_receiver: Receiver<bool>) {
+    pub async fn run(mut self, stop_receiver: Receiver<bool>) -> anyhow::Result<()> {
         match self.mode {
             RpcMode::Triggered => {
-                vlog::info!("Starting Checker in Triggered mode");
+                tracing::info!("Starting Checker in Triggered mode");
                 if let Err(e) = self.run_triggered().await {
                     self.log_divergences();
-                    vlog::error!("Error running in Triggered mode: {:?}", e);
+                    tracing::error!("Error running in Triggered mode: {:?}", e);
                 }
                 // Ensure CI will fail if any divergences were found.
                 assert!(self.divergences.is_empty(), "Divergences found");
             }
             RpcMode::Continuous => {
-                vlog::info!("Starting Checker in Continuous mode");
+                tracing::info!("Starting Checker in Continuous mode");
                 if let Err(e) = self.run_continuous(stop_receiver).await {
-                    vlog::error!("Error running in Continuous mode: {:?}", e);
+                    tracing::error!("Error running in Continuous mode: {:?}", e);
                 }
             }
         }
+        Ok(())
     }
 
     // For each instance, spawn a task that will continuously poll the instance for new miniblocks
@@ -148,9 +149,9 @@ impl Checker {
             let mut checker = self.clone();
 
             let handle = tokio::spawn(async move {
-                vlog::info!("Started a task to check instance {}", instance_client.url);
+                tracing::info!("Started a task to check instance {}", instance_client.url);
                 if let Err(e) = checker.run_node_level_checkers(&instance_client).await {
-                    vlog::error!("Error checking instance {}: {:?}", instance_client.url, e);
+                    tracing::error!("Error checking instance {}: {:?}", instance_client.url, e);
                 };
                 let mut next_block_to_check = checker.start_miniblock.unwrap_or(MiniblockNumber(0));
 
@@ -159,7 +160,7 @@ impl Checker {
                 // - Run the checkers through the blocks.
                 // - Maybe check batches.
                 loop {
-                    vlog::debug!(
+                    tracing::debug!(
                         "entered loop to check miniblock #({}) for instance: {}",
                         next_block_to_check,
                         instance_client.url
@@ -176,17 +177,18 @@ impl Checker {
                     {
                         Ok(Some(miniblock)) => miniblock,
                         Ok(None) => {
-                            vlog::debug!(
+                            tracing::debug!(
                                 "No miniblock found for miniblock #({}). Sleeping for {} seconds",
                                 next_block_to_check,
                                 checker.instance_poll_period
                             );
                             // The instance doesn't have a next block to check yet. For now, we wait until it does.
+                            // TODO(BFT-165): Implement miniblock existence divergence checker.
                             sleep(Duration::from_secs(checker.instance_poll_period)).await;
                             continue;
                         }
                         Err(e) => {
-                            vlog::error!(
+                            tracing::error!(
                                 "Error getting miniblock #({}) from instance: {}: {:?}",
                                 next_block_to_check,
                                 instance_client.url,
@@ -202,14 +204,14 @@ impl Checker {
                     {
                         Ok(Some(miniblock)) => miniblock,
                         Ok(None) => {
-                            vlog::error!(
+                            tracing::error!(
                                 "Miniblock #({}), which exists in external node instance {}, was not found in the main node",
                                 next_block_to_check, instance_client.url
                             );
                             break;
                         }
                         Err(e) => {
-                            vlog::error!("Error getting miniblock from main node while checking instance {}: {:?}", instance_client.url, e);
+                            tracing::error!("Error getting miniblock from main node while checking instance {}: {:?}", instance_client.url, e);
                             break;
                         }
                     };
@@ -220,7 +222,7 @@ impl Checker {
                     {
                         Ok(tx_map) => tx_map,
                         Err(e) => {
-                            vlog::error!("Error creating tx map for main node miniblock while checking instance {}: {}", instance_client.url, e);
+                            tracing::error!("Error creating tx map for main node miniblock while checking instance {}: {}", instance_client.url, e);
                             break;
                         }
                     };
@@ -235,14 +237,14 @@ impl Checker {
                         .await
                     {
                         Ok(_) => {
-                            vlog::info!(
+                            tracing::info!(
                                 "successfully checked miniblock #({}) for instance: {}",
                                 next_block_to_check,
                                 instance_client.url
                             );
                         }
                         Err(e) => {
-                            vlog::error!(
+                            tracing::error!(
                                 "Error checking miniblock #({}) for instance {}: {:?}. Skipping this miniblock",
                                 next_block_to_check,
                                 instance_client.url,
@@ -256,7 +258,7 @@ impl Checker {
                         .maybe_check_batches(&instance_client, instance_miniblock.l1_batch_number)
                         .await
                     {
-                        vlog::error!(
+                        tracing::error!(
                             "Error comparing batch {} for instance {}: {:?}",
                             instance_miniblock.l1_batch_number,
                             instance_client.url,
@@ -264,6 +266,7 @@ impl Checker {
                         );
                     }
                 }
+                Ok(())
             });
             join_handles.push(handle);
         }
@@ -272,7 +275,7 @@ impl Checker {
         tokio::select! {
             _ = wait_for_tasks(join_handles, None, None::<futures::future::Ready<()>>, false) => {},
             _ = stop_receiver.changed() => {
-                vlog::info!("Stop signal received, shutting down");
+                tracing::info!("Stop signal received, shutting down");
             },
         }
 
@@ -317,7 +320,8 @@ impl Checker {
                 {
                     Some(miniblock) => miniblock,
                     None => {
-                        vlog::warn!(
+                        // TODO(BFT-165): Implement Miniblock Existence Checker
+                        tracing::warn!(
                             "No miniblock found for miniblock #({}) in instance {}. skipping checking it for now.",
                             miniblock_num_to_check,
                             instance_client.url
@@ -337,7 +341,7 @@ impl Checker {
                 self.maybe_check_batches(&instance_client, main_node_miniblock.l1_batch_number)
                     .await?;
 
-                vlog::info!(
+                tracing::info!(
                     "successfully checked miniblock #({}) for instance: {}",
                     miniblock_num_to_check,
                     instance_client.url
@@ -359,7 +363,7 @@ impl Checker {
             .next_batch_to_check
             .get(instance_client.url.as_str())
             .expect("All instance URLs must exists in next_batch_to_check");
-        vlog::debug!("Maybe checking batch {}", miniblock_batch_number);
+        tracing::debug!("Maybe checking batch {}", miniblock_batch_number);
 
         // We should check batches only the first time we encounter them per instance
         // (i.e., next_instance_batch_to_check == miniblock_batch_number)
@@ -407,7 +411,8 @@ impl Checker {
         {
             Some(batch) => batch,
             None => {
-                vlog::warn!(
+                // TODO(BFT-165): Implement batch existence checker.
+                tracing::warn!(
                     "No batch found for batch #({}) in instance {}. skipping checking it for now.",
                     miniblock_batch_number,
                     instance_client.url
@@ -472,11 +477,11 @@ impl Checker {
                     .entry(url.to_string())
                     .or_insert_with(Vec::new);
                 divergences.push(divergence.clone());
-                vlog::error!("{}", divergence);
+                tracing::error!("{}", divergence);
             }
             RpcMode::Continuous => {
-                // Simply log for now.
-                vlog::error!("{}", divergence);
+                // Simply log for now. TODO(BFT-177): Add grafana metrics.
+                tracing::error!("{}", divergence);
             }
         }
     }
@@ -506,13 +511,13 @@ impl Checker {
 
     fn log_divergences(&mut self) {
         if self.divergences.is_empty() {
-            vlog::info!("No divergences found");
+            tracing::info!("No divergences found");
             return;
         }
         for (url, divergences) in &self.divergences {
-            vlog::error!("Divergences found for URL: {}", url);
+            tracing::error!("Divergences found for URL: {}", url);
             for divergence in divergences {
-                vlog::error!("{}", divergence);
+                tracing::error!("{}", divergence);
             }
         }
     }
@@ -526,7 +531,7 @@ impl Checker {
         instance_batch: L1BatchDetails,
         instance_url: &str,
     ) {
-        vlog::debug!(
+        tracing::debug!(
             "Checking batch details for batch #({})",
             main_node_batch.number
         );
@@ -545,13 +550,14 @@ impl Checker {
         }
     }
 
+    // TODO: What if when we checked the miniblock when the status was Sealed but not Verified?
     fn check_miniblock_details(
         &mut self,
         instance_url: &str,
         main_node_miniblock: &BlockDetails,
         instance_miniblock: &BlockDetails,
     ) {
-        vlog::debug!(
+        tracing::debug!(
             "Checking miniblock details for miniblock #({})",
             main_node_miniblock.number
         );
@@ -583,7 +589,7 @@ impl Checker {
             .create_tx_map(&instance_client.client, instance_miniblock.number)
             .await?;
 
-        vlog::debug!(
+        tracing::debug!(
             "Checking transactions for miniblock #({}) that has {} transactions",
             instance_miniblock.number,
             instance_tx_map.len(),
@@ -639,7 +645,7 @@ impl Checker {
                             miniblock_number: Some(instance_miniblock.number),
                         }),
                     );
-                    vlog::debug!(
+                    tracing::debug!(
                         "Added divergence for a tx that is in main node but not in instance: {:?}",
                         tx_hash
                     );
@@ -659,7 +665,7 @@ impl Checker {
                     miniblock_number: Some(instance_miniblock.number),
                 }),
             );
-            vlog::debug!(
+            tracing::debug!(
                 "Added divergence for a tx that is in instance but not in main node: {:?}",
                 tx_hash
             );
@@ -674,7 +680,7 @@ impl Checker {
         tx_hash: &H256,
         miniblock_number: MiniblockNumber,
     ) -> RpcResult<()> {
-        vlog::debug!(
+        tracing::debug!(
             "Checking receipts for a tx in miniblock {}",
             miniblock_number
         );
@@ -712,7 +718,7 @@ impl Checker {
         tx_hash: &H256,
         miniblock_number: MiniblockNumber,
     ) -> RpcResult<()> {
-        vlog::debug!(
+        tracing::debug!(
             "Checking transaction details for a tx in miniblock {}",
             miniblock_number
         );
@@ -755,10 +761,10 @@ impl Checker {
         let to_block = current_miniblock_block_num.0;
 
         if from_block < Some(0) || to_block % self.log_check_interval != 0 {
-            vlog::debug!("Skipping log check for miniblock {}", to_block);
+            tracing::debug!("Skipping log check for miniblock {}", to_block);
             return Ok(());
         }
-        vlog::debug!(
+        tracing::debug!(
             "Checking logs for miniblocks {}-{}",
             from_block.unwrap(),
             to_block - 1
@@ -772,14 +778,16 @@ impl Checker {
         let main_node_logs = match self.main_node_client.get_logs(filter.clone()).await {
             Ok(logs) => logs,
             Err(e) => {
-                vlog::error!("Failed to get logs from main node: {}", e);
+                // TODO(BFT-192): Be more specific with checking logs
+                tracing::error!("Failed to get logs from main node: {}", e);
                 return Ok(());
             }
         };
         let instance_logs = match instance_client.client.get_logs(filter).await {
             Ok(logs) => logs,
             Err(e) => {
-                vlog::error!("Failed to get logs from instance: {}", e);
+                // TODO(BFT-192): Be more specific with checking logs
+                tracing::error!("Failed to get logs from instance: {}", e);
                 return Ok(());
             }
         };
diff --git a/core/tests/cross_external_nodes_checker/src/helpers.rs b/core/tests/cross_external_nodes_checker/src/helpers.rs
index f250af1e0f99..14843e558680 100644
--- a/core/tests/cross_external_nodes_checker/src/helpers.rs
+++ b/core/tests/cross_external_nodes_checker/src/helpers.rs
@@ -119,7 +119,7 @@ impl ExponentialBackoff {
                 break;
             }
             let delay = self.base_delay * retry;
-            vlog::warn!(
+            tracing::warn!(
                 "{} Retrying in {} seconds",
                 self.retry_message,
                 delay.as_secs()
diff --git a/core/tests/cross_external_nodes_checker/src/main.rs b/core/tests/cross_external_nodes_checker/src/main.rs
index b69f715c227c..45192fe20fa9 100644
--- a/core/tests/cross_external_nodes_checker/src/main.rs
+++ b/core/tests/cross_external_nodes_checker/src/main.rs
@@ -15,13 +15,26 @@ use zksync_utils::wait_for_tasks::wait_for_tasks;
 
 #[tokio::main]
 async fn main() -> anyhow::Result<()> {
-    vlog::init();
-    let _sentry_guard = vlog::init_sentry();
+    #[allow(deprecated)] // TODO (QIT-21): Use centralized configuration approach.
+    let log_format = vlog::log_format_from_env();
+    #[allow(deprecated)] // TODO (QIT-21): Use centralized configuration approach.
+    let sentry_url = vlog::sentry_url_from_env();
+    #[allow(deprecated)] // TODO (QIT-21): Use centralized configuration approach.
+    let environment = vlog::environment_from_env();
 
-    vlog::info!("Started the Cross Node Checker");
+    let mut builder = vlog::ObservabilityBuilder::new().with_log_format(log_format);
+    if let Some(sentry_url) = sentry_url {
+        builder = builder
+            .with_sentry_url(&sentry_url)
+            .expect("Invalid Sentry URL")
+            .with_sentry_environment(environment);
+    }
+    let _guard = builder.build();
+
+    tracing::info!("Started the Cross Node Checker");
 
     let config = CheckerConfig::from_env();
-    vlog::info!("Loaded the checker config: {:?}", config);
+    tracing::info!("Loaded the checker config: {:?}", config);
 
     let mut join_handles = Vec::new();
     let sigint_receiver = setup_sigint_handler();
@@ -47,7 +60,7 @@ async fn main() -> anyhow::Result<()> {
         _ = wait_for_tasks(join_handles, None, None::<futures::future::Ready<()>>, false) => {},
         _ = sigint_receiver => {
             let _ = stop_sender.send(true);
-            vlog::info!("Stop signal received, shutting down the cross EN Checker");
+            tracing::info!("Stop signal received, shutting down the cross EN Checker");
         },
     }
 
diff --git a/core/tests/cross_external_nodes_checker/src/pubsub_checker.rs b/core/tests/cross_external_nodes_checker/src/pubsub_checker.rs
index 6f645d69d172..788602102975 100644
--- a/core/tests/cross_external_nodes_checker/src/pubsub_checker.rs
+++ b/core/tests/cross_external_nodes_checker/src/pubsub_checker.rs
@@ -3,6 +3,7 @@ use crate::{
     divergence::{Divergence, DivergenceDetails},
     helpers::{compare_json, ExponentialBackoff},
 };
+use anyhow::Context as _;
 use std::{
     collections::HashMap,
     sync::Arc,
@@ -58,18 +59,19 @@ impl PubSubChecker {
         }
     }
 
-    pub async fn run(&self, mut stop_receiver: Receiver<bool>) {
-        vlog::info!("Started pubsub checker");
+    pub async fn run(&self, mut stop_receiver: Receiver<bool>) -> anyhow::Result<()> {
+        tracing::info!("Started pubsub checker");
 
         let mut join_handles = Vec::new();
 
         let this = self.clone();
         let main_stop_receiver = stop_receiver.clone();
         let handle = spawn(async move {
-            vlog::info!("Started a task to subscribe to the main node");
+            tracing::info!("Started a task to subscribe to the main node");
             if let Err(e) = this.subscribe_main(main_stop_receiver).await {
-                vlog::error!("Error in main node subscription task: {}", e);
+                tracing::error!("Error in main node subscription task: {}", e);
             }
+            Ok(())
         });
         join_handles.push(handle);
 
@@ -79,10 +81,10 @@ impl PubSubChecker {
             let instance_stop_receiver = stop_receiver.clone();
             let url = instance_url.clone();
             let handle = spawn(async move {
-                vlog::info!("Started a task to subscribe to instance {}", url);
-                if let Err(e) = this.subscribe_instance(&url, instance_stop_receiver).await {
-                    vlog::error!("Error in instance {} subscription task: {}", url, e);
-                }
+                tracing::info!("Started a task to subscribe to instance {}", url);
+                this.subscribe_instance(&url, instance_stop_receiver)
+                    .await
+                    .with_context(|| format!("Error in instance {} subscription task", url))
             });
             join_handles.push(handle);
         }
@@ -90,9 +92,10 @@ impl PubSubChecker {
         select! {
             _ = wait_for_tasks(join_handles, None, None::<futures::future::Ready<()>>, false) => {},
             _ = stop_receiver.changed() => {
-                vlog::info!("Stop signal received, shutting down pubsub checker");
+                tracing::info!("Stop signal received, shutting down pubsub checker");
             },
         }
+        Ok(())
     }
 
     // Setup a client for the main node, subscribe, and insert incoming pubsub results into the shared hashmap.
@@ -126,7 +129,7 @@ impl PubSubChecker {
             // Secure the lock for the map and insert the new header.
             let mut blocks = self.blocks.lock().await;
             blocks.insert(block_number, (block_header, self.instance_urls.len()));
-            vlog::debug!("Inserted block {} to main node map", block_number);
+            tracing::debug!("Inserted block {} to main node map", block_number);
         }
 
         Ok(())
@@ -162,7 +165,7 @@ impl PubSubChecker {
                 )?;
             let pubsub_res = stream_res.ok_or_else(|| anyhow::anyhow!("Stream has ended"))?;
             let (instance_block_header, block_number) = self.extract_block_info(pubsub_res).await?;
-            vlog::debug!("Got block {} from instance {}", block_number, url);
+            tracing::debug!("Got block {} from instance {}", block_number, url);
 
             // Get the main node block header from the map and update its count.
             // This should be retried because the map not having the block the instance does might
@@ -188,7 +191,7 @@ impl PubSubChecker {
                                 } else {
                                     blocks.remove(&block_number);
                                 }
-                                vlog::debug!("Updated blocks map: {:?}", blocks.keys());
+                                tracing::debug!("Updated blocks map: {:?}", blocks.keys());
                                 Some((header, count))
                             }
                             None => None, // Retry
@@ -207,7 +210,7 @@ impl PubSubChecker {
                     // start with block X while instance is looking for block X-1, which will never
                     // be in the map. We don't want to log an error for this case.
                     if start.elapsed() > GRACE_PERIOD {
-                        vlog::error!(
+                        tracing::error!(
                             "block {} has not been found in the main node map for instance {} after {} retries",
                             block_number,
                             url,
@@ -239,12 +242,12 @@ impl PubSubChecker {
         url: &str,
     ) -> bool {
         if *stop_receiver.borrow() {
-            vlog::info!("Stop signal received, shutting down pubsub checker");
+            tracing::info!("Stop signal received, shutting down pubsub checker");
             return true;
         }
         if let Some(duration) = self.subscription_duration {
             if start.elapsed() > duration {
-                vlog::info!("Client {} reached its subscription duration", url);
+                tracing::info!("Client {} reached its subscription duration", url);
                 return true;
             }
         }
@@ -252,11 +255,10 @@ impl PubSubChecker {
     }
 
     async fn setup_client(&self, url: &str) -> WsClient {
-        let client = WsClientBuilder::default()
+        WsClientBuilder::default()
             .build(url)
             .await
-            .expect("Failed to create a WS client");
-        client
+            .expect("Failed to create a WS client")
     }
 
     // Extract the block header and block number from the pubsub result that is expected to be a header.
@@ -283,14 +285,14 @@ impl PubSubChecker {
     ) {
         let header_differences = compare_json(&main_node_header, &instance_header, "".to_string());
         if header_differences.is_empty() {
-            vlog::info!(
+            tracing::info!(
                 "No divergences found in header for block {} for instance {}",
                 instance_header.number.unwrap().as_u64(),
                 instance_url
             );
         }
         for (key, (main_node_val, instance_val)) in header_differences {
-            vlog::error!(
+            tracing::error!(
                 "{}",
                 Divergence::PubSubHeader(DivergenceDetails {
                     en_instance_url: instance_url.to_string(),
diff --git a/core/tests/loadnext/Cargo.toml b/core/tests/loadnext/Cargo.toml
index aa759318dfea..da222e5328c0 100644
--- a/core/tests/loadnext/Cargo.toml
+++ b/core/tests/loadnext/Cargo.toml
@@ -8,18 +8,19 @@ repository = "https://github.com/matter-labs/zksync-era"
 license = "MIT OR Apache-2.0"
 keywords = ["blockchain", "zksync"]
 categories = ["cryptography"]
-publish = false # We don't want to publish our tests.
+publish = false                                           # We don't want to publish our tests.
 
 [dependencies]
 zksync = { path = "../../../sdk/zksync-rs", features = ["mint"] }
-zksync_types = { path = "../../lib/types", version = "1.0" }
-zksync_utils = { path = "../../lib/utils", version = "1.0" }
-zksync_eth_signer = { path = "../../lib/eth_signer", version = "1.0" }
-zksync_web3_decl = { path = "../../lib/web3_decl", version = "1.0" }
-zksync_eth_client = { path = "../../lib/eth_client", version = "1.0" }
-zksync_config = { path = "../../lib/config", version = "1.0" }
-vlog = { path = "../../lib/vlog", version = "1.0" }
-prometheus_exporter = { path = "../../lib/prometheus_exporter", version = "1.0" }
+zksync_types = { path = "../../lib/types" }
+zksync_utils = { path = "../../lib/utils" }
+zksync_eth_signer = { path = "../../lib/eth_signer" }
+zksync_web3_decl = { path = "../../lib/web3_decl" }
+zksync_eth_client = { path = "../../lib/eth_client" }
+zksync_contracts = { path = "../../lib/contracts" }
+zksync_config = { path = "../../lib/config" }
+vlog = { path = "../../lib/vlog" }
+prometheus_exporter = { path = "../../lib/prometheus_exporter" }
 
 async-trait = "0.1"
 serde = { version = "1.0", features = ["derive"] }
@@ -36,4 +37,5 @@ once_cell = "1.7"
 thiserror = "1"
 reqwest = { version = "0.11", features = ["blocking", "json"] }
 regex = "1.7"
-metrics = "0.20"
+metrics = "0.21"
+tracing = "0.1"
diff --git a/core/tests/loadnext/src/account/api_request_executor.rs b/core/tests/loadnext/src/account/api_request_executor.rs
index dcaf17e206e8..e1e09004d4e9 100644
--- a/core/tests/loadnext/src/account/api_request_executor.rs
+++ b/core/tests/loadnext/src/account/api_request_executor.rs
@@ -114,7 +114,7 @@ impl AccountLifespan {
                 match result {
                     Ok(()) => ReportLabel::ActionDone,
                     Err(err) => {
-                        vlog::error!("API request failed: {request:?}, reason: {err}");
+                        tracing::error!("API request failed: {request:?}, reason: {err}");
                         ReportLabel::failed(err.to_string())
                     }
                 }
diff --git a/core/tests/loadnext/src/account/mod.rs b/core/tests/loadnext/src/account/mod.rs
index e868937f65c5..bead354cdeaa 100644
--- a/core/tests/loadnext/src/account/mod.rs
+++ b/core/tests/loadnext/src/account/mod.rs
@@ -8,9 +8,10 @@ use tokio::sync::RwLock;
 
 use zksync::{error::ClientError, operations::SyncTransactionHandle, HttpClient};
 use zksync_types::{api::TransactionReceipt, Address, Nonce, H256, U256, U64};
-use zksync_utils::test_utils::LoadnextContractExecutionParams;
 use zksync_web3_decl::jsonrpsee::core::Error as CoreError;
 
+use zksync_contracts::test_contracts::LoadnextContractExecutionParams;
+
 use crate::utils::format_gwei;
 use crate::{
     account::tx_command_executor::SubmitResult,
@@ -106,13 +107,13 @@ impl AccountLifespan {
 
         tokio::select! {
             result = tx_execution_task => {
-                vlog::trace!("Transaction execution task finished with {result:?}");
+                tracing::trace!("Transaction execution task finished with {result:?}");
             },
             result = api_requests_task => {
-                vlog::trace!("API requests task finished with {result:?}");
+                tracing::trace!("API requests task finished with {result:?}");
             },
             result = self.run_pubsub_task(limiters) => {
-                vlog::trace!("PubSub task finished with {result:?}");
+                tracing::trace!("PubSub task finished with {result:?}");
             },
             () = tokio::time::sleep(duration) => {}
         }
@@ -168,7 +169,7 @@ impl AccountLifespan {
         // Due to natural sleep for sending tx, usually more than 1 tx can be already
         // processed and have a receipt
         let start = Instant::now();
-        vlog::trace!(
+        tracing::trace!(
             "Account {:?}: check_inflight_txs len {:?}",
             self.wallet.wallet.address(),
             self.inflight_txs.len()
@@ -186,7 +187,7 @@ impl AccountLifespan {
                     let effective_gas_price = transaction_receipt
                         .effective_gas_price
                         .unwrap_or(U256::zero());
-                    vlog::debug!(
+                    tracing::debug!(
                         "Account {:?}: tx included. Total fee: {}, gas used: {gas_used}gas, \
                          gas price: {effective_gas_price} WEI. Latency {:?} at attempt {:?}",
                         self.wallet.wallet.address(),
@@ -198,7 +199,7 @@ impl AccountLifespan {
                         .await?;
                 }
                 other => {
-                    vlog::trace!(
+                    tracing::trace!(
                         "Account {:?}: check_inflight_txs tx not yet included: {other:?}",
                         self.wallet.wallet.address()
                     );
@@ -207,7 +208,7 @@ impl AccountLifespan {
                 }
             }
         }
-        vlog::trace!(
+        tracing::trace!(
             "Account {:?}: check_inflight_txs complete {:?}",
             self.wallet.wallet.address(),
             start.elapsed()
@@ -265,7 +266,7 @@ impl AccountLifespan {
                 Ok(result) => result,
                 Err(err) if Self::should_retry(&err) => {
                     if attempt < MAX_RETRIES {
-                        vlog::warn!("Error while sending tx: {err}. Retrying...");
+                        tracing::warn!("Error while sending tx: {err}. Retrying...");
                         // Retry operation.
                         attempt += 1;
                         continue;
@@ -327,7 +328,7 @@ impl AccountLifespan {
         command: TxCommand,
     ) -> Result<(), Aborted> {
         if let ReportLabel::ActionFailed { error } = &label {
-            vlog::error!(
+            tracing::error!(
                 "Command failed: from {:?}, {command:#?} ({error})",
                 self.wallet.wallet.address()
             )
diff --git a/core/tests/loadnext/src/account/pubsub_executor.rs b/core/tests/loadnext/src/account/pubsub_executor.rs
index fbe650d7bf9d..2dec5dbd8c60 100644
--- a/core/tests/loadnext/src/account/pubsub_executor.rs
+++ b/core/tests/loadnext/src/account/pubsub_executor.rs
@@ -39,7 +39,7 @@ impl AccountLifespan {
                 Ok(_) => ReportLabel::ActionDone,
                 Err(err) => {
                     // Subscriptions can fail for a variety of reasons - no need to escalate it.
-                    vlog::warn!("Subscription failed: {subscription_type:?}, reason: {err}");
+                    tracing::warn!("Subscription failed: {subscription_type:?}, reason: {err}");
                     ReportLabel::failed(err.to_string())
                 }
             }
diff --git a/core/tests/loadnext/src/account/tx_command_executor.rs b/core/tests/loadnext/src/account/tx_command_executor.rs
index d7f39bfed9d2..9338044fa2e9 100644
--- a/core/tests/loadnext/src/account/tx_command_executor.rs
+++ b/core/tests/loadnext/src/account/tx_command_executor.rs
@@ -353,14 +353,14 @@ impl AccountLifespan {
                 let tx = self
                     .build_execute_loadnext_contract(command, contract_address)
                     .await?;
-                vlog::trace!(
+                tracing::trace!(
                     "Account {:?}: execute_loadnext_contract: tx built in {:?}",
                     self.wallet.wallet.address(),
                     started_at.elapsed()
                 );
                 started_at = Instant::now();
                 let result = self.execute_submit(tx, command.modifier).await;
-                vlog::trace!(
+                tracing::trace!(
                     "Account {:?}: execute_loadnext_contract: tx executed in {:?}",
                     self.wallet.wallet.address(),
                     started_at.elapsed()
@@ -405,7 +405,7 @@ impl AccountLifespan {
                 self.main_l2_token,
             )))
             .await?;
-        vlog::trace!(
+        tracing::trace!(
             "Account {:?}: fee estimated. Max total fee: {}, gas limit: {}gas; Max gas price: {}WEI, \
              Gas per pubdata: {:?}gas",
             self.wallet.wallet.address(),
diff --git a/core/tests/loadnext/src/account_pool.rs b/core/tests/loadnext/src/account_pool.rs
index 385540badde3..c19765d2bb32 100644
--- a/core/tests/loadnext/src/account_pool.rs
+++ b/core/tests/loadnext/src/account_pool.rs
@@ -120,7 +120,7 @@ impl AccountPool {
         };
 
         let mut rng = LoadtestRng::new_generic(config.seed.clone());
-        vlog::info!("Using RNG with master seed: {}", rng.seed_hex());
+        tracing::info!("Using RNG with master seed: {}", rng.seed_hex());
 
         let group_size = config.accounts_group_size;
         let accounts_amount = config.accounts_amount;
diff --git a/core/tests/loadnext/src/config.rs b/core/tests/loadnext/src/config.rs
index 22990d7bc2e3..1c4b5ae77339 100644
--- a/core/tests/loadnext/src/config.rs
+++ b/core/tests/loadnext/src/config.rs
@@ -4,9 +4,9 @@ use tokio::sync::Semaphore;
 use std::path::PathBuf;
 use std::time::Duration;
 
+use zksync_contracts::test_contracts::LoadnextContractExecutionParams;
 use zksync_types::network::Network;
 use zksync_types::{Address, L2ChainId, H160};
-use zksync_utils::test_utils::LoadnextContractExecutionParams;
 
 use crate::fs_utils::read_tokens;
 
@@ -143,13 +143,13 @@ pub struct LoadtestConfig {
 
 fn default_max_inflight_txs() -> usize {
     let result = 5;
-    vlog::info!("Using default MAX_INFLIGHT_TXS: {result}");
+    tracing::info!("Using default MAX_INFLIGHT_TXS: {result}");
     result
 }
 
 fn default_l1_rpc_address() -> String {
     let result = "http://127.0.0.1:8545".to_string();
-    vlog::info!("Using default L1_RPC_ADDRESS: {result}");
+    tracing::info!("Using default L1_RPC_ADDRESS: {result}");
     result
 }
 
@@ -158,25 +158,25 @@ fn default_master_wallet_pk() -> String {
     // Using this key for rinkeby will result in losing rinkeby ETH.
     // Corresponding wallet is 0x36615Cf349d7F6344891B1e7CA7C72883F5dc049
     let result = "7726827caac94a7f9e1b160f7ea819f172f7b6f9d2a97f992c38edeab82d4110".to_string();
-    vlog::info!("Using default MASTER_WALLET_PK: {result}");
+    tracing::info!("Using default MASTER_WALLET_PK: {result}");
     result
 }
 
 fn default_accounts_amount() -> usize {
     let result = 80;
-    vlog::info!("Using default ACCOUNTS_AMOUNT: {result}");
+    tracing::info!("Using default ACCOUNTS_AMOUNT: {result}");
     result
 }
 
 fn default_duration_sec() -> u64 {
     let result = 300;
-    vlog::info!("Using default DURATION_SEC: {result}");
+    tracing::info!("Using default DURATION_SEC: {result}");
     result
 }
 
 fn default_accounts_group_size() -> usize {
     let result = 40;
-    vlog::info!("Using default ACCOUNTS_GROUP_SIZE: {result}");
+    tracing::info!("Using default ACCOUNTS_GROUP_SIZE: {result}");
     result
 }
 
@@ -187,7 +187,7 @@ fn default_main_token() -> H160 {
     // 0xeb8f08a975Ab53E34D8a0330E0D34de942C95926 for rinkeby
     let tokens = read_tokens(Network::Localhost).expect("Failed to parse tokens file");
     let main_token = tokens.first().expect("Loaded tokens list is empty");
-    vlog::info!("Main token: {main_token:?}");
+    tracing::info!("Main token: {main_token:?}");
     main_token.address
 }
 
@@ -198,39 +198,39 @@ fn default_test_contracts_path() -> PathBuf {
         path.join("etc/contracts-test-data")
     };
 
-    vlog::info!("Test contracts path: {}", test_contracts_path.display());
+    tracing::info!("Test contracts path: {}", test_contracts_path.display());
 
     test_contracts_path
 }
 
 fn default_sync_api_requests_limit() -> usize {
     let result = 20;
-    vlog::info!("Using default SYNC_API_REQUESTS_LIMIT: {result}");
+    tracing::info!("Using default SYNC_API_REQUESTS_LIMIT: {result}");
     result
 }
 
 fn default_sync_pubsub_subscriptions_limit() -> usize {
     let result = 150;
-    vlog::info!("Using default SYNC_PUBSUB_SUBSCRIPTIONS_LIMIT: {result}");
+    tracing::info!("Using default SYNC_PUBSUB_SUBSCRIPTIONS_LIMIT: {result}");
     result
 }
 
 fn default_single_subscription_time_secs() -> u64 {
     let result = 30;
-    vlog::info!("Using default SINGLE_SUBSCRIPTION_TIME_SECS: {result}");
+    tracing::info!("Using default SINGLE_SUBSCRIPTION_TIME_SECS: {result}");
     result
 }
 
 fn default_seed() -> Option<String> {
     let result = None;
-    vlog::info!("Using default SEED: {result:?}");
+    tracing::info!("Using default SEED: {result:?}");
     result
 }
 
 fn default_l2_chain_id() -> u16 {
     // 270 for rinkeby
     let result = *L2ChainId::default();
-    vlog::info!("Using default L2_CHAIN_ID: {result}");
+    tracing::info!("Using default L2_CHAIN_ID: {result}");
     result
 }
 
@@ -241,26 +241,26 @@ pub fn get_default_l2_rpc_address() -> String {
 fn default_l2_rpc_address() -> String {
     // https://z2-dev-api.zksync.dev:443 for stage2
     let result = get_default_l2_rpc_address();
-    vlog::info!("Using default L2_RPC_ADDRESS: {result}");
+    tracing::info!("Using default L2_RPC_ADDRESS: {result}");
     result
 }
 
 fn default_l2_ws_rpc_address() -> String {
     // ws://z2-dev-api.zksync.dev:80/ws for stage2
     let result = "ws://127.0.0.1:3051".to_string();
-    vlog::info!("Using default L2_WS_RPC_ADDRESS: {result}");
+    tracing::info!("Using default L2_WS_RPC_ADDRESS: {result}");
     result
 }
 
 fn default_expected_tx_count() -> Option<usize> {
     let result = None;
-    vlog::info!("Using default EXPECTED_TX_COUNT: {result:?}");
+    tracing::info!("Using default EXPECTED_TX_COUNT: {result:?}");
     result
 }
 
 fn default_prometheus_label() -> String {
     let result = "unset".to_string();
-    vlog::info!("Using default PROMETHEUS_LABEL: {result:?}");
+    tracing::info!("Using default PROMETHEUS_LABEL: {result:?}");
     result
 }
 
@@ -325,13 +325,13 @@ impl Default for TransactionWeights {
 
 fn default_transaction_weights() -> TransactionWeights {
     let result = TransactionWeights::default();
-    vlog::info!("Using default TransactionWeights: {result:?}");
+    tracing::info!("Using default TransactionWeights: {result:?}");
     result
 }
 
 fn default_contract_execution_params() -> LoadnextContractExecutionParams {
     let result = LoadnextContractExecutionParams::default();
-    vlog::info!("Using default LoadnextContractExecutionParams: {result:?}");
+    tracing::info!("Using default LoadnextContractExecutionParams: {result:?}");
     result
 }
 
diff --git a/core/tests/loadnext/src/executor.rs b/core/tests/loadnext/src/executor.rs
index 22208853fd55..4998ad338b3e 100644
--- a/core/tests/loadnext/src/executor.rs
+++ b/core/tests/loadnext/src/executor.rs
@@ -75,15 +75,15 @@ impl Executor {
     pub async fn start(&mut self) -> LoadtestResult {
         // If the error occurs during the main flow, we will consider it as a test failure.
         self.start_inner().await.unwrap_or_else(|err| {
-            vlog::error!("Loadtest was interrupted by the following error: {err}");
+            tracing::error!("Loadtest was interrupted by the following error: {err}");
             LoadtestResult::TestFailed
         })
     }
 
     /// Inner representation of `start` function which returns a `Result`, so it can conveniently use `?`.
     async fn start_inner(&mut self) -> anyhow::Result<LoadtestResult> {
-        vlog::info!("Initializing accounts");
-        vlog::info!("Running for MASTER {:?}", self.pool.master_wallet.address());
+        tracing::info!("Initializing accounts");
+        tracing::info!("Running for MASTER {:?}", self.pool.master_wallet.address());
         self.check_onchain_balance().await?;
         self.mint().await?;
         self.deposit_to_master().await?;
@@ -96,7 +96,7 @@ impl Executor {
 
     /// Verifies that onchain ETH balance for the main account is sufficient to run the loadtest.
     async fn check_onchain_balance(&mut self) -> anyhow::Result<()> {
-        vlog::info!("Master Account: Checking onchain balance");
+        tracing::info!("Master Account: Checking onchain balance");
         let master_wallet = &mut self.pool.master_wallet;
         let ethereum = master_wallet.ethereum(&self.config.l1_rpc_address).await?;
         let eth_balance = ethereum.balance().await?;
@@ -108,7 +108,7 @@ impl Executor {
                 format_eth(U256::from(MIN_MASTER_ACCOUNT_BALANCE))
             );
         }
-        vlog::info!(
+        tracing::info!(
             "Master Account {} L1 balance is {}",
             self.pool.master_wallet.address(),
             format_eth(eth_balance)
@@ -123,7 +123,7 @@ impl Executor {
 
     /// Mints the ERC-20 token on the main wallet.
     async fn mint(&mut self) -> anyhow::Result<()> {
-        vlog::info!("Master Account: Minting ERC20 token...");
+        tracing::info!("Master Account: Minting ERC20 token...");
         let mint_amount = self.amount_to_deposit() + self.amount_for_l1_distribution();
 
         let master_wallet = &self.pool.master_wallet;
@@ -139,7 +139,7 @@ impl Executor {
 
         // Only send the mint transaction if it's necessary.
         if eth_balance > U256::from(mint_amount) {
-            vlog::info!("There is already enough money on the master balance");
+            tracing::info!("There is already enough money on the master balance");
             return Ok(());
         }
 
@@ -162,7 +162,7 @@ impl Executor {
             Ok(value) => value,
         };
 
-        vlog::info!("Mint tx with hash {mint_tx_hash:?}");
+        tracing::info!("Mint tx with hash {mint_tx_hash:?}");
         let receipt = ethereum.wait_for_tx(mint_tx_hash).await?;
         self.assert_eth_tx_success(&receipt).await;
 
@@ -174,13 +174,13 @@ impl Executor {
             "Minting didn't result in tokens added to balance"
         );
 
-        vlog::info!("Master Account: Minting is OK (balance: {erc20_balance})");
+        tracing::info!("Master Account: Minting is OK (balance: {erc20_balance})");
         Ok(())
     }
 
     /// Deposits the ERC-20 token to main wallet in L2.
     async fn deposit_to_master(&mut self) -> anyhow::Result<()> {
-        vlog::info!("Master Account: Performing an ERC-20 deposit to master");
+        tracing::info!("Master Account: Performing an ERC-20 deposit to master");
 
         let balance = self
             .pool
@@ -190,13 +190,13 @@ impl Executor {
         let necessary_balance =
             U256::from(self.erc20_transfer_amount() * self.config.accounts_amount as u128);
 
-        vlog::info!(
+        tracing::info!(
             "Master account token balance on l2: {balance:?}, necessary balance \
              for initial transfers {necessary_balance:?}"
         );
 
         if balance > necessary_balance {
-            vlog::info!(
+            tracing::info!(
                 "Master account has enough money on l2, nothing to deposit. Current balance \
                  {balance:?}, necessary balance for initial transfers {necessary_balance:?}"
             );
@@ -222,7 +222,7 @@ impl Executor {
             self.assert_eth_tx_success(&receipt).await;
         }
 
-        vlog::info!("Approved ERC20 deposits");
+        tracing::info!("Approved ERC20 deposits");
         let receipt = deposit_with_attempts(
             &ethereum,
             self.pool.master_wallet.address(),
@@ -250,12 +250,12 @@ impl Executor {
             .wait_for_commit()
             .await?;
 
-        vlog::info!("Master Account: ERC-20 deposit is OK");
+        tracing::info!("Master Account: ERC-20 deposit is OK");
         Ok(())
     }
 
     async fn deposit_eth_to_paymaster(&mut self) -> anyhow::Result<()> {
-        vlog::info!("Master Account: Checking paymaster balance");
+        tracing::info!("Master Account: Checking paymaster balance");
         let mut ethereum = self
             .pool
             .master_wallet
@@ -279,7 +279,7 @@ impl Executor {
             .get_balance(paymaster_address, None)
             .await?;
 
-        vlog::info!(
+        tracing::info!(
             "Paymaster balance is {}. Minimum amount {}",
             format_eth(paymaster_balance),
             format_eth(U256::from(MIN_PAYMASTER_BALANCE))
@@ -326,7 +326,7 @@ impl Executor {
             .get_balance(paymaster_address, None)
             .await?;
 
-        vlog::info!(
+        tracing::info!(
             "Paymaster deposit complete. New balance: {}",
             format_eth(paymaster_balance)
         );
@@ -475,7 +475,7 @@ impl Executor {
             }
         }
 
-        vlog::info!("Master account: Wait for ethereum txs confirmations, {eth_txs:?}");
+        tracing::info!("Master account: Wait for ethereum txs confirmations, {eth_txs:?}");
         for eth_tx in eth_txs {
             ethereum.wait_for_tx(eth_tx).await?;
         }
@@ -500,7 +500,7 @@ impl Executor {
     /// - Spawning test account routine futures.
     /// - Completing all the spawned tasks and returning the result to the caller.
     async fn send_initial_transfers(&mut self) -> anyhow::Result<LoadtestResult> {
-        vlog::info!("Master Account: Sending initial transfers");
+        tracing::info!("Master Account: Sending initial transfers");
         // How many times we will resend a batch.
         const MAX_RETRIES: usize = 3;
 
@@ -542,13 +542,13 @@ impl Executor {
             let accounts_to_process = std::cmp::min(accounts_left, max_accounts_per_iter);
 
             if let Err(err) = self.send_initial_transfers_inner(accounts_to_process).await {
-                vlog::warn!("Iteration of the initial funds distribution failed: {err}");
+                tracing::warn!("Iteration of the initial funds distribution failed: {err}");
                 retry_counter += 1;
                 continue;
             }
 
             accounts_processed += accounts_to_process;
-            vlog::info!("[{accounts_processed}/{accounts_amount}] Accounts processed");
+            tracing::info!("[{accounts_processed}/{accounts_amount}] Accounts processed");
 
             retry_counter = 0;
 
@@ -592,11 +592,11 @@ impl Executor {
             self.pool.accounts.is_empty(),
             "Some accounts were not drained"
         );
-        vlog::info!("All the initial transfers are completed");
+        tracing::info!("All the initial transfers are completed");
 
-        vlog::info!("Waiting for the account futures to be completed...");
+        tracing::info!("Waiting for the account futures to be completed...");
         future::try_join_all(account_tasks).await?;
-        vlog::info!("All the spawned tasks are completed");
+        tracing::info!("All the spawned tasks are completed");
 
         Ok(report_collector_future.await?)
     }
@@ -616,6 +616,7 @@ impl Executor {
 
         let gas_price_with_priority = average_gas_price + U256::from(DEFAULT_PRIORITY_FEE);
 
+        // TODO (PLA-85): Add gas estimations for deposits in Rust SDK
         let average_l1_to_l2_gas_limit = 5_000_000u32;
         let average_price_for_l1_to_l2_execute = ethereum
             .base_cost(
@@ -694,7 +695,7 @@ async fn deposit_with_attempts(
             .deposit(token, deposit_amount, to, None, None, Some(options))
             .await?;
 
-        vlog::info!("Deposit with tx_hash {deposit_tx_hash:?}");
+        tracing::info!("Deposit with tx_hash {deposit_tx_hash:?}");
 
         // Wait for the corresponding priority operation to be committed in zkSync.
         match ethereum.wait_for_tx(deposit_tx_hash).await {
@@ -702,7 +703,7 @@ async fn deposit_with_attempts(
                 return Ok(eth_receipt);
             }
             Err(err) => {
-                vlog::error!("Deposit error: {err}");
+                tracing::error!("Deposit error: {err}");
             }
         };
     }
diff --git a/core/tests/loadnext/src/main.rs b/core/tests/loadnext/src/main.rs
index a920c5b19b29..5d35c4e7f799 100644
--- a/core/tests/loadnext/src/main.rs
+++ b/core/tests/loadnext/src/main.rs
@@ -4,6 +4,13 @@
 //! Without required variables provided, test is launched in the localhost/development mode with some hard-coded
 //! values to check the local zkSync deployment.
 
+use tokio::sync::watch;
+
+use std::time::Duration;
+
+use prometheus_exporter::PrometheusExporterConfig;
+use zksync_config::configs::api::PrometheusConfig;
+
 use loadnext::{
     command::TxType,
     config::{ExecutionConfig, LoadtestConfig},
@@ -11,13 +18,23 @@ use loadnext::{
     report_collector::LoadtestResult,
 };
 
-use std::time::Duration;
-use zksync_config::configs::api::PrometheusConfig;
-
 #[tokio::main]
 async fn main() -> anyhow::Result<()> {
-    vlog::init();
-    let _sentry_guard = vlog::init_sentry();
+    #[allow(deprecated)] // TODO (QIT-21): Use centralized configuration approach.
+    let log_format = vlog::log_format_from_env();
+    #[allow(deprecated)] // TODO (QIT-21): Use centralized configuration approach.
+    let sentry_url = vlog::sentry_url_from_env();
+    #[allow(deprecated)] // TODO (QIT-21): Use centralized configuration approach.
+    let environment = vlog::environment_from_env();
+
+    let mut builder = vlog::ObservabilityBuilder::new().with_log_format(log_format);
+    if let Some(sentry_url) = sentry_url {
+        builder = builder
+            .with_sentry_url(&sentry_url)
+            .expect("Invalid Sentry URL")
+            .with_sentry_environment(environment);
+    }
+    let _guard = builder.build();
 
     let config = LoadtestConfig::from_env()
         .expect("Config parameters should be loaded from env or from default values");
@@ -26,36 +43,37 @@ async fn main() -> anyhow::Result<()> {
 
     TxType::initialize_weights(&execution_config.transaction_weights);
 
-    vlog::info!(
+    tracing::info!(
         "Run with tx weights: {:?}",
         execution_config.transaction_weights
     );
     let mut executor = Executor::new(config, execution_config).await?;
+    let (stop_sender, stop_receiver) = watch::channel(false);
 
     if let Some(prometheus_config) = prometheus_config {
-        vlog::info!("Starting prometheus exporter with config {prometheus_config:?}");
-        tokio::spawn(prometheus_exporter::run_prometheus_exporter(
-            prometheus_config.listener_port,
-            Some((
-                prometheus_config.pushgateway_url.clone(),
-                prometheus_config.push_interval(),
-            )),
-        ));
+        let exporter_config = PrometheusExporterConfig::push(
+            prometheus_config.gateway_endpoint(),
+            prometheus_config.push_interval(),
+        );
+
+        tracing::info!("Starting prometheus exporter with config {prometheus_config:?}");
+        tokio::spawn(exporter_config.run(stop_receiver));
     } else {
-        vlog::info!("Starting without prometheus exporter");
+        tracing::info!("Starting without prometheus exporter");
     }
 
     let result = executor.start().await;
-    vlog::info!("Waiting 5 seconds to make sure all the metrics are pushed to the push gateway");
+    tracing::info!("Waiting 5 seconds to make sure all the metrics are pushed to the push gateway");
     tokio::time::sleep(Duration::from_secs(5)).await;
+    stop_sender.send_replace(true);
 
     match result {
         LoadtestResult::TestPassed => {
-            vlog::info!("Test passed");
+            tracing::info!("Test passed");
             Ok(())
         }
         LoadtestResult::TestFailed => {
-            vlog::error!("Test failed");
+            tracing::error!("Test failed");
             Err(anyhow::anyhow!("Test failed"))
         }
     }
diff --git a/core/tests/loadnext/src/report_collector/metrics_collector.rs b/core/tests/loadnext/src/report_collector/metrics_collector.rs
index 10883c5d3b2d..6c5867901b12 100644
--- a/core/tests/loadnext/src/report_collector/metrics_collector.rs
+++ b/core/tests/loadnext/src/report_collector/metrics_collector.rs
@@ -130,11 +130,11 @@ impl MetricsCollector {
     }
 
     pub fn report(&self) {
-        vlog::info!("Action: [10 percentile, 50 percentile, 90 percentile]");
+        tracing::info!("Action: [10 percentile, 50 percentile, 90 percentile]");
         for (action, histogram) in &self.action_stats {
             // Only report data that was actually gathered.
             if !histogram.is_empty() {
-                vlog::info!(
+                tracing::info!(
                     "{action:?}: [>{}ms >{}ms >{}ms]",
                     histogram.percentile(10).0.as_millis(),
                     histogram.percentile(50).0.as_millis(),
diff --git a/core/tests/loadnext/src/report_collector/mod.rs b/core/tests/loadnext/src/report_collector/mod.rs
index d2d5a50690f4..a7798e0bea7f 100644
--- a/core/tests/loadnext/src/report_collector/mod.rs
+++ b/core/tests/loadnext/src/report_collector/mod.rs
@@ -56,9 +56,9 @@ impl Collectors {
 
             let actual_count = self.operation_results.tx_results.successes() as f64;
             let delta = 100.0 * (actual_count - expected_count as f64) / (expected_count as f64);
-            vlog::info!("Expected number of processed txs: {expected_count}");
-            vlog::info!("Actual number of processed txs: {actual_count}");
-            vlog::info!("Delta: {delta:.1}%");
+            tracing::info!("Expected number of processed txs: {expected_count}");
+            tracing::info!("Actual number of processed txs: {actual_count}");
+            tracing::info!("Delta: {delta:.1}%");
 
             (MIN_ACCEPTABLE_DELTA..=MAX_ACCEPTABLE_DELTA).contains(&delta)
         });
@@ -127,11 +127,11 @@ impl ReportCollector {
         let mut start = Instant::now();
 
         while let Some(report) = self.reports_stream.next().await {
-            vlog::trace!("Report: {report:?}");
+            tracing::trace!("Report: {report:?}");
             if matches!(&report.action, ActionType::InitComplete) {
                 assert!(collectors.is_none(), "`InitComplete` report sent twice");
 
-                vlog::info!("Test initialization and warm-up took {:?}", start.elapsed());
+                tracing::info!("Test initialization and warm-up took {:?}", start.elapsed());
                 start = Instant::now();
                 collectors = Some(Collectors::new(self.loadtest_duration));
                 continue;
@@ -152,7 +152,7 @@ impl ReportCollector {
                     let processed_tx_count = collectors.operation_results.tx_results.total();
                     if processed_tx_count % 50 == 0 {
                         let current_test_duration = start.elapsed();
-                        vlog::info!(
+                        tracing::info!(
                             "Processed {processed_tx_count} transactions after initialization, \
                              took {current_test_duration:?} (current TPS: {})",
                             collectors.operation_results.tps(current_test_duration)
@@ -163,9 +163,9 @@ impl ReportCollector {
 
             // Report failure, if it exists.
             if let ReportLabel::ActionFailed { error } = &report.label {
-                vlog::warn!("Operation failed: {error}");
+                tracing::warn!("Operation failed: {error}");
                 if self.fail_fast && matches!(report.action, ActionType::Tx(_)) {
-                    vlog::error!("Test aborted because of an error in transaction processing");
+                    tracing::error!("Test aborted because of an error in transaction processing");
                     if let Some(collectors) = &mut collectors {
                         collectors.is_aborted = true;
                     }
@@ -180,7 +180,7 @@ impl ReportCollector {
             collectors.report(self.prometheus_label);
             collectors.final_resolution(self.expected_tx_count)
         } else {
-            vlog::error!("Test failed before initialization was completed");
+            tracing::error!("Test failed before initialization was completed");
             LoadtestResult::TestFailed
         }
     }
diff --git a/core/tests/loadnext/src/report_collector/operation_results_collector.rs b/core/tests/loadnext/src/report_collector/operation_results_collector.rs
index e794233a1de7..63f2bb7dbf9f 100644
--- a/core/tests/loadnext/src/report_collector/operation_results_collector.rs
+++ b/core/tests/loadnext/src/report_collector/operation_results_collector.rs
@@ -81,15 +81,15 @@ impl OperationResultsCollector {
     }
 
     pub fn report(&self, actual_duration: Duration) {
-        vlog::info!(
+        tracing::info!(
             "Ran loadtest for {actual_duration:?} (requested duration: {:?}). \
              TPS: {} (with requested duration: {})",
             self.loadtest_duration,
             self.tps(actual_duration),
             self.nominal_tps()
         );
-        vlog::info!("Transaction execution stats: {}", self.tx_results);
-        vlog::info!("API requests stats: {}", self.api_requests_results);
-        vlog::info!("Subscriptions stats: {}", self.subscriptions_results);
+        tracing::info!("Transaction execution stats: {}", self.tx_results);
+        tracing::info!("API requests stats: {}", self.api_requests_results);
+        tracing::info!("Subscriptions stats: {}", self.subscriptions_results);
     }
 }
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 a936f1d0de5f..b50cfde00bd2 100644
--- a/core/tests/revert-test/tests/revert-and-restart.test.ts
+++ b/core/tests/revert-test/tests/revert-and-restart.test.ts
@@ -3,6 +3,7 @@ import { Tester } from './tester';
 import * as zkweb3 from 'zksync-web3';
 import { BigNumber, Contract, ethers } from 'ethers';
 import { expect } from 'chai';
+import fs from 'fs';
 
 // Parses output of "print-suggested-values" command of the revert block tool.
 function parseSuggestedValues(suggestedValuesString: string) {
@@ -45,9 +46,9 @@ async function killServerAndWaitForShutdown(tester: Tester) {
     throw new Error("Server didn't stop after a kill request");
 }
 
-function ignoreError(err: any, context?: string) {
+function ignoreError(_err: any, context?: string) {
     const message = context ? `Error ignored (context: ${context}).` : 'Error ignored.';
-    console.info(message, err);
+    console.info(message);
 }
 
 const depositAmount = ethers.utils.parseEther('0.001');
@@ -57,10 +58,12 @@ describe('Block reverting test', function () {
     let alice: zkweb3.Wallet;
     let mainContract: Contract;
     let blocksCommittedBeforeRevert: number;
+    let logs: fs.WriteStream;
 
     before('create test wallet', async () => {
         tester = await Tester.init(process.env.CHAIN_ETH_NETWORK || 'localhost');
         alice = tester.emptyWallet();
+        logs = fs.createWriteStream('revert.log', { flags: 'a' });
     });
 
     step('run server and execute some transactions', async () => {
@@ -74,7 +77,7 @@ describe('Block reverting test', function () {
 
         // Run server in background.
         const components = 'api,tree,eth,data_fetcher,state_keeper';
-        utils.background(`zk server --components ${components}`);
+        utils.background(`zk server --components ${components}`, [null, logs, logs]);
         // Server may need some time to recompile if it's a cold run, so wait for it.
         let iter = 0;
         while (iter < 30 && !mainContract) {
@@ -169,7 +172,7 @@ describe('Block reverting test', function () {
         process.env.CHAIN_STATE_KEEPER_AGGREGATED_BLOCK_EXECUTE_DEADLINE = '1';
 
         // Run server.
-        utils.background('zk server --components api,tree,eth,data_fetcher,state_keeper');
+        utils.background('zk server --components api,tree,eth,data_fetcher,state_keeper', [null, logs, logs]);
         await utils.sleep(10);
 
         const balanceBefore = await alice.getBalance();
@@ -197,7 +200,7 @@ describe('Block reverting test', function () {
         await killServerAndWaitForShutdown(tester);
 
         // Run again.
-        utils.background(`zk server --components=api,tree,eth,data_fetcher,state_keeper`);
+        utils.background(`zk server --components=api,tree,eth,data_fetcher,state_keeper`, [null, logs, logs]);
         await utils.sleep(10);
 
         // Trying to send a transaction from the same address again
diff --git a/core/tests/test_account/Cargo.toml b/core/tests/test_account/Cargo.toml
deleted file mode 100644
index 43ef15158507..000000000000
--- a/core/tests/test_account/Cargo.toml
+++ /dev/null
@@ -1,19 +0,0 @@
-[package]
-name = "zksync_test_account"
-version = "1.0.0"
-edition = "2018"
-authors = ["The Matter Labs Team <hello@matterlabs.dev>"]
-homepage = "https://zksync.io/"
-repository = "https://github.com/matter-labs/zksync-era"
-license = "MIT OR Apache-2.0"
-keywords = ["blockchain", "zksync"]
-categories = ["cryptography"]
-# This Crate must be published, as it's a dev-dependency of some our library crates.
-
-[dependencies]
-zksync_types = { path = "../../lib/types", version = "1.0" }
-zksync_utils = { path = "../../lib/utils", version = "1.0" }
-zksync_crypto = { path = "../../lib/crypto", version = "1.0" }
-zksync_basic_types = { path = "../../lib/basic_types", version = "1.0" }
-
-num = { version = "0.3.1", features = ["serde"] }
diff --git a/core/tests/test_account/src/lib.rs b/core/tests/test_account/src/lib.rs
deleted file mode 100644
index a4087b24eb32..000000000000
--- a/core/tests/test_account/src/lib.rs
+++ /dev/null
@@ -1,165 +0,0 @@
-#![allow(clippy::upper_case_acronyms)]
-
-// Built-in imports
-use std::{fmt, sync::Mutex};
-
-// Workspace uses
-use zksync_crypto::rand::{thread_rng, Rng};
-use zksync_types::{
-    fee::Fee, l2::L2Tx, tx::primitives::PackedEthSignature, Address, Execute, L2ChainId, Nonce,
-    CONTRACT_DEPLOYER_ADDRESS, H256, U256,
-};
-use zksync_utils::bytecode::hash_bytecode;
-
-/// Structure used to sign ZKSync transactions, keeps tracks of its nonce internally
-pub struct ZkSyncAccount {
-    pub private_key: H256,
-    pub address: Address,
-    nonce: Mutex<Nonce>,
-}
-
-impl Clone for ZkSyncAccount {
-    fn clone(&self) -> Self {
-        Self {
-            private_key: self.private_key,
-            address: self.address,
-            nonce: Mutex::new(*self.nonce.lock().unwrap()),
-        }
-    }
-}
-
-impl fmt::Debug for ZkSyncAccount {
-    fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
-        // It is OK to disclose the private key contents for a testkit account.
-        f.debug_struct("ZkSyncAccount")
-            .field("private_key", &self.private_key)
-            .field("address", &self.address)
-            .field("nonce", &self.nonce)
-            .finish()
-    }
-}
-
-impl ZkSyncAccount {
-    /// Note: probably not secure, use for testing.
-    pub fn rand() -> Self {
-        let rng = &mut thread_rng();
-        let private_key = rng.gen::<[u8; 32]>().into();
-
-        Self::new(private_key, Nonce(0))
-    }
-
-    pub fn new(private_key: H256, nonce: Nonce) -> Self {
-        let address = PackedEthSignature::address_from_private_key(&private_key).unwrap();
-        Self {
-            address,
-            private_key,
-            nonce: Mutex::new(nonce),
-        }
-    }
-
-    pub fn nonce(&self) -> Nonce {
-        let n = self.nonce.lock().unwrap();
-        *n
-    }
-
-    pub fn set_nonce(&self, new_nonce: Nonce) {
-        *self.nonce.lock().unwrap() = new_nonce;
-    }
-
-    pub fn sign_withdraw(
-        &self,
-        _token: Address,
-        _amount: U256,
-        _fee: Fee,
-        _to: Address,
-        _nonce: Option<Nonce>,
-        _increment_nonce: bool,
-    ) -> L2Tx {
-        todo!("New withdrawal support is not yet implemented")
-
-        // let mut stored_nonce = self.nonce.lock().unwrap();
-        // let withdraw = GenericL2Tx::<Withdraw>::new_signed(
-        //     token,
-        //     amount,
-        //     to,
-        //     nonce.unwrap_or(*stored_nonce),
-        //     fee,
-        //     L2ChainId(270),
-        //     &self.private_key,
-        // )
-        // .expect("should create a signed transfer transaction");
-
-        // if increment_nonce {
-        //     **stored_nonce += 1;
-        // }
-
-        // withdraw.into()
-    }
-
-    pub fn sign_deploy_contract(
-        &self,
-        bytecode: Vec<u8>,
-        calldata: Vec<u8>,
-        fee: Fee,
-        nonce: Option<Nonce>,
-        increment_nonce: bool,
-    ) -> L2Tx {
-        let mut stored_nonce = self.nonce.lock().unwrap();
-        let bytecode_hash = hash_bytecode(&bytecode);
-
-        let execute_calldata =
-            Execute::encode_deploy_params_create(Default::default(), bytecode_hash, calldata);
-
-        let deploy_contract = L2Tx::new_signed(
-            CONTRACT_DEPLOYER_ADDRESS,
-            execute_calldata,
-            nonce.unwrap_or(*stored_nonce),
-            fee,
-            U256::zero(),
-            L2ChainId(270),
-            &self.private_key,
-            Some(vec![bytecode]),
-            Default::default(),
-        )
-        .expect("should create a signed transfer transaction");
-
-        if increment_nonce {
-            **stored_nonce += 1;
-        }
-
-        deploy_contract
-    }
-
-    pub fn sign_execute(
-        &self,
-        contract_address: Address,
-        calldata: Vec<u8>,
-        fee: Fee,
-        nonce: Option<Nonce>,
-        increment_nonce: bool,
-    ) -> L2Tx {
-        let mut stored_nonce = self.nonce.lock().unwrap();
-        let execute = L2Tx::new_signed(
-            contract_address,
-            calldata,
-            nonce.unwrap_or(*stored_nonce),
-            fee,
-            U256::zero(),
-            L2ChainId(270),
-            &self.private_key,
-            None,
-            Default::default(),
-        )
-        .expect("should create a signed transfer transaction");
-
-        if increment_nonce {
-            **stored_nonce += 1;
-        }
-
-        execute
-    }
-
-    pub fn get_private_key(&self) -> H256 {
-        self.private_key
-    }
-}
diff --git a/core/tests/ts-integration/contracts/custom-account/RLPEncoder.sol b/core/tests/ts-integration/contracts/custom-account/RLPEncoder.sol
index 1ad6b64ce44c..409f3d16b372 100644
--- a/core/tests/ts-integration/contracts/custom-account/RLPEncoder.sol
+++ b/core/tests/ts-integration/contracts/custom-account/RLPEncoder.sol
@@ -75,8 +75,8 @@ library RLPEncoder {
 	/// @notice Uses little endian ordering (The least significant byte has index `0`).
 	/// NOTE: returns `0` for `0`
 	function _highestByteSet(uint256 _number) private pure returns (uint256 hbs) {
-		//
-		//
+		// TODO: for optimization, the comparison can be replaced with bitwise operations
+		// should be resolver after evaluating the cost of opcodes.
 		if (_number >= 2**128) {
 			_number >>= 128;
 			hbs += 16;
diff --git a/core/tests/ts-integration/contracts/zkasm/deep_stak.zkasm b/core/tests/ts-integration/contracts/zkasm/deep_stak.zkasm
new file mode 100644
index 000000000000..bdfb4e70de7c
--- /dev/null
+++ b/core/tests/ts-integration/contracts/zkasm/deep_stak.zkasm
@@ -0,0 +1,26 @@
+.text
+	.file	"loop.yul"
+	.globl	__entry
+__entry:
+.func_begin0:
+	and!	1, r2, r1
+	jump.ne	@.BB0_2
+__LOOP:
+	near_call	r0, @__LOOP, @__LOOP
+.BB0_1:
+	add	1, r0, r2
+	ret
+.BB0_2:
+	add	32, r0, r1
+	st.2	256, r1
+	st.2	288, r0
+	add	@CPI0_0[0], r0, r1
+	ret.ok.to_label	r1, @DEFAULT_FAR_RETURN
+.func_end0:
+
+.func_end1:
+
+	.note.GNU-stack
+	.rodata
+CPI0_0:
+	.cell 53919893334301279589334030174039261352344891250716429051063678533632
\ No newline at end of file
diff --git a/core/tests/ts-integration/hardhat.config.ts b/core/tests/ts-integration/hardhat.config.ts
index 2dd44b82b531..eb10bc488a51 100644
--- a/core/tests/ts-integration/hardhat.config.ts
+++ b/core/tests/ts-integration/hardhat.config.ts
@@ -4,14 +4,14 @@ import '@matterlabs/hardhat-zksync-vyper';
 
 export default {
     zksolc: {
-        version: '1.3.13',
+        version: '1.3.14',
         compilerSource: 'binary',
         settings: {
             isSystem: true
         }
     },
     zkvyper: {
-        version: '1.3.9',
+        version: '1.3.10',
         compilerSource: 'binary'
     },
     networks: {
@@ -20,7 +20,7 @@ export default {
         }
     },
     solidity: {
-        version: '0.8.20'
+        version: '0.8.21'
     },
     vyper: {
         version: '0.3.3'
diff --git a/core/tests/ts-integration/scripts/compile-yul.ts b/core/tests/ts-integration/scripts/compile-yul.ts
index bdd30d47756f..0b47f8689cf2 100644
--- a/core/tests/ts-integration/scripts/compile-yul.ts
+++ b/core/tests/ts-integration/scripts/compile-yul.ts
@@ -4,7 +4,7 @@ import { spawn as _spawn } from 'child_process';
 
 import { getZksolcPath, getZksolcUrl, saltFromUrl } from '@matterlabs/hardhat-zksync-solc';
 
-const COMPILER_VERSION = '1.3.13';
+const COMPILER_VERSION = '1.3.14';
 const IS_COMPILER_PRE_RELEASE = false;
 
 async function compilerLocation(): Promise<string> {
@@ -30,23 +30,25 @@ export function spawn(command: string) {
     });
 }
 
-export async function compileYul(path: string, files: string[], outputDirName: string | null) {
+export async function compile(path: string, files: string[], outputDirName: string | null, type: string) {
     if (!files.length) {
         console.log(`No test files provided in folder ${path}.`);
         return;
     }
     let paths = preparePaths(path, files, outputDirName);
 
+    let systemMode = type === 'yul' ? '--system-mode  --optimization 3' : '';
+
     const zksolcLocation = await compilerLocation();
     await spawn(
-        `${zksolcLocation} ${paths.absolutePathSources}/${paths.outputDir} --optimization 3 --system-mode --yul --bin --overwrite -o ${paths.absolutePathArtifacts}/${paths.outputDir}`
+        `${zksolcLocation} ${paths.absolutePathSources}/${paths.outputDir} ${systemMode} --${type} --bin --overwrite -o ${paths.absolutePathArtifacts}/${paths.outputDir}`
     );
 }
 
-export async function compileYulFolder(path: string) {
-    let files: string[] = (await fs.promises.readdir(path)).filter((fn) => fn.endsWith('.yul'));
+export async function compileFolder(path: string, type: string) {
+    let files: string[] = (await fs.promises.readdir(path)).filter((fn) => fn.endsWith(`.${type}`));
     for (const file of files) {
-        await compileYul(path, [file], `${file}`);
+        await compile(path, [file], `${file}`, type);
     }
 }
 
@@ -78,7 +80,8 @@ class CompilerPaths {
 }
 
 async function main() {
-    await compileYulFolder('contracts/yul');
+    await compileFolder('contracts/yul', 'yul');
+    await compileFolder('contracts/zkasm', 'zkasm');
 }
 
 main()
diff --git a/core/tests/ts-integration/tests/api/contract-verification.test.ts b/core/tests/ts-integration/tests/api/contract-verification.test.ts
index 55dee90a21bf..0bbd50cc6edd 100644
--- a/core/tests/ts-integration/tests/api/contract-verification.test.ts
+++ b/core/tests/ts-integration/tests/api/contract-verification.test.ts
@@ -22,10 +22,10 @@ const contracts = {
 // Regular expression to match ISO dates.
 const DATE_REGEX = /\d{4}-\d{2}-\d{2}T\d{2}:\d{2}:\d{2}(\.\d{6})?/;
 
-const ZKSOLC_VERSION = 'v1.3.13';
-const SOLC_VERSION = '0.8.20';
+const ZKSOLC_VERSION = 'v1.3.14';
+const SOLC_VERSION = '0.8.21';
 
-const ZKVYPER_VERSION = 'v1.3.9';
+const ZKVYPER_VERSION = 'v1.3.10';
 const VYPER_VERSION = '0.3.3';
 
 type HttpMethod = 'POST' | 'GET';
diff --git a/core/tests/ts-integration/tests/api/debug.test.ts b/core/tests/ts-integration/tests/api/debug.test.ts
index e8e860c4ec19..adf0bf31a04f 100644
--- a/core/tests/ts-integration/tests/api/debug.test.ts
+++ b/core/tests/ts-integration/tests/api/debug.test.ts
@@ -8,6 +8,7 @@ import { Token } from '../../src/types';
 import * as zksync from 'zksync-web3';
 import { ethers } from 'ethers';
 import { BOOTLOADER_FORMAL_ADDRESS } from 'zksync-web3/build/src/utils';
+import fs from 'fs';
 
 describe('Debug methods', () => {
     let testMaster: TestMaster;
@@ -25,6 +26,35 @@ describe('Debug methods', () => {
         aliceErc20 = new zksync.Contract(tokenDetails.l2Address, zksync.utils.IERC20, alice);
     });
 
+    test('Should not fail for infinity recursion', async () => {
+        const bytecodePath = `${process.env.ZKSYNC_HOME}/core/tests/ts-integration/contracts/zkasm/artifacts/deep_stak.zkasm/deep_stak.zkasm.zbin`;
+        const bytecode = fs.readFileSync(bytecodePath);
+
+        const contractFactory = new zksync.ContractFactory([], bytecode, testMaster.mainAccount());
+        const deployTx = await contractFactory.deploy();
+        const contractAddress = (await deployTx.deployed()).address;
+        let txCallTrace = await testMaster.mainAccount().provider.send('debug_traceCall', [
+            {
+                to: contractAddress,
+                data: '0x'
+            }
+        ]);
+        let expected = {
+            error: null,
+            from: ethers.constants.AddressZero,
+            gas: expect.any(String),
+            gasUsed: expect.any(String),
+            input: expect.any(String),
+            output: '0x',
+            revertReason: 'Error function_selector = 0x, data = 0x',
+            to: BOOTLOADER_FORMAL_ADDRESS,
+            type: 'Call',
+            value: expect.any(String),
+            calls: expect.any(Array)
+        };
+        expect(txCallTrace).toEqual(expected);
+    });
+
     test('Debug sending erc20 token in a block', async () => {
         const value = ethers.BigNumber.from(200);
         await aliceErc20.transfer(bob.address, value).then((tx: any) => tx.wait());
diff --git a/core/tests/ts-integration/tests/api/web3.test.ts b/core/tests/ts-integration/tests/api/web3.test.ts
index 48888e106541..c188b08c04a4 100644
--- a/core/tests/ts-integration/tests/api/web3.test.ts
+++ b/core/tests/ts-integration/tests/api/web3.test.ts
@@ -442,8 +442,10 @@ describe('web3 API compatibility tests', () => {
         const receipt = await sentTx.wait();
 
         let details = await alice.provider.getTransactionDetails(receipt.transactionHash);
+
         let expectedDetails = {
             fee: expect.stringMatching(HEX_VALUE_REGEX),
+            gasPerPubdata: expect.stringMatching(HEX_VALUE_REGEX),
             initiatorAddress: expect.stringMatching(HEX_VALUE_REGEX),
             isL1Originated: true,
             receivedAt: expect.stringMatching(DATE_REGEX),
@@ -478,6 +480,10 @@ describe('web3 API compatibility tests', () => {
         expect(nextBlock.l1BatchNumber).toEqual(l1BatchNumber + 1);
     });
 
+    // TODO (SMA-1576): This test is flaky. Test logic seems to be correct: we *first*
+    // subscribe for events and then send transactions. However, this test
+    // sometimes fails because one of the events was not received. Probably, there is
+    // some problem in the pub-sub API that should be found & fixed.
     test.skip('Should listen for human-readable events', async () => {
         const contract = await deployContract(alice, contracts.events, []);
 
@@ -778,6 +784,30 @@ describe('web3 API compatibility tests', () => {
         expect(exactProtocolVersion).toMatchObject(expectedProtocolVersion);
     });
 
+    test('Should check zks_getLogsWithVirtualBlocks endpoint', async () => {
+        let logs;
+        logs = await alice.provider.send('zks_getLogsWithVirtualBlocks', [{ fromBlock: '0x0', toBlock: '0x0' }]);
+        expect(logs).toEqual([]);
+
+        logs = await alice.provider.send('zks_getLogsWithVirtualBlocks', [{ fromBlock: '0x1', toBlock: '0x2' }]);
+        expect(logs.length > 0);
+
+        logs = await alice.provider.send('zks_getLogsWithVirtualBlocks', [{ fromBlock: '0x2', toBlock: '0x1' }]);
+        expect(logs).toEqual([]);
+
+        logs = await alice.provider.send('zks_getLogsWithVirtualBlocks', [{ fromBlock: '0x3', toBlock: '0x3' }]);
+        expect(logs.length > 0);
+
+        await expect(
+            alice.provider.send('zks_getLogsWithVirtualBlocks', [{ fromBlock: '0x100000000', toBlock: '0x100000000' }]) // 2^32
+        ).toBeRejected();
+        await expect(
+            alice.provider.send('zks_getLogsWithVirtualBlocks', [
+                { fromBlock: '0x10000000000000000', toBlock: '0x10000000000000000' } // 2^64
+            ])
+        ).toBeRejected();
+    });
+
     afterAll(async () => {
         await testMaster.deinitialize();
     });
diff --git a/core/tests/ts-integration/tests/contracts.test.ts b/core/tests/ts-integration/tests/contracts.test.ts
index d9d4484bd615..535c7c0bbe54 100644
--- a/core/tests/ts-integration/tests/contracts.test.ts
+++ b/core/tests/ts-integration/tests/contracts.test.ts
@@ -15,6 +15,7 @@ import * as zksync from 'zksync-web3';
 import { Provider } from 'zksync-web3';
 import { RetryProvider } from '../src/retry-provider';
 
+// TODO: Leave only important ones.
 const contracts = {
     counter: getTestContract('Counter'),
     constructor: getTestContract('SimpleConstructor'),
@@ -89,6 +90,7 @@ describe('Smart contract behavior checks', () => {
 
     test('Should fail an infinite loop transaction', async () => {
         if (testMaster.isFastMode()) {
+            // TODO: This test currently doesn't work on stage (ZKD-552).
             console.log(`This test is disabled. If you see this line, please check if the issue is resolved`);
             return;
         }
@@ -96,6 +98,7 @@ describe('Smart contract behavior checks', () => {
         const infiniteLoop = await deployContract(alice, contracts.infinite, []);
 
         // Test eth_call first
+        // TODO: provide a proper error for transactions that consume too much gas.
         // await expect(infiniteLoop.callStatic.infiniteLoop()).toBeRejected('cannot estimate transaction: out of gas');
         // ...and then an actual transaction
         await expect(infiniteLoop.infiniteLoop({ gasLimit: 1_000_000 })).toBeReverted([]);
diff --git a/core/tests/ts-integration/tests/ether.test.ts b/core/tests/ts-integration/tests/ether.test.ts
index 8f4492666506..eef7b0d0d01f 100644
--- a/core/tests/ts-integration/tests/ether.test.ts
+++ b/core/tests/ts-integration/tests/ether.test.ts
@@ -69,7 +69,31 @@ describe('ETH token checks', () => {
         expect(l1EthBalanceBefore.sub(depositFee).sub(l1EthBalanceAfter)).bnToBeEq(amount);
     });
 
-    test('Can perform a transfer (legacy)', async () => {
+    test('Can perform a transfer (legacy pre EIP-155)', async () => {
+        const LEGACY_TX_TYPE = 0;
+        const value = BigNumber.from(200);
+
+        const ethBalanceChange = await shouldChangeETHBalances([
+            { wallet: alice, change: -value },
+            { wallet: bob, change: value }
+        ]);
+        const correctReceiptType = checkReceipt(
+            (receipt) => receipt.type == LEGACY_TX_TYPE,
+            'Incorrect tx type in receipt'
+        );
+
+        // ethers doesn't support sending pre EIP-155 transactions, so we create one manually.
+        const transaction = await alice.populateTransaction({ type: LEGACY_TX_TYPE, to: bob.address, value });
+        // Remove chainId and sign the transaction without it.
+        transaction.chainId = undefined;
+        const signedTransaction = await alice.signTransaction(transaction);
+        await expect(alice.provider.sendTransaction(signedTransaction)).toBeAccepted([
+            ethBalanceChange,
+            correctReceiptType
+        ]);
+    });
+
+    test('Can perform a transfer (legacy EIP-155)', async () => {
         const LEGACY_TX_TYPE = 0;
         const value = BigNumber.from(200);
 
@@ -176,6 +200,7 @@ describe('ETH token checks', () => {
         const withdrawalTx = await withdrawalPromise;
         await withdrawalTx.waitFinalize();
 
+        // TODO (SMA-1374): Enable L1 ETH checks as soon as they're supported.
         await expect(alice.finalizeWithdrawal(withdrawalTx.hash)).toBeAccepted();
         const tx = await alice.provider.getTransactionReceipt(withdrawalTx.hash);
 
diff --git a/core/tests/ts-integration/tests/l1.test.ts b/core/tests/ts-integration/tests/l1.test.ts
index d719350e4c24..c4cf0b669cb7 100644
--- a/core/tests/ts-integration/tests/l1.test.ts
+++ b/core/tests/ts-integration/tests/l1.test.ts
@@ -359,6 +359,7 @@ function getOverheadForTransaction(
 
     const MAX_TRANSACTIONS_IN_BLOCK = ethers.BigNumber.from(SYSTEM_CONFIG['MAX_TRANSACTIONS_IN_BLOCK']);
     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 L2_TX_MAX_GAS_LIMIT = ethers.BigNumber.from(SYSTEM_CONFIG['L2_TX_MAX_GAS_LIMIT']);
 
@@ -375,6 +376,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);
     // if (overheadForPublicData.gt(blockOverheadForTransaction)) {
diff --git a/core/tests/ts-integration/tests/system.test.ts b/core/tests/ts-integration/tests/system.test.ts
index 5927bdefe8f6..f1727d952c58 100644
--- a/core/tests/ts-integration/tests/system.test.ts
+++ b/core/tests/ts-integration/tests/system.test.ts
@@ -249,6 +249,7 @@ describe('System behavior checks', () => {
         await expect(alice.finalizeWithdrawal(receipt2.transactionHash)).toBeAccepted([change2]);
     });
 
+    // TODO (SMA-1713): the test is flaky.
     test.skip('Should test forceDeploy', async () => {
         // Testing forcedDeploys involves small upgrades of smart contacts.
         // Thus, it is not appropriate to do them anywhere else except for localhost.
@@ -349,6 +350,7 @@ describe('System behavior checks', () => {
     async function testForcedDeployments(forcedDeployments: ForceDeployment[], bytecode: BytesLike) {
         const receipt = await deployOnAnyLocalAddress(alice.providerL1!, alice.provider, forcedDeployments, [bytecode]);
 
+        // TODO: use toBeAccepted
         expect(receipt.status).toBe(1);
 
         // veryfing that the codes stored are correct
diff --git a/core/tests/upgrade-test/tests/upgrade.test.ts b/core/tests/upgrade-test/tests/upgrade.test.ts
index 6f30d9c0c6f2..14b57bee4832 100644
--- a/core/tests/upgrade-test/tests/upgrade.test.ts
+++ b/core/tests/upgrade-test/tests/upgrade.test.ts
@@ -35,10 +35,12 @@ describe('Upgrade test', function () {
     let executeUpgradeCalldata: string;
     let forceDeployAddress: string;
     let forceDeployBytecode: string;
+    let logs: fs.WriteStream;
 
     before('Create test wallet', async () => {
         tester = await Tester.init(process.env.CHAIN_ETH_NETWORK || 'localhost');
         alice = tester.emptyWallet();
+        logs = fs.createWriteStream('upgrade.log', { flags: 'a' });
 
         const govMnemonic = require('../../../../etc/test_config/constant/eth.json').mnemonic;
         govWallet = ethers.Wallet.fromMnemonic(govMnemonic, "m/44'/60'/0'/0/1").connect(alice._providerL1());
@@ -60,7 +62,8 @@ describe('Upgrade test', function () {
         process.env.CHAIN_STATE_KEEPER_BLOCK_COMMIT_DEADLINE_MS = '2000';
         // Run server in background.
         utils.background(
-            `cd $ZKSYNC_HOME && cargo run --bin zksync_server --release -- --components=api,tree,eth,data_fetcher,state_keeper > server_logs.txt`
+            'cd $ZKSYNC_HOME && cargo run --bin zksync_server --release -- --components=api,tree,eth,data_fetcher,state_keeper',
+            [null, logs, logs]
         );
         // Server may need some time to recompile if it's a cold run, so wait for it.
         let iter = 0;
@@ -102,6 +105,14 @@ describe('Upgrade test', function () {
         const balance = await alice.getBalance();
         expect(balance.eq(depositAmount.mul(2)), 'Incorrect balance after deposits').to.be.true;
 
+        if (process.env.CHECK_EN_URL) {
+            console.log('Checking EN after deposit');
+            await utils.sleep(2);
+            const enProvider = new ethers.providers.JsonRpcProvider(process.env.CHECK_EN_URL);
+            const enBalance = await enProvider.getBalance(alice.address);
+            expect(enBalance.eq(balance), 'Failed to update the balance on EN after deposit').to.be.true;
+        }
+
         // Wait for at least one new committed block
         let newBlocksCommitted = await mainContract.getTotalBlocksCommitted();
         let tryCount = 0;
@@ -113,7 +124,7 @@ describe('Upgrade test', function () {
     });
 
     step('Send l1 tx for saving new bootloader', async () => {
-        const path = `${process.env.ZKSYNC_HOME}/etc/system-contracts/bootloader/build/artifacts/playground_block.yul/playground_block.yul.zbin`;
+        const path = `${process.env.ZKSYNC_HOME}/etc/system-contracts/bootloader/build/artifacts/playground_batch.yul/playground_batch.yul.zbin`;
         const bootloaderCode = ethers.utils.hexlify(fs.readFileSync(path));
         bootloaderHash = ethers.utils.hexlify(hashBytecode(bootloaderCode));
         const txHandle = await tester.syncWallet.requestExecute({
@@ -240,7 +251,8 @@ 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 >> server_logs.txt`
+            '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);
 
@@ -272,6 +284,15 @@ async function checkedRandomTransfer(sender: zkweb3.Wallet, amount: BigNumber):
     const spentAmount = txReceipt.gasUsed.mul(transferHandle.gasPrice!).add(amount);
     expect(senderBalanceAfter.add(spentAmount).eq(senderBalanceBefore), 'Failed to update the balance of the sender').to
         .be.true;
+
+    if (process.env.CHECK_EN_URL) {
+        console.log('Checking EN after transfer');
+        await utils.sleep(2);
+        const enProvider = new ethers.providers.JsonRpcProvider(process.env.CHECK_EN_URL);
+        const enSenderBalance = await enProvider.getBalance(sender.address);
+        expect(enSenderBalance.eq(senderBalanceAfter), 'Failed to update the balance of the sender on EN').to.be.true;
+    }
+
     return transferHandle;
 }
 
diff --git a/core/tests/vm-benchmark/Cargo.toml b/core/tests/vm-benchmark/Cargo.toml
index 6b6b6caba71c..bb39d306719f 100644
--- a/core/tests/vm-benchmark/Cargo.toml
+++ b/core/tests/vm-benchmark/Cargo.toml
@@ -5,8 +5,8 @@ edition = "2021"
 
 [dependencies]
 vm-benchmark-harness = {path = "harness"}
-metrics-exporter-prometheus = "0.11"
-metrics = "0.20"
+metrics-exporter-prometheus = "0.12"
+metrics = "0.21"
 tokio = "1"
 
 [dev-dependencies]
diff --git a/core/tests/vm-benchmark/benches/diy_benchmark.rs b/core/tests/vm-benchmark/benches/diy_benchmark.rs
index 02ea280a5675..8f5b6cd685bb 100644
--- a/core/tests/vm-benchmark/benches/diy_benchmark.rs
+++ b/core/tests/vm-benchmark/benches/diy_benchmark.rs
@@ -21,9 +21,7 @@ fn main() {
         let benchmark_start = Instant::now();
         while benchmark_start.elapsed() < Duration::from_secs(5) {
             let start = Instant::now();
-            BenchmarkingVm::new()
-                .run_transaction(black_box(&tx))
-                .unwrap();
+            BenchmarkingVm::new().run_transaction(black_box(&tx));
             timings.push(start.elapsed());
         }
 
diff --git a/core/tests/vm-benchmark/benches/iai.rs b/core/tests/vm-benchmark/benches/iai.rs
index f49358e0af15..a7c8a9c2ecd4 100644
--- a/core/tests/vm-benchmark/benches/iai.rs
+++ b/core/tests/vm-benchmark/benches/iai.rs
@@ -6,7 +6,7 @@ fn run_bytecode(path: &str) {
     let code = cut_to_allowed_bytecode_size(&test_contract).unwrap();
     let tx = get_deploy_tx(code);
 
-    black_box(BenchmarkingVm::new().run_transaction(&tx).unwrap());
+    black_box(BenchmarkingVm::new().run_transaction(&tx));
 }
 
 macro_rules! make_functions_and_main {
diff --git a/core/tests/vm-benchmark/harness/Cargo.toml b/core/tests/vm-benchmark/harness/Cargo.toml
index 07e7320ec37b..f5ee5e9f1565 100644
--- a/core/tests/vm-benchmark/harness/Cargo.toml
+++ b/core/tests/vm-benchmark/harness/Cargo.toml
@@ -10,6 +10,5 @@ zksync_state = { path = "../../../lib/state" }
 zksync_utils = { path = "../../../lib/utils" }
 zksync_config = { path = "../../../lib/config" }
 zksync_contracts = { path = "../../../lib/contracts" }
-zk_evm = { git = "https://github.com/matter-labs/era-zk_evm.git", tag = "v1.3.3-rc0" }
+zk_evm = { git = "https://github.com/matter-labs/era-zk_evm.git", branch = "v1.3.3" }
 once_cell = "1.17"
-ouroboros = "0.15.6"
diff --git a/core/tests/vm-benchmark/harness/src/lib.rs b/core/tests/vm-benchmark/harness/src/lib.rs
index 0775e4e8dcf9..55b4eb238d7d 100644
--- a/core/tests/vm-benchmark/harness/src/lib.rs
+++ b/core/tests/vm-benchmark/harness/src/lib.rs
@@ -1,18 +1,22 @@
-use once_cell::sync::{Lazy, OnceCell};
-use ouroboros::self_referencing;
-use vm::vm_with_bootloader::DerivedBlockContext;
-use vm::vm_with_bootloader::TxExecutionMode::VerifyExecute;
-use vm::vm_with_bootloader::{push_transaction_to_bootloader_memory, BlockContextMode};
-use vm::{HistoryEnabled, OracleTools, VmInstance};
-use zk_evm::block_properties::BlockProperties;
+use once_cell::sync::Lazy;
+use std::{cell::RefCell, rc::Rc};
+use vm::{
+    constants::BLOCK_GAS_LIMIT, HistoryEnabled, L2BlockEnv, TxExecutionMode, Vm, VmExecutionMode,
+    VmExecutionResultAndLogs,
+};
 use zksync_config::constants::ethereum::MAX_GAS_PER_PUBDATA_BYTE;
-use zksync_contracts::deployer_contract;
+use zksync_contracts::{deployer_contract, BaseSystemContracts};
 use zksync_state::{InMemoryStorage, StorageView};
-use zksync_types::ethabi::{encode, Token};
-use zksync_types::l2::L2Tx;
-use zksync_types::utils::storage_key_for_eth_balance;
-use zksync_types::{fee::Fee, Nonce, Transaction, H256, U256};
-use zksync_types::{L2ChainId, PackedEthSignature, CONTRACT_DEPLOYER_ADDRESS};
+use zksync_types::{
+    block::legacy_miniblock_hash,
+    ethabi::{encode, Token},
+    fee::Fee,
+    helpers::unix_timestamp_ms,
+    l2::L2Tx,
+    utils::storage_key_for_eth_balance,
+    Address, L1BatchNumber, L2ChainId, MiniblockNumber, Nonce, PackedEthSignature,
+    ProtocolVersionId, Transaction, CONTRACT_DEPLOYER_ADDRESS, H256, U256,
+};
 use zksync_utils::bytecode::hash_bytecode;
 
 /// Bytecodes have consist of an odd number of 32 byte words
@@ -39,6 +43,9 @@ static STORAGE: Lazy<InMemoryStorage> = Lazy::new(|| {
 
     storage
 });
+
+static SYSTEM_CONTRACTS: Lazy<BaseSystemContracts> = Lazy::new(BaseSystemContracts::load_from_disk);
+
 static CREATE_FUNCTION_SIGNATURE: Lazy<[u8; 4]> = Lazy::new(|| {
     deployer_contract()
         .function("create")
@@ -46,56 +53,47 @@ static CREATE_FUNCTION_SIGNATURE: Lazy<[u8; 4]> = Lazy::new(|| {
         .short_signature()
 });
 const PRIVATE_KEY: H256 = H256([42; 32]);
-static BLOCK_PROPERTIES: OnceCell<BlockProperties> = OnceCell::new();
-
-pub struct BenchmarkingVm<'a>(BenchmarkingVmInner<'a>);
-
-#[self_referencing]
-struct BenchmarkingVmInner<'a> {
-    storage_view: StorageView<&'a InMemoryStorage>,
-    #[borrows(mut storage_view)]
-    oracle_tools: OracleTools<'this, false, HistoryEnabled>,
-    #[borrows(mut oracle_tools)]
-    #[not_covariant]
-    vm: Box<VmInstance<'this, HistoryEnabled>>,
-}
 
-impl BenchmarkingVm<'_> {
+pub struct BenchmarkingVm(Vm<StorageView<&'static InMemoryStorage>, HistoryEnabled>);
+
+impl BenchmarkingVm {
     #[allow(clippy::new_without_default)]
     pub fn new() -> Self {
-        let (block_context, block_properties) = vm::utils::create_test_block_params();
-        let block_context = block_context.into();
-
-        let block_properties = BLOCK_PROPERTIES.get_or_init(|| block_properties);
-
-        Self(
-            BenchmarkingVmInnerBuilder {
-                storage_view: StorageView::new(&*STORAGE),
-                oracle_tools_builder: |storage_view| {
-                    vm::OracleTools::new(storage_view, HistoryEnabled)
+        let timestamp = unix_timestamp_ms();
+
+        Self(Vm::new(
+            vm::L1BatchEnv {
+                previous_batch_hash: None,
+                number: L1BatchNumber(1),
+                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,
                 },
-                vm_builder: |oracle_tools| {
-                    vm::vm_with_bootloader::init_vm(
-                        oracle_tools,
-                        BlockContextMode::NewBlock(block_context, Default::default()),
-                        block_properties,
-                        VerifyExecute,
-                        &vm::utils::BASE_SYSTEM_CONTRACTS,
-                    )
-                },
-            }
-            .build(),
-        )
+            },
+            vm::SystemEnv {
+                zk_porter_available: false,
+                version: ProtocolVersionId::latest(),
+                base_system_smart_contracts: SYSTEM_CONTRACTS.clone(),
+                gas_limit: BLOCK_GAS_LIMIT,
+                execution_mode: TxExecutionMode::VerifyExecute,
+                default_validation_computational_gas_limit: BLOCK_GAS_LIMIT,
+                chain_id: L2ChainId(270),
+            },
+            Rc::new(RefCell::new(StorageView::new(&*STORAGE))),
+            HistoryEnabled,
+        ))
     }
 
-    pub fn run_transaction(
-        &mut self,
-        tx: &Transaction,
-    ) -> Result<vm::vm::VmTxExecutionResult, vm::TxRevertReason> {
-        self.0.with_vm_mut(|vm| {
-            push_transaction_to_bootloader_memory(vm, tx, VerifyExecute, None);
-            vm.execute_next_tx(u32::MAX, false)
-        })
+    pub fn run_transaction(&mut self, tx: &Transaction) -> VmExecutionResultAndLogs {
+        self.0.push_transaction(tx.clone());
+        self.0.execute(VmExecutionMode::OneTx)
     }
 }
 
@@ -111,16 +109,13 @@ pub fn get_deploy_tx(code: &[u8]) -> Transaction {
         .chain(encode(&params))
         .collect();
 
-    let (block_context, _) = vm::utils::create_test_block_params();
-    let block_context: DerivedBlockContext = block_context.into();
-
     let mut signed = L2Tx::new_signed(
         CONTRACT_DEPLOYER_ADDRESS,
         calldata,
         Nonce(0),
         Fee {
             gas_limit: U256::from(10000000u32),
-            max_fee_per_gas: U256::from(block_context.base_fee),
+            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),
         },
@@ -139,10 +134,8 @@ pub fn get_deploy_tx(code: &[u8]) -> Transaction {
 
 #[cfg(test)]
 mod tests {
-    use zksync_contracts::read_bytecode;
-    use zksync_types::tx::tx_execution_info::TxExecutionStatus::Success;
-
     use crate::*;
+    use zksync_contracts::read_bytecode;
 
     #[test]
     fn can_deploy_contract() {
@@ -152,9 +145,6 @@ mod tests {
         let mut vm = BenchmarkingVm::new();
         let res = vm.run_transaction(&get_deploy_tx(&test_contract));
 
-        match res {
-            Ok(x) => assert_eq!(x.status, Success),
-            Err(_) => panic!("should succeed"),
-        }
+        assert!(matches!(res.result, vm::ExecutionResult::Success { .. }));
     }
 }
diff --git a/core/tests/vm-benchmark/src/find_slowest.rs b/core/tests/vm-benchmark/src/find_slowest.rs
index be04dda26d46..947f944541cf 100644
--- a/core/tests/vm-benchmark/src/find_slowest.rs
+++ b/core/tests/vm-benchmark/src/find_slowest.rs
@@ -23,7 +23,7 @@ fn main() {
             let tx = get_deploy_tx(code);
 
             let start_time = Instant::now();
-            BenchmarkingVm::new().run_transaction(&tx).unwrap();
+            BenchmarkingVm::new().run_transaction(&tx);
             results.push((start_time.elapsed(), path));
         }
 
diff --git a/core/tests/vm-benchmark/src/main.rs b/core/tests/vm-benchmark/src/main.rs
index 0d159ffa8d80..99105e078ea7 100644
--- a/core/tests/vm-benchmark/src/main.rs
+++ b/core/tests/vm-benchmark/src/main.rs
@@ -13,6 +13,6 @@ fn main() {
 
     for _ in 0..100 {
         let mut vm = BenchmarkingVm::new();
-        vm.run_transaction(&tx).unwrap();
+        vm.run_transaction(&tx);
     }
 }
diff --git a/core/tests/vm-benchmark/src/with_prometheus.rs b/core/tests/vm-benchmark/src/with_prometheus.rs
index cd7b1e69d4ff..e9d4f2e57edc 100644
--- a/core/tests/vm-benchmark/src/with_prometheus.rs
+++ b/core/tests/vm-benchmark/src/with_prometheus.rs
@@ -9,7 +9,7 @@ pub fn with_prometheus<F: FnOnce()>(f: F) {
 
     tokio::runtime::Runtime::new().unwrap().block_on(async {
         PrometheusBuilder::new()
-            .with_push_gateway(endpoint, Duration::from_millis(100))
+            .with_push_gateway(endpoint, Duration::from_millis(100), None, None)
             .unwrap()
             .install()
             .unwrap();
diff --git a/docker/circuit-synthesizer/Dockerfile b/docker/circuit-synthesizer/Dockerfile
index a2e8f6b4ba7e..811e73a19edf 100644
--- a/docker/circuit-synthesizer/Dockerfile
+++ b/docker/circuit-synthesizer/Dockerfile
@@ -15,8 +15,8 @@ ENV RUSTUP_HOME=/usr/local/rustup \
     PATH=/usr/local/cargo/bin:$PATH
 
 RUN curl https://sh.rustup.rs -sSf | bash -s -- -y && \
-    rustup install nightly-2023-05-31 && \
-    rustup default nightly-2023-05-31
+    rustup install nightly-2023-07-21 && \
+    rustup default nightly-2023-07-21
 
 WORKDIR /usr/src/zksync
 COPY . .
diff --git a/docker/contract-verifier/Dockerfile b/docker/contract-verifier/Dockerfile
index 8d8dac21f965..7d25f6984272 100644
--- a/docker/contract-verifier/Dockerfile
+++ b/docker/contract-verifier/Dockerfile
@@ -63,12 +63,20 @@ RUN mkdir -p /etc/zksolc-bin/v1.3.13 \
     && wget https://github.com/matter-labs/zksolc-bin/raw/main/linux-amd64/zksolc-linux-amd64-musl-v1.3.13 \
     && mv zksolc-linux-amd64-musl-v1.3.13 /etc/zksolc-bin/v1.3.13/zksolc \
     && chmod +x /etc/zksolc-bin/v1.3.13/zksolc
+RUN mkdir -p /etc/zksolc-bin/v1.3.14 \
+    && wget https://github.com/matter-labs/zksolc-bin/raw/main/linux-amd64/zksolc-linux-amd64-musl-v1.3.14 \
+    && mv zksolc-linux-amd64-musl-v1.3.14 /etc/zksolc-bin/v1.3.14/zksolc \
+    && chmod +x /etc/zksolc-bin/v1.3.14/zksolc
 
 # install zkvyper
 RUN mkdir -p /etc/zkvyper-bin/v1.3.9 \
     && wget https://github.com/matter-labs/zkvyper-bin/raw/main/linux-amd64/zkvyper-linux-amd64-musl-v1.3.9 \
     && mv zkvyper-linux-amd64-musl-v1.3.9 /etc/zkvyper-bin/v1.3.9/zkvyper \
     && chmod +x /etc/zkvyper-bin/v1.3.9/zkvyper
+RUN mkdir -p /etc/zkvyper-bin/v1.3.10 \
+    && wget https://github.com/matter-labs/zkvyper-bin/raw/main/linux-amd64/zkvyper-linux-amd64-musl-v1.3.10 \
+    && mv zkvyper-linux-amd64-musl-v1.3.10 /etc/zkvyper-bin/v1.3.10/zkvyper \
+    && chmod +x /etc/zkvyper-bin/v1.3.10/zkvyper
 
 # install solc
 COPY docker/contract-verifier/install-all-solc.sh install-all-solc.sh
diff --git a/docker/external-node/Dockerfile b/docker/external-node/Dockerfile
index 7a0d01370c0a..6890193b95b5 100644
--- a/docker/external-node/Dockerfile
+++ b/docker/external-node/Dockerfile
@@ -14,8 +14,10 @@ FROM debian:bookworm-slim
 RUN apt-get update && apt-get install -y curl libpq5 ca-certificates && rm -rf /var/lib/apt/lists/*
 
 COPY --from=builder /usr/src/zksync/target/release/zksync_external_node /usr/bin
+COPY --from=builder /usr/src/zksync/target/release/block_reverter /usr/bin
 COPY --from=builder /usr/src/zksync/cargo/bin/sqlx /usr/bin
 COPY --from=builder /usr/src/zksync/docker/external-node/entrypoint.sh /usr/bin
+RUN chmod +x /usr/bin/entrypoint.sh
 COPY etc/system-contracts/bootloader/build/artifacts/ /etc/system-contracts/bootloader/build/artifacts/
 COPY etc/system-contracts/contracts/artifacts/ /etc/system-contracts/contracts/artifacts/
 COPY etc/system-contracts/contracts/precompiles/artifacts/ /etc/system-contracts/contracts/precompiles/artifacts/
@@ -24,6 +26,7 @@ COPY contracts/ethereum/artifacts/ /contracts/ethereum/artifacts/
 COPY contracts/zksync/artifacts-zk/ /contracts/zksync/artifacts-zk/
 COPY etc/tokens/ /etc/tokens/
 COPY etc/ERC20/ /etc/ERC20/
+COPY etc/multivm_bootloaders/ /etc/multivm_bootloaders/
 COPY core/lib/dal/migrations/ /migrations
 
 ENTRYPOINT [ "sh", "/usr/bin/entrypoint.sh"]
diff --git a/docker/local-node/Dockerfile b/docker/local-node/Dockerfile
index d6275b008404..e34dded01109 100644
--- a/docker/local-node/Dockerfile
+++ b/docker/local-node/Dockerfile
@@ -11,8 +11,8 @@ RUN apt-get update; apt-get install -y make bash git openssl libssl-dev gcc g++
 RUN apt-get install -y libpq5 ca-certificates postgresql-client && rm -rf /var/lib/apt/lists/*
 
 # Install node and yarn
-RUN curl -sL https://deb.nodesource.com/setup_14.x | bash -
-RUN apt-get install -y nodejs
+RUN curl -sL https://deb.nodesource.com/setup_18.x | bash -
+RUN apt-get install -y nodejs npm
 RUN npm install -g yarn
 
 # Copy compiler (both solc and zksolc) binaries
diff --git a/docker/proof-fri-compressor/Dockerfile b/docker/proof-fri-compressor/Dockerfile
new file mode 100644
index 000000000000..6b2642231d94
--- /dev/null
+++ b/docker/proof-fri-compressor/Dockerfile
@@ -0,0 +1,34 @@
+# For using private GitHub dependencies, CI downdloads all crates outside of the contatiner
+# Not expected to work locally
+
+# syntax=docker/dockerfile:experimental
+FROM debian:bookworm-slim as builder
+
+ARG DEBIAN_FRONTEND=noninteractive
+
+RUN apt-get update && apt-get install -y curl clang openssl libssl-dev gcc g++ \
+    pkg-config build-essential libclang-dev && \
+    rm -rf /var/lib/apt/lists/*
+
+ENV RUSTUP_HOME=/usr/local/rustup \
+    CARGO_HOME=/usr/local/cargo \
+    PATH=/usr/local/cargo/bin:$PATH
+
+RUN curl https://sh.rustup.rs -sSf | bash -s -- -y && \
+    rustup install nightly-2023-07-21 && \
+    rustup default nightly-2023-07-21
+
+WORKDIR /usr/src/zksync
+COPY . .
+
+RUN CARGO_HOME=./cargo cargo build --release
+
+FROM debian:bookworm-slim
+RUN apt-get update && apt-get install -y curl libpq5 ca-certificates && rm -rf /var/lib/apt/lists/*
+
+# copy VK required for proof wrapping
+COPY prover/vk_setup_data_generator_server_fri/data/ /prover/vk_setup_data_generator_server_fri/data/
+
+
+COPY --from=builder /usr/src/zksync/target/release/zksync_proof_fri_compressor /usr/bin/
+ENTRYPOINT ["zksync_proof_fri_compressor"]
diff --git a/docker/prover-fri-gateway/Dockerfile b/docker/prover-fri-gateway/Dockerfile
new file mode 100644
index 000000000000..03341d20df63
--- /dev/null
+++ b/docker/prover-fri-gateway/Dockerfile
@@ -0,0 +1,34 @@
+# For using private GitHub dependencies, CI downdloads all crates outside of the contatiner
+# Not expected to work locally
+
+# syntax=docker/dockerfile:experimental
+FROM debian:bookworm-slim as builder
+
+ARG DEBIAN_FRONTEND=noninteractive
+
+RUN apt-get update && apt-get install -y curl clang openssl libssl-dev gcc g++ \
+    pkg-config build-essential libclang-dev && \
+    rm -rf /var/lib/apt/lists/*
+
+ENV RUSTUP_HOME=/usr/local/rustup \
+    CARGO_HOME=/usr/local/cargo \
+    PATH=/usr/local/cargo/bin:$PATH
+
+RUN curl https://sh.rustup.rs -sSf | bash -s -- -y && \
+    rustup install nightly-2023-07-21 && \
+    rustup default nightly-2023-07-21
+
+WORKDIR /usr/src/zksync
+COPY . .
+
+RUN CARGO_HOME=./cargo cargo build --release
+
+FROM debian:bookworm-slim
+RUN apt-get update && apt-get install -y curl libpq5 ca-certificates && rm -rf /var/lib/apt/lists/*
+
+# copy VK required for proof wrapping
+COPY prover/vk_setup_data_generator_server_fri/data/ /prover/vk_setup_data_generator_server_fri/data/
+
+
+COPY --from=builder /usr/src/zksync/target/release/zksync_prover_fri_gateway /usr/bin/
+ENTRYPOINT ["zksync_prover_fri_gateway"]
diff --git a/docker/prover-fri/Dockerfile b/docker/prover-fri/Dockerfile
index 9daf02bab257..16677d128ee6 100644
--- a/docker/prover-fri/Dockerfile
+++ b/docker/prover-fri/Dockerfile
@@ -15,8 +15,8 @@ ENV RUSTUP_HOME=/usr/local/rustup \
     PATH=/usr/local/cargo/bin:$PATH
 
 RUN curl https://sh.rustup.rs -sSf | bash -s -- -y && \
-    rustup install nightly-2023-05-31 && \
-    rustup default nightly-2023-05-31
+    rustup install nightly-2023-07-21 && \
+    rustup default nightly-2023-07-21
 
 WORKDIR /usr/src/zksync
 COPY . .
@@ -26,5 +26,9 @@ RUN CARGO_HOME=./cargo cargo build --release
 FROM debian:bookworm-slim
 RUN apt-get update && apt-get install -y curl libpq5 ca-certificates && rm -rf /var/lib/apt/lists/*
 
+# copy VK required for protocol version
+COPY prover/vk_setup_data_generator_server_fri/data/ /prover/vk_setup_data_generator_server_fri/data/
+
+
 COPY --from=builder /usr/src/zksync/target/release/zksync_prover_fri /usr/bin/
 ENTRYPOINT ["zksync_prover_fri"]
diff --git a/docker/prover-gpu-fri-gar/Dockerfile b/docker/prover-gpu-fri-gar/Dockerfile
index aef78ff26e90..44577a79dc83 100644
--- a/docker/prover-gpu-fri-gar/Dockerfile
+++ b/docker/prover-gpu-fri-gar/Dockerfile
@@ -9,7 +9,8 @@ COPY *.bin /
 
 RUN apt-get update && apt-get install -y libpq5 ca-certificates openssl && rm -rf /var/lib/apt/lists/*
 
-
+# copy finalization hints required for assembly generation
+COPY --from=prover prover/vk_setup_data_generator_server_fri/data/ /prover/vk_setup_data_generator_server_fri/data/
 COPY --from=prover /usr/bin/zksync_prover_fri /usr/bin/
 
 ENTRYPOINT ["zksync_prover_fri"]
diff --git a/docker/prover-gpu-fri/Dockerfile b/docker/prover-gpu-fri/Dockerfile
index a1d214c0f91b..8234dd2b6b0e 100644
--- a/docker/prover-gpu-fri/Dockerfile
+++ b/docker/prover-gpu-fri/Dockerfile
@@ -17,8 +17,8 @@ ENV RUSTUP_HOME=/usr/local/rustup \
 ENV CUDAARCHS=75
 
 RUN curl https://sh.rustup.rs -sSf | bash -s -- -y && \
-    rustup install nightly-2023-05-31 && \
-    rustup default nightly-2023-05-31
+    rustup install nightly-2023-07-21 && \
+    rustup default nightly-2023-07-21
 
 # Setup cmake
 RUN curl -Lo cmake-3.24.2-linux-x86_64.sh https://github.com/Kitware/CMake/releases/download/v3.24.2/cmake-3.24.2-linux-x86_64.sh && \
@@ -33,5 +33,8 @@ RUN CARGO_HOME=./cargo cargo build --release --features "gpu"
 FROM nvidia/cuda:12.0.0-devel-ubuntu22.04
 RUN apt-get update && apt-get install -y curl libpq5 ca-certificates && rm -rf /var/lib/apt/lists/*
 
+# copy finalization hints required for assembly generation
+COPY prover/vk_setup_data_generator_server_fri/data/ /prover/vk_setup_data_generator_server_fri/data/
+
 COPY --from=builder /usr/src/zksync/target/release/zksync_prover_fri /usr/bin/
 ENTRYPOINT ["zksync_prover_fri"]
diff --git a/docker/prover/Dockerfile b/docker/prover/Dockerfile
index 69cde6674f04..74ce3c12c100 100644
--- a/docker/prover/Dockerfile
+++ b/docker/prover/Dockerfile
@@ -15,8 +15,8 @@ ENV RUSTUP_HOME=/usr/local/rustup \
     PATH=/usr/local/cargo/bin:$PATH
 
 RUN curl https://sh.rustup.rs -sSf | bash -s -- -y && \
-    rustup install nightly-2023-05-31 && \
-    rustup default nightly-2023-05-31
+    rustup install nightly-2023-07-21 && \
+    rustup default nightly-2023-07-21
 
 WORKDIR /usr/src/zksync
 COPY . .
diff --git a/docker/server-v2/Dockerfile b/docker/server-v2/Dockerfile
index a0b03448cc10..6ebc5d205a95 100644
--- a/docker/server-v2/Dockerfile
+++ b/docker/server-v2/Dockerfile
@@ -20,7 +20,6 @@ EXPOSE 3030
 COPY --from=builder /usr/src/zksync/target/release/zksync_server /usr/bin
 COPY --from=builder /usr/src/zksync/target/release/block_reverter /usr/bin
 COPY --from=builder /usr/src/zksync/target/release/merkle_tree_consistency_checker /usr/bin
-COPY --from=builder /usr/src/zksync/target/release/slot_index_consistency_checker /usr/bin
 COPY --from=builder /usr/src/zksync/target/release/rocksdb_util /usr/bin
 COPY etc/system-contracts/bootloader/build/artifacts/ /etc/system-contracts/bootloader/build/artifacts/
 COPY etc/system-contracts/contracts/artifacts/ /etc/system-contracts/contracts/artifacts/
@@ -30,6 +29,7 @@ COPY contracts/ethereum/artifacts/ /contracts/ethereum/artifacts/
 COPY contracts/zksync/artifacts-zk/ /contracts/zksync/artifacts-zk/
 COPY etc/tokens/ /etc/tokens/
 COPY etc/ERC20/ /etc/ERC20/
+COPY etc/multivm_bootloaders/ /etc/multivm_bootloaders/
 COPY core/bin/verification_key_generator_and_server/data/ /core/bin/verification_key_generator_and_server/data/
 
 ENTRYPOINT ["zksync_server"]
diff --git a/docker/witness-generator/Dockerfile b/docker/witness-generator/Dockerfile
index 7d54863c31ea..a917a73669fb 100644
--- a/docker/witness-generator/Dockerfile
+++ b/docker/witness-generator/Dockerfile
@@ -15,8 +15,8 @@ ENV RUSTUP_HOME=/usr/local/rustup \
     PATH=/usr/local/cargo/bin:$PATH
 
 RUN curl https://sh.rustup.rs -sSf | bash -s -- -y && \
-    rustup install nightly-2023-05-31 && \
-    rustup default nightly-2023-05-31
+    rustup install nightly-2023-07-21 && \
+    rustup default nightly-2023-07-21
 
 WORKDIR /usr/src/zksync
 COPY . .
diff --git a/docker/witness-vector-generator/Dockerfile b/docker/witness-vector-generator/Dockerfile
index 1fd67cbd7f32..4b26646801c5 100644
--- a/docker/witness-vector-generator/Dockerfile
+++ b/docker/witness-vector-generator/Dockerfile
@@ -15,8 +15,8 @@ ENV RUSTUP_HOME=/usr/local/rustup \
     PATH=/usr/local/cargo/bin:$PATH
 
 RUN curl https://sh.rustup.rs -sSf | bash -s -- -y && \
-    rustup install nightly-2023-05-31 && \
-    rustup default nightly-2023-05-31
+    rustup install nightly-2023-07-21 && \
+    rustup default nightly-2023-07-21
 
 WORKDIR /usr/src/zksync
 COPY . .
diff --git a/docker/zk-environment-cuda-12-0/Dockerfile b/docker/zk-environment-cuda-12-0/Dockerfile
index 0f9e601f4314..e31d3a6ec6b9 100644
--- a/docker/zk-environment-cuda-12-0/Dockerfile
+++ b/docker/zk-environment-cuda-12-0/Dockerfile
@@ -22,20 +22,21 @@ RUN apt-get update && apt-get install -y \
     wget \
     vim \
     ca-certificates \
-    gnupg2
+    gnupg2 \
+    postgresql-client
 
 # Install dependencies for RocksDB. `liburing` is not available for Ubuntu 20.04,
 # so we use a PPA with the backport
 RUN add-apt-repository ppa:savoury1/virtualisation && \
     apt-get update && \
     apt-get install -y \
-        curl \
-        gnutls-bin git \
-        build-essential \
-        clang-7 \
-        lldb-7 \
-        lld-7 \
-        liburing-dev
+    curl \
+    gnutls-bin git \
+    build-essential \
+    clang-7 \
+    lldb-7 \
+    lld-7 \
+    liburing-dev
 
 # Install docker engine
 RUN curl -fsSL https://download.docker.com/linux/ubuntu/gpg | apt-key add -
@@ -46,7 +47,7 @@ RUN apt update; apt install -y docker-ce-cli
 RUN git config --global http.postBuffer 1048576000
 
 # Install node and yarn
-RUN curl -sL https://deb.nodesource.com/setup_14.x | bash -
+RUN curl -sL https://deb.nodesource.com/setup_18.x | bash -
 RUN apt-get install -y nodejs
 RUN npm install -g yarn
 
@@ -65,10 +66,11 @@ RUN echo "deb http://packages.cloud.google.com/apt cloud-sdk main" > /etc/apt/so
     gcloud config set metrics/environment github_docker_image
 
 RUN curl https://sh.rustup.rs -sSf | bash -s -- -y
-RUN rustup install nightly-2023-05-31
+RUN rustup install nightly-2023-07-21
 RUN rustup default stable
 RUN cargo install --version=0.5.6 sqlx-cli
 RUN cargo install cargo-tarpaulin
+RUN cargo install cargo-nextest
 
 # Copy compiler (both solc and zksolc) binaries
 # Obtain `solc` 0.8.20.
@@ -110,22 +112,22 @@ ENV NV_CUDA_COMPAT_PACKAGE cuda-compat-12-0
 
 # curl purging is removed, it's required in next steps
 RUN apt-get update && apt-get install -y --no-install-recommends \
-  gnupg2 curl ca-certificates && \
-  curl -fsSL https://developer.download.nvidia.com/compute/cuda/repos/ubuntu2004/${NVARCH}/3bf863cc.pub | apt-key add - && \
-  echo "deb https://developer.download.nvidia.com/compute/cuda/repos/ubuntu2004/${NVARCH} /" > /etc/apt/sources.list.d/cuda.list && \
-  rm -rf /var/lib/apt/lists/*
+    gnupg2 curl ca-certificates && \
+    curl -fsSL https://developer.download.nvidia.com/compute/cuda/repos/ubuntu2004/${NVARCH}/3bf863cc.pub | apt-key add - && \
+    echo "deb https://developer.download.nvidia.com/compute/cuda/repos/ubuntu2004/${NVARCH} /" > /etc/apt/sources.list.d/cuda.list && \
+    rm -rf /var/lib/apt/lists/*
 
 ENV CUDA_VERSION 12.0.0
 
 # For libraries in the cuda-compat-* package: https://docs.nvidia.com/cuda/eula/index.html#attachment-a
 RUN apt-get update && apt-get install -y --no-install-recommends \
-  cuda-cudart-12-0=${NV_CUDA_CUDART_VERSION} \
-  ${NV_CUDA_COMPAT_PACKAGE} \
-  && rm -rf /var/lib/apt/lists/*
+    cuda-cudart-12-0=${NV_CUDA_CUDART_VERSION} \
+    ${NV_CUDA_COMPAT_PACKAGE} \
+    && rm -rf /var/lib/apt/lists/*
 
 # Required for nvidia-docker v1
 RUN echo "/usr/local/nvidia/lib" >> /etc/ld.so.conf.d/nvidia.conf \
-  && echo "/usr/local/nvidia/lib64" >> /etc/ld.so.conf.d/nvidia.conf
+    && echo "/usr/local/nvidia/lib64" >> /etc/ld.so.conf.d/nvidia.conf
 
 ENV PATH /usr/local/nvidia/bin:/usr/local/cuda/bin:${PATH}
 ENV LD_LIBRARY_PATH /usr/local/nvidia/lib:/usr/local/nvidia/lib64
@@ -165,13 +167,13 @@ ENV NCCL_VERSION 2.17.1-1
 ENV NV_LIBNCCL_PACKAGE ${NV_LIBNCCL_PACKAGE_NAME}=${NV_LIBNCCL_PACKAGE_VERSION}+cuda12.0
 
 RUN apt-get update && apt-get install -y --no-install-recommends \
-  cuda-libraries-12-0=${NV_CUDA_LIB_VERSION} \
-  ${NV_LIBNPP_PACKAGE} \
-  cuda-nvtx-12-0=${NV_NVTX_VERSION} \
-  libcusparse-12-0=${NV_LIBCUSPARSE_VERSION} \
-  ${NV_LIBCUBLAS_PACKAGE} \
-  ${NV_LIBNCCL_PACKAGE} \
-  && rm -rf /var/lib/apt/lists/*
+    cuda-libraries-12-0=${NV_CUDA_LIB_VERSION} \
+    ${NV_LIBNPP_PACKAGE} \
+    cuda-nvtx-12-0=${NV_NVTX_VERSION} \
+    libcusparse-12-0=${NV_LIBCUSPARSE_VERSION} \
+    ${NV_LIBCUBLAS_PACKAGE} \
+    ${NV_LIBNCCL_PACKAGE} \
+    && rm -rf /var/lib/apt/lists/*
 
 # Keep apt from auto upgrading the cublas and nccl packages. See https://gitlab.com/nvidia/container-images/cuda/-/issues/88
 RUN apt-mark hold ${NV_LIBCUBLAS_PACKAGE_NAME} ${NV_LIBNCCL_PACKAGE_NAME}
@@ -220,19 +222,19 @@ ENV NCCL_VERSION 2.17.1-1
 ENV NV_LIBNCCL_DEV_PACKAGE ${NV_LIBNCCL_DEV_PACKAGE_NAME}=${NV_LIBNCCL_DEV_PACKAGE_VERSION}+cuda12.0
 
 RUN apt-get update && apt-get install -y --no-install-recommends \
-  libtinfo5 libncursesw5 \
-  cuda-cudart-dev-12-0=${NV_CUDA_CUDART_DEV_VERSION} \
-  cuda-command-line-tools-12-0=${NV_CUDA_LIB_VERSION} \
-  cuda-minimal-build-12-0=${NV_CUDA_LIB_VERSION} \
-  cuda-libraries-dev-12-0=${NV_CUDA_LIB_VERSION} \
-  cuda-nvml-dev-12-0=${NV_NVML_DEV_VERSION} \
-  ${NV_NVPROF_DEV_PACKAGE} \
-  ${NV_LIBNPP_DEV_PACKAGE} \
-  libcusparse-dev-12-0=${NV_LIBCUSPARSE_DEV_VERSION} \
-  ${NV_LIBCUBLAS_DEV_PACKAGE} \
-  ${NV_LIBNCCL_DEV_PACKAGE} \
-  ${NV_CUDA_NSIGHT_COMPUTE_DEV_PACKAGE} \
-  && rm -rf /var/lib/apt/lists/*
+    libtinfo5 libncursesw5 \
+    cuda-cudart-dev-12-0=${NV_CUDA_CUDART_DEV_VERSION} \
+    cuda-command-line-tools-12-0=${NV_CUDA_LIB_VERSION} \
+    cuda-minimal-build-12-0=${NV_CUDA_LIB_VERSION} \
+    cuda-libraries-dev-12-0=${NV_CUDA_LIB_VERSION} \
+    cuda-nvml-dev-12-0=${NV_NVML_DEV_VERSION} \
+    ${NV_NVPROF_DEV_PACKAGE} \
+    ${NV_LIBNPP_DEV_PACKAGE} \
+    libcusparse-dev-12-0=${NV_LIBCUSPARSE_DEV_VERSION} \
+    ${NV_LIBCUBLAS_DEV_PACKAGE} \
+    ${NV_LIBNCCL_DEV_PACKAGE} \
+    ${NV_CUDA_NSIGHT_COMPUTE_DEV_PACKAGE} \
+    && rm -rf /var/lib/apt/lists/*
 
 # Keep apt from auto upgrading the cublas and nccl packages. See https://gitlab.com/nvidia/container-images/cuda/-/issues/88
 RUN apt-mark hold ${NV_LIBCUBLAS_DEV_PACKAGE_NAME} ${NV_LIBNCCL_DEV_PACKAGE_NAME}
diff --git a/docker/zk-environment/Dockerfile b/docker/zk-environment/Dockerfile
index c8809c904e20..356e58b268d8 100644
--- a/docker/zk-environment/Dockerfile
+++ b/docker/zk-environment/Dockerfile
@@ -1,4 +1,4 @@
-FROM ubuntu:20.04 as base
+FROM ubuntu:20.04@sha256:3246518d9735254519e1b2ff35f95686e4a5011c90c85344c1f38df7bae9dd37 as base
 
 WORKDIR /usr/src/zksync
 ENV DEBIAN_FRONTEND noninteractive
@@ -22,20 +22,23 @@ RUN apt-get update && apt-get install -y \
     wget \
     vim \
     ca-certificates \
-    gnupg2
+    gnupg2 \
+    postgresql-client \
+    wget \
+    bzip2
 
 # Install dependencies for RocksDB. `liburing` is not available for Ubuntu 20.04,
 # so we use a PPA with the backport
 RUN add-apt-repository ppa:savoury1/virtualisation && \
     apt-get update && \
     apt-get install -y \
-        curl \
-        gnutls-bin git \
-        build-essential \
-        clang-7 \
-        lldb-7 \
-        lld-7 \
-        liburing-dev
+    curl \
+    gnutls-bin git \
+    build-essential \
+    clang-7 \
+    lldb-7 \
+    lld-7 \
+    liburing-dev
 
 # Install docker engine
 RUN curl -fsSL https://download.docker.com/linux/ubuntu/gpg | apt-key add -
@@ -46,7 +49,7 @@ RUN apt update; apt install -y docker-ce-cli
 RUN git config --global http.postBuffer 1048576000
 
 # Install node and yarn
-RUN curl -sL https://deb.nodesource.com/setup_14.x | bash -
+RUN curl -sL https://deb.nodesource.com/setup_18.x | bash -
 RUN apt-get install -y nodejs
 RUN npm install -g yarn
 
@@ -65,10 +68,11 @@ RUN echo "deb http://packages.cloud.google.com/apt cloud-sdk main" > /etc/apt/so
     gcloud config set metrics/environment github_docker_image
 
 RUN curl https://sh.rustup.rs -sSf | bash -s -- -y
-RUN rustup install nightly-2023-05-31
+RUN rustup install nightly-2023-07-21
 RUN rustup default stable
 RUN cargo install --version=0.5.6 sqlx-cli
 RUN cargo install cargo-tarpaulin
+RUN cargo install cargo-nextest
 
 # Copy compiler (both solc and zksolc) binaries
 # Obtain `solc` 0.8.20.
@@ -80,6 +84,15 @@ RUN wget https://github.com/matter-labs/zksolc-bin/raw/main/linux-amd64/zksolc-l
     && mv zksolc-linux-amd64-musl-v1.3.13 /usr/bin/zksolc \
     && chmod +x /usr/bin/zksolc
 
+# Somehow it is installed with some other packages
+RUN apt-get remove valgrind -y
+
+# We need valgrind 3.20, which is unavailable in repos or ppa, so we will build it from source
+RUN wget https://sourceware.org/pub/valgrind/valgrind-3.20.0.tar.bz2 && \
+    tar -xf valgrind-3.20.0.tar.bz2 && \
+    cd valgrind-3.20.0 && ./configure && make && make install && \
+    cd ../ && rm -rf valgrind-3.20.0.tar.bz2 && rm -rf valgrind-3.20.0
+
 # Setup the environment
 ENV ZKSYNC_HOME=/usr/src/zksync
 ENV PATH="${ZKSYNC_HOME}/bin:${PATH}"
@@ -109,20 +122,20 @@ ENV NV_CUDA_CUDART_VERSION 11.8.89-1
 ENV NV_CUDA_COMPAT_PACKAGE cuda-compat-11-8
 
 RUN curl -fsSL https://developer.download.nvidia.com/compute/cuda/repos/ubuntu2004/${NVARCH}/3bf863cc.pub | apt-key add - && \
-  echo "deb https://developer.download.nvidia.com/compute/cuda/repos/ubuntu2004/${NVARCH} /" > /etc/apt/sources.list.d/cuda.list
+    echo "deb https://developer.download.nvidia.com/compute/cuda/repos/ubuntu2004/${NVARCH} /" > /etc/apt/sources.list.d/cuda.list
 
 ENV CUDA_VERSION 11.8.0
 
 # For libraries in the cuda-compat-* package: https://docs.nvidia.com/cuda/eula/index.html#attachment-a
 RUN apt-get update && apt-get install -y --no-install-recommends \
-  cuda-cudart-11-8=${NV_CUDA_CUDART_VERSION} \
-  ${NV_CUDA_COMPAT_PACKAGE} \
-  && ln -s cuda-11.8 /usr/local/cuda && \
-  rm -rf /var/lib/apt/lists/*
+    cuda-cudart-11-8=${NV_CUDA_CUDART_VERSION} \
+    ${NV_CUDA_COMPAT_PACKAGE} \
+    && ln -s cuda-11.8 /usr/local/cuda && \
+    rm -rf /var/lib/apt/lists/*
 
 # Required for nvidia-docker v1
 RUN echo "/usr/local/nvidia/lib" >> /etc/ld.so.conf.d/nvidia.conf \
-  && echo "/usr/local/nvidia/lib64" >> /etc/ld.so.conf.d/nvidia.conf
+    && echo "/usr/local/nvidia/lib64" >> /etc/ld.so.conf.d/nvidia.conf
 
 ENV PATH /usr/local/nvidia/bin:/usr/local/cuda/bin:${PATH}
 ENV LD_LIBRARY_PATH /usr/local/nvidia/lib:/usr/local/nvidia/lib64
@@ -143,12 +156,12 @@ ENV NV_LIBCUBLAS_VERSION 11.11.3.6-1
 ENV NV_LIBCUBLAS_PACKAGE ${NV_LIBCUBLAS_PACKAGE_NAME}=${NV_LIBCUBLAS_VERSION}
 
 RUN apt-get update && apt-get install -y --no-install-recommends \
-  cuda-libraries-11-8=${NV_CUDA_LIB_VERSION} \
-  ${NV_LIBNPP_PACKAGE} \
-  cuda-nvtx-11-8=${NV_NVTX_VERSION} \
-  libcusparse-11-8=${NV_LIBCUSPARSE_VERSION} \
-  ${NV_LIBCUBLAS_PACKAGE} \
-  && rm -rf /var/lib/apt/lists/*
+    cuda-libraries-11-8=${NV_CUDA_LIB_VERSION} \
+    ${NV_LIBNPP_PACKAGE} \
+    cuda-nvtx-11-8=${NV_NVTX_VERSION} \
+    libcusparse-11-8=${NV_LIBCUSPARSE_VERSION} \
+    ${NV_LIBCUBLAS_PACKAGE} \
+    && rm -rf /var/lib/apt/lists/*
 
 # Keep apt from auto upgrading the cublas and nccl packages. See https://gitlab.com/nvidia/container-images/cuda/-/issues/88
 RUN apt-mark hold ${NV_LIBCUBLAS_PACKAGE_NAME}
@@ -167,16 +180,16 @@ ENV NV_NVPROF_VERSION 11.8.87-1
 ENV NV_NVPROF_DEV_PACKAGE cuda-nvprof-11-8=${NV_NVPROF_VERSION}
 
 RUN apt-get update && apt-get install -y --no-install-recommends \
-  libtinfo5 libncursesw5 \
-  cuda-cudart-dev-11-8=${NV_CUDA_CUDART_DEV_VERSION} \
-  cuda-command-line-tools-11-8=${NV_CUDA_LIB_VERSION} \
-  cuda-minimal-build-11-8=${NV_CUDA_LIB_VERSION} \
-  cuda-libraries-dev-11-8=${NV_CUDA_LIB_VERSION} \
-  cuda-nvml-dev-11-8=${NV_NVML_DEV_VERSION} \
-  ${NV_NVPROF_DEV_PACKAGE} \
-  ${NV_LIBNPP_DEV_PACKAGE} \
-  libcusparse-dev-11-8=${NV_LIBCUSPARSE_DEV_VERSION} \
-  ${NV_LIBCUBLAS_DEV_PACKAGE} \
-  && rm -rf /var/lib/apt/lists/*
+    libtinfo5 libncursesw5 \
+    cuda-cudart-dev-11-8=${NV_CUDA_CUDART_DEV_VERSION} \
+    cuda-command-line-tools-11-8=${NV_CUDA_LIB_VERSION} \
+    cuda-minimal-build-11-8=${NV_CUDA_LIB_VERSION} \
+    cuda-libraries-dev-11-8=${NV_CUDA_LIB_VERSION} \
+    cuda-nvml-dev-11-8=${NV_NVML_DEV_VERSION} \
+    ${NV_NVPROF_DEV_PACKAGE} \
+    ${NV_LIBNPP_DEV_PACKAGE} \
+    libcusparse-dev-11-8=${NV_LIBCUSPARSE_DEV_VERSION} \
+    ${NV_LIBCUBLAS_DEV_PACKAGE} \
+    && rm -rf /var/lib/apt/lists/*
 
 ENV LIBRARY_PATH /usr/local/cuda/lib64/stubs
diff --git a/docker/zk-rust-nightly-environment/Dockerfile b/docker/zk-rust-nightly-environment/Dockerfile
index 49fec856f5cc..db3c8515c36b 100644
--- a/docker/zk-rust-nightly-environment/Dockerfile
+++ b/docker/zk-rust-nightly-environment/Dockerfile
@@ -10,9 +10,8 @@ ENV RUSTUP_HOME=/usr/local/rustup \
 
 # Setup rust nightly
 RUN curl https://sh.rustup.rs -sSf | bash -s -- -y && \
-    rustup install nightly-2023-05-31 && \
-    rustup default nightly-2023-05-31
-
+    rustup install nightly-2023-07-21 && \
+    rustup default nightly-2023-07-21
 
 # Setup cmake
 RUN curl -Lo cmake-3.24.2-linux-x86_64.sh https://github.com/Kitware/CMake/releases/download/v3.24.2/cmake-3.24.2-linux-x86_64.sh && \
diff --git a/docs/advanced/02_deposits.md b/docs/advanced/02_deposits.md
index 49b01b90e36b..a6478d05a0bc 100644
--- a/docs/advanced/02_deposits.md
+++ b/docs/advanced/02_deposits.md
@@ -60,12 +60,10 @@ and now let's bridge it over to L2.
 We'll use the zksync-cli from: <https://github.com/matter-labs/zksync-cli> and then run:
 
 ```shell
-npm i
-npm run build
-npm exec zksync-cli deposit --l1-rpc-url=http://localhost:8545 --l2-rpc-url=http://localhost:3050
-# Address to deposit funds to: 0x618263CE921F7dd5F4f40C29f6c524Aaf97b9bbd
-# Amount in ETH: 3
+npx zksync-cli deposit --chain=local-dockerized
+# Amount of ETH to deposit: 3
 # Private key of the sender: 0x5090c024edb3bdf4ce2ebc2da96bedee925d9d77d729687e5e2d56382cf0a5a6
+# Recipient address on L2: 0x618263CE921F7dd5F4f40C29f6c524Aaf97b9bbd
 ```
 
 If everything goes well, you should be able to see 3 tokens transferred:
diff --git a/docs/advanced/03_withdrawals.md b/docs/advanced/03_withdrawals.md
index 9a8bfb09a598..70c3f9f1ec20 100644
--- a/docs/advanced/03_withdrawals.md
+++ b/docs/advanced/03_withdrawals.md
@@ -4,7 +4,7 @@ Assuming that you have completed [part 1](01_initialization.md) and [part 2](02_
 tokens back by simply calling the zksync-cli:
 
 ```bash
-npm exec zksync-cli withdraw --l1-rpc-url=http://localhost:8545 --l2-rpc-url=http://localhost:3050
+npx zksync-cli withdraw --chain=local-dockerized
 ```
 
 And providing the account name (public address) and private key.
@@ -15,10 +15,10 @@ they didn't** - what happened?
 Actually we'll have to run one additional step:
 
 ```bash
-npm exec zksync-cli confirm-withdraw --l1-rpc-url=http://localhost:8545 --l2-rpc-url=http://localhost:3050
+npx zksync-cli withdraw-finalize --chain=local-dockerized
 ```
 
-and pass the transaction that we received from the first call, into the `confirm-withdraw` call.
+and pass the transaction that we received from the first call, into the `withdraw-finalize` call.
 
 **Note:** This is not needed on testnet - as we (MatterLabs) - are running an automatic tool that confirms withdrawals.
 
diff --git a/docs/advanced/how_l2_messaging_works.md b/docs/advanced/how_l2_messaging_works.md
new file mode 100644
index 000000000000..e3380f027d3d
--- /dev/null
+++ b/docs/advanced/how_l2_messaging_works.md
@@ -0,0 +1,215 @@
+# How L2 to L1 messaging works
+
+In this article, we will explore the workings of Layer 2 (L2) to Layer 1 (L1) messaging in zkSync Era.
+
+If you're uncertain about why messaging is necessary in the first place, please refer to our [user
+documentation][user_docs].
+
+For ease of understanding, here's a quick visual guide. We will unpack each part in detail as we progress.
+
+![overview image][overview_image]
+
+## Part 1 - User Generates a Message
+
+Consider the following contract. Its main function is to forward any received string to L1:
+
+```solidity
+contract Messenger {
+  function sendMessage(string memory message) public returns (bytes32 messageHash) {
+    messageHash = L1_MESSENGER_CONTRACT.sendToL1(bytes(message));
+  }
+}
+
+```
+
+From a developer's standpoint, you only need to invoke the `sendToL1` method, and your task is complete.
+
+It's worth noting, however, that transferring data to L1 typically incurs high costs. These costs are associated with
+the 'pubdata cost' that is charged for each byte in the message. As a workaround, many individuals choose to send the
+hash of the message instead of the full message, as this helps to conserve resources.
+
+## Part 2 - System Contract Execution
+
+The previously mentioned `sendToL1` method executes a call to the `L1Messenger.sol` system contract
+[here][l1_messenger]. This system contract performs tasks such as computing the appropriate gas cost and hashes, and
+then it broadcasts an Event carrying the complete message.
+
+```solidity
+function sendToL1(bytes calldata _message) external override returns (bytes32 hash) {
+  // ...
+  SystemContractHelper.toL1(true, bytes32(uint256(uint160(msg.sender))), hash);
+  emit L1MessageSent(msg.sender, hash, _message);
+}
+
+```
+
+As depicted in the leading image, this stage is where the message data splits. The full body of the message is emitted
+for retrieval in Part 5 by the StateKeeper, while the hash of the message proceeds to be added to the Virtual Machine
+(VM) - as it has to be included in the proof.
+
+The method then sends the message's hash to the `SystemContractHelper`, which makes an internal call:
+
+```solidity
+function toL1(
+  bool _isService,
+  bytes32 _key,
+  bytes32 _value
+) internal {
+  // ...
+  address callAddr = TO_L1_CALL_ADDRESS;
+  assembly {
+    call(_isService, callAddr, _key, _value, 0xFFFF, 0, 0)
+  }
+}
+
+```
+
+Following the `TO_L1_CALL_ADDRESS`, we discover that it's set to a placeholder value. So what exactly is occurring here?
+
+## Part 3 - Compiler Tricks and the EraVM
+
+Our VM features special opcodes designed to manage operations that aren't possible in the Ethereum Virtual Machine
+(EVM), such as publishing data to L1. But how can we make these features accessible to Solidity?
+
+We could expand the language by introducing new Solidity opcodes, but that would require modifying the solc compiler,
+among other things. Hence, we've adopted a different strategy.
+
+To access these unique eraVM opcodes, the Solidity code simply executes a call to a specific address (the full list can
+be seen [here][list_of_opcodes]). This call is compiled by the solc frontend, and then on the compiler backend, we
+intercept it and replace it with the correct eraVM opcode call [here][opcode_catch_compiler].
+
+```rust
+match simulation_address {
+  Some(compiler_common::ADDRESS_TO_L1) => {
+    return crate::zkevm::general::to_l1(context, is_first, in_0, in_1);
+  }
+}
+```
+
+This method allows your message to reach the VM.
+
+## Part 4 - Inside the Virtual Machine
+
+The zkEVM assembly translates these [opcodes][zkevm_assembly_parse] into LogOpcodes.
+
+```rust
+pub const ALL_CANONICAL_MODIFIERS: [&'static str; 5] =
+    ["sread", "swrite", "event", "to_l1", "precompile"];
+let variant = match idx {
+  0 => LogOpcode::StorageRead,
+  1 => LogOpcode::StorageWrite,
+  2 => LogOpcode::Event,
+  3 => LogOpcode::ToL1Message,
+  4 => LogOpcode::PrecompileCall,
+}
+```
+
+Each opcode is then converted into the corresponding [LogOpcode][log_opcode] and written into the Log
+[here][log_writing_in_vm], which is handled by the EventSink oracle.
+
+## Part 5 - The Role of the State Keeper
+
+At this stage, the state keeper needs to collect all the messages generated by the VM execution and append them to the
+calldata it transmits to Ethereum.
+
+This process is divided into two steps:
+
+- Retrieval of the 'full' messages
+- Extraction of all the message hashes.
+
+Why are these steps kept separate?
+
+To avoid overwhelming our circuits with the content of entire messages, we relay them through Events, sending only their
+hash to the VM. In this manner, the VM only adds to the proof the information that a message with a specific hash was
+sent.
+
+### Retrieving Full Message Contents
+
+We go through all the Events generated during the run [here][iterate_over_events] and identify those coming from the
+`L1_MESSENGER_ADDRESS` that correspond to the `L1MessageSent` topic. These Events represent the 'emit' calls executed in
+Part 2.
+
+### Retrieving Message Hashes
+
+Message hashes are transmitted alongside the other `l2_to_l1_logs` within the [VmExecutionResult][vm_execution_result].
+
+The StateKeeper collects them from the [LogQueries][log_queries] that the VM creates (these log queries also contain
+information about storage writes, so we use the AUX_BYTE filter to determine which ones contain L1 messages. The entire
+list can be found [here][aux_bytes]). The StateKeeper employs the VM's EventSink to filter them out [here][event_sink].
+
+## Part 6 - Interaction with Ethereum (L1)
+
+After the StateKeeper has collected all the required data, it invokes the `CommitBlocks` method from the
+[Executor.sol][executor_sol] contract.
+
+Inside the `processL2Blocks` method, we iterate through the list of L2 message hashes, ensuring that the appropriate
+full text is present for each:
+
+```solidity
+// show preimage for hashed message stored in log
+if (logSender == L2_TO_L1_MESSENGER_SYSTEM_CONTRACT_ADDR) {
+    (bytes32 hashedMessage, ) = UnsafeBytes.readBytes32(emittedL2Logs, i + 56);
+    // check that the full message body matches the hash.
+    require(keccak256(l2Messages[currentMessage]) == hashedMessage, "k2");
+```
+
+Currently, the executor is deployed on Ethereum mainnet at
+[0x389a081BCf20e5803288183b929F08458F1d863D][mainnet_executor].
+
+You can view an example of our contract execution from Part 1, carrying the message "My sample message", in this Sepolia
+transaction: [0x18c2a113d18c53237a4056403047ff9fafbf772cb83ccd44bb5b607f8108a64c][sepolia_tx].
+
+## Part 7 - Verifying Message Inclusion
+
+We've now arrived at the final stage — how L1 users and contracts can confirm a message's presence in L1.
+
+This is accomplished through the `ProveL2MessageInclusion` function call in [Mailbox.sol][mailbox_log_inclusion].
+
+Users supply the proof (merkle path) and the message, and the contract verifies that the merkle path is accurate and
+matches the root hash.
+
+```solidity
+bytes32 calculatedRootHash = Merkle.calculateRoot(_proof, _index, hashedLog);
+bytes32 actualRootHash = s.l2LogsRootHashes[_blockNumber];
+
+return actualRootHash == calculatedRootHash;
+```
+
+## Summary
+
+In this article, we've travelled through a vast array of topics: from a user contract dispatching a message to L1 by
+invoking a system contract, to this message's hash making its way all the way to the VM via special opcodes. We've also
+explored how it's ultimately included in the execution results (as part of QueryLogs), gathered by the State Keeper, and
+transmitted to L1 for final verification.
+
+[overview_image]: https://user-images.githubusercontent.com/128217157/257739371-f971c10b-87c7-4ee9-bd0e-731670c616ac.png
+[user_docs]: https://era.zksync.io/docs/dev/how-to/send-message-l2-l1.html
+[l1_messenger]:
+  https://github.com/matter-labs/system-contracts/blob/f01df555c03860b6093dd669d119eed4d9f8ec99/contracts/L1Messenger.sol#L22
+[list_of_opcodes]:
+  https://github.com/matter-labs/system-contracts/blob/e96dfe0b5093fa95c2fb340c0411c646327db921/contracts/libraries/SystemContractsCaller.sol#L12
+[opcode_catch_compiler]: https://github.com/matter-labs/era-compiler-llvm-context/blob/main/src/evm/call.rs#L39
+[iterate_over_events]:
+  https://github.com/matter-labs/zksync-2-dev/blob/43d7bd587a84b1b4489f4c6a4169ccb90e0df467/core/lib/types/src/event.rs#L147
+[vm_execution_result]:
+  https://github.com/matter-labs/zksync-2-dev/blob/43d7bd587a84b1b4489f4c6a4169ccb90e0df467/core/lib/vm/src/vm.rs#L81
+[log_queries]:
+  https://github.com/matter-labs/zk_evm_abstractions/blob/839721a4ae2093c5c0aa8ffd49758f32ecd172ed/src/queries.rs#L30C2-L30C2
+[aux_bytes]:
+  https://github.com/matter-labs/zkevm_opcode_defs/blob/780ce4129a95ab9a68abf0d60c156ee8df6008c2/src/system_params.rs#L37C39-L37C39
+[event_sink]:
+  https://github.com/matter-labs/zksync-2-dev/blob/43d7bd587a84b1b4489f4c6a4169ccb90e0df467/core/lib/vm/src/event_sink.rs#L116
+[log_writing_in_vm]:
+  https://github.com/matter-labs/zk_evm/blob/be4da71446924f739b9fb10cfd310231adf2a542/src/opcodes/execution/log.rs#L231
+[log_opcode]: https://github.com/matter-labs/zkevm_opcode_defs/blob/v1.3.2/src/definitions/log.rs#L16
+[zkevm_assembly_parse]:
+  https://github.com/matter-labs/zkEVM-assembly/blob/fcfeb51e45544a629d4279b3455def847dcc2505/src/assembly/instruction/log.rs#L32
+[executor_sol]:
+  https://github.com/matter-labs/era-contracts/blob/3a4506522aaef81485d8abb96f5a6394bd2ba69e/ethereum/contracts/zksync/facets/Executor.sol#L26
+[mainet_executor]: https://etherscan.io/address/0x389a081BCf20e5803288183b929F08458F1d863D
+
+[sepolia_tx]:
+[0x18c2a113d18c53237a4056403047ff9fafbf772cb83ccd44bb5b607f8108a64c](https://sepolia.etherscan.io/tx/0x18c2a113d18c53237a4056403047ff9fafbf772cb83ccd44bb5b607f8108a64c)
+
+[mailbox_log_inclusion]:
+  https://github.com/matter-labs/era-contracts/blob/3a4506522aaef81485d8abb96f5a6394bd2ba69e/ethereum/contracts/zksync/facets/Mailbox.sol#L54
diff --git a/docs/external-node/01_intro.md b/docs/external-node/01_intro.md
index ecbfd7e0b77d..4ebbf2d88fa2 100644
--- a/docs/external-node/01_intro.md
+++ b/docs/external-node/01_intro.md
@@ -2,9 +2,12 @@
 
 This documentation explains the basics of the zkSync Era External Node.
 
-## Alpha phase disclaimer
+## Disclaimers
 
-Warning: the external node is in the alpha phase, and should be used with caution.
+- The external node is in the alpha phase, and should be used with caution.
+- While in alpha, the EN is dependent on a DB snapshot in order to run that is not yet publicly available.
+- The EN is a read-only replica of the main node. We are currently working on decentralizing our infrastructure by
+  creating a consensus node. The EN is not going to be the consensus node.
 
 ## What is the external node
 
diff --git a/docs/repositories.md b/docs/repositories.md
index ffde2ec357c4..9ff22a93ee23 100644
--- a/docs/repositories.md
+++ b/docs/repositories.md
@@ -11,11 +11,11 @@
 
 ### Contracts
 
-| Internal repository                                                 | Public repository                                                           | Description                                                                           |
-| ------------------------------------------------------------------- | --------------------------------------------------------------------------- | ------------------------------------------------------------------------------------- |
-| [contracts](https://github.com/matter-labs/contracts)               | [era-contracts](https://github.com/matter-labs/era-contracts)               | L1 & L2 contracts, that are used to manage bridges and communication between L1 & L2. |
-| [system-contracts](https://github.com/matter-labs/system-contracts) | [era-system-contracts](https://github.com/matter-labs/era-system-contracts) | Privileged contracts that are running on L2 (like Bootloader oc ContractDeployer)     |
-|                                                                     | [v2-testnet-contracts](https://github.com/matter-labs/zksync-2-dev)         |                                                                                       |
+| Public repository                                                           | Description                                                                           |
+| --------------------------------------------------------------------------- | ------------------------------------------------------------------------------------- |
+| [era-contracts](https://github.com/matter-labs/era-contracts)               | L1 & L2 contracts, that are used to manage bridges and communication between L1 & L2. |
+| [era-system-contracts](https://github.com/matter-labs/era-system-contracts) | Privileged contracts that are running on L2 (like Bootloader oc ContractDeployer)     |
+| [v2-testnet-contracts](https://github.com/matter-labs/v2-testnet-contracts) |                                                                                       |
 
 ### Compiler
 
diff --git a/docs/setup-dev.md b/docs/setup-dev.md
index d299eee96ebb..6f31a6afa6db 100644
--- a/docs/setup-dev.md
+++ b/docs/setup-dev.md
@@ -9,6 +9,10 @@ If you're using Windows, then make sure to use WSL 2, since WSL 1 is known to ca
 Additionally, if you are going to use WSL 2, make sure that your project is located in the _linux filesystem_, since
 accessing NTFS partitions from inside of WSL is very slow.
 
+If you're using MacOS with an ARM processor (e.g. M1/M2), make sure that you are working in the _native_ environment
+(e.g. your terminal and IDE don't run in Rosetta, and your toolchain is native). Trying to work with zkSync code via
+Rosetta may cause problems that are hard to spot and debug, so make sure to check everything before you start.
+
 If you are a NixOS user or would like to have a reproducible environment, skip to the section about `nix`.
 
 ## `git`
@@ -63,9 +67,9 @@ If logging out does not help, restarting the computer should.
 
 ## `Node` & `Yarn`
 
-1. Install `Node` (requires version 16.19.1). Since our team attempts to always use the latest LTS version of`Node.js`,
-   we suggest you to install [nvm](https://github.com/nvm-sh/nvm). It will allow you to update `Node.js`version easily
-   in the future (by running `nvm use 16.19.1`)
+1. Install `Node` (requires version `v18.18.0`). Since our team attempts to always use the latest LTS version of
+   `Node.js`, we suggest you to install [nvm](https://github.com/nvm-sh/nvm). It will allow you to update `Node.js`
+   version easily in the future (by running `nvm use` in the root of the repository)
 2. Install `yarn` (make sure to get version 1.22.19 - you can change the version by running `yarn set version 1.22.19`).
    Instructions can be found on the [official site](https://classic.yarnpkg.com/en/docs/install/).  
    Check if `yarn` is installed by running `yarn -v`. If you face any problems when installing `yarn`, it might be the
@@ -140,6 +144,29 @@ rustc --version
 rustc 1.xx.y (xxxxxx 20xx-yy-zz) # Output may vary depending on actual version of rust
 ```
 
+If you are using MacOS with ARM processor (e.g. M1/M2), make sure that you use an `aarch64` toolchain. For example, when
+you run `rustup show`, you should see a similar input:
+
+```bash
+rustup show
+Default host: aarch64-apple-darwin
+rustup home:  /Users/user/.rustup
+
+installed toolchains
+--------------------
+
+...
+
+active toolchain
+----------------
+
+1.67.1-aarch64-apple-darwin (overridden by '/Users/user/workspace/zksync-2-dev/rust-toolchain')
+```
+
+If you see `x86_64` mentioned in the output, probably you're running (or used to run) your IDE/terminal in Rosetta. If
+that's the case, you should probably change the way you run terminal, and/or reinstall your IDE, and then reinstall the
+Rust toolchain as well.
+
 ## Postgres
 
 Install the latest postgres.
@@ -148,6 +175,15 @@ Install the latest postgres.
 brew install postgresql
 ```
 
+### Cargo nextest
+
+[cargo-nextest](https://nexte.st/) is the next-generation test runner for Rust projects. `zk test rust` uses
+`cargo nextest` by default.
+
+```bash
+cargo install cargo-nextest
+```
+
 ### SQLx CLI
 
 SQLx is a Rust library we use to interact with Postgres, and its CLI is used to manage DB migrations and support several
diff --git a/etc/contracts-test-data/counter/counter.sol b/etc/contracts-test-data/counter/counter.sol
new file mode 100644
index 000000000000..3c4e19222762
--- /dev/null
+++ b/etc/contracts-test-data/counter/counter.sol
@@ -0,0 +1,27 @@
+// SPDX-License-Identifier: UNLICENSED
+
+pragma solidity ^0.8.0;
+
+contract Counter {
+    uint256 value;
+
+    function increment(uint256 x) public {
+        value += x;
+    }
+
+    function incrementWithRevertPayable(uint256 x, bool shouldRevert) payable public returns (uint256) {
+        return incrementWithRevert(x, shouldRevert);
+    }
+
+    function incrementWithRevert(uint256 x, bool shouldRevert) public returns (uint256) {
+        value += x;
+        if(shouldRevert) {
+            revert("This method always reverts");
+        }
+        return value;
+    }
+
+    function get() public view returns (uint256) {
+        return value;
+    }
+}
\ No newline at end of file
diff --git a/etc/contracts-test-data/package.json b/etc/contracts-test-data/package.json
index 8b528a66093b..7ba728af6580 100644
--- a/etc/contracts-test-data/package.json
+++ b/etc/contracts-test-data/package.json
@@ -8,5 +8,9 @@
   },
   "devDependencies": {
     "@matterlabs/hardhat-zksync-solc": "^0.3.15"
+  },
+  "scripts": {
+    "build": "hardhat compile",
+    "clean": "hardhat clean"
   }
 }
diff --git a/etc/env/base/alerts.toml b/etc/env/base/alerts.toml
index 223b0458d857..b6e494f6486f 100644
--- a/etc/env/base/alerts.toml
+++ b/etc/env/base/alerts.toml
@@ -2,5 +2,5 @@
 sporadic_crypto_errors_substrs=[
     "EventDestroyErr",
     "Can't free memory of DeviceBuf",
-    "called `Result::unwrap()` on an `Err` value: PoisonError"
+    "value: PoisonError"
 ]
diff --git a/etc/env/base/chain.toml b/etc/env/base/chain.toml
index aa83693824a7..adf0b7d572c9 100644
--- a/etc/env/base/chain.toml
+++ b/etc/env/base/chain.toml
@@ -55,6 +55,14 @@ fair_l2_gas_price=250000000
 validation_computational_gas_limit=300000
 save_call_traces=true
 
+virtual_blocks_interval=1
+virtual_blocks_per_miniblock=1
+
+# WARNING! This slows down the statekeeper, forcing mempool to upload to GCS
+# It is meant as a validation flag to be used in STAGING only.
+# This variable should not be set to true in any customer facing environment.
+upload_witness_inputs_to_gcs=false
+
 [chain.operations_manager]
 # Sleep time when there is no new input data
 delay_interval=100
diff --git a/etc/env/base/contracts.toml b/etc/env/base/contracts.toml
index 41c0c7c05f60..d232124ef0af 100644
--- a/etc/env/base/contracts.toml
+++ b/etc/env/base/contracts.toml
@@ -21,10 +21,10 @@ L1_ALLOW_LIST_ADDR="0xFC073319977e314F251EAE6ae6bE76B0B3BAeeCF"
 CREATE2_FACTORY_ADDR="0xce0042B868300000d44A59004Da54A005ffdcf9f"
 VALIDATOR_TIMELOCK_ADDR="0xFC073319977e314F251EAE6ae6bE76B0B3BAeeCF"
 VALIDATOR_TIMELOCK_EXECUTION_DELAY=0
-RECURSION_SCHEDULER_LEVEL_VK_HASH="0x548dcd0bcf9f94b9d27b7adebf4afb7f28e540277b6757b56a10fb587cb71919"
+RECURSION_SCHEDULER_LEVEL_VK_HASH="0x2b53d65c2b3310daa4b3b747f3b5c73881469197d1d2c3f29b2033d4b947a427"
 RECURSION_NODE_LEVEL_VK_HASH="0x1186ec268d49f1905f8d9c1e9d39fc33e98c74f91d91a21b8f7ef78bd09a8db8"
 RECURSION_LEAF_LEVEL_VK_HASH="0x101e08b00193e529145ee09823378ef51a3bc8966504064f1f6ba3f1ba863210"
-RECURSION_CIRCUITS_SET_VKS_HASH="0x0a3657f884af32d3a573c5fdb3440c9ac45271ede8c982faeaae7434d032ab3e"
+RECURSION_CIRCUITS_SET_VKS_HASH="0x236c97bfbe75ff507e03909fae32a78be3a70d1b468b183f430010810284ed45"
 GENESIS_TX_HASH="0xb99ebfea46cbe05a21cd80fe5597d97b204befc52a16303f579c607dc1ac2e2e"
 GENESIS_ROOT="0x2d5ab622df708ab44944bb02377be85b6f27812e9ae520734873b7a193898ba4"
 PRIORITY_TX_MAX_GAS_LIMIT=72000000
@@ -38,8 +38,9 @@ L1_WETH_TOKEN_ADDR="0x5E6D086F5eC079ADFF4FB3774CDf3e8D6a34F7E9"
 L2_WETH_BRIDGE_ADDR="0x5E6D086F5eC079ADFF4FB3774CDf3e8D6a34F7E9"
 L2_WETH_TOKEN_IMPL_ADDR="0x5E6D086F5eC079ADFF4FB3774CDf3e8D6a34F7E9"
 L2_WETH_TOKEN_PROXY_ADDR="0x5E6D086F5eC079ADFF4FB3774CDf3e8D6a34F7E9"
-FRI_VK_COMMITMENT_LEAF ="[0x72167c43a46cf388, 0x75b267d67716edc4, 0x563861364a3c03ab, 0x7aee73498421e828]"
-FRI_VK_COMMITMENT_NODE ="[0x5a3ef282b21e12fe, 0x1f4438e5bb158fc5, 0x060b160559c5158c, 0x6389d62d9fe3d080]"
+FRI_RECURSION_LEAF_LEVEL_VK_HASH ="0x72167c43a46cf38875b267d67716edc4563861364a3c03ab7aee73498421e828"
+FRI_RECURSION_NODE_LEVEL_VK_HASH ="0x5a3ef282b21e12fe1f4438e5bb158fc5060b160559c5158c6389d62d9fe3d080"
+FRI_RECURSION_SCHEDULER_LEVEL_VK_HASH ="0x201d4c7d8e781d51a3bbd451a43a8f45240bb765b565ae6ce69192d918c3563d"
 
 [contracts.test]
 dummy_verifier=true
diff --git a/etc/env/base/eth_sender.toml b/etc/env/base/eth_sender.toml
index 60193788fd6f..f95a70c5f96a 100644
--- a/etc/env/base/eth_sender.toml
+++ b/etc/env/base/eth_sender.toml
@@ -44,6 +44,8 @@ max_single_tx_gas=6000000
 # Max acceptable fee for sending tx to L1
 max_acceptable_priority_fee_in_gwei=100000000000
 
+proof_loading_mode="OldProofFromDb"
+
 [eth_sender.gas_adjuster]
 # Priority fee to be used by GasAdjuster (in wei).
 default_priority_fee_per_gas=1_000_000_000
diff --git a/etc/env/base/fri_proof_compressor.toml b/etc/env/base/fri_proof_compressor.toml
new file mode 100644
index 000000000000..86a5b0cbcba9
--- /dev/null
+++ b/etc/env/base/fri_proof_compressor.toml
@@ -0,0 +1,7 @@
+[fri_proof_compressor]
+compression_mode=1
+prometheus_listener_port=3321
+prometheus_pushgateway_url="http://127.0.0.1:9091"
+prometheus_push_interval_ms=100
+generation_timeout_in_secs=3600
+max_attempts=5
diff --git a/etc/env/base/fri_prover_gateway.toml b/etc/env/base/fri_prover_gateway.toml
new file mode 100644
index 000000000000..8974298a57c3
--- /dev/null
+++ b/etc/env/base/fri_prover_gateway.toml
@@ -0,0 +1,6 @@
+[fri_prover_gateway]
+api_url="http://127.0.0.1:3320"
+api_poll_duration_secs=1000
+prometheus_listener_port=3314
+prometheus_pushgateway_url="http://127.0.0.1:9091"
+prometheus_push_interval_ms=100
diff --git a/etc/env/base/house_keeper.toml b/etc/env/base/house_keeper.toml
index fa3e18a9fcb3..f015c63272ec 100644
--- a/etc/env/base/house_keeper.toml
+++ b/etc/env/base/house_keeper.toml
@@ -11,3 +11,5 @@ fri_prover_job_retrying_interval_ms=30000
 fri_witness_generator_job_retrying_interval_ms=30000
 prover_db_pool_size=2
 fri_prover_stats_reporting_interval_ms=30000
+fri_proof_compressor_job_retrying_interval_ms=30000
+fri_proof_compressor_stats_reporting_interval_ms=10000
diff --git a/etc/env/base/object_store.toml b/etc/env/base/object_store.toml
index 62853ec2e997..3ffec9f2ff65 100644
--- a/etc/env/base/object_store.toml
+++ b/etc/env/base/object_store.toml
@@ -11,3 +11,10 @@ mode="FileBacked"
 file_backed_base_path="artifacts"
 gcs_credential_file_path="/path/to/gcs_credentials.json"
 max_retries=5
+
+[prover_object_store]
+bucket_base_url="prover_base_url"
+mode="FileBacked"
+file_backed_base_path="artifacts"
+gcs_credential_file_path="/path/to/gcs_credentials.json"
+max_retries=5
diff --git a/etc/env/base/proof_data_handler.toml b/etc/env/base/proof_data_handler.toml
index 5f51c9cf17a6..3ac0911f08e7 100644
--- a/etc/env/base/proof_data_handler.toml
+++ b/etc/env/base/proof_data_handler.toml
@@ -1,3 +1,5 @@
 [proof_data_handler]
 http_port=3320
-proof_generation_timeout_in_secs=18000
\ No newline at end of file
+proof_generation_timeout_in_secs=18000
+protocol_version_loading_mode="FromEnvVar"
+fri_protocol_version_id=2
diff --git a/etc/env/base/rust.toml b/etc/env/base/rust.toml
index 28b197ba2027..2842d3bbcafb 100644
--- a/etc/env/base/rust.toml
+++ b/etc/env/base/rust.toml
@@ -31,8 +31,10 @@ zksync_external_node=info,\
 cross_nodes_checker=debug,\
 zksync_witness_generator=info,\
 zksync_prover_fri=info,\
-slot_index_consistency_checker=debug,\
 zksync_witness_vector_generator=info,\
+zksync_health_check=debug,\
+zksync_proof_fri_compressor=info,\
+vise_exporter=debug,\
 """
 
 # `RUST_BACKTRACE` variable
diff --git a/etc/env/base/witness_generator.toml b/etc/env/base/witness_generator.toml
index 9deaade9d2c9..c5df54919ad3 100644
--- a/etc/env/base/witness_generator.toml
+++ b/etc/env/base/witness_generator.toml
@@ -4,3 +4,4 @@ initial_setup_key_path="./keys/setup/setup_2^22.key"
 key_download_url="https://storage.googleapis.com/matterlabs-setup-keys-us/setup-keys/setup_2^22.key"
 max_attempts=1
 dump_arguments_for_blocks="2,3"
+data_source="FromPostgres"
\ No newline at end of file
diff --git a/etc/multivm_bootloaders/vm_1_3_2/commit b/etc/multivm_bootloaders/vm_1_3_2/commit
new file mode 100644
index 000000000000..c73cfa59721c
--- /dev/null
+++ b/etc/multivm_bootloaders/vm_1_3_2/commit
@@ -0,0 +1 @@
+663fede669db3ba66f0941985db304e8bca881e4
diff --git a/etc/multivm_bootloaders/vm_1_3_2/fee_estimate.yul/fee_estimate.yul.zbin b/etc/multivm_bootloaders/vm_1_3_2/fee_estimate.yul/fee_estimate.yul.zbin
new file mode 100644
index 000000000000..27119cd8831b
Binary files /dev/null and b/etc/multivm_bootloaders/vm_1_3_2/fee_estimate.yul/fee_estimate.yul.zbin differ
diff --git a/etc/multivm_bootloaders/vm_1_3_2/gas_test.yul/gas_test.yul.zbin b/etc/multivm_bootloaders/vm_1_3_2/gas_test.yul/gas_test.yul.zbin
new file mode 100644
index 000000000000..1e17e77e734a
Binary files /dev/null and b/etc/multivm_bootloaders/vm_1_3_2/gas_test.yul/gas_test.yul.zbin differ
diff --git a/etc/multivm_bootloaders/vm_1_3_2/playground_block.yul/playground_block.yul.zbin b/etc/multivm_bootloaders/vm_1_3_2/playground_block.yul/playground_block.yul.zbin
new file mode 100644
index 000000000000..5d1743662a43
Binary files /dev/null and b/etc/multivm_bootloaders/vm_1_3_2/playground_block.yul/playground_block.yul.zbin differ
diff --git a/etc/multivm_bootloaders/vm_1_3_2/proved_block.yul/proved_block.yul.zbin b/etc/multivm_bootloaders/vm_1_3_2/proved_block.yul/proved_block.yul.zbin
new file mode 100644
index 000000000000..a74550cd041c
Binary files /dev/null and b/etc/multivm_bootloaders/vm_1_3_2/proved_block.yul/proved_block.yul.zbin differ
diff --git a/etc/multivm_bootloaders/vm_virtual_blocks/commit b/etc/multivm_bootloaders/vm_virtual_blocks/commit
new file mode 100644
index 000000000000..038cc1906219
--- /dev/null
+++ b/etc/multivm_bootloaders/vm_virtual_blocks/commit
@@ -0,0 +1 @@
+7381458849b42b4860c5bdc3e45f57e967022095
diff --git a/etc/multivm_bootloaders/vm_virtual_blocks/fee_estimate.yul/fee_estimate.yul.zbin b/etc/multivm_bootloaders/vm_virtual_blocks/fee_estimate.yul/fee_estimate.yul.zbin
new file mode 100644
index 000000000000..486f6f59ce07
Binary files /dev/null and b/etc/multivm_bootloaders/vm_virtual_blocks/fee_estimate.yul/fee_estimate.yul.zbin differ
diff --git a/etc/multivm_bootloaders/vm_virtual_blocks/gas_test.yul/gas_test.yul.zbin b/etc/multivm_bootloaders/vm_virtual_blocks/gas_test.yul/gas_test.yul.zbin
new file mode 100644
index 000000000000..0b3190964e81
Binary files /dev/null and b/etc/multivm_bootloaders/vm_virtual_blocks/gas_test.yul/gas_test.yul.zbin differ
diff --git a/etc/multivm_bootloaders/vm_virtual_blocks/playground_batch.yul/playground_batch.yul.zbin b/etc/multivm_bootloaders/vm_virtual_blocks/playground_batch.yul/playground_batch.yul.zbin
new file mode 100644
index 000000000000..e0c6de766415
Binary files /dev/null and b/etc/multivm_bootloaders/vm_virtual_blocks/playground_batch.yul/playground_batch.yul.zbin differ
diff --git a/etc/multivm_bootloaders/vm_virtual_blocks/proved_batch.yul/proved_batch.yul.zbin b/etc/multivm_bootloaders/vm_virtual_blocks/proved_batch.yul/proved_batch.yul.zbin
new file mode 100644
index 000000000000..87d57da156af
Binary files /dev/null and b/etc/multivm_bootloaders/vm_virtual_blocks/proved_batch.yul/proved_batch.yul.zbin differ
diff --git a/etc/multivm_bootloaders/vm_virtual_blocks_finish_upgrade_fix/commit b/etc/multivm_bootloaders/vm_virtual_blocks_finish_upgrade_fix/commit
new file mode 100644
index 000000000000..43a175d731c1
--- /dev/null
+++ b/etc/multivm_bootloaders/vm_virtual_blocks_finish_upgrade_fix/commit
@@ -0,0 +1 @@
+de404a390af2aa37ad23b2a543c5f1b408ca84bf
diff --git a/etc/multivm_bootloaders/vm_virtual_blocks_finish_upgrade_fix/fee_estimate.yul/fee_estimate.yul.zbin b/etc/multivm_bootloaders/vm_virtual_blocks_finish_upgrade_fix/fee_estimate.yul/fee_estimate.yul.zbin
new file mode 100644
index 000000000000..51ceb18a6876
Binary files /dev/null and b/etc/multivm_bootloaders/vm_virtual_blocks_finish_upgrade_fix/fee_estimate.yul/fee_estimate.yul.zbin differ
diff --git a/etc/multivm_bootloaders/vm_virtual_blocks_finish_upgrade_fix/gas_test.yul/gas_test.yul.zbin b/etc/multivm_bootloaders/vm_virtual_blocks_finish_upgrade_fix/gas_test.yul/gas_test.yul.zbin
new file mode 100644
index 000000000000..95ad9499e13f
Binary files /dev/null and b/etc/multivm_bootloaders/vm_virtual_blocks_finish_upgrade_fix/gas_test.yul/gas_test.yul.zbin differ
diff --git a/etc/multivm_bootloaders/vm_virtual_blocks_finish_upgrade_fix/playground_batch.yul/playground_batch.yul.zbin b/etc/multivm_bootloaders/vm_virtual_blocks_finish_upgrade_fix/playground_batch.yul/playground_batch.yul.zbin
new file mode 100644
index 000000000000..5fb13eaf859b
Binary files /dev/null and b/etc/multivm_bootloaders/vm_virtual_blocks_finish_upgrade_fix/playground_batch.yul/playground_batch.yul.zbin differ
diff --git a/etc/multivm_bootloaders/vm_virtual_blocks_finish_upgrade_fix/proved_batch.yul/proved_batch.yul.zbin b/etc/multivm_bootloaders/vm_virtual_blocks_finish_upgrade_fix/proved_batch.yul/proved_batch.yul.zbin
new file mode 100644
index 000000000000..287180a3a241
Binary files /dev/null and b/etc/multivm_bootloaders/vm_virtual_blocks_finish_upgrade_fix/proved_batch.yul/proved_batch.yul.zbin differ
diff --git a/etc/system-contracts b/etc/system-contracts
index ae905bd1f589..66899a675d50 160000
--- a/etc/system-contracts
+++ b/etc/system-contracts
@@ -1 +1 @@
-Subproject commit ae905bd1f589dc702fc46830626cd607b1849c44
+Subproject commit 66899a675d5072a3a7ad9c4a51b5360a95e83f6e
diff --git a/etc/upgrades/1692195639-upgrade-system/mainnet2/facetCuts.json b/etc/upgrades/1692195639-upgrade-system/mainnet2/facetCuts.json
new file mode 100644
index 000000000000..bfad4bfe0b9c
--- /dev/null
+++ b/etc/upgrades/1692195639-upgrade-system/mainnet2/facetCuts.json
@@ -0,0 +1,190 @@
+[
+  {
+    "facet": "0x0000000000000000000000000000000000000000",
+    "selectors": [
+      "0x0c4dd810",
+      "0xce9dcf16",
+      "0x7739cbe7",
+      "0xa9a2d18a"
+    ],
+    "action": 2,
+    "isFreezable": false
+  },
+  {
+    "facet": "0x0000000000000000000000000000000000000000",
+    "selectors": [
+      "0x6c0960f9",
+      "0xb473318e",
+      "0x042901c7",
+      "0x263b7f8e",
+      "0xe4948f43",
+      "0xeb672419"
+    ],
+    "action": 2,
+    "isFreezable": false
+  },
+  {
+    "facet": "0x0000000000000000000000000000000000000000",
+    "selectors": [
+      "0xe58bb639",
+      "0xed6d06c0",
+      "0x86cb9909",
+      "0x0707ac09",
+      "0xf235757f",
+      "0x1cc5d103",
+      "0xbe6f11cf",
+      "0x4623c91d",
+      "0x5437988d",
+      "0x0b508883"
+    ],
+    "action": 2,
+    "isFreezable": false
+  },
+  {
+    "facet": "0x0000000000000000000000000000000000000000",
+    "selectors": [
+      "0x73fb9297",
+      "0x36d4eb84",
+      "0x27ae4c16",
+      "0x0551448c",
+      "0x8043760a",
+      "0xbeda4b12",
+      "0x17338945",
+      "0x587809c7"
+    ],
+    "action": 2,
+    "isFreezable": false
+  },
+  {
+    "facet": "0x0000000000000000000000000000000000000000",
+    "selectors": [
+      "0xcdffacc6",
+      "0x52ef6b2c",
+      "0xadfca15e",
+      "0x7a0ed627",
+      "0xa7cd63b7",
+      "0xfe10226d",
+      "0x79823c9a",
+      "0x4fc07d75",
+      "0xd86970d8",
+      "0xfd791f3c",
+      "0x8665b150",
+      "0x631f4bac",
+      "0x0ec6b0b7",
+      "0x1b60e626",
+      "0xe39d3bff",
+      "0x0ef240a0",
+      "0xfe26699e",
+      "0x39607382",
+      "0xaf6a2dcd",
+      "0xa1954fc5",
+      "0xa39980a0",
+      "0x46657fe9",
+      "0x18e3a941",
+      "0x3db920ce",
+      "0x29b98c67",
+      "0xbd7c5412",
+      "0xc3bbd2d7",
+      "0xe81e0ba1",
+      "0xfacd743b",
+      "0x9cd939e4",
+      "0x56142d7a",
+      "0x74f4d30d"
+    ],
+    "action": 2,
+    "isFreezable": false
+  },
+  {
+    "facet": "0xc6f7e57C6e1e20468D869Fe33675524e243CD6a0",
+    "selectors": [
+      "0x73fb9297",
+      "0x36d4eb84",
+      "0x27ae4c16",
+      "0x0551448c",
+      "0x8043760a",
+      "0xbeda4b12",
+      "0x17338945",
+      "0x587809c7"
+    ],
+    "action": 0,
+    "isFreezable": false
+  },
+  {
+    "facet": "0x7444DE636699F080cA1C033528D2bB3705B391Ce",
+    "selectors": [
+      "0xcdffacc6",
+      "0x52ef6b2c",
+      "0xadfca15e",
+      "0x7a0ed627",
+      "0xa7cd63b7",
+      "0xfe10226d",
+      "0x79823c9a",
+      "0x4fc07d75",
+      "0xd86970d8",
+      "0xfd791f3c",
+      "0x9d1b5a81",
+      "0x7b30c8da",
+      "0x8665b150",
+      "0x631f4bac",
+      "0x0ec6b0b7",
+      "0x1b60e626",
+      "0xe39d3bff",
+      "0x33ce93fe",
+      "0x0ef240a0",
+      "0xfe26699e",
+      "0x39607382",
+      "0xaf6a2dcd",
+      "0xa1954fc5",
+      "0xa39980a0",
+      "0x46657fe9",
+      "0x18e3a941",
+      "0x3db920ce",
+      "0x29b98c67",
+      "0xbd7c5412",
+      "0xc3bbd2d7",
+      "0xe81e0ba1",
+      "0xfacd743b",
+      "0x9cd939e4",
+      "0x56142d7a",
+      "0x74f4d30d"
+    ],
+    "action": 0,
+    "isFreezable": false
+  },
+  {
+    "facet": "0x5349E94435Cc9Cab9FfB40A492DA46935052733A",
+    "selectors": [
+      "0x6c0960f9",
+      "0xb473318e",
+      "0x042901c7",
+      "0x263b7f8e",
+      "0xe4948f43",
+      "0xeb672419"
+    ],
+    "action": 0,
+    "isFreezable": true
+  },
+  {
+    "facet": "0x16615a85B451edfb6FCBea0b34405D9C7ca1a22A",
+    "selectors": [
+      "0x0c4dd810",
+      "0xce9dcf16",
+      "0x7739cbe7",
+      "0xa9a2d18a"
+    ],
+    "action": 0,
+    "isFreezable": true
+  },
+  {
+    "facet": "0x2E64926BE35412f7710A3E097Ba076740bF97CC0",
+    "selectors": [
+      "0xe58bb639",
+      "0xf235757f",
+      "0x1cc5d103",
+      "0xbe6f11cf",
+      "0x4623c91d"
+    ],
+    "action": 0,
+    "isFreezable": true
+  }
+]
\ No newline at end of file
diff --git a/etc/upgrades/1692195639-upgrade-system/mainnet2/facets.json b/etc/upgrades/1692195639-upgrade-system/mainnet2/facets.json
new file mode 100644
index 000000000000..f8247ebc3536
--- /dev/null
+++ b/etc/upgrades/1692195639-upgrade-system/mainnet2/facets.json
@@ -0,0 +1,22 @@
+{
+  "ExecutorFacet": {
+    "address": "0x16615a85B451edfb6FCBea0b34405D9C7ca1a22A",
+    "txHash": "0x4a8f18eca43258e25298ceccdec3bda1cb2b91e5b56a31331312c8a6e58d9b01"
+  },
+  "GovernanceFacet": {
+    "address": "0x2E64926BE35412f7710A3E097Ba076740bF97CC0",
+    "txHash": "0x08c111b4dedb7b607c46e7359601e538449a60ad58fcfc76096c77a4a47dfa9a"
+  },
+  "DiamondCutFacet": {
+    "address": "0xc6f7e57C6e1e20468D869Fe33675524e243CD6a0",
+    "txHash": "0x4ff7bae67e0e955808c028bc862798048005b94405ba91f7900d3f86b1af4a50"
+  },
+  "GettersFacet": {
+    "address": "0x7444DE636699F080cA1C033528D2bB3705B391Ce",
+    "txHash": "0xee4ec701cbdc572d698fb58d5f9fda1702c24ae96e3e12c74535159f9a40ce83"
+  },
+  "MailboxFacet": {
+    "address": "0x5349E94435Cc9Cab9FfB40A492DA46935052733A",
+    "txHash": "0x5040611a8ba1811851e998aa8d7bbe4aa3027db9ccc526a84a1237bc2f9fa698"
+  }
+}
\ No newline at end of file
diff --git a/etc/upgrades/1692195639-upgrade-system/mainnet2/l2Upgrade.json b/etc/upgrades/1692195639-upgrade-system/mainnet2/l2Upgrade.json
new file mode 100644
index 000000000000..da024be79e33
--- /dev/null
+++ b/etc/upgrades/1692195639-upgrade-system/mainnet2/l2Upgrade.json
@@ -0,0 +1,211 @@
+{
+  "systemContracts": [
+    {
+      "name": "AccountCodeStorage",
+      "bytecodeHashes": [
+        "0x01000091af8506f97c5a2b2ff4edf06ba1bfd2ec2304056fb9987ce717970105"
+      ],
+      "address": "0x0000000000000000000000000000000000008002"
+    },
+    {
+      "name": "NonceHolder",
+      "bytecodeHashes": [
+        "0x0100012f78c4022788ff0deb6c282f93df2b209d3c819999c3384498f1fec9b4"
+      ],
+      "address": "0x0000000000000000000000000000000000008003"
+    },
+    {
+      "name": "KnownCodesStorage",
+      "bytecodeHashes": [
+        "0x0100008fa5c8a47d82ec783ad7cdefd382f5b031e7ef0754fcf242ccb4c65fd3"
+      ],
+      "address": "0x0000000000000000000000000000000000008004"
+    },
+    {
+      "name": "ImmutableSimulator",
+      "bytecodeHashes": [
+        "0x010000475561147799af163bef4d19262be10ed2d4a8977f793a195cd077e83d"
+      ],
+      "address": "0x0000000000000000000000000000000000008005"
+    },
+    {
+      "name": "ContractDeployer",
+      "bytecodeHashes": [
+        "0x010005c17cd3ee506e5156f76afda69c905dfdc22578bec37609a1693bba4fdc"
+      ],
+      "address": "0x0000000000000000000000000000000000008006"
+    },
+    {
+      "name": "L1Messenger",
+      "bytecodeHashes": [
+        "0x0100007562a15173ca081ddb179bb321500997ba6b43b15cf601cdf266af1cdb"
+      ],
+      "address": "0x0000000000000000000000000000000000008008"
+    },
+    {
+      "name": "MsgValueSimulator",
+      "bytecodeHashes": [
+        "0x010000711288f63c4cd27ecd73df769b834eeda2645f6567beea6b7ed44aaf03"
+      ],
+      "address": "0x0000000000000000000000000000000000008009"
+    },
+    {
+      "name": "L2EthToken",
+      "bytecodeHashes": [
+        "0x010001397d906d62832c455f701b9f81267a1687e52210986d4e943b3f440d7d"
+      ],
+      "address": "0x000000000000000000000000000000000000800a"
+    },
+    {
+      "name": "SystemContext",
+      "bytecodeHashes": [
+        "0x010000f1d9ad80b5eb80ad14232d7438b1c09314dda76f296eca922da87dbfcc"
+      ],
+      "address": "0x000000000000000000000000000000000000800b"
+    },
+    {
+      "name": "BootloaderUtilities",
+      "bytecodeHashes": [
+        "0x010009ad8e522bb120c5f52d2236035edeb0a4259b89c3429c5ece7d1dc50286"
+      ],
+      "address": "0x000000000000000000000000000000000000800c"
+    },
+    {
+      "name": "BytecodeCompressor",
+      "bytecodeHashes": [
+        "0x010000e1066c916b985495ac9e671ae6930e373e9b5074499c7f6014c439a04a"
+      ],
+      "address": "0x000000000000000000000000000000000000800e"
+    },
+    {
+      "name": "ComplexUpgrader",
+      "bytecodeHashes": [
+        "0x0100005b3e7150f7f6daac7cc9a46522f5ad593f9a3e3f0573282b41f86acf16"
+      ],
+      "address": "0x000000000000000000000000000000000000800f"
+    }
+  ],
+  "bootloader": {
+    "name": "Bootloader",
+    "bytecodeHashes": [
+      "0x010007af2271352ac99f97670a7d6999ae63b53f4e9480a957091d8848a46c61"
+    ]
+  },
+  "defaultAA": {
+    "name": "DefaultAccount",
+    "bytecodeHashes": [
+      "0x0100067d592a040e8914eda295f3521561d64b1a4c1b9e6dbd2933093102febf"
+    ]
+  },
+  "forcedDeployments": [
+    {
+      "bytecodeHash": "0x01000091af8506f97c5a2b2ff4edf06ba1bfd2ec2304056fb9987ce717970105",
+      "newAddress": "0x0000000000000000000000000000000000008002",
+      "value": 0,
+      "input": "0x",
+      "callConstructor": false
+    },
+    {
+      "bytecodeHash": "0x0100012f78c4022788ff0deb6c282f93df2b209d3c819999c3384498f1fec9b4",
+      "newAddress": "0x0000000000000000000000000000000000008003",
+      "value": 0,
+      "input": "0x",
+      "callConstructor": false
+    },
+    {
+      "bytecodeHash": "0x0100008fa5c8a47d82ec783ad7cdefd382f5b031e7ef0754fcf242ccb4c65fd3",
+      "newAddress": "0x0000000000000000000000000000000000008004",
+      "value": 0,
+      "input": "0x",
+      "callConstructor": false
+    },
+    {
+      "bytecodeHash": "0x010000475561147799af163bef4d19262be10ed2d4a8977f793a195cd077e83d",
+      "newAddress": "0x0000000000000000000000000000000000008005",
+      "value": 0,
+      "input": "0x",
+      "callConstructor": false
+    },
+    {
+      "bytecodeHash": "0x010005c17cd3ee506e5156f76afda69c905dfdc22578bec37609a1693bba4fdc",
+      "newAddress": "0x0000000000000000000000000000000000008006",
+      "value": 0,
+      "input": "0x",
+      "callConstructor": false
+    },
+    {
+      "bytecodeHash": "0x0100007562a15173ca081ddb179bb321500997ba6b43b15cf601cdf266af1cdb",
+      "newAddress": "0x0000000000000000000000000000000000008008",
+      "value": 0,
+      "input": "0x",
+      "callConstructor": false
+    },
+    {
+      "bytecodeHash": "0x010000711288f63c4cd27ecd73df769b834eeda2645f6567beea6b7ed44aaf03",
+      "newAddress": "0x0000000000000000000000000000000000008009",
+      "value": 0,
+      "input": "0x",
+      "callConstructor": false
+    },
+    {
+      "bytecodeHash": "0x010001397d906d62832c455f701b9f81267a1687e52210986d4e943b3f440d7d",
+      "newAddress": "0x000000000000000000000000000000000000800a",
+      "value": 0,
+      "input": "0x",
+      "callConstructor": false
+    },
+    {
+      "bytecodeHash": "0x010000f1d9ad80b5eb80ad14232d7438b1c09314dda76f296eca922da87dbfcc",
+      "newAddress": "0x000000000000000000000000000000000000800b",
+      "value": 0,
+      "input": "0x",
+      "callConstructor": false
+    },
+    {
+      "bytecodeHash": "0x010009ad8e522bb120c5f52d2236035edeb0a4259b89c3429c5ece7d1dc50286",
+      "newAddress": "0x000000000000000000000000000000000000800c",
+      "value": 0,
+      "input": "0x",
+      "callConstructor": false
+    },
+    {
+      "bytecodeHash": "0x010000e1066c916b985495ac9e671ae6930e373e9b5074499c7f6014c439a04a",
+      "newAddress": "0x000000000000000000000000000000000000800e",
+      "value": 0,
+      "input": "0x",
+      "callConstructor": false
+    },
+    {
+      "bytecodeHash": "0x0100005b3e7150f7f6daac7cc9a46522f5ad593f9a3e3f0573282b41f86acf16",
+      "newAddress": "0x000000000000000000000000000000000000800f",
+      "value": 0,
+      "input": "0x",
+      "callConstructor": false
+    }
+  ],
+  "forcedDeploymentCalldata": "0xe9f18c170000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000000c00000000000000000000000000000000000000000000000000000000000001800000000000000000000000000000000000000000000000000000000000000240000000000000000000000000000000000000000000000000000000000000030000000000000000000000000000000000000000000000000000000000000003c000000000000000000000000000000000000000000000000000000000000004800000000000000000000000000000000000000000000000000000000000000540000000000000000000000000000000000000000000000000000000000000060000000000000000000000000000000000000000000000000000000000000006c000000000000000000000000000000000000000000000000000000000000007800000000000000000000000000000000000000000000000000000000000000840000000000000000000000000000000000000000000000000000000000000090000000000000000000000000000000000000000000000000000000000000009c001000091af8506f97c5a2b2ff4edf06ba1bfd2ec2304056fb9987ce71797010500000000000000000000000000000000000000000000000000000000000080020000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000a000000000000000000000000000000000000000000000000000000000000000000100012f78c4022788ff0deb6c282f93df2b209d3c819999c3384498f1fec9b400000000000000000000000000000000000000000000000000000000000080030000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000a000000000000000000000000000000000000000000000000000000000000000000100008fa5c8a47d82ec783ad7cdefd382f5b031e7ef0754fcf242ccb4c65fd300000000000000000000000000000000000000000000000000000000000080040000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000a00000000000000000000000000000000000000000000000000000000000000000010000475561147799af163bef4d19262be10ed2d4a8977f793a195cd077e83d00000000000000000000000000000000000000000000000000000000000080050000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000a00000000000000000000000000000000000000000000000000000000000000000010005c17cd3ee506e5156f76afda69c905dfdc22578bec37609a1693bba4fdc00000000000000000000000000000000000000000000000000000000000080060000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000a000000000000000000000000000000000000000000000000000000000000000000100007562a15173ca081ddb179bb321500997ba6b43b15cf601cdf266af1cdb00000000000000000000000000000000000000000000000000000000000080080000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000a00000000000000000000000000000000000000000000000000000000000000000010000711288f63c4cd27ecd73df769b834eeda2645f6567beea6b7ed44aaf0300000000000000000000000000000000000000000000000000000000000080090000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000a00000000000000000000000000000000000000000000000000000000000000000010001397d906d62832c455f701b9f81267a1687e52210986d4e943b3f440d7d000000000000000000000000000000000000000000000000000000000000800a0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000a00000000000000000000000000000000000000000000000000000000000000000010000f1d9ad80b5eb80ad14232d7438b1c09314dda76f296eca922da87dbfcc000000000000000000000000000000000000000000000000000000000000800b0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000a00000000000000000000000000000000000000000000000000000000000000000010009ad8e522bb120c5f52d2236035edeb0a4259b89c3429c5ece7d1dc50286000000000000000000000000000000000000000000000000000000000000800c0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000a00000000000000000000000000000000000000000000000000000000000000000010000e1066c916b985495ac9e671ae6930e373e9b5074499c7f6014c439a04a000000000000000000000000000000000000000000000000000000000000800e0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000a000000000000000000000000000000000000000000000000000000000000000000100005b3e7150f7f6daac7cc9a46522f5ad593f9a3e3f0573282b41f86acf16000000000000000000000000000000000000000000000000000000000000800f0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000a00000000000000000000000000000000000000000000000000000000000000000",
+  "calldata": "0xe9f18c170000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000000c00000000000000000000000000000000000000000000000000000000000001800000000000000000000000000000000000000000000000000000000000000240000000000000000000000000000000000000000000000000000000000000030000000000000000000000000000000000000000000000000000000000000003c000000000000000000000000000000000000000000000000000000000000004800000000000000000000000000000000000000000000000000000000000000540000000000000000000000000000000000000000000000000000000000000060000000000000000000000000000000000000000000000000000000000000006c000000000000000000000000000000000000000000000000000000000000007800000000000000000000000000000000000000000000000000000000000000840000000000000000000000000000000000000000000000000000000000000090000000000000000000000000000000000000000000000000000000000000009c001000091af8506f97c5a2b2ff4edf06ba1bfd2ec2304056fb9987ce71797010500000000000000000000000000000000000000000000000000000000000080020000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000a000000000000000000000000000000000000000000000000000000000000000000100012f78c4022788ff0deb6c282f93df2b209d3c819999c3384498f1fec9b400000000000000000000000000000000000000000000000000000000000080030000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000a000000000000000000000000000000000000000000000000000000000000000000100008fa5c8a47d82ec783ad7cdefd382f5b031e7ef0754fcf242ccb4c65fd300000000000000000000000000000000000000000000000000000000000080040000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000a00000000000000000000000000000000000000000000000000000000000000000010000475561147799af163bef4d19262be10ed2d4a8977f793a195cd077e83d00000000000000000000000000000000000000000000000000000000000080050000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000a00000000000000000000000000000000000000000000000000000000000000000010005c17cd3ee506e5156f76afda69c905dfdc22578bec37609a1693bba4fdc00000000000000000000000000000000000000000000000000000000000080060000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000a000000000000000000000000000000000000000000000000000000000000000000100007562a15173ca081ddb179bb321500997ba6b43b15cf601cdf266af1cdb00000000000000000000000000000000000000000000000000000000000080080000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000a00000000000000000000000000000000000000000000000000000000000000000010000711288f63c4cd27ecd73df769b834eeda2645f6567beea6b7ed44aaf0300000000000000000000000000000000000000000000000000000000000080090000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000a00000000000000000000000000000000000000000000000000000000000000000010001397d906d62832c455f701b9f81267a1687e52210986d4e943b3f440d7d000000000000000000000000000000000000000000000000000000000000800a0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000a00000000000000000000000000000000000000000000000000000000000000000010000f1d9ad80b5eb80ad14232d7438b1c09314dda76f296eca922da87dbfcc000000000000000000000000000000000000000000000000000000000000800b0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000a00000000000000000000000000000000000000000000000000000000000000000010009ad8e522bb120c5f52d2236035edeb0a4259b89c3429c5ece7d1dc50286000000000000000000000000000000000000000000000000000000000000800c0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000a00000000000000000000000000000000000000000000000000000000000000000010000e1066c916b985495ac9e671ae6930e373e9b5074499c7f6014c439a04a000000000000000000000000000000000000000000000000000000000000800e0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000a000000000000000000000000000000000000000000000000000000000000000000100005b3e7150f7f6daac7cc9a46522f5ad593f9a3e3f0573282b41f86acf16000000000000000000000000000000000000000000000000000000000000800f0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000a00000000000000000000000000000000000000000000000000000000000000000",
+  "tx": {
+    "txType": 254,
+    "from": "0x0000000000000000000000000000000000008007",
+    "to": "0x0000000000000000000000000000000000008006",
+    "gasLimit": 72000000,
+    "gasPerPubdataByteLimit": 800,
+    "maxFeePerGas": 0,
+    "maxPriorityFeePerGas": 0,
+    "paymaster": 0,
+    "nonce": "12",
+    "value": 0,
+    "reserved": [
+      0,
+      0,
+      0,
+      0
+    ],
+    "data": "0xe9f18c170000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000000c00000000000000000000000000000000000000000000000000000000000001800000000000000000000000000000000000000000000000000000000000000240000000000000000000000000000000000000000000000000000000000000030000000000000000000000000000000000000000000000000000000000000003c000000000000000000000000000000000000000000000000000000000000004800000000000000000000000000000000000000000000000000000000000000540000000000000000000000000000000000000000000000000000000000000060000000000000000000000000000000000000000000000000000000000000006c000000000000000000000000000000000000000000000000000000000000007800000000000000000000000000000000000000000000000000000000000000840000000000000000000000000000000000000000000000000000000000000090000000000000000000000000000000000000000000000000000000000000009c001000091af8506f97c5a2b2ff4edf06ba1bfd2ec2304056fb9987ce71797010500000000000000000000000000000000000000000000000000000000000080020000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000a000000000000000000000000000000000000000000000000000000000000000000100012f78c4022788ff0deb6c282f93df2b209d3c819999c3384498f1fec9b400000000000000000000000000000000000000000000000000000000000080030000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000a000000000000000000000000000000000000000000000000000000000000000000100008fa5c8a47d82ec783ad7cdefd382f5b031e7ef0754fcf242ccb4c65fd300000000000000000000000000000000000000000000000000000000000080040000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000a00000000000000000000000000000000000000000000000000000000000000000010000475561147799af163bef4d19262be10ed2d4a8977f793a195cd077e83d00000000000000000000000000000000000000000000000000000000000080050000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000a00000000000000000000000000000000000000000000000000000000000000000010005c17cd3ee506e5156f76afda69c905dfdc22578bec37609a1693bba4fdc00000000000000000000000000000000000000000000000000000000000080060000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000a000000000000000000000000000000000000000000000000000000000000000000100007562a15173ca081ddb179bb321500997ba6b43b15cf601cdf266af1cdb00000000000000000000000000000000000000000000000000000000000080080000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000a00000000000000000000000000000000000000000000000000000000000000000010000711288f63c4cd27ecd73df769b834eeda2645f6567beea6b7ed44aaf0300000000000000000000000000000000000000000000000000000000000080090000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000a00000000000000000000000000000000000000000000000000000000000000000010001397d906d62832c455f701b9f81267a1687e52210986d4e943b3f440d7d000000000000000000000000000000000000000000000000000000000000800a0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000a00000000000000000000000000000000000000000000000000000000000000000010000f1d9ad80b5eb80ad14232d7438b1c09314dda76f296eca922da87dbfcc000000000000000000000000000000000000000000000000000000000000800b0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000a00000000000000000000000000000000000000000000000000000000000000000010009ad8e522bb120c5f52d2236035edeb0a4259b89c3429c5ece7d1dc50286000000000000000000000000000000000000000000000000000000000000800c0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000a00000000000000000000000000000000000000000000000000000000000000000010000e1066c916b985495ac9e671ae6930e373e9b5074499c7f6014c439a04a000000000000000000000000000000000000000000000000000000000000800e0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000a000000000000000000000000000000000000000000000000000000000000000000100005b3e7150f7f6daac7cc9a46522f5ad593f9a3e3f0573282b41f86acf16000000000000000000000000000000000000000000000000000000000000800f0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000a00000000000000000000000000000000000000000000000000000000000000000",
+    "signature": "0x",
+    "factoryDeps": [],
+    "paymasterInput": "0x",
+    "reservedDynamic": "0x"
+  }
+}
\ No newline at end of file
diff --git a/etc/upgrades/1692195639-upgrade-system/mainnet2/transactions.json b/etc/upgrades/1692195639-upgrade-system/mainnet2/transactions.json
new file mode 100644
index 000000000000..badf4772a3c8
--- /dev/null
+++ b/etc/upgrades/1692195639-upgrade-system/mainnet2/transactions.json
@@ -0,0 +1,248 @@
+{
+  "proposeUpgradeTx": {
+    "l2ProtocolUpgradeTx": {
+      "txType": 254,
+      "from": "0x0000000000000000000000000000000000008007",
+      "to": "0x0000000000000000000000000000000000008006",
+      "gasLimit": 72000000,
+      "gasPerPubdataByteLimit": 800,
+      "maxFeePerGas": 0,
+      "maxPriorityFeePerGas": 0,
+      "paymaster": 0,
+      "nonce": "12",
+      "value": 0,
+      "reserved": [
+        0,
+        0,
+        0,
+        0
+      ],
+      "data": "0xe9f18c170000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000000c00000000000000000000000000000000000000000000000000000000000001800000000000000000000000000000000000000000000000000000000000000240000000000000000000000000000000000000000000000000000000000000030000000000000000000000000000000000000000000000000000000000000003c000000000000000000000000000000000000000000000000000000000000004800000000000000000000000000000000000000000000000000000000000000540000000000000000000000000000000000000000000000000000000000000060000000000000000000000000000000000000000000000000000000000000006c000000000000000000000000000000000000000000000000000000000000007800000000000000000000000000000000000000000000000000000000000000840000000000000000000000000000000000000000000000000000000000000090000000000000000000000000000000000000000000000000000000000000009c001000091af8506f97c5a2b2ff4edf06ba1bfd2ec2304056fb9987ce71797010500000000000000000000000000000000000000000000000000000000000080020000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000a000000000000000000000000000000000000000000000000000000000000000000100012f78c4022788ff0deb6c282f93df2b209d3c819999c3384498f1fec9b400000000000000000000000000000000000000000000000000000000000080030000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000a000000000000000000000000000000000000000000000000000000000000000000100008fa5c8a47d82ec783ad7cdefd382f5b031e7ef0754fcf242ccb4c65fd300000000000000000000000000000000000000000000000000000000000080040000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000a00000000000000000000000000000000000000000000000000000000000000000010000475561147799af163bef4d19262be10ed2d4a8977f793a195cd077e83d00000000000000000000000000000000000000000000000000000000000080050000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000a00000000000000000000000000000000000000000000000000000000000000000010005c17cd3ee506e5156f76afda69c905dfdc22578bec37609a1693bba4fdc00000000000000000000000000000000000000000000000000000000000080060000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000a000000000000000000000000000000000000000000000000000000000000000000100007562a15173ca081ddb179bb321500997ba6b43b15cf601cdf266af1cdb00000000000000000000000000000000000000000000000000000000000080080000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000a00000000000000000000000000000000000000000000000000000000000000000010000711288f63c4cd27ecd73df769b834eeda2645f6567beea6b7ed44aaf0300000000000000000000000000000000000000000000000000000000000080090000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000a00000000000000000000000000000000000000000000000000000000000000000010001397d906d62832c455f701b9f81267a1687e52210986d4e943b3f440d7d000000000000000000000000000000000000000000000000000000000000800a0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000a00000000000000000000000000000000000000000000000000000000000000000010000f1d9ad80b5eb80ad14232d7438b1c09314dda76f296eca922da87dbfcc000000000000000000000000000000000000000000000000000000000000800b0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000a00000000000000000000000000000000000000000000000000000000000000000010009ad8e522bb120c5f52d2236035edeb0a4259b89c3429c5ece7d1dc50286000000000000000000000000000000000000000000000000000000000000800c0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000a00000000000000000000000000000000000000000000000000000000000000000010000e1066c916b985495ac9e671ae6930e373e9b5074499c7f6014c439a04a000000000000000000000000000000000000000000000000000000000000800e0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000a000000000000000000000000000000000000000000000000000000000000000000100005b3e7150f7f6daac7cc9a46522f5ad593f9a3e3f0573282b41f86acf16000000000000000000000000000000000000000000000000000000000000800f0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000a00000000000000000000000000000000000000000000000000000000000000000",
+      "signature": "0x",
+      "factoryDeps": [],
+      "paymasterInput": "0x",
+      "reservedDynamic": "0x"
+    },
+    "bootloaderHash": "0x010007af2271352ac99f97670a7d6999ae63b53f4e9480a957091d8848a46c61",
+    "defaultAccountHash": "0x0100067d592a040e8914eda295f3521561d64b1a4c1b9e6dbd2933093102febf",
+    "verifier": "0x0000000000000000000000000000000000000000",
+    "verifierParams": {
+      "recursionNodeLevelVkHash": "0x0000000000000000000000000000000000000000000000000000000000000000",
+      "recursionLeafLevelVkHash": "0x0000000000000000000000000000000000000000000000000000000000000000",
+      "recursionCircuitsSetVksHash": "0x0000000000000000000000000000000000000000000000000000000000000000"
+    },
+    "l1ContractsUpgradeCalldata": "0x",
+    "postUpgradeCalldata": "0x",
+    "upgradeTimestamp": {
+      "type": "BigNumber",
+      "hex": "0x64ec7e30"
+    },
+    "factoryDeps": [],
+    "newProtocolVersion": "12",
+    "newAllowList": "0x0000000000000000000000000000000000000000"
+  },
+  "l1upgradeCalldata": "0x1ed824a0000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000001a00000000000000000000000000000000000000000000000000000000000000f80010007af2271352ac99f97670a7d6999ae63b53f4e9480a957091d8848a46c610100067d592a040e8914eda295f3521561d64b1a4c1b9e6dbd2933093102febf00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000fa00000000000000000000000000000000000000000000000000000000000000fc00000000000000000000000000000000000000000000000000000000064ec7e30000000000000000000000000000000000000000000000000000000000000000c000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000fe0000000000000000000000000000000000000000000000000000000000008007000000000000000000000000000000000000000000000000000000000000800600000000000000000000000000000000000000000000000000000000044aa2000000000000000000000000000000000000000000000000000000000000000320000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000c0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000002600000000000000000000000000000000000000000000000000000000000000d600000000000000000000000000000000000000000000000000000000000000d800000000000000000000000000000000000000000000000000000000000000da00000000000000000000000000000000000000000000000000000000000000dc00000000000000000000000000000000000000000000000000000000000000ac4e9f18c170000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000000c00000000000000000000000000000000000000000000000000000000000001800000000000000000000000000000000000000000000000000000000000000240000000000000000000000000000000000000000000000000000000000000030000000000000000000000000000000000000000000000000000000000000003c000000000000000000000000000000000000000000000000000000000000004800000000000000000000000000000000000000000000000000000000000000540000000000000000000000000000000000000000000000000000000000000060000000000000000000000000000000000000000000000000000000000000006c000000000000000000000000000000000000000000000000000000000000007800000000000000000000000000000000000000000000000000000000000000840000000000000000000000000000000000000000000000000000000000000090000000000000000000000000000000000000000000000000000000000000009c001000091af8506f97c5a2b2ff4edf06ba1bfd2ec2304056fb9987ce71797010500000000000000000000000000000000000000000000000000000000000080020000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000a000000000000000000000000000000000000000000000000000000000000000000100012f78c4022788ff0deb6c282f93df2b209d3c819999c3384498f1fec9b400000000000000000000000000000000000000000000000000000000000080030000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000a000000000000000000000000000000000000000000000000000000000000000000100008fa5c8a47d82ec783ad7cdefd382f5b031e7ef0754fcf242ccb4c65fd300000000000000000000000000000000000000000000000000000000000080040000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000a00000000000000000000000000000000000000000000000000000000000000000010000475561147799af163bef4d19262be10ed2d4a8977f793a195cd077e83d00000000000000000000000000000000000000000000000000000000000080050000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000a00000000000000000000000000000000000000000000000000000000000000000010005c17cd3ee506e5156f76afda69c905dfdc22578bec37609a1693bba4fdc00000000000000000000000000000000000000000000000000000000000080060000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000a000000000000000000000000000000000000000000000000000000000000000000100007562a15173ca081ddb179bb321500997ba6b43b15cf601cdf266af1cdb00000000000000000000000000000000000000000000000000000000000080080000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000a00000000000000000000000000000000000000000000000000000000000000000010000711288f63c4cd27ecd73df769b834eeda2645f6567beea6b7ed44aaf0300000000000000000000000000000000000000000000000000000000000080090000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000a00000000000000000000000000000000000000000000000000000000000000000010001397d906d62832c455f701b9f81267a1687e52210986d4e943b3f440d7d000000000000000000000000000000000000000000000000000000000000800a0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000a00000000000000000000000000000000000000000000000000000000000000000010000f1d9ad80b5eb80ad14232d7438b1c09314dda76f296eca922da87dbfcc000000000000000000000000000000000000000000000000000000000000800b0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000a00000000000000000000000000000000000000000000000000000000000000000010009ad8e522bb120c5f52d2236035edeb0a4259b89c3429c5ece7d1dc50286000000000000000000000000000000000000000000000000000000000000800c0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000a00000000000000000000000000000000000000000000000000000000000000000010000e1066c916b985495ac9e671ae6930e373e9b5074499c7f6014c439a04a000000000000000000000000000000000000000000000000000000000000800e0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000a000000000000000000000000000000000000000000000000000000000000000000100005b3e7150f7f6daac7cc9a46522f5ad593f9a3e3f0573282b41f86acf16000000000000000000000000000000000000000000000000000000000000800f0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000a00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+  "upgradeAddress": "0x91Ca046daD8c3Db41f296267E1720d9C940f613d",
+  "protocolVersion": "12",
+  "diamondUpgradeProposalId": {
+    "type": "BigNumber",
+    "hex": "0x06"
+  },
+  "upgradeTimestamp": "1693220400",
+  "proposeTransparentUpgradeCalldata": "0x8043760a00000000000000000000000000000000000000000000000000000000000000400000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000006000000000000000000000000091ca046dad8c3db41f296267e1720d9c940f613d00000000000000000000000000000000000000000000000000000000000016c0000000000000000000000000000000000000000000000000000000000000000a0000000000000000000000000000000000000000000000000000000000000140000000000000000000000000000000000000000000000000000000000000026000000000000000000000000000000000000000000000000000000000000003c000000000000000000000000000000000000000000000000000000000000005a000000000000000000000000000000000000000000000000000000000000007400000000000000000000000000000000000000000000000000000000000000be00000000000000000000000000000000000000000000000000000000000000d80000000000000000000000000000000000000000000000000000000000000128000000000000000000000000000000000000000000000000000000000000013e00000000000000000000000000000000000000000000000000000000000001500000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008000000000000000000000000000000000000000000000000000000000000000040c4dd81000000000000000000000000000000000000000000000000000000000ce9dcf16000000000000000000000000000000000000000000000000000000007739cbe700000000000000000000000000000000000000000000000000000000a9a2d18a00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008000000000000000000000000000000000000000000000000000000000000000066c0960f900000000000000000000000000000000000000000000000000000000b473318e00000000000000000000000000000000000000000000000000000000042901c700000000000000000000000000000000000000000000000000000000263b7f8e00000000000000000000000000000000000000000000000000000000e4948f4300000000000000000000000000000000000000000000000000000000eb672419000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000080000000000000000000000000000000000000000000000000000000000000000ae58bb63900000000000000000000000000000000000000000000000000000000ed6d06c00000000000000000000000000000000000000000000000000000000086cb9909000000000000000000000000000000000000000000000000000000000707ac0900000000000000000000000000000000000000000000000000000000f235757f000000000000000000000000000000000000000000000000000000001cc5d10300000000000000000000000000000000000000000000000000000000be6f11cf000000000000000000000000000000000000000000000000000000004623c91d000000000000000000000000000000000000000000000000000000005437988d000000000000000000000000000000000000000000000000000000000b508883000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000080000000000000000000000000000000000000000000000000000000000000000873fb92970000000000000000000000000000000000000000000000000000000036d4eb840000000000000000000000000000000000000000000000000000000027ae4c16000000000000000000000000000000000000000000000000000000000551448c000000000000000000000000000000000000000000000000000000008043760a00000000000000000000000000000000000000000000000000000000beda4b12000000000000000000000000000000000000000000000000000000001733894500000000000000000000000000000000000000000000000000000000587809c70000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000800000000000000000000000000000000000000000000000000000000000000020cdffacc60000000000000000000000000000000000000000000000000000000052ef6b2c00000000000000000000000000000000000000000000000000000000adfca15e000000000000000000000000000000000000000000000000000000007a0ed62700000000000000000000000000000000000000000000000000000000a7cd63b700000000000000000000000000000000000000000000000000000000fe10226d0000000000000000000000000000000000000000000000000000000079823c9a000000000000000000000000000000000000000000000000000000004fc07d7500000000000000000000000000000000000000000000000000000000d86970d800000000000000000000000000000000000000000000000000000000fd791f3c000000000000000000000000000000000000000000000000000000008665b15000000000000000000000000000000000000000000000000000000000631f4bac000000000000000000000000000000000000000000000000000000000ec6b0b7000000000000000000000000000000000000000000000000000000001b60e62600000000000000000000000000000000000000000000000000000000e39d3bff000000000000000000000000000000000000000000000000000000000ef240a000000000000000000000000000000000000000000000000000000000fe26699e000000000000000000000000000000000000000000000000000000003960738200000000000000000000000000000000000000000000000000000000af6a2dcd00000000000000000000000000000000000000000000000000000000a1954fc500000000000000000000000000000000000000000000000000000000a39980a00000000000000000000000000000000000000000000000000000000046657fe90000000000000000000000000000000000000000000000000000000018e3a941000000000000000000000000000000000000000000000000000000003db920ce0000000000000000000000000000000000000000000000000000000029b98c6700000000000000000000000000000000000000000000000000000000bd7c541200000000000000000000000000000000000000000000000000000000c3bbd2d700000000000000000000000000000000000000000000000000000000e81e0ba100000000000000000000000000000000000000000000000000000000facd743b000000000000000000000000000000000000000000000000000000009cd939e40000000000000000000000000000000000000000000000000000000056142d7a0000000000000000000000000000000000000000000000000000000074f4d30d00000000000000000000000000000000000000000000000000000000000000000000000000000000c6f7e57c6e1e20468d869fe33675524e243cd6a0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000080000000000000000000000000000000000000000000000000000000000000000873fb92970000000000000000000000000000000000000000000000000000000036d4eb840000000000000000000000000000000000000000000000000000000027ae4c16000000000000000000000000000000000000000000000000000000000551448c000000000000000000000000000000000000000000000000000000008043760a00000000000000000000000000000000000000000000000000000000beda4b12000000000000000000000000000000000000000000000000000000001733894500000000000000000000000000000000000000000000000000000000587809c7000000000000000000000000000000000000000000000000000000000000000000000000000000007444de636699f080ca1c033528d2bb3705b391ce0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000800000000000000000000000000000000000000000000000000000000000000023cdffacc60000000000000000000000000000000000000000000000000000000052ef6b2c00000000000000000000000000000000000000000000000000000000adfca15e000000000000000000000000000000000000000000000000000000007a0ed62700000000000000000000000000000000000000000000000000000000a7cd63b700000000000000000000000000000000000000000000000000000000fe10226d0000000000000000000000000000000000000000000000000000000079823c9a000000000000000000000000000000000000000000000000000000004fc07d7500000000000000000000000000000000000000000000000000000000d86970d800000000000000000000000000000000000000000000000000000000fd791f3c000000000000000000000000000000000000000000000000000000009d1b5a81000000000000000000000000000000000000000000000000000000007b30c8da000000000000000000000000000000000000000000000000000000008665b15000000000000000000000000000000000000000000000000000000000631f4bac000000000000000000000000000000000000000000000000000000000ec6b0b7000000000000000000000000000000000000000000000000000000001b60e62600000000000000000000000000000000000000000000000000000000e39d3bff0000000000000000000000000000000000000000000000000000000033ce93fe000000000000000000000000000000000000000000000000000000000ef240a000000000000000000000000000000000000000000000000000000000fe26699e000000000000000000000000000000000000000000000000000000003960738200000000000000000000000000000000000000000000000000000000af6a2dcd00000000000000000000000000000000000000000000000000000000a1954fc500000000000000000000000000000000000000000000000000000000a39980a00000000000000000000000000000000000000000000000000000000046657fe90000000000000000000000000000000000000000000000000000000018e3a941000000000000000000000000000000000000000000000000000000003db920ce0000000000000000000000000000000000000000000000000000000029b98c6700000000000000000000000000000000000000000000000000000000bd7c541200000000000000000000000000000000000000000000000000000000c3bbd2d700000000000000000000000000000000000000000000000000000000e81e0ba100000000000000000000000000000000000000000000000000000000facd743b000000000000000000000000000000000000000000000000000000009cd939e40000000000000000000000000000000000000000000000000000000056142d7a0000000000000000000000000000000000000000000000000000000074f4d30d000000000000000000000000000000000000000000000000000000000000000000000000000000005349e94435cc9cab9ffb40a492da46935052733a00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000008000000000000000000000000000000000000000000000000000000000000000066c0960f900000000000000000000000000000000000000000000000000000000b473318e00000000000000000000000000000000000000000000000000000000042901c700000000000000000000000000000000000000000000000000000000263b7f8e00000000000000000000000000000000000000000000000000000000e4948f4300000000000000000000000000000000000000000000000000000000eb6724190000000000000000000000000000000000000000000000000000000000000000000000000000000016615a85b451edfb6fcbea0b34405d9c7ca1a22a00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000008000000000000000000000000000000000000000000000000000000000000000040c4dd81000000000000000000000000000000000000000000000000000000000ce9dcf16000000000000000000000000000000000000000000000000000000007739cbe700000000000000000000000000000000000000000000000000000000a9a2d18a000000000000000000000000000000000000000000000000000000000000000000000000000000002e64926be35412f7710a3e097ba076740bf97cc00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000800000000000000000000000000000000000000000000000000000000000000005e58bb63900000000000000000000000000000000000000000000000000000000f235757f000000000000000000000000000000000000000000000000000000001cc5d10300000000000000000000000000000000000000000000000000000000be6f11cf000000000000000000000000000000000000000000000000000000004623c91d0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000010041ed824a0000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000001a00000000000000000000000000000000000000000000000000000000000000f80010007af2271352ac99f97670a7d6999ae63b53f4e9480a957091d8848a46c610100067d592a040e8914eda295f3521561d64b1a4c1b9e6dbd2933093102febf00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000fa00000000000000000000000000000000000000000000000000000000000000fc00000000000000000000000000000000000000000000000000000000064ec7e30000000000000000000000000000000000000000000000000000000000000000c000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000fe0000000000000000000000000000000000000000000000000000000000008007000000000000000000000000000000000000000000000000000000000000800600000000000000000000000000000000000000000000000000000000044aa2000000000000000000000000000000000000000000000000000000000000000320000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000c0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000002600000000000000000000000000000000000000000000000000000000000000d600000000000000000000000000000000000000000000000000000000000000d800000000000000000000000000000000000000000000000000000000000000da00000000000000000000000000000000000000000000000000000000000000dc00000000000000000000000000000000000000000000000000000000000000ac4e9f18c170000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000000c00000000000000000000000000000000000000000000000000000000000001800000000000000000000000000000000000000000000000000000000000000240000000000000000000000000000000000000000000000000000000000000030000000000000000000000000000000000000000000000000000000000000003c000000000000000000000000000000000000000000000000000000000000004800000000000000000000000000000000000000000000000000000000000000540000000000000000000000000000000000000000000000000000000000000060000000000000000000000000000000000000000000000000000000000000006c000000000000000000000000000000000000000000000000000000000000007800000000000000000000000000000000000000000000000000000000000000840000000000000000000000000000000000000000000000000000000000000090000000000000000000000000000000000000000000000000000000000000009c001000091af8506f97c5a2b2ff4edf06ba1bfd2ec2304056fb9987ce71797010500000000000000000000000000000000000000000000000000000000000080020000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000a000000000000000000000000000000000000000000000000000000000000000000100012f78c4022788ff0deb6c282f93df2b209d3c819999c3384498f1fec9b400000000000000000000000000000000000000000000000000000000000080030000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000a000000000000000000000000000000000000000000000000000000000000000000100008fa5c8a47d82ec783ad7cdefd382f5b031e7ef0754fcf242ccb4c65fd300000000000000000000000000000000000000000000000000000000000080040000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000a00000000000000000000000000000000000000000000000000000000000000000010000475561147799af163bef4d19262be10ed2d4a8977f793a195cd077e83d00000000000000000000000000000000000000000000000000000000000080050000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000a00000000000000000000000000000000000000000000000000000000000000000010005c17cd3ee506e5156f76afda69c905dfdc22578bec37609a1693bba4fdc00000000000000000000000000000000000000000000000000000000000080060000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000a000000000000000000000000000000000000000000000000000000000000000000100007562a15173ca081ddb179bb321500997ba6b43b15cf601cdf266af1cdb00000000000000000000000000000000000000000000000000000000000080080000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000a00000000000000000000000000000000000000000000000000000000000000000010000711288f63c4cd27ecd73df769b834eeda2645f6567beea6b7ed44aaf0300000000000000000000000000000000000000000000000000000000000080090000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000a00000000000000000000000000000000000000000000000000000000000000000010001397d906d62832c455f701b9f81267a1687e52210986d4e943b3f440d7d000000000000000000000000000000000000000000000000000000000000800a0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000a00000000000000000000000000000000000000000000000000000000000000000010000f1d9ad80b5eb80ad14232d7438b1c09314dda76f296eca922da87dbfcc000000000000000000000000000000000000000000000000000000000000800b0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000a00000000000000000000000000000000000000000000000000000000000000000010009ad8e522bb120c5f52d2236035edeb0a4259b89c3429c5ece7d1dc50286000000000000000000000000000000000000000000000000000000000000800c0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000a00000000000000000000000000000000000000000000000000000000000000000010000e1066c916b985495ac9e671ae6930e373e9b5074499c7f6014c439a04a000000000000000000000000000000000000000000000000000000000000800e0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000a000000000000000000000000000000000000000000000000000000000000000000100005b3e7150f7f6daac7cc9a46522f5ad593f9a3e3f0573282b41f86acf16000000000000000000000000000000000000000000000000000000000000800f0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000a0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+  "transparentUpgrade": {
+    "facetCuts": [
+      {
+        "facet": "0x0000000000000000000000000000000000000000",
+        "selectors": [
+          "0x0c4dd810",
+          "0xce9dcf16",
+          "0x7739cbe7",
+          "0xa9a2d18a"
+        ],
+        "action": 2,
+        "isFreezable": false
+      },
+      {
+        "facet": "0x0000000000000000000000000000000000000000",
+        "selectors": [
+          "0x6c0960f9",
+          "0xb473318e",
+          "0x042901c7",
+          "0x263b7f8e",
+          "0xe4948f43",
+          "0xeb672419"
+        ],
+        "action": 2,
+        "isFreezable": false
+      },
+      {
+        "facet": "0x0000000000000000000000000000000000000000",
+        "selectors": [
+          "0xe58bb639",
+          "0xed6d06c0",
+          "0x86cb9909",
+          "0x0707ac09",
+          "0xf235757f",
+          "0x1cc5d103",
+          "0xbe6f11cf",
+          "0x4623c91d",
+          "0x5437988d",
+          "0x0b508883"
+        ],
+        "action": 2,
+        "isFreezable": false
+      },
+      {
+        "facet": "0x0000000000000000000000000000000000000000",
+        "selectors": [
+          "0x73fb9297",
+          "0x36d4eb84",
+          "0x27ae4c16",
+          "0x0551448c",
+          "0x8043760a",
+          "0xbeda4b12",
+          "0x17338945",
+          "0x587809c7"
+        ],
+        "action": 2,
+        "isFreezable": false
+      },
+      {
+        "facet": "0x0000000000000000000000000000000000000000",
+        "selectors": [
+          "0xcdffacc6",
+          "0x52ef6b2c",
+          "0xadfca15e",
+          "0x7a0ed627",
+          "0xa7cd63b7",
+          "0xfe10226d",
+          "0x79823c9a",
+          "0x4fc07d75",
+          "0xd86970d8",
+          "0xfd791f3c",
+          "0x8665b150",
+          "0x631f4bac",
+          "0x0ec6b0b7",
+          "0x1b60e626",
+          "0xe39d3bff",
+          "0x0ef240a0",
+          "0xfe26699e",
+          "0x39607382",
+          "0xaf6a2dcd",
+          "0xa1954fc5",
+          "0xa39980a0",
+          "0x46657fe9",
+          "0x18e3a941",
+          "0x3db920ce",
+          "0x29b98c67",
+          "0xbd7c5412",
+          "0xc3bbd2d7",
+          "0xe81e0ba1",
+          "0xfacd743b",
+          "0x9cd939e4",
+          "0x56142d7a",
+          "0x74f4d30d"
+        ],
+        "action": 2,
+        "isFreezable": false
+      },
+      {
+        "facet": "0xc6f7e57C6e1e20468D869Fe33675524e243CD6a0",
+        "selectors": [
+          "0x73fb9297",
+          "0x36d4eb84",
+          "0x27ae4c16",
+          "0x0551448c",
+          "0x8043760a",
+          "0xbeda4b12",
+          "0x17338945",
+          "0x587809c7"
+        ],
+        "action": 0,
+        "isFreezable": false
+      },
+      {
+        "facet": "0x7444DE636699F080cA1C033528D2bB3705B391Ce",
+        "selectors": [
+          "0xcdffacc6",
+          "0x52ef6b2c",
+          "0xadfca15e",
+          "0x7a0ed627",
+          "0xa7cd63b7",
+          "0xfe10226d",
+          "0x79823c9a",
+          "0x4fc07d75",
+          "0xd86970d8",
+          "0xfd791f3c",
+          "0x9d1b5a81",
+          "0x7b30c8da",
+          "0x8665b150",
+          "0x631f4bac",
+          "0x0ec6b0b7",
+          "0x1b60e626",
+          "0xe39d3bff",
+          "0x33ce93fe",
+          "0x0ef240a0",
+          "0xfe26699e",
+          "0x39607382",
+          "0xaf6a2dcd",
+          "0xa1954fc5",
+          "0xa39980a0",
+          "0x46657fe9",
+          "0x18e3a941",
+          "0x3db920ce",
+          "0x29b98c67",
+          "0xbd7c5412",
+          "0xc3bbd2d7",
+          "0xe81e0ba1",
+          "0xfacd743b",
+          "0x9cd939e4",
+          "0x56142d7a",
+          "0x74f4d30d"
+        ],
+        "action": 0,
+        "isFreezable": false
+      },
+      {
+        "facet": "0x5349E94435Cc9Cab9FfB40A492DA46935052733A",
+        "selectors": [
+          "0x6c0960f9",
+          "0xb473318e",
+          "0x042901c7",
+          "0x263b7f8e",
+          "0xe4948f43",
+          "0xeb672419"
+        ],
+        "action": 0,
+        "isFreezable": true
+      },
+      {
+        "facet": "0x16615a85B451edfb6FCBea0b34405D9C7ca1a22A",
+        "selectors": [
+          "0x0c4dd810",
+          "0xce9dcf16",
+          "0x7739cbe7",
+          "0xa9a2d18a"
+        ],
+        "action": 0,
+        "isFreezable": true
+      },
+      {
+        "facet": "0x2E64926BE35412f7710A3E097Ba076740bF97CC0",
+        "selectors": [
+          "0xe58bb639",
+          "0xf235757f",
+          "0x1cc5d103",
+          "0xbe6f11cf",
+          "0x4623c91d"
+        ],
+        "action": 0,
+        "isFreezable": true
+      }
+    ],
+    "initAddress": "0x91Ca046daD8c3Db41f296267E1720d9C940f613d",
+    "initCalldata": "0x1ed824a0000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000001a00000000000000000000000000000000000000000000000000000000000000f80010007af2271352ac99f97670a7d6999ae63b53f4e9480a957091d8848a46c610100067d592a040e8914eda295f3521561d64b1a4c1b9e6dbd2933093102febf00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000fa00000000000000000000000000000000000000000000000000000000000000fc00000000000000000000000000000000000000000000000000000000064ec7e30000000000000000000000000000000000000000000000000000000000000000c000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000fe0000000000000000000000000000000000000000000000000000000000008007000000000000000000000000000000000000000000000000000000000000800600000000000000000000000000000000000000000000000000000000044aa2000000000000000000000000000000000000000000000000000000000000000320000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000c0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000002600000000000000000000000000000000000000000000000000000000000000d600000000000000000000000000000000000000000000000000000000000000d800000000000000000000000000000000000000000000000000000000000000da00000000000000000000000000000000000000000000000000000000000000dc00000000000000000000000000000000000000000000000000000000000000ac4e9f18c170000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000000c00000000000000000000000000000000000000000000000000000000000001800000000000000000000000000000000000000000000000000000000000000240000000000000000000000000000000000000000000000000000000000000030000000000000000000000000000000000000000000000000000000000000003c000000000000000000000000000000000000000000000000000000000000004800000000000000000000000000000000000000000000000000000000000000540000000000000000000000000000000000000000000000000000000000000060000000000000000000000000000000000000000000000000000000000000006c000000000000000000000000000000000000000000000000000000000000007800000000000000000000000000000000000000000000000000000000000000840000000000000000000000000000000000000000000000000000000000000090000000000000000000000000000000000000000000000000000000000000009c001000091af8506f97c5a2b2ff4edf06ba1bfd2ec2304056fb9987ce71797010500000000000000000000000000000000000000000000000000000000000080020000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000a000000000000000000000000000000000000000000000000000000000000000000100012f78c4022788ff0deb6c282f93df2b209d3c819999c3384498f1fec9b400000000000000000000000000000000000000000000000000000000000080030000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000a000000000000000000000000000000000000000000000000000000000000000000100008fa5c8a47d82ec783ad7cdefd382f5b031e7ef0754fcf242ccb4c65fd300000000000000000000000000000000000000000000000000000000000080040000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000a00000000000000000000000000000000000000000000000000000000000000000010000475561147799af163bef4d19262be10ed2d4a8977f793a195cd077e83d00000000000000000000000000000000000000000000000000000000000080050000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000a00000000000000000000000000000000000000000000000000000000000000000010005c17cd3ee506e5156f76afda69c905dfdc22578bec37609a1693bba4fdc00000000000000000000000000000000000000000000000000000000000080060000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000a000000000000000000000000000000000000000000000000000000000000000000100007562a15173ca081ddb179bb321500997ba6b43b15cf601cdf266af1cdb00000000000000000000000000000000000000000000000000000000000080080000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000a00000000000000000000000000000000000000000000000000000000000000000010000711288f63c4cd27ecd73df769b834eeda2645f6567beea6b7ed44aaf0300000000000000000000000000000000000000000000000000000000000080090000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000a00000000000000000000000000000000000000000000000000000000000000000010001397d906d62832c455f701b9f81267a1687e52210986d4e943b3f440d7d000000000000000000000000000000000000000000000000000000000000800a0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000a00000000000000000000000000000000000000000000000000000000000000000010000f1d9ad80b5eb80ad14232d7438b1c09314dda76f296eca922da87dbfcc000000000000000000000000000000000000000000000000000000000000800b0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000a00000000000000000000000000000000000000000000000000000000000000000010009ad8e522bb120c5f52d2236035edeb0a4259b89c3429c5ece7d1dc50286000000000000000000000000000000000000000000000000000000000000800c0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000a00000000000000000000000000000000000000000000000000000000000000000010000e1066c916b985495ac9e671ae6930e373e9b5074499c7f6014c439a04a000000000000000000000000000000000000000000000000000000000000800e0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000a000000000000000000000000000000000000000000000000000000000000000000100005b3e7150f7f6daac7cc9a46522f5ad593f9a3e3f0573282b41f86acf16000000000000000000000000000000000000000000000000000000000000800f0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000a00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000"
+  },
+  "executeUpgradeCalldata": "0x36d4eb8400000000000000000000000000000000000000000000000000000000000000400000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000006000000000000000000000000091ca046dad8c3db41f296267e1720d9c940f613d00000000000000000000000000000000000000000000000000000000000016c0000000000000000000000000000000000000000000000000000000000000000a0000000000000000000000000000000000000000000000000000000000000140000000000000000000000000000000000000000000000000000000000000026000000000000000000000000000000000000000000000000000000000000003c000000000000000000000000000000000000000000000000000000000000005a000000000000000000000000000000000000000000000000000000000000007400000000000000000000000000000000000000000000000000000000000000be00000000000000000000000000000000000000000000000000000000000000d80000000000000000000000000000000000000000000000000000000000000128000000000000000000000000000000000000000000000000000000000000013e00000000000000000000000000000000000000000000000000000000000001500000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008000000000000000000000000000000000000000000000000000000000000000040c4dd81000000000000000000000000000000000000000000000000000000000ce9dcf16000000000000000000000000000000000000000000000000000000007739cbe700000000000000000000000000000000000000000000000000000000a9a2d18a00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008000000000000000000000000000000000000000000000000000000000000000066c0960f900000000000000000000000000000000000000000000000000000000b473318e00000000000000000000000000000000000000000000000000000000042901c700000000000000000000000000000000000000000000000000000000263b7f8e00000000000000000000000000000000000000000000000000000000e4948f4300000000000000000000000000000000000000000000000000000000eb672419000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000080000000000000000000000000000000000000000000000000000000000000000ae58bb63900000000000000000000000000000000000000000000000000000000ed6d06c00000000000000000000000000000000000000000000000000000000086cb9909000000000000000000000000000000000000000000000000000000000707ac0900000000000000000000000000000000000000000000000000000000f235757f000000000000000000000000000000000000000000000000000000001cc5d10300000000000000000000000000000000000000000000000000000000be6f11cf000000000000000000000000000000000000000000000000000000004623c91d000000000000000000000000000000000000000000000000000000005437988d000000000000000000000000000000000000000000000000000000000b508883000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000080000000000000000000000000000000000000000000000000000000000000000873fb92970000000000000000000000000000000000000000000000000000000036d4eb840000000000000000000000000000000000000000000000000000000027ae4c16000000000000000000000000000000000000000000000000000000000551448c000000000000000000000000000000000000000000000000000000008043760a00000000000000000000000000000000000000000000000000000000beda4b12000000000000000000000000000000000000000000000000000000001733894500000000000000000000000000000000000000000000000000000000587809c70000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000800000000000000000000000000000000000000000000000000000000000000020cdffacc60000000000000000000000000000000000000000000000000000000052ef6b2c00000000000000000000000000000000000000000000000000000000adfca15e000000000000000000000000000000000000000000000000000000007a0ed62700000000000000000000000000000000000000000000000000000000a7cd63b700000000000000000000000000000000000000000000000000000000fe10226d0000000000000000000000000000000000000000000000000000000079823c9a000000000000000000000000000000000000000000000000000000004fc07d7500000000000000000000000000000000000000000000000000000000d86970d800000000000000000000000000000000000000000000000000000000fd791f3c000000000000000000000000000000000000000000000000000000008665b15000000000000000000000000000000000000000000000000000000000631f4bac000000000000000000000000000000000000000000000000000000000ec6b0b7000000000000000000000000000000000000000000000000000000001b60e62600000000000000000000000000000000000000000000000000000000e39d3bff000000000000000000000000000000000000000000000000000000000ef240a000000000000000000000000000000000000000000000000000000000fe26699e000000000000000000000000000000000000000000000000000000003960738200000000000000000000000000000000000000000000000000000000af6a2dcd00000000000000000000000000000000000000000000000000000000a1954fc500000000000000000000000000000000000000000000000000000000a39980a00000000000000000000000000000000000000000000000000000000046657fe90000000000000000000000000000000000000000000000000000000018e3a941000000000000000000000000000000000000000000000000000000003db920ce0000000000000000000000000000000000000000000000000000000029b98c6700000000000000000000000000000000000000000000000000000000bd7c541200000000000000000000000000000000000000000000000000000000c3bbd2d700000000000000000000000000000000000000000000000000000000e81e0ba100000000000000000000000000000000000000000000000000000000facd743b000000000000000000000000000000000000000000000000000000009cd939e40000000000000000000000000000000000000000000000000000000056142d7a0000000000000000000000000000000000000000000000000000000074f4d30d00000000000000000000000000000000000000000000000000000000000000000000000000000000c6f7e57c6e1e20468d869fe33675524e243cd6a0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000080000000000000000000000000000000000000000000000000000000000000000873fb92970000000000000000000000000000000000000000000000000000000036d4eb840000000000000000000000000000000000000000000000000000000027ae4c16000000000000000000000000000000000000000000000000000000000551448c000000000000000000000000000000000000000000000000000000008043760a00000000000000000000000000000000000000000000000000000000beda4b12000000000000000000000000000000000000000000000000000000001733894500000000000000000000000000000000000000000000000000000000587809c7000000000000000000000000000000000000000000000000000000000000000000000000000000007444de636699f080ca1c033528d2bb3705b391ce0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000800000000000000000000000000000000000000000000000000000000000000023cdffacc60000000000000000000000000000000000000000000000000000000052ef6b2c00000000000000000000000000000000000000000000000000000000adfca15e000000000000000000000000000000000000000000000000000000007a0ed62700000000000000000000000000000000000000000000000000000000a7cd63b700000000000000000000000000000000000000000000000000000000fe10226d0000000000000000000000000000000000000000000000000000000079823c9a000000000000000000000000000000000000000000000000000000004fc07d7500000000000000000000000000000000000000000000000000000000d86970d800000000000000000000000000000000000000000000000000000000fd791f3c000000000000000000000000000000000000000000000000000000009d1b5a81000000000000000000000000000000000000000000000000000000007b30c8da000000000000000000000000000000000000000000000000000000008665b15000000000000000000000000000000000000000000000000000000000631f4bac000000000000000000000000000000000000000000000000000000000ec6b0b7000000000000000000000000000000000000000000000000000000001b60e62600000000000000000000000000000000000000000000000000000000e39d3bff0000000000000000000000000000000000000000000000000000000033ce93fe000000000000000000000000000000000000000000000000000000000ef240a000000000000000000000000000000000000000000000000000000000fe26699e000000000000000000000000000000000000000000000000000000003960738200000000000000000000000000000000000000000000000000000000af6a2dcd00000000000000000000000000000000000000000000000000000000a1954fc500000000000000000000000000000000000000000000000000000000a39980a00000000000000000000000000000000000000000000000000000000046657fe90000000000000000000000000000000000000000000000000000000018e3a941000000000000000000000000000000000000000000000000000000003db920ce0000000000000000000000000000000000000000000000000000000029b98c6700000000000000000000000000000000000000000000000000000000bd7c541200000000000000000000000000000000000000000000000000000000c3bbd2d700000000000000000000000000000000000000000000000000000000e81e0ba100000000000000000000000000000000000000000000000000000000facd743b000000000000000000000000000000000000000000000000000000009cd939e40000000000000000000000000000000000000000000000000000000056142d7a0000000000000000000000000000000000000000000000000000000074f4d30d000000000000000000000000000000000000000000000000000000000000000000000000000000005349e94435cc9cab9ffb40a492da46935052733a00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000008000000000000000000000000000000000000000000000000000000000000000066c0960f900000000000000000000000000000000000000000000000000000000b473318e00000000000000000000000000000000000000000000000000000000042901c700000000000000000000000000000000000000000000000000000000263b7f8e00000000000000000000000000000000000000000000000000000000e4948f4300000000000000000000000000000000000000000000000000000000eb6724190000000000000000000000000000000000000000000000000000000000000000000000000000000016615a85b451edfb6fcbea0b34405d9c7ca1a22a00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000008000000000000000000000000000000000000000000000000000000000000000040c4dd81000000000000000000000000000000000000000000000000000000000ce9dcf16000000000000000000000000000000000000000000000000000000007739cbe700000000000000000000000000000000000000000000000000000000a9a2d18a000000000000000000000000000000000000000000000000000000000000000000000000000000002e64926be35412f7710a3e097ba076740bf97cc00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000800000000000000000000000000000000000000000000000000000000000000005e58bb63900000000000000000000000000000000000000000000000000000000f235757f000000000000000000000000000000000000000000000000000000001cc5d10300000000000000000000000000000000000000000000000000000000be6f11cf000000000000000000000000000000000000000000000000000000004623c91d0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000010041ed824a0000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000001a00000000000000000000000000000000000000000000000000000000000000f80010007af2271352ac99f97670a7d6999ae63b53f4e9480a957091d8848a46c610100067d592a040e8914eda295f3521561d64b1a4c1b9e6dbd2933093102febf00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000fa00000000000000000000000000000000000000000000000000000000000000fc00000000000000000000000000000000000000000000000000000000064ec7e30000000000000000000000000000000000000000000000000000000000000000c000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000fe0000000000000000000000000000000000000000000000000000000000008007000000000000000000000000000000000000000000000000000000000000800600000000000000000000000000000000000000000000000000000000044aa2000000000000000000000000000000000000000000000000000000000000000320000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000c0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000002600000000000000000000000000000000000000000000000000000000000000d600000000000000000000000000000000000000000000000000000000000000d800000000000000000000000000000000000000000000000000000000000000da00000000000000000000000000000000000000000000000000000000000000dc00000000000000000000000000000000000000000000000000000000000000ac4e9f18c170000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000000c00000000000000000000000000000000000000000000000000000000000001800000000000000000000000000000000000000000000000000000000000000240000000000000000000000000000000000000000000000000000000000000030000000000000000000000000000000000000000000000000000000000000003c000000000000000000000000000000000000000000000000000000000000004800000000000000000000000000000000000000000000000000000000000000540000000000000000000000000000000000000000000000000000000000000060000000000000000000000000000000000000000000000000000000000000006c000000000000000000000000000000000000000000000000000000000000007800000000000000000000000000000000000000000000000000000000000000840000000000000000000000000000000000000000000000000000000000000090000000000000000000000000000000000000000000000000000000000000009c001000091af8506f97c5a2b2ff4edf06ba1bfd2ec2304056fb9987ce71797010500000000000000000000000000000000000000000000000000000000000080020000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000a000000000000000000000000000000000000000000000000000000000000000000100012f78c4022788ff0deb6c282f93df2b209d3c819999c3384498f1fec9b400000000000000000000000000000000000000000000000000000000000080030000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000a000000000000000000000000000000000000000000000000000000000000000000100008fa5c8a47d82ec783ad7cdefd382f5b031e7ef0754fcf242ccb4c65fd300000000000000000000000000000000000000000000000000000000000080040000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000a00000000000000000000000000000000000000000000000000000000000000000010000475561147799af163bef4d19262be10ed2d4a8977f793a195cd077e83d00000000000000000000000000000000000000000000000000000000000080050000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000a00000000000000000000000000000000000000000000000000000000000000000010005c17cd3ee506e5156f76afda69c905dfdc22578bec37609a1693bba4fdc00000000000000000000000000000000000000000000000000000000000080060000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000a000000000000000000000000000000000000000000000000000000000000000000100007562a15173ca081ddb179bb321500997ba6b43b15cf601cdf266af1cdb00000000000000000000000000000000000000000000000000000000000080080000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000a00000000000000000000000000000000000000000000000000000000000000000010000711288f63c4cd27ecd73df769b834eeda2645f6567beea6b7ed44aaf0300000000000000000000000000000000000000000000000000000000000080090000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000a00000000000000000000000000000000000000000000000000000000000000000010001397d906d62832c455f701b9f81267a1687e52210986d4e943b3f440d7d000000000000000000000000000000000000000000000000000000000000800a0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000a00000000000000000000000000000000000000000000000000000000000000000010000f1d9ad80b5eb80ad14232d7438b1c09314dda76f296eca922da87dbfcc000000000000000000000000000000000000000000000000000000000000800b0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000a00000000000000000000000000000000000000000000000000000000000000000010009ad8e522bb120c5f52d2236035edeb0a4259b89c3429c5ece7d1dc50286000000000000000000000000000000000000000000000000000000000000800c0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000a00000000000000000000000000000000000000000000000000000000000000000010000e1066c916b985495ac9e671ae6930e373e9b5074499c7f6014c439a04a000000000000000000000000000000000000000000000000000000000000800e0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000a000000000000000000000000000000000000000000000000000000000000000000100005b3e7150f7f6daac7cc9a46522f5ad593f9a3e3f0573282b41f86acf16000000000000000000000000000000000000000000000000000000000000800f0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000a0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000"
+}
\ No newline at end of file
diff --git a/etc/upgrades/1692195639-upgrade-system/testnet2/facetCuts.json b/etc/upgrades/1692195639-upgrade-system/testnet2/facetCuts.json
new file mode 100644
index 000000000000..f48328679fee
--- /dev/null
+++ b/etc/upgrades/1692195639-upgrade-system/testnet2/facetCuts.json
@@ -0,0 +1,190 @@
+[
+  {
+    "facet": "0x0000000000000000000000000000000000000000",
+    "selectors": [
+      "0x0c4dd810",
+      "0xce9dcf16",
+      "0x7739cbe7",
+      "0xa9a2d18a"
+    ],
+    "action": 2,
+    "isFreezable": false
+  },
+  {
+    "facet": "0x0000000000000000000000000000000000000000",
+    "selectors": [
+      "0x6c0960f9",
+      "0xb473318e",
+      "0x042901c7",
+      "0x263b7f8e",
+      "0xe4948f43",
+      "0xeb672419"
+    ],
+    "action": 2,
+    "isFreezable": false
+  },
+  {
+    "facet": "0x0000000000000000000000000000000000000000",
+    "selectors": [
+      "0xe58bb639",
+      "0xed6d06c0",
+      "0x86cb9909",
+      "0x0707ac09",
+      "0xf235757f",
+      "0x1cc5d103",
+      "0xbe6f11cf",
+      "0x4623c91d",
+      "0x5437988d",
+      "0x0b508883"
+    ],
+    "action": 2,
+    "isFreezable": false
+  },
+  {
+    "facet": "0x0000000000000000000000000000000000000000",
+    "selectors": [
+      "0x73fb9297",
+      "0x36d4eb84",
+      "0x27ae4c16",
+      "0x0551448c",
+      "0x8043760a",
+      "0xbeda4b12",
+      "0x17338945",
+      "0x587809c7"
+    ],
+    "action": 2,
+    "isFreezable": false
+  },
+  {
+    "facet": "0x0000000000000000000000000000000000000000",
+    "selectors": [
+      "0xcdffacc6",
+      "0x52ef6b2c",
+      "0xadfca15e",
+      "0x7a0ed627",
+      "0xa7cd63b7",
+      "0xfe10226d",
+      "0x79823c9a",
+      "0x4fc07d75",
+      "0xd86970d8",
+      "0xfd791f3c",
+      "0x8665b150",
+      "0x631f4bac",
+      "0x0ec6b0b7",
+      "0x1b60e626",
+      "0xe39d3bff",
+      "0x0ef240a0",
+      "0xfe26699e",
+      "0x39607382",
+      "0xaf6a2dcd",
+      "0xa1954fc5",
+      "0xa39980a0",
+      "0x46657fe9",
+      "0x18e3a941",
+      "0x3db920ce",
+      "0x29b98c67",
+      "0xbd7c5412",
+      "0xc3bbd2d7",
+      "0xe81e0ba1",
+      "0xfacd743b",
+      "0x9cd939e4",
+      "0x56142d7a",
+      "0x74f4d30d"
+    ],
+    "action": 2,
+    "isFreezable": false
+  },
+  {
+    "facet": "0xc6f7e57C6e1e20468D869Fe33675524e243CD6a0",
+    "selectors": [
+      "0x73fb9297",
+      "0x36d4eb84",
+      "0x27ae4c16",
+      "0x0551448c",
+      "0x8043760a",
+      "0xbeda4b12",
+      "0x17338945",
+      "0x587809c7"
+    ],
+    "action": 0,
+    "isFreezable": false
+  },
+  {
+    "facet": "0x7444DE636699F080cA1C033528D2bB3705B391Ce",
+    "selectors": [
+      "0xcdffacc6",
+      "0x52ef6b2c",
+      "0xadfca15e",
+      "0x7a0ed627",
+      "0xa7cd63b7",
+      "0xfe10226d",
+      "0x79823c9a",
+      "0x4fc07d75",
+      "0xd86970d8",
+      "0xfd791f3c",
+      "0x9d1b5a81",
+      "0x7b30c8da",
+      "0x8665b150",
+      "0x631f4bac",
+      "0x0ec6b0b7",
+      "0x1b60e626",
+      "0xe39d3bff",
+      "0x33ce93fe",
+      "0x0ef240a0",
+      "0xfe26699e",
+      "0x39607382",
+      "0xaf6a2dcd",
+      "0xa1954fc5",
+      "0xa39980a0",
+      "0x46657fe9",
+      "0x18e3a941",
+      "0x3db920ce",
+      "0x29b98c67",
+      "0xbd7c5412",
+      "0xc3bbd2d7",
+      "0xe81e0ba1",
+      "0xfacd743b",
+      "0x9cd939e4",
+      "0x56142d7a",
+      "0x74f4d30d"
+    ],
+    "action": 0,
+    "isFreezable": false
+  },
+  {
+    "facet": "0x5349E94435Cc9Cab9FfB40A492DA46935052733A",
+    "selectors": [
+      "0x6c0960f9",
+      "0xb473318e",
+      "0x042901c7",
+      "0x263b7f8e",
+      "0xe4948f43",
+      "0xeb672419"
+    ],
+    "action": 0,
+    "isFreezable": true
+  },
+  {
+    "facet": "0xB54f822966FD4940b6fb465AC67075e5119094C3",
+    "selectors": [
+      "0x0c4dd810",
+      "0xce9dcf16",
+      "0x7739cbe7",
+      "0xa9a2d18a"
+    ],
+    "action": 0,
+    "isFreezable": true
+  },
+  {
+    "facet": "0x2E64926BE35412f7710A3E097Ba076740bF97CC0",
+    "selectors": [
+      "0xe58bb639",
+      "0xf235757f",
+      "0x1cc5d103",
+      "0xbe6f11cf",
+      "0x4623c91d"
+    ],
+    "action": 0,
+    "isFreezable": true
+  }
+]
\ No newline at end of file
diff --git a/etc/upgrades/1692195639-upgrade-system/testnet2/facets.json b/etc/upgrades/1692195639-upgrade-system/testnet2/facets.json
new file mode 100644
index 000000000000..56fbbc601317
--- /dev/null
+++ b/etc/upgrades/1692195639-upgrade-system/testnet2/facets.json
@@ -0,0 +1,22 @@
+{
+  "ExecutorFacet": {
+    "address": "0xB54f822966FD4940b6fb465AC67075e5119094C3",
+    "txHash": "0xed714bdf2562d12b231796632a5e3cca195d540c8a8c9a7ff6d733ddcde097a8"
+  },
+  "GovernanceFacet": {
+    "address": "0x2E64926BE35412f7710A3E097Ba076740bF97CC0",
+    "txHash": "0x92bd619a7b403f5a12e3fb1f83373977c028338496854d740ec26d9934022b4d"
+  },
+  "DiamondCutFacet": {
+    "address": "0xc6f7e57C6e1e20468D869Fe33675524e243CD6a0",
+    "txHash": "0x6784e9175eb12561f7222bd8dac38049b5b33d85c898de7dc0dc49e2d672635c"
+  },
+  "GettersFacet": {
+    "address": "0x7444DE636699F080cA1C033528D2bB3705B391Ce",
+    "txHash": "0xcbd1eb301ae202a4c827dd4364bd60f5f6ec4da73c5237a9604022cc7fedccd3"
+  },
+  "MailboxFacet": {
+    "address": "0x5349E94435Cc9Cab9FfB40A492DA46935052733A",
+    "txHash": "0x2a584f3e8229a38e5f976fadf563411728c4dbc3ff6259c067dfc7ffccb0dd80"
+  }
+}
\ No newline at end of file
diff --git a/etc/upgrades/1692195639-upgrade-system/testnet2/l2Upgrade.json b/etc/upgrades/1692195639-upgrade-system/testnet2/l2Upgrade.json
new file mode 100644
index 000000000000..da024be79e33
--- /dev/null
+++ b/etc/upgrades/1692195639-upgrade-system/testnet2/l2Upgrade.json
@@ -0,0 +1,211 @@
+{
+  "systemContracts": [
+    {
+      "name": "AccountCodeStorage",
+      "bytecodeHashes": [
+        "0x01000091af8506f97c5a2b2ff4edf06ba1bfd2ec2304056fb9987ce717970105"
+      ],
+      "address": "0x0000000000000000000000000000000000008002"
+    },
+    {
+      "name": "NonceHolder",
+      "bytecodeHashes": [
+        "0x0100012f78c4022788ff0deb6c282f93df2b209d3c819999c3384498f1fec9b4"
+      ],
+      "address": "0x0000000000000000000000000000000000008003"
+    },
+    {
+      "name": "KnownCodesStorage",
+      "bytecodeHashes": [
+        "0x0100008fa5c8a47d82ec783ad7cdefd382f5b031e7ef0754fcf242ccb4c65fd3"
+      ],
+      "address": "0x0000000000000000000000000000000000008004"
+    },
+    {
+      "name": "ImmutableSimulator",
+      "bytecodeHashes": [
+        "0x010000475561147799af163bef4d19262be10ed2d4a8977f793a195cd077e83d"
+      ],
+      "address": "0x0000000000000000000000000000000000008005"
+    },
+    {
+      "name": "ContractDeployer",
+      "bytecodeHashes": [
+        "0x010005c17cd3ee506e5156f76afda69c905dfdc22578bec37609a1693bba4fdc"
+      ],
+      "address": "0x0000000000000000000000000000000000008006"
+    },
+    {
+      "name": "L1Messenger",
+      "bytecodeHashes": [
+        "0x0100007562a15173ca081ddb179bb321500997ba6b43b15cf601cdf266af1cdb"
+      ],
+      "address": "0x0000000000000000000000000000000000008008"
+    },
+    {
+      "name": "MsgValueSimulator",
+      "bytecodeHashes": [
+        "0x010000711288f63c4cd27ecd73df769b834eeda2645f6567beea6b7ed44aaf03"
+      ],
+      "address": "0x0000000000000000000000000000000000008009"
+    },
+    {
+      "name": "L2EthToken",
+      "bytecodeHashes": [
+        "0x010001397d906d62832c455f701b9f81267a1687e52210986d4e943b3f440d7d"
+      ],
+      "address": "0x000000000000000000000000000000000000800a"
+    },
+    {
+      "name": "SystemContext",
+      "bytecodeHashes": [
+        "0x010000f1d9ad80b5eb80ad14232d7438b1c09314dda76f296eca922da87dbfcc"
+      ],
+      "address": "0x000000000000000000000000000000000000800b"
+    },
+    {
+      "name": "BootloaderUtilities",
+      "bytecodeHashes": [
+        "0x010009ad8e522bb120c5f52d2236035edeb0a4259b89c3429c5ece7d1dc50286"
+      ],
+      "address": "0x000000000000000000000000000000000000800c"
+    },
+    {
+      "name": "BytecodeCompressor",
+      "bytecodeHashes": [
+        "0x010000e1066c916b985495ac9e671ae6930e373e9b5074499c7f6014c439a04a"
+      ],
+      "address": "0x000000000000000000000000000000000000800e"
+    },
+    {
+      "name": "ComplexUpgrader",
+      "bytecodeHashes": [
+        "0x0100005b3e7150f7f6daac7cc9a46522f5ad593f9a3e3f0573282b41f86acf16"
+      ],
+      "address": "0x000000000000000000000000000000000000800f"
+    }
+  ],
+  "bootloader": {
+    "name": "Bootloader",
+    "bytecodeHashes": [
+      "0x010007af2271352ac99f97670a7d6999ae63b53f4e9480a957091d8848a46c61"
+    ]
+  },
+  "defaultAA": {
+    "name": "DefaultAccount",
+    "bytecodeHashes": [
+      "0x0100067d592a040e8914eda295f3521561d64b1a4c1b9e6dbd2933093102febf"
+    ]
+  },
+  "forcedDeployments": [
+    {
+      "bytecodeHash": "0x01000091af8506f97c5a2b2ff4edf06ba1bfd2ec2304056fb9987ce717970105",
+      "newAddress": "0x0000000000000000000000000000000000008002",
+      "value": 0,
+      "input": "0x",
+      "callConstructor": false
+    },
+    {
+      "bytecodeHash": "0x0100012f78c4022788ff0deb6c282f93df2b209d3c819999c3384498f1fec9b4",
+      "newAddress": "0x0000000000000000000000000000000000008003",
+      "value": 0,
+      "input": "0x",
+      "callConstructor": false
+    },
+    {
+      "bytecodeHash": "0x0100008fa5c8a47d82ec783ad7cdefd382f5b031e7ef0754fcf242ccb4c65fd3",
+      "newAddress": "0x0000000000000000000000000000000000008004",
+      "value": 0,
+      "input": "0x",
+      "callConstructor": false
+    },
+    {
+      "bytecodeHash": "0x010000475561147799af163bef4d19262be10ed2d4a8977f793a195cd077e83d",
+      "newAddress": "0x0000000000000000000000000000000000008005",
+      "value": 0,
+      "input": "0x",
+      "callConstructor": false
+    },
+    {
+      "bytecodeHash": "0x010005c17cd3ee506e5156f76afda69c905dfdc22578bec37609a1693bba4fdc",
+      "newAddress": "0x0000000000000000000000000000000000008006",
+      "value": 0,
+      "input": "0x",
+      "callConstructor": false
+    },
+    {
+      "bytecodeHash": "0x0100007562a15173ca081ddb179bb321500997ba6b43b15cf601cdf266af1cdb",
+      "newAddress": "0x0000000000000000000000000000000000008008",
+      "value": 0,
+      "input": "0x",
+      "callConstructor": false
+    },
+    {
+      "bytecodeHash": "0x010000711288f63c4cd27ecd73df769b834eeda2645f6567beea6b7ed44aaf03",
+      "newAddress": "0x0000000000000000000000000000000000008009",
+      "value": 0,
+      "input": "0x",
+      "callConstructor": false
+    },
+    {
+      "bytecodeHash": "0x010001397d906d62832c455f701b9f81267a1687e52210986d4e943b3f440d7d",
+      "newAddress": "0x000000000000000000000000000000000000800a",
+      "value": 0,
+      "input": "0x",
+      "callConstructor": false
+    },
+    {
+      "bytecodeHash": "0x010000f1d9ad80b5eb80ad14232d7438b1c09314dda76f296eca922da87dbfcc",
+      "newAddress": "0x000000000000000000000000000000000000800b",
+      "value": 0,
+      "input": "0x",
+      "callConstructor": false
+    },
+    {
+      "bytecodeHash": "0x010009ad8e522bb120c5f52d2236035edeb0a4259b89c3429c5ece7d1dc50286",
+      "newAddress": "0x000000000000000000000000000000000000800c",
+      "value": 0,
+      "input": "0x",
+      "callConstructor": false
+    },
+    {
+      "bytecodeHash": "0x010000e1066c916b985495ac9e671ae6930e373e9b5074499c7f6014c439a04a",
+      "newAddress": "0x000000000000000000000000000000000000800e",
+      "value": 0,
+      "input": "0x",
+      "callConstructor": false
+    },
+    {
+      "bytecodeHash": "0x0100005b3e7150f7f6daac7cc9a46522f5ad593f9a3e3f0573282b41f86acf16",
+      "newAddress": "0x000000000000000000000000000000000000800f",
+      "value": 0,
+      "input": "0x",
+      "callConstructor": false
+    }
+  ],
+  "forcedDeploymentCalldata": "0xe9f18c170000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000000c00000000000000000000000000000000000000000000000000000000000001800000000000000000000000000000000000000000000000000000000000000240000000000000000000000000000000000000000000000000000000000000030000000000000000000000000000000000000000000000000000000000000003c000000000000000000000000000000000000000000000000000000000000004800000000000000000000000000000000000000000000000000000000000000540000000000000000000000000000000000000000000000000000000000000060000000000000000000000000000000000000000000000000000000000000006c000000000000000000000000000000000000000000000000000000000000007800000000000000000000000000000000000000000000000000000000000000840000000000000000000000000000000000000000000000000000000000000090000000000000000000000000000000000000000000000000000000000000009c001000091af8506f97c5a2b2ff4edf06ba1bfd2ec2304056fb9987ce71797010500000000000000000000000000000000000000000000000000000000000080020000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000a000000000000000000000000000000000000000000000000000000000000000000100012f78c4022788ff0deb6c282f93df2b209d3c819999c3384498f1fec9b400000000000000000000000000000000000000000000000000000000000080030000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000a000000000000000000000000000000000000000000000000000000000000000000100008fa5c8a47d82ec783ad7cdefd382f5b031e7ef0754fcf242ccb4c65fd300000000000000000000000000000000000000000000000000000000000080040000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000a00000000000000000000000000000000000000000000000000000000000000000010000475561147799af163bef4d19262be10ed2d4a8977f793a195cd077e83d00000000000000000000000000000000000000000000000000000000000080050000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000a00000000000000000000000000000000000000000000000000000000000000000010005c17cd3ee506e5156f76afda69c905dfdc22578bec37609a1693bba4fdc00000000000000000000000000000000000000000000000000000000000080060000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000a000000000000000000000000000000000000000000000000000000000000000000100007562a15173ca081ddb179bb321500997ba6b43b15cf601cdf266af1cdb00000000000000000000000000000000000000000000000000000000000080080000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000a00000000000000000000000000000000000000000000000000000000000000000010000711288f63c4cd27ecd73df769b834eeda2645f6567beea6b7ed44aaf0300000000000000000000000000000000000000000000000000000000000080090000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000a00000000000000000000000000000000000000000000000000000000000000000010001397d906d62832c455f701b9f81267a1687e52210986d4e943b3f440d7d000000000000000000000000000000000000000000000000000000000000800a0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000a00000000000000000000000000000000000000000000000000000000000000000010000f1d9ad80b5eb80ad14232d7438b1c09314dda76f296eca922da87dbfcc000000000000000000000000000000000000000000000000000000000000800b0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000a00000000000000000000000000000000000000000000000000000000000000000010009ad8e522bb120c5f52d2236035edeb0a4259b89c3429c5ece7d1dc50286000000000000000000000000000000000000000000000000000000000000800c0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000a00000000000000000000000000000000000000000000000000000000000000000010000e1066c916b985495ac9e671ae6930e373e9b5074499c7f6014c439a04a000000000000000000000000000000000000000000000000000000000000800e0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000a000000000000000000000000000000000000000000000000000000000000000000100005b3e7150f7f6daac7cc9a46522f5ad593f9a3e3f0573282b41f86acf16000000000000000000000000000000000000000000000000000000000000800f0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000a00000000000000000000000000000000000000000000000000000000000000000",
+  "calldata": "0xe9f18c170000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000000c00000000000000000000000000000000000000000000000000000000000001800000000000000000000000000000000000000000000000000000000000000240000000000000000000000000000000000000000000000000000000000000030000000000000000000000000000000000000000000000000000000000000003c000000000000000000000000000000000000000000000000000000000000004800000000000000000000000000000000000000000000000000000000000000540000000000000000000000000000000000000000000000000000000000000060000000000000000000000000000000000000000000000000000000000000006c000000000000000000000000000000000000000000000000000000000000007800000000000000000000000000000000000000000000000000000000000000840000000000000000000000000000000000000000000000000000000000000090000000000000000000000000000000000000000000000000000000000000009c001000091af8506f97c5a2b2ff4edf06ba1bfd2ec2304056fb9987ce71797010500000000000000000000000000000000000000000000000000000000000080020000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000a000000000000000000000000000000000000000000000000000000000000000000100012f78c4022788ff0deb6c282f93df2b209d3c819999c3384498f1fec9b400000000000000000000000000000000000000000000000000000000000080030000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000a000000000000000000000000000000000000000000000000000000000000000000100008fa5c8a47d82ec783ad7cdefd382f5b031e7ef0754fcf242ccb4c65fd300000000000000000000000000000000000000000000000000000000000080040000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000a00000000000000000000000000000000000000000000000000000000000000000010000475561147799af163bef4d19262be10ed2d4a8977f793a195cd077e83d00000000000000000000000000000000000000000000000000000000000080050000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000a00000000000000000000000000000000000000000000000000000000000000000010005c17cd3ee506e5156f76afda69c905dfdc22578bec37609a1693bba4fdc00000000000000000000000000000000000000000000000000000000000080060000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000a000000000000000000000000000000000000000000000000000000000000000000100007562a15173ca081ddb179bb321500997ba6b43b15cf601cdf266af1cdb00000000000000000000000000000000000000000000000000000000000080080000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000a00000000000000000000000000000000000000000000000000000000000000000010000711288f63c4cd27ecd73df769b834eeda2645f6567beea6b7ed44aaf0300000000000000000000000000000000000000000000000000000000000080090000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000a00000000000000000000000000000000000000000000000000000000000000000010001397d906d62832c455f701b9f81267a1687e52210986d4e943b3f440d7d000000000000000000000000000000000000000000000000000000000000800a0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000a00000000000000000000000000000000000000000000000000000000000000000010000f1d9ad80b5eb80ad14232d7438b1c09314dda76f296eca922da87dbfcc000000000000000000000000000000000000000000000000000000000000800b0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000a00000000000000000000000000000000000000000000000000000000000000000010009ad8e522bb120c5f52d2236035edeb0a4259b89c3429c5ece7d1dc50286000000000000000000000000000000000000000000000000000000000000800c0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000a00000000000000000000000000000000000000000000000000000000000000000010000e1066c916b985495ac9e671ae6930e373e9b5074499c7f6014c439a04a000000000000000000000000000000000000000000000000000000000000800e0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000a000000000000000000000000000000000000000000000000000000000000000000100005b3e7150f7f6daac7cc9a46522f5ad593f9a3e3f0573282b41f86acf16000000000000000000000000000000000000000000000000000000000000800f0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000a00000000000000000000000000000000000000000000000000000000000000000",
+  "tx": {
+    "txType": 254,
+    "from": "0x0000000000000000000000000000000000008007",
+    "to": "0x0000000000000000000000000000000000008006",
+    "gasLimit": 72000000,
+    "gasPerPubdataByteLimit": 800,
+    "maxFeePerGas": 0,
+    "maxPriorityFeePerGas": 0,
+    "paymaster": 0,
+    "nonce": "12",
+    "value": 0,
+    "reserved": [
+      0,
+      0,
+      0,
+      0
+    ],
+    "data": "0xe9f18c170000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000000c00000000000000000000000000000000000000000000000000000000000001800000000000000000000000000000000000000000000000000000000000000240000000000000000000000000000000000000000000000000000000000000030000000000000000000000000000000000000000000000000000000000000003c000000000000000000000000000000000000000000000000000000000000004800000000000000000000000000000000000000000000000000000000000000540000000000000000000000000000000000000000000000000000000000000060000000000000000000000000000000000000000000000000000000000000006c000000000000000000000000000000000000000000000000000000000000007800000000000000000000000000000000000000000000000000000000000000840000000000000000000000000000000000000000000000000000000000000090000000000000000000000000000000000000000000000000000000000000009c001000091af8506f97c5a2b2ff4edf06ba1bfd2ec2304056fb9987ce71797010500000000000000000000000000000000000000000000000000000000000080020000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000a000000000000000000000000000000000000000000000000000000000000000000100012f78c4022788ff0deb6c282f93df2b209d3c819999c3384498f1fec9b400000000000000000000000000000000000000000000000000000000000080030000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000a000000000000000000000000000000000000000000000000000000000000000000100008fa5c8a47d82ec783ad7cdefd382f5b031e7ef0754fcf242ccb4c65fd300000000000000000000000000000000000000000000000000000000000080040000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000a00000000000000000000000000000000000000000000000000000000000000000010000475561147799af163bef4d19262be10ed2d4a8977f793a195cd077e83d00000000000000000000000000000000000000000000000000000000000080050000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000a00000000000000000000000000000000000000000000000000000000000000000010005c17cd3ee506e5156f76afda69c905dfdc22578bec37609a1693bba4fdc00000000000000000000000000000000000000000000000000000000000080060000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000a000000000000000000000000000000000000000000000000000000000000000000100007562a15173ca081ddb179bb321500997ba6b43b15cf601cdf266af1cdb00000000000000000000000000000000000000000000000000000000000080080000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000a00000000000000000000000000000000000000000000000000000000000000000010000711288f63c4cd27ecd73df769b834eeda2645f6567beea6b7ed44aaf0300000000000000000000000000000000000000000000000000000000000080090000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000a00000000000000000000000000000000000000000000000000000000000000000010001397d906d62832c455f701b9f81267a1687e52210986d4e943b3f440d7d000000000000000000000000000000000000000000000000000000000000800a0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000a00000000000000000000000000000000000000000000000000000000000000000010000f1d9ad80b5eb80ad14232d7438b1c09314dda76f296eca922da87dbfcc000000000000000000000000000000000000000000000000000000000000800b0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000a00000000000000000000000000000000000000000000000000000000000000000010009ad8e522bb120c5f52d2236035edeb0a4259b89c3429c5ece7d1dc50286000000000000000000000000000000000000000000000000000000000000800c0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000a00000000000000000000000000000000000000000000000000000000000000000010000e1066c916b985495ac9e671ae6930e373e9b5074499c7f6014c439a04a000000000000000000000000000000000000000000000000000000000000800e0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000a000000000000000000000000000000000000000000000000000000000000000000100005b3e7150f7f6daac7cc9a46522f5ad593f9a3e3f0573282b41f86acf16000000000000000000000000000000000000000000000000000000000000800f0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000a00000000000000000000000000000000000000000000000000000000000000000",
+    "signature": "0x",
+    "factoryDeps": [],
+    "paymasterInput": "0x",
+    "reservedDynamic": "0x"
+  }
+}
\ No newline at end of file
diff --git a/etc/upgrades/1692195639-upgrade-system/testnet2/transactions.json b/etc/upgrades/1692195639-upgrade-system/testnet2/transactions.json
new file mode 100644
index 000000000000..82f3a1d9d750
--- /dev/null
+++ b/etc/upgrades/1692195639-upgrade-system/testnet2/transactions.json
@@ -0,0 +1,248 @@
+{
+  "proposeUpgradeTx": {
+    "l2ProtocolUpgradeTx": {
+      "txType": 254,
+      "from": "0x0000000000000000000000000000000000008007",
+      "to": "0x0000000000000000000000000000000000008006",
+      "gasLimit": 72000000,
+      "gasPerPubdataByteLimit": 800,
+      "maxFeePerGas": 0,
+      "maxPriorityFeePerGas": 0,
+      "paymaster": 0,
+      "nonce": "12",
+      "value": 0,
+      "reserved": [
+        0,
+        0,
+        0,
+        0
+      ],
+      "data": "0xe9f18c170000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000000c00000000000000000000000000000000000000000000000000000000000001800000000000000000000000000000000000000000000000000000000000000240000000000000000000000000000000000000000000000000000000000000030000000000000000000000000000000000000000000000000000000000000003c000000000000000000000000000000000000000000000000000000000000004800000000000000000000000000000000000000000000000000000000000000540000000000000000000000000000000000000000000000000000000000000060000000000000000000000000000000000000000000000000000000000000006c000000000000000000000000000000000000000000000000000000000000007800000000000000000000000000000000000000000000000000000000000000840000000000000000000000000000000000000000000000000000000000000090000000000000000000000000000000000000000000000000000000000000009c001000091af8506f97c5a2b2ff4edf06ba1bfd2ec2304056fb9987ce71797010500000000000000000000000000000000000000000000000000000000000080020000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000a000000000000000000000000000000000000000000000000000000000000000000100012f78c4022788ff0deb6c282f93df2b209d3c819999c3384498f1fec9b400000000000000000000000000000000000000000000000000000000000080030000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000a000000000000000000000000000000000000000000000000000000000000000000100008fa5c8a47d82ec783ad7cdefd382f5b031e7ef0754fcf242ccb4c65fd300000000000000000000000000000000000000000000000000000000000080040000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000a00000000000000000000000000000000000000000000000000000000000000000010000475561147799af163bef4d19262be10ed2d4a8977f793a195cd077e83d00000000000000000000000000000000000000000000000000000000000080050000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000a00000000000000000000000000000000000000000000000000000000000000000010005c17cd3ee506e5156f76afda69c905dfdc22578bec37609a1693bba4fdc00000000000000000000000000000000000000000000000000000000000080060000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000a000000000000000000000000000000000000000000000000000000000000000000100007562a15173ca081ddb179bb321500997ba6b43b15cf601cdf266af1cdb00000000000000000000000000000000000000000000000000000000000080080000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000a00000000000000000000000000000000000000000000000000000000000000000010000711288f63c4cd27ecd73df769b834eeda2645f6567beea6b7ed44aaf0300000000000000000000000000000000000000000000000000000000000080090000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000a00000000000000000000000000000000000000000000000000000000000000000010001397d906d62832c455f701b9f81267a1687e52210986d4e943b3f440d7d000000000000000000000000000000000000000000000000000000000000800a0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000a00000000000000000000000000000000000000000000000000000000000000000010000f1d9ad80b5eb80ad14232d7438b1c09314dda76f296eca922da87dbfcc000000000000000000000000000000000000000000000000000000000000800b0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000a00000000000000000000000000000000000000000000000000000000000000000010009ad8e522bb120c5f52d2236035edeb0a4259b89c3429c5ece7d1dc50286000000000000000000000000000000000000000000000000000000000000800c0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000a00000000000000000000000000000000000000000000000000000000000000000010000e1066c916b985495ac9e671ae6930e373e9b5074499c7f6014c439a04a000000000000000000000000000000000000000000000000000000000000800e0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000a000000000000000000000000000000000000000000000000000000000000000000100005b3e7150f7f6daac7cc9a46522f5ad593f9a3e3f0573282b41f86acf16000000000000000000000000000000000000000000000000000000000000800f0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000a00000000000000000000000000000000000000000000000000000000000000000",
+      "signature": "0x",
+      "factoryDeps": [],
+      "paymasterInput": "0x",
+      "reservedDynamic": "0x"
+    },
+    "bootloaderHash": "0x010007af2271352ac99f97670a7d6999ae63b53f4e9480a957091d8848a46c61",
+    "defaultAccountHash": "0x0100067d592a040e8914eda295f3521561d64b1a4c1b9e6dbd2933093102febf",
+    "verifier": "0x0000000000000000000000000000000000000000",
+    "verifierParams": {
+      "recursionNodeLevelVkHash": "0x0000000000000000000000000000000000000000000000000000000000000000",
+      "recursionLeafLevelVkHash": "0x0000000000000000000000000000000000000000000000000000000000000000",
+      "recursionCircuitsSetVksHash": "0x0000000000000000000000000000000000000000000000000000000000000000"
+    },
+    "l1ContractsUpgradeCalldata": "0x",
+    "postUpgradeCalldata": "0x",
+    "upgradeTimestamp": {
+      "type": "BigNumber",
+      "hex": "0x64e35670"
+    },
+    "factoryDeps": [],
+    "newProtocolVersion": "12",
+    "newAllowList": "0x0000000000000000000000000000000000000000"
+  },
+  "l1upgradeCalldata": "0x1ed824a0000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000001a00000000000000000000000000000000000000000000000000000000000000f80010007af2271352ac99f97670a7d6999ae63b53f4e9480a957091d8848a46c610100067d592a040e8914eda295f3521561d64b1a4c1b9e6dbd2933093102febf00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000fa00000000000000000000000000000000000000000000000000000000000000fc00000000000000000000000000000000000000000000000000000000064e35670000000000000000000000000000000000000000000000000000000000000000c000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000fe0000000000000000000000000000000000000000000000000000000000008007000000000000000000000000000000000000000000000000000000000000800600000000000000000000000000000000000000000000000000000000044aa2000000000000000000000000000000000000000000000000000000000000000320000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000c0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000002600000000000000000000000000000000000000000000000000000000000000d600000000000000000000000000000000000000000000000000000000000000d800000000000000000000000000000000000000000000000000000000000000da00000000000000000000000000000000000000000000000000000000000000dc00000000000000000000000000000000000000000000000000000000000000ac4e9f18c170000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000000c00000000000000000000000000000000000000000000000000000000000001800000000000000000000000000000000000000000000000000000000000000240000000000000000000000000000000000000000000000000000000000000030000000000000000000000000000000000000000000000000000000000000003c000000000000000000000000000000000000000000000000000000000000004800000000000000000000000000000000000000000000000000000000000000540000000000000000000000000000000000000000000000000000000000000060000000000000000000000000000000000000000000000000000000000000006c000000000000000000000000000000000000000000000000000000000000007800000000000000000000000000000000000000000000000000000000000000840000000000000000000000000000000000000000000000000000000000000090000000000000000000000000000000000000000000000000000000000000009c001000091af8506f97c5a2b2ff4edf06ba1bfd2ec2304056fb9987ce71797010500000000000000000000000000000000000000000000000000000000000080020000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000a000000000000000000000000000000000000000000000000000000000000000000100012f78c4022788ff0deb6c282f93df2b209d3c819999c3384498f1fec9b400000000000000000000000000000000000000000000000000000000000080030000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000a000000000000000000000000000000000000000000000000000000000000000000100008fa5c8a47d82ec783ad7cdefd382f5b031e7ef0754fcf242ccb4c65fd300000000000000000000000000000000000000000000000000000000000080040000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000a00000000000000000000000000000000000000000000000000000000000000000010000475561147799af163bef4d19262be10ed2d4a8977f793a195cd077e83d00000000000000000000000000000000000000000000000000000000000080050000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000a00000000000000000000000000000000000000000000000000000000000000000010005c17cd3ee506e5156f76afda69c905dfdc22578bec37609a1693bba4fdc00000000000000000000000000000000000000000000000000000000000080060000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000a000000000000000000000000000000000000000000000000000000000000000000100007562a15173ca081ddb179bb321500997ba6b43b15cf601cdf266af1cdb00000000000000000000000000000000000000000000000000000000000080080000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000a00000000000000000000000000000000000000000000000000000000000000000010000711288f63c4cd27ecd73df769b834eeda2645f6567beea6b7ed44aaf0300000000000000000000000000000000000000000000000000000000000080090000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000a00000000000000000000000000000000000000000000000000000000000000000010001397d906d62832c455f701b9f81267a1687e52210986d4e943b3f440d7d000000000000000000000000000000000000000000000000000000000000800a0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000a00000000000000000000000000000000000000000000000000000000000000000010000f1d9ad80b5eb80ad14232d7438b1c09314dda76f296eca922da87dbfcc000000000000000000000000000000000000000000000000000000000000800b0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000a00000000000000000000000000000000000000000000000000000000000000000010009ad8e522bb120c5f52d2236035edeb0a4259b89c3429c5ece7d1dc50286000000000000000000000000000000000000000000000000000000000000800c0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000a00000000000000000000000000000000000000000000000000000000000000000010000e1066c916b985495ac9e671ae6930e373e9b5074499c7f6014c439a04a000000000000000000000000000000000000000000000000000000000000800e0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000a000000000000000000000000000000000000000000000000000000000000000000100005b3e7150f7f6daac7cc9a46522f5ad593f9a3e3f0573282b41f86acf16000000000000000000000000000000000000000000000000000000000000800f0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000a00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+  "upgradeAddress": "0x70EEdd750Ce140c6320a721D3e6Ff62c80e29DB8",
+  "protocolVersion": "12",
+  "diamondUpgradeProposalId": {
+    "type": "BigNumber",
+    "hex": "0x07"
+  },
+  "upgradeTimestamp": "1692620400",
+  "proposeTransparentUpgradeCalldata": "0x8043760a00000000000000000000000000000000000000000000000000000000000000400000000000000000000000000000000000000000000000000000000000000007000000000000000000000000000000000000000000000000000000000000006000000000000000000000000070eedd750ce140c6320a721d3e6ff62c80e29db800000000000000000000000000000000000000000000000000000000000016c0000000000000000000000000000000000000000000000000000000000000000a0000000000000000000000000000000000000000000000000000000000000140000000000000000000000000000000000000000000000000000000000000026000000000000000000000000000000000000000000000000000000000000003c000000000000000000000000000000000000000000000000000000000000005a000000000000000000000000000000000000000000000000000000000000007400000000000000000000000000000000000000000000000000000000000000be00000000000000000000000000000000000000000000000000000000000000d80000000000000000000000000000000000000000000000000000000000000128000000000000000000000000000000000000000000000000000000000000013e00000000000000000000000000000000000000000000000000000000000001500000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008000000000000000000000000000000000000000000000000000000000000000040c4dd81000000000000000000000000000000000000000000000000000000000ce9dcf16000000000000000000000000000000000000000000000000000000007739cbe700000000000000000000000000000000000000000000000000000000a9a2d18a00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008000000000000000000000000000000000000000000000000000000000000000066c0960f900000000000000000000000000000000000000000000000000000000b473318e00000000000000000000000000000000000000000000000000000000042901c700000000000000000000000000000000000000000000000000000000263b7f8e00000000000000000000000000000000000000000000000000000000e4948f4300000000000000000000000000000000000000000000000000000000eb672419000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000080000000000000000000000000000000000000000000000000000000000000000ae58bb63900000000000000000000000000000000000000000000000000000000ed6d06c00000000000000000000000000000000000000000000000000000000086cb9909000000000000000000000000000000000000000000000000000000000707ac0900000000000000000000000000000000000000000000000000000000f235757f000000000000000000000000000000000000000000000000000000001cc5d10300000000000000000000000000000000000000000000000000000000be6f11cf000000000000000000000000000000000000000000000000000000004623c91d000000000000000000000000000000000000000000000000000000005437988d000000000000000000000000000000000000000000000000000000000b508883000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000080000000000000000000000000000000000000000000000000000000000000000873fb92970000000000000000000000000000000000000000000000000000000036d4eb840000000000000000000000000000000000000000000000000000000027ae4c16000000000000000000000000000000000000000000000000000000000551448c000000000000000000000000000000000000000000000000000000008043760a00000000000000000000000000000000000000000000000000000000beda4b12000000000000000000000000000000000000000000000000000000001733894500000000000000000000000000000000000000000000000000000000587809c70000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000800000000000000000000000000000000000000000000000000000000000000020cdffacc60000000000000000000000000000000000000000000000000000000052ef6b2c00000000000000000000000000000000000000000000000000000000adfca15e000000000000000000000000000000000000000000000000000000007a0ed62700000000000000000000000000000000000000000000000000000000a7cd63b700000000000000000000000000000000000000000000000000000000fe10226d0000000000000000000000000000000000000000000000000000000079823c9a000000000000000000000000000000000000000000000000000000004fc07d7500000000000000000000000000000000000000000000000000000000d86970d800000000000000000000000000000000000000000000000000000000fd791f3c000000000000000000000000000000000000000000000000000000008665b15000000000000000000000000000000000000000000000000000000000631f4bac000000000000000000000000000000000000000000000000000000000ec6b0b7000000000000000000000000000000000000000000000000000000001b60e62600000000000000000000000000000000000000000000000000000000e39d3bff000000000000000000000000000000000000000000000000000000000ef240a000000000000000000000000000000000000000000000000000000000fe26699e000000000000000000000000000000000000000000000000000000003960738200000000000000000000000000000000000000000000000000000000af6a2dcd00000000000000000000000000000000000000000000000000000000a1954fc500000000000000000000000000000000000000000000000000000000a39980a00000000000000000000000000000000000000000000000000000000046657fe90000000000000000000000000000000000000000000000000000000018e3a941000000000000000000000000000000000000000000000000000000003db920ce0000000000000000000000000000000000000000000000000000000029b98c6700000000000000000000000000000000000000000000000000000000bd7c541200000000000000000000000000000000000000000000000000000000c3bbd2d700000000000000000000000000000000000000000000000000000000e81e0ba100000000000000000000000000000000000000000000000000000000facd743b000000000000000000000000000000000000000000000000000000009cd939e40000000000000000000000000000000000000000000000000000000056142d7a0000000000000000000000000000000000000000000000000000000074f4d30d00000000000000000000000000000000000000000000000000000000000000000000000000000000c6f7e57c6e1e20468d869fe33675524e243cd6a0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000080000000000000000000000000000000000000000000000000000000000000000873fb92970000000000000000000000000000000000000000000000000000000036d4eb840000000000000000000000000000000000000000000000000000000027ae4c16000000000000000000000000000000000000000000000000000000000551448c000000000000000000000000000000000000000000000000000000008043760a00000000000000000000000000000000000000000000000000000000beda4b12000000000000000000000000000000000000000000000000000000001733894500000000000000000000000000000000000000000000000000000000587809c7000000000000000000000000000000000000000000000000000000000000000000000000000000007444de636699f080ca1c033528d2bb3705b391ce0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000800000000000000000000000000000000000000000000000000000000000000023cdffacc60000000000000000000000000000000000000000000000000000000052ef6b2c00000000000000000000000000000000000000000000000000000000adfca15e000000000000000000000000000000000000000000000000000000007a0ed62700000000000000000000000000000000000000000000000000000000a7cd63b700000000000000000000000000000000000000000000000000000000fe10226d0000000000000000000000000000000000000000000000000000000079823c9a000000000000000000000000000000000000000000000000000000004fc07d7500000000000000000000000000000000000000000000000000000000d86970d800000000000000000000000000000000000000000000000000000000fd791f3c000000000000000000000000000000000000000000000000000000009d1b5a81000000000000000000000000000000000000000000000000000000007b30c8da000000000000000000000000000000000000000000000000000000008665b15000000000000000000000000000000000000000000000000000000000631f4bac000000000000000000000000000000000000000000000000000000000ec6b0b7000000000000000000000000000000000000000000000000000000001b60e62600000000000000000000000000000000000000000000000000000000e39d3bff0000000000000000000000000000000000000000000000000000000033ce93fe000000000000000000000000000000000000000000000000000000000ef240a000000000000000000000000000000000000000000000000000000000fe26699e000000000000000000000000000000000000000000000000000000003960738200000000000000000000000000000000000000000000000000000000af6a2dcd00000000000000000000000000000000000000000000000000000000a1954fc500000000000000000000000000000000000000000000000000000000a39980a00000000000000000000000000000000000000000000000000000000046657fe90000000000000000000000000000000000000000000000000000000018e3a941000000000000000000000000000000000000000000000000000000003db920ce0000000000000000000000000000000000000000000000000000000029b98c6700000000000000000000000000000000000000000000000000000000bd7c541200000000000000000000000000000000000000000000000000000000c3bbd2d700000000000000000000000000000000000000000000000000000000e81e0ba100000000000000000000000000000000000000000000000000000000facd743b000000000000000000000000000000000000000000000000000000009cd939e40000000000000000000000000000000000000000000000000000000056142d7a0000000000000000000000000000000000000000000000000000000074f4d30d000000000000000000000000000000000000000000000000000000000000000000000000000000005349e94435cc9cab9ffb40a492da46935052733a00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000008000000000000000000000000000000000000000000000000000000000000000066c0960f900000000000000000000000000000000000000000000000000000000b473318e00000000000000000000000000000000000000000000000000000000042901c700000000000000000000000000000000000000000000000000000000263b7f8e00000000000000000000000000000000000000000000000000000000e4948f4300000000000000000000000000000000000000000000000000000000eb67241900000000000000000000000000000000000000000000000000000000000000000000000000000000b54f822966fd4940b6fb465ac67075e5119094c300000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000008000000000000000000000000000000000000000000000000000000000000000040c4dd81000000000000000000000000000000000000000000000000000000000ce9dcf16000000000000000000000000000000000000000000000000000000007739cbe700000000000000000000000000000000000000000000000000000000a9a2d18a000000000000000000000000000000000000000000000000000000000000000000000000000000002e64926be35412f7710a3e097ba076740bf97cc00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000800000000000000000000000000000000000000000000000000000000000000005e58bb63900000000000000000000000000000000000000000000000000000000f235757f000000000000000000000000000000000000000000000000000000001cc5d10300000000000000000000000000000000000000000000000000000000be6f11cf000000000000000000000000000000000000000000000000000000004623c91d0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000010041ed824a0000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000001a00000000000000000000000000000000000000000000000000000000000000f80010007af2271352ac99f97670a7d6999ae63b53f4e9480a957091d8848a46c610100067d592a040e8914eda295f3521561d64b1a4c1b9e6dbd2933093102febf00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000fa00000000000000000000000000000000000000000000000000000000000000fc00000000000000000000000000000000000000000000000000000000064e35670000000000000000000000000000000000000000000000000000000000000000c000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000fe0000000000000000000000000000000000000000000000000000000000008007000000000000000000000000000000000000000000000000000000000000800600000000000000000000000000000000000000000000000000000000044aa2000000000000000000000000000000000000000000000000000000000000000320000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000c0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000002600000000000000000000000000000000000000000000000000000000000000d600000000000000000000000000000000000000000000000000000000000000d800000000000000000000000000000000000000000000000000000000000000da00000000000000000000000000000000000000000000000000000000000000dc00000000000000000000000000000000000000000000000000000000000000ac4e9f18c170000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000000c00000000000000000000000000000000000000000000000000000000000001800000000000000000000000000000000000000000000000000000000000000240000000000000000000000000000000000000000000000000000000000000030000000000000000000000000000000000000000000000000000000000000003c000000000000000000000000000000000000000000000000000000000000004800000000000000000000000000000000000000000000000000000000000000540000000000000000000000000000000000000000000000000000000000000060000000000000000000000000000000000000000000000000000000000000006c000000000000000000000000000000000000000000000000000000000000007800000000000000000000000000000000000000000000000000000000000000840000000000000000000000000000000000000000000000000000000000000090000000000000000000000000000000000000000000000000000000000000009c001000091af8506f97c5a2b2ff4edf06ba1bfd2ec2304056fb9987ce71797010500000000000000000000000000000000000000000000000000000000000080020000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000a000000000000000000000000000000000000000000000000000000000000000000100012f78c4022788ff0deb6c282f93df2b209d3c819999c3384498f1fec9b400000000000000000000000000000000000000000000000000000000000080030000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000a000000000000000000000000000000000000000000000000000000000000000000100008fa5c8a47d82ec783ad7cdefd382f5b031e7ef0754fcf242ccb4c65fd300000000000000000000000000000000000000000000000000000000000080040000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000a00000000000000000000000000000000000000000000000000000000000000000010000475561147799af163bef4d19262be10ed2d4a8977f793a195cd077e83d00000000000000000000000000000000000000000000000000000000000080050000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000a00000000000000000000000000000000000000000000000000000000000000000010005c17cd3ee506e5156f76afda69c905dfdc22578bec37609a1693bba4fdc00000000000000000000000000000000000000000000000000000000000080060000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000a000000000000000000000000000000000000000000000000000000000000000000100007562a15173ca081ddb179bb321500997ba6b43b15cf601cdf266af1cdb00000000000000000000000000000000000000000000000000000000000080080000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000a00000000000000000000000000000000000000000000000000000000000000000010000711288f63c4cd27ecd73df769b834eeda2645f6567beea6b7ed44aaf0300000000000000000000000000000000000000000000000000000000000080090000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000a00000000000000000000000000000000000000000000000000000000000000000010001397d906d62832c455f701b9f81267a1687e52210986d4e943b3f440d7d000000000000000000000000000000000000000000000000000000000000800a0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000a00000000000000000000000000000000000000000000000000000000000000000010000f1d9ad80b5eb80ad14232d7438b1c09314dda76f296eca922da87dbfcc000000000000000000000000000000000000000000000000000000000000800b0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000a00000000000000000000000000000000000000000000000000000000000000000010009ad8e522bb120c5f52d2236035edeb0a4259b89c3429c5ece7d1dc50286000000000000000000000000000000000000000000000000000000000000800c0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000a00000000000000000000000000000000000000000000000000000000000000000010000e1066c916b985495ac9e671ae6930e373e9b5074499c7f6014c439a04a000000000000000000000000000000000000000000000000000000000000800e0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000a000000000000000000000000000000000000000000000000000000000000000000100005b3e7150f7f6daac7cc9a46522f5ad593f9a3e3f0573282b41f86acf16000000000000000000000000000000000000000000000000000000000000800f0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000a0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+  "transparentUpgrade": {
+    "facetCuts": [
+      {
+        "facet": "0x0000000000000000000000000000000000000000",
+        "selectors": [
+          "0x0c4dd810",
+          "0xce9dcf16",
+          "0x7739cbe7",
+          "0xa9a2d18a"
+        ],
+        "action": 2,
+        "isFreezable": false
+      },
+      {
+        "facet": "0x0000000000000000000000000000000000000000",
+        "selectors": [
+          "0x6c0960f9",
+          "0xb473318e",
+          "0x042901c7",
+          "0x263b7f8e",
+          "0xe4948f43",
+          "0xeb672419"
+        ],
+        "action": 2,
+        "isFreezable": false
+      },
+      {
+        "facet": "0x0000000000000000000000000000000000000000",
+        "selectors": [
+          "0xe58bb639",
+          "0xed6d06c0",
+          "0x86cb9909",
+          "0x0707ac09",
+          "0xf235757f",
+          "0x1cc5d103",
+          "0xbe6f11cf",
+          "0x4623c91d",
+          "0x5437988d",
+          "0x0b508883"
+        ],
+        "action": 2,
+        "isFreezable": false
+      },
+      {
+        "facet": "0x0000000000000000000000000000000000000000",
+        "selectors": [
+          "0x73fb9297",
+          "0x36d4eb84",
+          "0x27ae4c16",
+          "0x0551448c",
+          "0x8043760a",
+          "0xbeda4b12",
+          "0x17338945",
+          "0x587809c7"
+        ],
+        "action": 2,
+        "isFreezable": false
+      },
+      {
+        "facet": "0x0000000000000000000000000000000000000000",
+        "selectors": [
+          "0xcdffacc6",
+          "0x52ef6b2c",
+          "0xadfca15e",
+          "0x7a0ed627",
+          "0xa7cd63b7",
+          "0xfe10226d",
+          "0x79823c9a",
+          "0x4fc07d75",
+          "0xd86970d8",
+          "0xfd791f3c",
+          "0x8665b150",
+          "0x631f4bac",
+          "0x0ec6b0b7",
+          "0x1b60e626",
+          "0xe39d3bff",
+          "0x0ef240a0",
+          "0xfe26699e",
+          "0x39607382",
+          "0xaf6a2dcd",
+          "0xa1954fc5",
+          "0xa39980a0",
+          "0x46657fe9",
+          "0x18e3a941",
+          "0x3db920ce",
+          "0x29b98c67",
+          "0xbd7c5412",
+          "0xc3bbd2d7",
+          "0xe81e0ba1",
+          "0xfacd743b",
+          "0x9cd939e4",
+          "0x56142d7a",
+          "0x74f4d30d"
+        ],
+        "action": 2,
+        "isFreezable": false
+      },
+      {
+        "facet": "0xc6f7e57C6e1e20468D869Fe33675524e243CD6a0",
+        "selectors": [
+          "0x73fb9297",
+          "0x36d4eb84",
+          "0x27ae4c16",
+          "0x0551448c",
+          "0x8043760a",
+          "0xbeda4b12",
+          "0x17338945",
+          "0x587809c7"
+        ],
+        "action": 0,
+        "isFreezable": false
+      },
+      {
+        "facet": "0x7444DE636699F080cA1C033528D2bB3705B391Ce",
+        "selectors": [
+          "0xcdffacc6",
+          "0x52ef6b2c",
+          "0xadfca15e",
+          "0x7a0ed627",
+          "0xa7cd63b7",
+          "0xfe10226d",
+          "0x79823c9a",
+          "0x4fc07d75",
+          "0xd86970d8",
+          "0xfd791f3c",
+          "0x9d1b5a81",
+          "0x7b30c8da",
+          "0x8665b150",
+          "0x631f4bac",
+          "0x0ec6b0b7",
+          "0x1b60e626",
+          "0xe39d3bff",
+          "0x33ce93fe",
+          "0x0ef240a0",
+          "0xfe26699e",
+          "0x39607382",
+          "0xaf6a2dcd",
+          "0xa1954fc5",
+          "0xa39980a0",
+          "0x46657fe9",
+          "0x18e3a941",
+          "0x3db920ce",
+          "0x29b98c67",
+          "0xbd7c5412",
+          "0xc3bbd2d7",
+          "0xe81e0ba1",
+          "0xfacd743b",
+          "0x9cd939e4",
+          "0x56142d7a",
+          "0x74f4d30d"
+        ],
+        "action": 0,
+        "isFreezable": false
+      },
+      {
+        "facet": "0x5349E94435Cc9Cab9FfB40A492DA46935052733A",
+        "selectors": [
+          "0x6c0960f9",
+          "0xb473318e",
+          "0x042901c7",
+          "0x263b7f8e",
+          "0xe4948f43",
+          "0xeb672419"
+        ],
+        "action": 0,
+        "isFreezable": true
+      },
+      {
+        "facet": "0xB54f822966FD4940b6fb465AC67075e5119094C3",
+        "selectors": [
+          "0x0c4dd810",
+          "0xce9dcf16",
+          "0x7739cbe7",
+          "0xa9a2d18a"
+        ],
+        "action": 0,
+        "isFreezable": true
+      },
+      {
+        "facet": "0x2E64926BE35412f7710A3E097Ba076740bF97CC0",
+        "selectors": [
+          "0xe58bb639",
+          "0xf235757f",
+          "0x1cc5d103",
+          "0xbe6f11cf",
+          "0x4623c91d"
+        ],
+        "action": 0,
+        "isFreezable": true
+      }
+    ],
+    "initAddress": "0x70EEdd750Ce140c6320a721D3e6Ff62c80e29DB8",
+    "initCalldata": "0x1ed824a0000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000001a00000000000000000000000000000000000000000000000000000000000000f80010007af2271352ac99f97670a7d6999ae63b53f4e9480a957091d8848a46c610100067d592a040e8914eda295f3521561d64b1a4c1b9e6dbd2933093102febf00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000fa00000000000000000000000000000000000000000000000000000000000000fc00000000000000000000000000000000000000000000000000000000064e35670000000000000000000000000000000000000000000000000000000000000000c000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000fe0000000000000000000000000000000000000000000000000000000000008007000000000000000000000000000000000000000000000000000000000000800600000000000000000000000000000000000000000000000000000000044aa2000000000000000000000000000000000000000000000000000000000000000320000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000c0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000002600000000000000000000000000000000000000000000000000000000000000d600000000000000000000000000000000000000000000000000000000000000d800000000000000000000000000000000000000000000000000000000000000da00000000000000000000000000000000000000000000000000000000000000dc00000000000000000000000000000000000000000000000000000000000000ac4e9f18c170000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000000c00000000000000000000000000000000000000000000000000000000000001800000000000000000000000000000000000000000000000000000000000000240000000000000000000000000000000000000000000000000000000000000030000000000000000000000000000000000000000000000000000000000000003c000000000000000000000000000000000000000000000000000000000000004800000000000000000000000000000000000000000000000000000000000000540000000000000000000000000000000000000000000000000000000000000060000000000000000000000000000000000000000000000000000000000000006c000000000000000000000000000000000000000000000000000000000000007800000000000000000000000000000000000000000000000000000000000000840000000000000000000000000000000000000000000000000000000000000090000000000000000000000000000000000000000000000000000000000000009c001000091af8506f97c5a2b2ff4edf06ba1bfd2ec2304056fb9987ce71797010500000000000000000000000000000000000000000000000000000000000080020000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000a000000000000000000000000000000000000000000000000000000000000000000100012f78c4022788ff0deb6c282f93df2b209d3c819999c3384498f1fec9b400000000000000000000000000000000000000000000000000000000000080030000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000a000000000000000000000000000000000000000000000000000000000000000000100008fa5c8a47d82ec783ad7cdefd382f5b031e7ef0754fcf242ccb4c65fd300000000000000000000000000000000000000000000000000000000000080040000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000a00000000000000000000000000000000000000000000000000000000000000000010000475561147799af163bef4d19262be10ed2d4a8977f793a195cd077e83d00000000000000000000000000000000000000000000000000000000000080050000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000a00000000000000000000000000000000000000000000000000000000000000000010005c17cd3ee506e5156f76afda69c905dfdc22578bec37609a1693bba4fdc00000000000000000000000000000000000000000000000000000000000080060000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000a000000000000000000000000000000000000000000000000000000000000000000100007562a15173ca081ddb179bb321500997ba6b43b15cf601cdf266af1cdb00000000000000000000000000000000000000000000000000000000000080080000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000a00000000000000000000000000000000000000000000000000000000000000000010000711288f63c4cd27ecd73df769b834eeda2645f6567beea6b7ed44aaf0300000000000000000000000000000000000000000000000000000000000080090000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000a00000000000000000000000000000000000000000000000000000000000000000010001397d906d62832c455f701b9f81267a1687e52210986d4e943b3f440d7d000000000000000000000000000000000000000000000000000000000000800a0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000a00000000000000000000000000000000000000000000000000000000000000000010000f1d9ad80b5eb80ad14232d7438b1c09314dda76f296eca922da87dbfcc000000000000000000000000000000000000000000000000000000000000800b0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000a00000000000000000000000000000000000000000000000000000000000000000010009ad8e522bb120c5f52d2236035edeb0a4259b89c3429c5ece7d1dc50286000000000000000000000000000000000000000000000000000000000000800c0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000a00000000000000000000000000000000000000000000000000000000000000000010000e1066c916b985495ac9e671ae6930e373e9b5074499c7f6014c439a04a000000000000000000000000000000000000000000000000000000000000800e0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000a000000000000000000000000000000000000000000000000000000000000000000100005b3e7150f7f6daac7cc9a46522f5ad593f9a3e3f0573282b41f86acf16000000000000000000000000000000000000000000000000000000000000800f0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000a00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000"
+  },
+  "executeUpgradeCalldata": "0x36d4eb8400000000000000000000000000000000000000000000000000000000000000400000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000006000000000000000000000000070eedd750ce140c6320a721d3e6ff62c80e29db800000000000000000000000000000000000000000000000000000000000016c0000000000000000000000000000000000000000000000000000000000000000a0000000000000000000000000000000000000000000000000000000000000140000000000000000000000000000000000000000000000000000000000000026000000000000000000000000000000000000000000000000000000000000003c000000000000000000000000000000000000000000000000000000000000005a000000000000000000000000000000000000000000000000000000000000007400000000000000000000000000000000000000000000000000000000000000be00000000000000000000000000000000000000000000000000000000000000d80000000000000000000000000000000000000000000000000000000000000128000000000000000000000000000000000000000000000000000000000000013e00000000000000000000000000000000000000000000000000000000000001500000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008000000000000000000000000000000000000000000000000000000000000000040c4dd81000000000000000000000000000000000000000000000000000000000ce9dcf16000000000000000000000000000000000000000000000000000000007739cbe700000000000000000000000000000000000000000000000000000000a9a2d18a00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008000000000000000000000000000000000000000000000000000000000000000066c0960f900000000000000000000000000000000000000000000000000000000b473318e00000000000000000000000000000000000000000000000000000000042901c700000000000000000000000000000000000000000000000000000000263b7f8e00000000000000000000000000000000000000000000000000000000e4948f4300000000000000000000000000000000000000000000000000000000eb672419000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000080000000000000000000000000000000000000000000000000000000000000000ae58bb63900000000000000000000000000000000000000000000000000000000ed6d06c00000000000000000000000000000000000000000000000000000000086cb9909000000000000000000000000000000000000000000000000000000000707ac0900000000000000000000000000000000000000000000000000000000f235757f000000000000000000000000000000000000000000000000000000001cc5d10300000000000000000000000000000000000000000000000000000000be6f11cf000000000000000000000000000000000000000000000000000000004623c91d000000000000000000000000000000000000000000000000000000005437988d000000000000000000000000000000000000000000000000000000000b508883000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000080000000000000000000000000000000000000000000000000000000000000000873fb92970000000000000000000000000000000000000000000000000000000036d4eb840000000000000000000000000000000000000000000000000000000027ae4c16000000000000000000000000000000000000000000000000000000000551448c000000000000000000000000000000000000000000000000000000008043760a00000000000000000000000000000000000000000000000000000000beda4b12000000000000000000000000000000000000000000000000000000001733894500000000000000000000000000000000000000000000000000000000587809c70000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000800000000000000000000000000000000000000000000000000000000000000020cdffacc60000000000000000000000000000000000000000000000000000000052ef6b2c00000000000000000000000000000000000000000000000000000000adfca15e000000000000000000000000000000000000000000000000000000007a0ed62700000000000000000000000000000000000000000000000000000000a7cd63b700000000000000000000000000000000000000000000000000000000fe10226d0000000000000000000000000000000000000000000000000000000079823c9a000000000000000000000000000000000000000000000000000000004fc07d7500000000000000000000000000000000000000000000000000000000d86970d800000000000000000000000000000000000000000000000000000000fd791f3c000000000000000000000000000000000000000000000000000000008665b15000000000000000000000000000000000000000000000000000000000631f4bac000000000000000000000000000000000000000000000000000000000ec6b0b7000000000000000000000000000000000000000000000000000000001b60e62600000000000000000000000000000000000000000000000000000000e39d3bff000000000000000000000000000000000000000000000000000000000ef240a000000000000000000000000000000000000000000000000000000000fe26699e000000000000000000000000000000000000000000000000000000003960738200000000000000000000000000000000000000000000000000000000af6a2dcd00000000000000000000000000000000000000000000000000000000a1954fc500000000000000000000000000000000000000000000000000000000a39980a00000000000000000000000000000000000000000000000000000000046657fe90000000000000000000000000000000000000000000000000000000018e3a941000000000000000000000000000000000000000000000000000000003db920ce0000000000000000000000000000000000000000000000000000000029b98c6700000000000000000000000000000000000000000000000000000000bd7c541200000000000000000000000000000000000000000000000000000000c3bbd2d700000000000000000000000000000000000000000000000000000000e81e0ba100000000000000000000000000000000000000000000000000000000facd743b000000000000000000000000000000000000000000000000000000009cd939e40000000000000000000000000000000000000000000000000000000056142d7a0000000000000000000000000000000000000000000000000000000074f4d30d00000000000000000000000000000000000000000000000000000000000000000000000000000000c6f7e57c6e1e20468d869fe33675524e243cd6a0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000080000000000000000000000000000000000000000000000000000000000000000873fb92970000000000000000000000000000000000000000000000000000000036d4eb840000000000000000000000000000000000000000000000000000000027ae4c16000000000000000000000000000000000000000000000000000000000551448c000000000000000000000000000000000000000000000000000000008043760a00000000000000000000000000000000000000000000000000000000beda4b12000000000000000000000000000000000000000000000000000000001733894500000000000000000000000000000000000000000000000000000000587809c7000000000000000000000000000000000000000000000000000000000000000000000000000000007444de636699f080ca1c033528d2bb3705b391ce0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000800000000000000000000000000000000000000000000000000000000000000023cdffacc60000000000000000000000000000000000000000000000000000000052ef6b2c00000000000000000000000000000000000000000000000000000000adfca15e000000000000000000000000000000000000000000000000000000007a0ed62700000000000000000000000000000000000000000000000000000000a7cd63b700000000000000000000000000000000000000000000000000000000fe10226d0000000000000000000000000000000000000000000000000000000079823c9a000000000000000000000000000000000000000000000000000000004fc07d7500000000000000000000000000000000000000000000000000000000d86970d800000000000000000000000000000000000000000000000000000000fd791f3c000000000000000000000000000000000000000000000000000000009d1b5a81000000000000000000000000000000000000000000000000000000007b30c8da000000000000000000000000000000000000000000000000000000008665b15000000000000000000000000000000000000000000000000000000000631f4bac000000000000000000000000000000000000000000000000000000000ec6b0b7000000000000000000000000000000000000000000000000000000001b60e62600000000000000000000000000000000000000000000000000000000e39d3bff0000000000000000000000000000000000000000000000000000000033ce93fe000000000000000000000000000000000000000000000000000000000ef240a000000000000000000000000000000000000000000000000000000000fe26699e000000000000000000000000000000000000000000000000000000003960738200000000000000000000000000000000000000000000000000000000af6a2dcd00000000000000000000000000000000000000000000000000000000a1954fc500000000000000000000000000000000000000000000000000000000a39980a00000000000000000000000000000000000000000000000000000000046657fe90000000000000000000000000000000000000000000000000000000018e3a941000000000000000000000000000000000000000000000000000000003db920ce0000000000000000000000000000000000000000000000000000000029b98c6700000000000000000000000000000000000000000000000000000000bd7c541200000000000000000000000000000000000000000000000000000000c3bbd2d700000000000000000000000000000000000000000000000000000000e81e0ba100000000000000000000000000000000000000000000000000000000facd743b000000000000000000000000000000000000000000000000000000009cd939e40000000000000000000000000000000000000000000000000000000056142d7a0000000000000000000000000000000000000000000000000000000074f4d30d000000000000000000000000000000000000000000000000000000000000000000000000000000005349e94435cc9cab9ffb40a492da46935052733a00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000008000000000000000000000000000000000000000000000000000000000000000066c0960f900000000000000000000000000000000000000000000000000000000b473318e00000000000000000000000000000000000000000000000000000000042901c700000000000000000000000000000000000000000000000000000000263b7f8e00000000000000000000000000000000000000000000000000000000e4948f4300000000000000000000000000000000000000000000000000000000eb67241900000000000000000000000000000000000000000000000000000000000000000000000000000000b54f822966fd4940b6fb465ac67075e5119094c300000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000008000000000000000000000000000000000000000000000000000000000000000040c4dd81000000000000000000000000000000000000000000000000000000000ce9dcf16000000000000000000000000000000000000000000000000000000007739cbe700000000000000000000000000000000000000000000000000000000a9a2d18a000000000000000000000000000000000000000000000000000000000000000000000000000000002e64926be35412f7710a3e097ba076740bf97cc00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000800000000000000000000000000000000000000000000000000000000000000005e58bb63900000000000000000000000000000000000000000000000000000000f235757f000000000000000000000000000000000000000000000000000000001cc5d10300000000000000000000000000000000000000000000000000000000be6f11cf000000000000000000000000000000000000000000000000000000004623c91d0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000010041ed824a0000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000001a00000000000000000000000000000000000000000000000000000000000000f80010007af2271352ac99f97670a7d6999ae63b53f4e9480a957091d8848a46c610100067d592a040e8914eda295f3521561d64b1a4c1b9e6dbd2933093102febf00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000fa00000000000000000000000000000000000000000000000000000000000000fc00000000000000000000000000000000000000000000000000000000064e35670000000000000000000000000000000000000000000000000000000000000000c000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000fe0000000000000000000000000000000000000000000000000000000000008007000000000000000000000000000000000000000000000000000000000000800600000000000000000000000000000000000000000000000000000000044aa2000000000000000000000000000000000000000000000000000000000000000320000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000c0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000002600000000000000000000000000000000000000000000000000000000000000d600000000000000000000000000000000000000000000000000000000000000d800000000000000000000000000000000000000000000000000000000000000da00000000000000000000000000000000000000000000000000000000000000dc00000000000000000000000000000000000000000000000000000000000000ac4e9f18c170000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000000c00000000000000000000000000000000000000000000000000000000000001800000000000000000000000000000000000000000000000000000000000000240000000000000000000000000000000000000000000000000000000000000030000000000000000000000000000000000000000000000000000000000000003c000000000000000000000000000000000000000000000000000000000000004800000000000000000000000000000000000000000000000000000000000000540000000000000000000000000000000000000000000000000000000000000060000000000000000000000000000000000000000000000000000000000000006c000000000000000000000000000000000000000000000000000000000000007800000000000000000000000000000000000000000000000000000000000000840000000000000000000000000000000000000000000000000000000000000090000000000000000000000000000000000000000000000000000000000000009c001000091af8506f97c5a2b2ff4edf06ba1bfd2ec2304056fb9987ce71797010500000000000000000000000000000000000000000000000000000000000080020000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000a000000000000000000000000000000000000000000000000000000000000000000100012f78c4022788ff0deb6c282f93df2b209d3c819999c3384498f1fec9b400000000000000000000000000000000000000000000000000000000000080030000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000a000000000000000000000000000000000000000000000000000000000000000000100008fa5c8a47d82ec783ad7cdefd382f5b031e7ef0754fcf242ccb4c65fd300000000000000000000000000000000000000000000000000000000000080040000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000a00000000000000000000000000000000000000000000000000000000000000000010000475561147799af163bef4d19262be10ed2d4a8977f793a195cd077e83d00000000000000000000000000000000000000000000000000000000000080050000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000a00000000000000000000000000000000000000000000000000000000000000000010005c17cd3ee506e5156f76afda69c905dfdc22578bec37609a1693bba4fdc00000000000000000000000000000000000000000000000000000000000080060000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000a000000000000000000000000000000000000000000000000000000000000000000100007562a15173ca081ddb179bb321500997ba6b43b15cf601cdf266af1cdb00000000000000000000000000000000000000000000000000000000000080080000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000a00000000000000000000000000000000000000000000000000000000000000000010000711288f63c4cd27ecd73df769b834eeda2645f6567beea6b7ed44aaf0300000000000000000000000000000000000000000000000000000000000080090000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000a00000000000000000000000000000000000000000000000000000000000000000010001397d906d62832c455f701b9f81267a1687e52210986d4e943b3f440d7d000000000000000000000000000000000000000000000000000000000000800a0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000a00000000000000000000000000000000000000000000000000000000000000000010000f1d9ad80b5eb80ad14232d7438b1c09314dda76f296eca922da87dbfcc000000000000000000000000000000000000000000000000000000000000800b0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000a00000000000000000000000000000000000000000000000000000000000000000010009ad8e522bb120c5f52d2236035edeb0a4259b89c3429c5ece7d1dc50286000000000000000000000000000000000000000000000000000000000000800c0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000a00000000000000000000000000000000000000000000000000000000000000000010000e1066c916b985495ac9e671ae6930e373e9b5074499c7f6014c439a04a000000000000000000000000000000000000000000000000000000000000800e0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000a000000000000000000000000000000000000000000000000000000000000000000100005b3e7150f7f6daac7cc9a46522f5ad593f9a3e3f0573282b41f86acf16000000000000000000000000000000000000000000000000000000000000800f0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000a0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000"
+}
\ No newline at end of file
diff --git a/etc/upgrades/1693318788-virtual-block-timestamp/common.json b/etc/upgrades/1693318788-virtual-block-timestamp/common.json
new file mode 100644
index 000000000000..c2da970debeb
--- /dev/null
+++ b/etc/upgrades/1693318788-virtual-block-timestamp/common.json
@@ -0,0 +1,5 @@
+{
+  "name": "virtual-block-timestamp",
+  "creationTimestamp": 1693318788,
+  "protocolVersion": "13"
+}
\ No newline at end of file
diff --git a/etc/upgrades/1693318788-virtual-block-timestamp/stage2/facetCuts.json b/etc/upgrades/1693318788-virtual-block-timestamp/stage2/facetCuts.json
new file mode 100644
index 000000000000..4dca4e604b2d
--- /dev/null
+++ b/etc/upgrades/1693318788-virtual-block-timestamp/stage2/facetCuts.json
@@ -0,0 +1,188 @@
+[
+  {
+    "facet": "0x0000000000000000000000000000000000000000",
+    "selectors": [
+      "0x73fb9297",
+      "0x36d4eb84",
+      "0x27ae4c16",
+      "0x0551448c",
+      "0x8043760a",
+      "0xbeda4b12",
+      "0x17338945",
+      "0x587809c7"
+    ],
+    "action": 2,
+    "isFreezable": false
+  },
+  {
+    "facet": "0x0000000000000000000000000000000000000000",
+    "selectors": [
+      "0xcdffacc6",
+      "0x52ef6b2c",
+      "0xadfca15e",
+      "0x7a0ed627",
+      "0xa7cd63b7",
+      "0xfe10226d",
+      "0x79823c9a",
+      "0x4fc07d75",
+      "0xd86970d8",
+      "0xfd791f3c",
+      "0x9d1b5a81",
+      "0x7b30c8da",
+      "0x8665b150",
+      "0x631f4bac",
+      "0x0ec6b0b7",
+      "0x1b60e626",
+      "0xe39d3bff",
+      "0x33ce93fe",
+      "0x0ef240a0",
+      "0xfe26699e",
+      "0x39607382",
+      "0xaf6a2dcd",
+      "0xa1954fc5",
+      "0xa39980a0",
+      "0x46657fe9",
+      "0x18e3a941",
+      "0x3db920ce",
+      "0x29b98c67",
+      "0xbd7c5412",
+      "0xc3bbd2d7",
+      "0xe81e0ba1",
+      "0xfacd743b",
+      "0x9cd939e4",
+      "0x56142d7a",
+      "0x74f4d30d"
+    ],
+    "action": 2,
+    "isFreezable": false
+  },
+  {
+    "facet": "0x0000000000000000000000000000000000000000",
+    "selectors": [
+      "0x6c0960f9",
+      "0xb473318e",
+      "0x042901c7",
+      "0x263b7f8e",
+      "0xe4948f43",
+      "0xeb672419"
+    ],
+    "action": 2,
+    "isFreezable": false
+  },
+  {
+    "facet": "0x0000000000000000000000000000000000000000",
+    "selectors": [
+      "0x0c4dd810",
+      "0xce9dcf16",
+      "0x7739cbe7",
+      "0xa9a2d18a"
+    ],
+    "action": 2,
+    "isFreezable": false
+  },
+  {
+    "facet": "0x0000000000000000000000000000000000000000",
+    "selectors": [
+      "0xe58bb639",
+      "0xf235757f",
+      "0x1cc5d103",
+      "0xbe6f11cf",
+      "0x4623c91d"
+    ],
+    "action": 2,
+    "isFreezable": false
+  },
+  {
+    "facet": "0xdC7c3D03845EfE2c4a9E758A70a68BA6bba9FaC4",
+    "selectors": [
+      "0x73fb9297",
+      "0x36d4eb84",
+      "0x27ae4c16",
+      "0x0551448c",
+      "0x8043760a",
+      "0xbeda4b12",
+      "0x17338945",
+      "0x587809c7"
+    ],
+    "action": 0,
+    "isFreezable": false
+  },
+  {
+    "facet": "0x7444DE636699F080cA1C033528D2bB3705B391Ce",
+    "selectors": [
+      "0xcdffacc6",
+      "0x52ef6b2c",
+      "0xadfca15e",
+      "0x7a0ed627",
+      "0xa7cd63b7",
+      "0xfe10226d",
+      "0x79823c9a",
+      "0x4fc07d75",
+      "0xd86970d8",
+      "0xfd791f3c",
+      "0x9d1b5a81",
+      "0x7b30c8da",
+      "0x8665b150",
+      "0x631f4bac",
+      "0x0ec6b0b7",
+      "0x1b60e626",
+      "0xe39d3bff",
+      "0x33ce93fe",
+      "0x0ef240a0",
+      "0xfe26699e",
+      "0x39607382",
+      "0xaf6a2dcd",
+      "0xa1954fc5",
+      "0xa39980a0",
+      "0x46657fe9",
+      "0x18e3a941",
+      "0x3db920ce",
+      "0x29b98c67",
+      "0xbd7c5412",
+      "0xc3bbd2d7",
+      "0xe81e0ba1",
+      "0xfacd743b",
+      "0x9cd939e4",
+      "0x56142d7a",
+      "0x74f4d30d"
+    ],
+    "action": 0,
+    "isFreezable": false
+  },
+  {
+    "facet": "0x0aE41F9fc8A83FBC6062bA956224AB86fA6D1507",
+    "selectors": [
+      "0x6c0960f9",
+      "0xb473318e",
+      "0x042901c7",
+      "0x263b7f8e",
+      "0xe4948f43",
+      "0xeb672419"
+    ],
+    "action": 0,
+    "isFreezable": true
+  },
+  {
+    "facet": "0x69b8cdA4c8E66A0b51Fc82834458e087039dB2Ab",
+    "selectors": [
+      "0x0c4dd810",
+      "0xce9dcf16",
+      "0x7739cbe7",
+      "0xa9a2d18a"
+    ],
+    "action": 0,
+    "isFreezable": true
+  },
+  {
+    "facet": "0x2E64926BE35412f7710A3E097Ba076740bF97CC0",
+    "selectors": [
+      "0xe58bb639",
+      "0xf235757f",
+      "0x1cc5d103",
+      "0xbe6f11cf",
+      "0x4623c91d"
+    ],
+    "action": 0,
+    "isFreezable": true
+  }
+]
\ No newline at end of file
diff --git a/etc/upgrades/1693318788-virtual-block-timestamp/stage2/facets.json b/etc/upgrades/1693318788-virtual-block-timestamp/stage2/facets.json
new file mode 100644
index 000000000000..8825c24c5821
--- /dev/null
+++ b/etc/upgrades/1693318788-virtual-block-timestamp/stage2/facets.json
@@ -0,0 +1,22 @@
+{
+  "ExecutorFacet": {
+    "address": "0x69b8cdA4c8E66A0b51Fc82834458e087039dB2Ab",
+    "txHash": "0x0000000000000000000000000000000000000000000000000000000000000000"
+  },
+  "GovernanceFacet": {
+    "address": "0x2E64926BE35412f7710A3E097Ba076740bF97CC0",
+    "txHash": "0x0000000000000000000000000000000000000000000000000000000000000000"
+  },
+  "DiamondCutFacet": {
+    "address": "0xdC7c3D03845EfE2c4a9E758A70a68BA6bba9FaC4",
+    "txHash": "0x0000000000000000000000000000000000000000000000000000000000000000"
+  },
+  "GettersFacet": {
+    "address": "0x7444DE636699F080cA1C033528D2bB3705B391Ce",
+    "txHash": "0x0000000000000000000000000000000000000000000000000000000000000000"
+  },
+  "MailboxFacet": {
+    "address": "0x0aE41F9fc8A83FBC6062bA956224AB86fA6D1507",
+    "txHash": "0x670ec0ed30ecb0950c54321bc06ad9d98cd063eef282d17253446f248978691f"
+  }
+}
\ No newline at end of file
diff --git a/etc/upgrades/1693318788-virtual-block-timestamp/stage2/l2Upgrade.json b/etc/upgrades/1693318788-virtual-block-timestamp/stage2/l2Upgrade.json
new file mode 100644
index 000000000000..33bc8587bbbe
--- /dev/null
+++ b/etc/upgrades/1693318788-virtual-block-timestamp/stage2/l2Upgrade.json
@@ -0,0 +1,211 @@
+{
+  "systemContracts": [
+    {
+      "name": "AccountCodeStorage",
+      "bytecodeHashes": [
+        "0x010000911c610c6e91d050e608ac4f5db8b08c33bb032a57f70899cdd250a75e"
+      ],
+      "address": "0x0000000000000000000000000000000000008002"
+    },
+    {
+      "name": "NonceHolder",
+      "bytecodeHashes": [
+        "0x0100012f42627ab0dd09d78d8a25f459e3b3caf2126668fdfc19887eb5cbf4de"
+      ],
+      "address": "0x0000000000000000000000000000000000008003"
+    },
+    {
+      "name": "KnownCodesStorage",
+      "bytecodeHashes": [
+        "0x0100008fd05a39ae3ccc0c081732b2c09b783810773a66d6429cfb03d813a692"
+      ],
+      "address": "0x0000000000000000000000000000000000008004"
+    },
+    {
+      "name": "ImmutableSimulator",
+      "bytecodeHashes": [
+        "0x010000475ebeaf64663ebad3ab3fd14b6e985f576c816a66f84bda5a18253107"
+      ],
+      "address": "0x0000000000000000000000000000000000008005"
+    },
+    {
+      "name": "ContractDeployer",
+      "bytecodeHashes": [
+        "0x010005c1731dded081c794319523b82102fd09237011e23e0dda219b1a814799"
+      ],
+      "address": "0x0000000000000000000000000000000000008006"
+    },
+    {
+      "name": "L1Messenger",
+      "bytecodeHashes": [
+        "0x01000075efc5d3c37f1861e7c9f7f12c5c71f7b98c8e96bc1ae750441942911a"
+      ],
+      "address": "0x0000000000000000000000000000000000008008"
+    },
+    {
+      "name": "MsgValueSimulator",
+      "bytecodeHashes": [
+        "0x01000071fb47c4855b3cee15acfc19af66272afb61ae2196cdf8f0af81316c22"
+      ],
+      "address": "0x0000000000000000000000000000000000008009"
+    },
+    {
+      "name": "L2EthToken",
+      "bytecodeHashes": [
+        "0x01000139d95a414e7910bb755fecc60531a8c7ba6cc49c2fbd763df8541e4fae"
+      ],
+      "address": "0x000000000000000000000000000000000000800a"
+    },
+    {
+      "name": "SystemContext",
+      "bytecodeHashes": [
+        "0x0100021f8bc6a6311dc169f267fafb32fa14724539b5488a9c62788b158e8fcd"
+      ],
+      "address": "0x000000000000000000000000000000000000800b"
+    },
+    {
+      "name": "BootloaderUtilities",
+      "bytecodeHashes": [
+        "0x010009adf7ebf8227ee5d057438bf502d132ed4c7017255f16f691286f3dd7b3"
+      ],
+      "address": "0x000000000000000000000000000000000000800c"
+    },
+    {
+      "name": "BytecodeCompressor",
+      "bytecodeHashes": [
+        "0x010000e1073ab7b4226bb86ca2746fbf1ecb305e23c61240b900c4e0ea161a99"
+      ],
+      "address": "0x000000000000000000000000000000000000800e"
+    },
+    {
+      "name": "ComplexUpgrader",
+      "bytecodeHashes": [
+        "0x0100005bc7e5e9f6718a7a59ba32849b08a12d957bcf517cb6ba68faf03983ba"
+      ],
+      "address": "0x000000000000000000000000000000000000800f"
+    }
+  ],
+  "defaultAA": {
+    "name": "DefaultAccount",
+    "bytecodeHashes": [
+      "0x0100067d16a5485875b4249040bf421f53e869337fe118ec747cf40a4c777e5f"
+    ]
+  },
+  "bootloader": {
+    "name": "Bootloader",
+    "bytecodeHashes": [
+      "0x0100089b29c64a520d9033da5a4f80c6f74132cbd44142c6afc5913c26f0487d"
+    ]
+  },
+  "forcedDeployments": [
+    {
+      "bytecodeHash": "0x010000911c610c6e91d050e608ac4f5db8b08c33bb032a57f70899cdd250a75e",
+      "newAddress": "0x0000000000000000000000000000000000008002",
+      "value": 0,
+      "input": "0x",
+      "callConstructor": false
+    },
+    {
+      "bytecodeHash": "0x0100012f42627ab0dd09d78d8a25f459e3b3caf2126668fdfc19887eb5cbf4de",
+      "newAddress": "0x0000000000000000000000000000000000008003",
+      "value": 0,
+      "input": "0x",
+      "callConstructor": false
+    },
+    {
+      "bytecodeHash": "0x0100008fd05a39ae3ccc0c081732b2c09b783810773a66d6429cfb03d813a692",
+      "newAddress": "0x0000000000000000000000000000000000008004",
+      "value": 0,
+      "input": "0x",
+      "callConstructor": false
+    },
+    {
+      "bytecodeHash": "0x010000475ebeaf64663ebad3ab3fd14b6e985f576c816a66f84bda5a18253107",
+      "newAddress": "0x0000000000000000000000000000000000008005",
+      "value": 0,
+      "input": "0x",
+      "callConstructor": false
+    },
+    {
+      "bytecodeHash": "0x010005c1731dded081c794319523b82102fd09237011e23e0dda219b1a814799",
+      "newAddress": "0x0000000000000000000000000000000000008006",
+      "value": 0,
+      "input": "0x",
+      "callConstructor": false
+    },
+    {
+      "bytecodeHash": "0x01000075efc5d3c37f1861e7c9f7f12c5c71f7b98c8e96bc1ae750441942911a",
+      "newAddress": "0x0000000000000000000000000000000000008008",
+      "value": 0,
+      "input": "0x",
+      "callConstructor": false
+    },
+    {
+      "bytecodeHash": "0x01000071fb47c4855b3cee15acfc19af66272afb61ae2196cdf8f0af81316c22",
+      "newAddress": "0x0000000000000000000000000000000000008009",
+      "value": 0,
+      "input": "0x",
+      "callConstructor": false
+    },
+    {
+      "bytecodeHash": "0x01000139d95a414e7910bb755fecc60531a8c7ba6cc49c2fbd763df8541e4fae",
+      "newAddress": "0x000000000000000000000000000000000000800a",
+      "value": 0,
+      "input": "0x",
+      "callConstructor": false
+    },
+    {
+      "bytecodeHash": "0x0100021f8bc6a6311dc169f267fafb32fa14724539b5488a9c62788b158e8fcd",
+      "newAddress": "0x000000000000000000000000000000000000800b",
+      "value": 0,
+      "input": "0x",
+      "callConstructor": false
+    },
+    {
+      "bytecodeHash": "0x010009adf7ebf8227ee5d057438bf502d132ed4c7017255f16f691286f3dd7b3",
+      "newAddress": "0x000000000000000000000000000000000000800c",
+      "value": 0,
+      "input": "0x",
+      "callConstructor": false
+    },
+    {
+      "bytecodeHash": "0x010000e1073ab7b4226bb86ca2746fbf1ecb305e23c61240b900c4e0ea161a99",
+      "newAddress": "0x000000000000000000000000000000000000800e",
+      "value": 0,
+      "input": "0x",
+      "callConstructor": false
+    },
+    {
+      "bytecodeHash": "0x0100005bc7e5e9f6718a7a59ba32849b08a12d957bcf517cb6ba68faf03983ba",
+      "newAddress": "0x000000000000000000000000000000000000800f",
+      "value": 0,
+      "input": "0x",
+      "callConstructor": false
+    }
+  ],
+  "forcedDeploymentCalldata": "0xe9f18c170000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000000c00000000000000000000000000000000000000000000000000000000000001800000000000000000000000000000000000000000000000000000000000000240000000000000000000000000000000000000000000000000000000000000030000000000000000000000000000000000000000000000000000000000000003c000000000000000000000000000000000000000000000000000000000000004800000000000000000000000000000000000000000000000000000000000000540000000000000000000000000000000000000000000000000000000000000060000000000000000000000000000000000000000000000000000000000000006c000000000000000000000000000000000000000000000000000000000000007800000000000000000000000000000000000000000000000000000000000000840000000000000000000000000000000000000000000000000000000000000090000000000000000000000000000000000000000000000000000000000000009c0010000911c610c6e91d050e608ac4f5db8b08c33bb032a57f70899cdd250a75e00000000000000000000000000000000000000000000000000000000000080020000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000a000000000000000000000000000000000000000000000000000000000000000000100012f42627ab0dd09d78d8a25f459e3b3caf2126668fdfc19887eb5cbf4de00000000000000000000000000000000000000000000000000000000000080030000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000a000000000000000000000000000000000000000000000000000000000000000000100008fd05a39ae3ccc0c081732b2c09b783810773a66d6429cfb03d813a69200000000000000000000000000000000000000000000000000000000000080040000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000a00000000000000000000000000000000000000000000000000000000000000000010000475ebeaf64663ebad3ab3fd14b6e985f576c816a66f84bda5a1825310700000000000000000000000000000000000000000000000000000000000080050000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000a00000000000000000000000000000000000000000000000000000000000000000010005c1731dded081c794319523b82102fd09237011e23e0dda219b1a81479900000000000000000000000000000000000000000000000000000000000080060000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000a0000000000000000000000000000000000000000000000000000000000000000001000075efc5d3c37f1861e7c9f7f12c5c71f7b98c8e96bc1ae750441942911a00000000000000000000000000000000000000000000000000000000000080080000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000a0000000000000000000000000000000000000000000000000000000000000000001000071fb47c4855b3cee15acfc19af66272afb61ae2196cdf8f0af81316c2200000000000000000000000000000000000000000000000000000000000080090000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000a0000000000000000000000000000000000000000000000000000000000000000001000139d95a414e7910bb755fecc60531a8c7ba6cc49c2fbd763df8541e4fae000000000000000000000000000000000000000000000000000000000000800a0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000a000000000000000000000000000000000000000000000000000000000000000000100021f8bc6a6311dc169f267fafb32fa14724539b5488a9c62788b158e8fcd000000000000000000000000000000000000000000000000000000000000800b0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000a00000000000000000000000000000000000000000000000000000000000000000010009adf7ebf8227ee5d057438bf502d132ed4c7017255f16f691286f3dd7b3000000000000000000000000000000000000000000000000000000000000800c0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000a00000000000000000000000000000000000000000000000000000000000000000010000e1073ab7b4226bb86ca2746fbf1ecb305e23c61240b900c4e0ea161a99000000000000000000000000000000000000000000000000000000000000800e0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000a000000000000000000000000000000000000000000000000000000000000000000100005bc7e5e9f6718a7a59ba32849b08a12d957bcf517cb6ba68faf03983ba000000000000000000000000000000000000000000000000000000000000800f0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000a00000000000000000000000000000000000000000000000000000000000000000",
+  "calldata": "0xe9f18c170000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000000c00000000000000000000000000000000000000000000000000000000000001800000000000000000000000000000000000000000000000000000000000000240000000000000000000000000000000000000000000000000000000000000030000000000000000000000000000000000000000000000000000000000000003c000000000000000000000000000000000000000000000000000000000000004800000000000000000000000000000000000000000000000000000000000000540000000000000000000000000000000000000000000000000000000000000060000000000000000000000000000000000000000000000000000000000000006c000000000000000000000000000000000000000000000000000000000000007800000000000000000000000000000000000000000000000000000000000000840000000000000000000000000000000000000000000000000000000000000090000000000000000000000000000000000000000000000000000000000000009c0010000911c610c6e91d050e608ac4f5db8b08c33bb032a57f70899cdd250a75e00000000000000000000000000000000000000000000000000000000000080020000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000a000000000000000000000000000000000000000000000000000000000000000000100012f42627ab0dd09d78d8a25f459e3b3caf2126668fdfc19887eb5cbf4de00000000000000000000000000000000000000000000000000000000000080030000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000a000000000000000000000000000000000000000000000000000000000000000000100008fd05a39ae3ccc0c081732b2c09b783810773a66d6429cfb03d813a69200000000000000000000000000000000000000000000000000000000000080040000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000a00000000000000000000000000000000000000000000000000000000000000000010000475ebeaf64663ebad3ab3fd14b6e985f576c816a66f84bda5a1825310700000000000000000000000000000000000000000000000000000000000080050000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000a00000000000000000000000000000000000000000000000000000000000000000010005c1731dded081c794319523b82102fd09237011e23e0dda219b1a81479900000000000000000000000000000000000000000000000000000000000080060000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000a0000000000000000000000000000000000000000000000000000000000000000001000075efc5d3c37f1861e7c9f7f12c5c71f7b98c8e96bc1ae750441942911a00000000000000000000000000000000000000000000000000000000000080080000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000a0000000000000000000000000000000000000000000000000000000000000000001000071fb47c4855b3cee15acfc19af66272afb61ae2196cdf8f0af81316c2200000000000000000000000000000000000000000000000000000000000080090000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000a0000000000000000000000000000000000000000000000000000000000000000001000139d95a414e7910bb755fecc60531a8c7ba6cc49c2fbd763df8541e4fae000000000000000000000000000000000000000000000000000000000000800a0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000a000000000000000000000000000000000000000000000000000000000000000000100021f8bc6a6311dc169f267fafb32fa14724539b5488a9c62788b158e8fcd000000000000000000000000000000000000000000000000000000000000800b0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000a00000000000000000000000000000000000000000000000000000000000000000010009adf7ebf8227ee5d057438bf502d132ed4c7017255f16f691286f3dd7b3000000000000000000000000000000000000000000000000000000000000800c0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000a00000000000000000000000000000000000000000000000000000000000000000010000e1073ab7b4226bb86ca2746fbf1ecb305e23c61240b900c4e0ea161a99000000000000000000000000000000000000000000000000000000000000800e0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000a000000000000000000000000000000000000000000000000000000000000000000100005bc7e5e9f6718a7a59ba32849b08a12d957bcf517cb6ba68faf03983ba000000000000000000000000000000000000000000000000000000000000800f0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000a00000000000000000000000000000000000000000000000000000000000000000",
+  "tx": {
+    "txType": 254,
+    "from": "0x0000000000000000000000000000000000008007",
+    "to": "0x0000000000000000000000000000000000008006",
+    "gasLimit": 72000000,
+    "gasPerPubdataByteLimit": 800,
+    "maxFeePerGas": 0,
+    "maxPriorityFeePerGas": 0,
+    "paymaster": 0,
+    "nonce": "13",
+    "value": 0,
+    "reserved": [
+      0,
+      0,
+      0,
+      0
+    ],
+    "data": "0xe9f18c170000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000000c00000000000000000000000000000000000000000000000000000000000001800000000000000000000000000000000000000000000000000000000000000240000000000000000000000000000000000000000000000000000000000000030000000000000000000000000000000000000000000000000000000000000003c000000000000000000000000000000000000000000000000000000000000004800000000000000000000000000000000000000000000000000000000000000540000000000000000000000000000000000000000000000000000000000000060000000000000000000000000000000000000000000000000000000000000006c000000000000000000000000000000000000000000000000000000000000007800000000000000000000000000000000000000000000000000000000000000840000000000000000000000000000000000000000000000000000000000000090000000000000000000000000000000000000000000000000000000000000009c0010000911c610c6e91d050e608ac4f5db8b08c33bb032a57f70899cdd250a75e00000000000000000000000000000000000000000000000000000000000080020000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000a000000000000000000000000000000000000000000000000000000000000000000100012f42627ab0dd09d78d8a25f459e3b3caf2126668fdfc19887eb5cbf4de00000000000000000000000000000000000000000000000000000000000080030000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000a000000000000000000000000000000000000000000000000000000000000000000100008fd05a39ae3ccc0c081732b2c09b783810773a66d6429cfb03d813a69200000000000000000000000000000000000000000000000000000000000080040000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000a00000000000000000000000000000000000000000000000000000000000000000010000475ebeaf64663ebad3ab3fd14b6e985f576c816a66f84bda5a1825310700000000000000000000000000000000000000000000000000000000000080050000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000a00000000000000000000000000000000000000000000000000000000000000000010005c1731dded081c794319523b82102fd09237011e23e0dda219b1a81479900000000000000000000000000000000000000000000000000000000000080060000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000a0000000000000000000000000000000000000000000000000000000000000000001000075efc5d3c37f1861e7c9f7f12c5c71f7b98c8e96bc1ae750441942911a00000000000000000000000000000000000000000000000000000000000080080000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000a0000000000000000000000000000000000000000000000000000000000000000001000071fb47c4855b3cee15acfc19af66272afb61ae2196cdf8f0af81316c2200000000000000000000000000000000000000000000000000000000000080090000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000a0000000000000000000000000000000000000000000000000000000000000000001000139d95a414e7910bb755fecc60531a8c7ba6cc49c2fbd763df8541e4fae000000000000000000000000000000000000000000000000000000000000800a0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000a000000000000000000000000000000000000000000000000000000000000000000100021f8bc6a6311dc169f267fafb32fa14724539b5488a9c62788b158e8fcd000000000000000000000000000000000000000000000000000000000000800b0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000a00000000000000000000000000000000000000000000000000000000000000000010009adf7ebf8227ee5d057438bf502d132ed4c7017255f16f691286f3dd7b3000000000000000000000000000000000000000000000000000000000000800c0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000a00000000000000000000000000000000000000000000000000000000000000000010000e1073ab7b4226bb86ca2746fbf1ecb305e23c61240b900c4e0ea161a99000000000000000000000000000000000000000000000000000000000000800e0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000a000000000000000000000000000000000000000000000000000000000000000000100005bc7e5e9f6718a7a59ba32849b08a12d957bcf517cb6ba68faf03983ba000000000000000000000000000000000000000000000000000000000000800f0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000a00000000000000000000000000000000000000000000000000000000000000000",
+    "signature": "0x",
+    "factoryDeps": [],
+    "paymasterInput": "0x",
+    "reservedDynamic": "0x"
+  }
+}
\ No newline at end of file
diff --git a/etc/upgrades/1693318788-virtual-block-timestamp/stage2/transactions.json b/etc/upgrades/1693318788-virtual-block-timestamp/stage2/transactions.json
new file mode 100644
index 000000000000..0e954c5c1d93
--- /dev/null
+++ b/etc/upgrades/1693318788-virtual-block-timestamp/stage2/transactions.json
@@ -0,0 +1,246 @@
+{
+  "proposeUpgradeTx": {
+    "l2ProtocolUpgradeTx": {
+      "txType": 254,
+      "from": "0x0000000000000000000000000000000000008007",
+      "to": "0x0000000000000000000000000000000000008006",
+      "gasLimit": 72000000,
+      "gasPerPubdataByteLimit": 800,
+      "maxFeePerGas": 0,
+      "maxPriorityFeePerGas": 0,
+      "paymaster": 0,
+      "nonce": "13",
+      "value": 0,
+      "reserved": [
+        0,
+        0,
+        0,
+        0
+      ],
+      "data": "0xe9f18c170000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000000c00000000000000000000000000000000000000000000000000000000000001800000000000000000000000000000000000000000000000000000000000000240000000000000000000000000000000000000000000000000000000000000030000000000000000000000000000000000000000000000000000000000000003c000000000000000000000000000000000000000000000000000000000000004800000000000000000000000000000000000000000000000000000000000000540000000000000000000000000000000000000000000000000000000000000060000000000000000000000000000000000000000000000000000000000000006c000000000000000000000000000000000000000000000000000000000000007800000000000000000000000000000000000000000000000000000000000000840000000000000000000000000000000000000000000000000000000000000090000000000000000000000000000000000000000000000000000000000000009c0010000911c610c6e91d050e608ac4f5db8b08c33bb032a57f70899cdd250a75e00000000000000000000000000000000000000000000000000000000000080020000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000a000000000000000000000000000000000000000000000000000000000000000000100012f42627ab0dd09d78d8a25f459e3b3caf2126668fdfc19887eb5cbf4de00000000000000000000000000000000000000000000000000000000000080030000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000a000000000000000000000000000000000000000000000000000000000000000000100008fd05a39ae3ccc0c081732b2c09b783810773a66d6429cfb03d813a69200000000000000000000000000000000000000000000000000000000000080040000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000a00000000000000000000000000000000000000000000000000000000000000000010000475ebeaf64663ebad3ab3fd14b6e985f576c816a66f84bda5a1825310700000000000000000000000000000000000000000000000000000000000080050000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000a00000000000000000000000000000000000000000000000000000000000000000010005c1731dded081c794319523b82102fd09237011e23e0dda219b1a81479900000000000000000000000000000000000000000000000000000000000080060000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000a0000000000000000000000000000000000000000000000000000000000000000001000075efc5d3c37f1861e7c9f7f12c5c71f7b98c8e96bc1ae750441942911a00000000000000000000000000000000000000000000000000000000000080080000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000a0000000000000000000000000000000000000000000000000000000000000000001000071fb47c4855b3cee15acfc19af66272afb61ae2196cdf8f0af81316c2200000000000000000000000000000000000000000000000000000000000080090000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000a0000000000000000000000000000000000000000000000000000000000000000001000139d95a414e7910bb755fecc60531a8c7ba6cc49c2fbd763df8541e4fae000000000000000000000000000000000000000000000000000000000000800a0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000a000000000000000000000000000000000000000000000000000000000000000000100021f8bc6a6311dc169f267fafb32fa14724539b5488a9c62788b158e8fcd000000000000000000000000000000000000000000000000000000000000800b0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000a00000000000000000000000000000000000000000000000000000000000000000010009adf7ebf8227ee5d057438bf502d132ed4c7017255f16f691286f3dd7b3000000000000000000000000000000000000000000000000000000000000800c0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000a00000000000000000000000000000000000000000000000000000000000000000010000e1073ab7b4226bb86ca2746fbf1ecb305e23c61240b900c4e0ea161a99000000000000000000000000000000000000000000000000000000000000800e0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000a000000000000000000000000000000000000000000000000000000000000000000100005bc7e5e9f6718a7a59ba32849b08a12d957bcf517cb6ba68faf03983ba000000000000000000000000000000000000000000000000000000000000800f0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000a00000000000000000000000000000000000000000000000000000000000000000",
+      "signature": "0x",
+      "factoryDeps": [],
+      "paymasterInput": "0x",
+      "reservedDynamic": "0x"
+    },
+    "bootloaderHash": "0x0100089b29c64a520d9033da5a4f80c6f74132cbd44142c6afc5913c26f0487d",
+    "defaultAccountHash": "0x0100067d16a5485875b4249040bf421f53e869337fe118ec747cf40a4c777e5f",
+    "verifier": "0x0000000000000000000000000000000000000000",
+    "verifierParams": {
+      "recursionNodeLevelVkHash": "0x0000000000000000000000000000000000000000000000000000000000000000",
+      "recursionLeafLevelVkHash": "0x0000000000000000000000000000000000000000000000000000000000000000",
+      "recursionCircuitsSetVksHash": "0x0000000000000000000000000000000000000000000000000000000000000000"
+    },
+    "l1ContractsUpgradeCalldata": "0x",
+    "postUpgradeCalldata": "0x",
+    "upgradeTimestamp": {
+      "type": "BigNumber",
+      "hex": "0x64ef2a90"
+    },
+    "factoryDeps": [],
+    "newProtocolVersion": "13",
+    "newAllowList": "0x0000000000000000000000000000000000000000"
+  },
+  "l1upgradeCalldata": "0x1ed824a0000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000001a00000000000000000000000000000000000000000000000000000000000000f800100089b29c64a520d9033da5a4f80c6f74132cbd44142c6afc5913c26f0487d0100067d16a5485875b4249040bf421f53e869337fe118ec747cf40a4c777e5f00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000fa00000000000000000000000000000000000000000000000000000000000000fc00000000000000000000000000000000000000000000000000000000064ef2a90000000000000000000000000000000000000000000000000000000000000000d000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000fe0000000000000000000000000000000000000000000000000000000000008007000000000000000000000000000000000000000000000000000000000000800600000000000000000000000000000000000000000000000000000000044aa2000000000000000000000000000000000000000000000000000000000000000320000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000d0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000002600000000000000000000000000000000000000000000000000000000000000d600000000000000000000000000000000000000000000000000000000000000d800000000000000000000000000000000000000000000000000000000000000da00000000000000000000000000000000000000000000000000000000000000dc00000000000000000000000000000000000000000000000000000000000000ac4e9f18c170000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000000c00000000000000000000000000000000000000000000000000000000000001800000000000000000000000000000000000000000000000000000000000000240000000000000000000000000000000000000000000000000000000000000030000000000000000000000000000000000000000000000000000000000000003c000000000000000000000000000000000000000000000000000000000000004800000000000000000000000000000000000000000000000000000000000000540000000000000000000000000000000000000000000000000000000000000060000000000000000000000000000000000000000000000000000000000000006c000000000000000000000000000000000000000000000000000000000000007800000000000000000000000000000000000000000000000000000000000000840000000000000000000000000000000000000000000000000000000000000090000000000000000000000000000000000000000000000000000000000000009c0010000911c610c6e91d050e608ac4f5db8b08c33bb032a57f70899cdd250a75e00000000000000000000000000000000000000000000000000000000000080020000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000a000000000000000000000000000000000000000000000000000000000000000000100012f42627ab0dd09d78d8a25f459e3b3caf2126668fdfc19887eb5cbf4de00000000000000000000000000000000000000000000000000000000000080030000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000a000000000000000000000000000000000000000000000000000000000000000000100008fd05a39ae3ccc0c081732b2c09b783810773a66d6429cfb03d813a69200000000000000000000000000000000000000000000000000000000000080040000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000a00000000000000000000000000000000000000000000000000000000000000000010000475ebeaf64663ebad3ab3fd14b6e985f576c816a66f84bda5a1825310700000000000000000000000000000000000000000000000000000000000080050000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000a00000000000000000000000000000000000000000000000000000000000000000010005c1731dded081c794319523b82102fd09237011e23e0dda219b1a81479900000000000000000000000000000000000000000000000000000000000080060000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000a0000000000000000000000000000000000000000000000000000000000000000001000075efc5d3c37f1861e7c9f7f12c5c71f7b98c8e96bc1ae750441942911a00000000000000000000000000000000000000000000000000000000000080080000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000a0000000000000000000000000000000000000000000000000000000000000000001000071fb47c4855b3cee15acfc19af66272afb61ae2196cdf8f0af81316c2200000000000000000000000000000000000000000000000000000000000080090000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000a0000000000000000000000000000000000000000000000000000000000000000001000139d95a414e7910bb755fecc60531a8c7ba6cc49c2fbd763df8541e4fae000000000000000000000000000000000000000000000000000000000000800a0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000a000000000000000000000000000000000000000000000000000000000000000000100021f8bc6a6311dc169f267fafb32fa14724539b5488a9c62788b158e8fcd000000000000000000000000000000000000000000000000000000000000800b0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000a00000000000000000000000000000000000000000000000000000000000000000010009adf7ebf8227ee5d057438bf502d132ed4c7017255f16f691286f3dd7b3000000000000000000000000000000000000000000000000000000000000800c0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000a00000000000000000000000000000000000000000000000000000000000000000010000e1073ab7b4226bb86ca2746fbf1ecb305e23c61240b900c4e0ea161a99000000000000000000000000000000000000000000000000000000000000800e0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000a000000000000000000000000000000000000000000000000000000000000000000100005bc7e5e9f6718a7a59ba32849b08a12d957bcf517cb6ba68faf03983ba000000000000000000000000000000000000000000000000000000000000800f0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000a00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+  "upgradeAddress": "0xdb876240F01A6dd38F5EFC4EcEFe52e5C13dB3C7",
+  "protocolVersion": "13",
+  "diamondUpgradeProposalId": {
+    "type": "BigNumber",
+    "hex": "0x04"
+  },
+  "upgradeTimestamp": "1693395600",
+  "proposeTransparentUpgradeCalldata": "0x8043760a000000000000000000000000000000000000000000000000000000000000004000000000000000000000000000000000000000000000000000000000000000040000000000000000000000000000000000000000000000000000000000000060000000000000000000000000db876240f01a6dd38f5efc4ecefe52e5c13db3c70000000000000000000000000000000000000000000000000000000000001680000000000000000000000000000000000000000000000000000000000000000a000000000000000000000000000000000000000000000000000000000000014000000000000000000000000000000000000000000000000000000000000002e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000009400000000000000000000000000000000000000000000000000000000000000a600000000000000000000000000000000000000000000000000000000000000ba00000000000000000000000000000000000000000000000000000000000000d40000000000000000000000000000000000000000000000000000000000000124000000000000000000000000000000000000000000000000000000000000013a000000000000000000000000000000000000000000000000000000000000014c00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000080000000000000000000000000000000000000000000000000000000000000000873fb92970000000000000000000000000000000000000000000000000000000036d4eb840000000000000000000000000000000000000000000000000000000027ae4c16000000000000000000000000000000000000000000000000000000000551448c000000000000000000000000000000000000000000000000000000008043760a00000000000000000000000000000000000000000000000000000000beda4b12000000000000000000000000000000000000000000000000000000001733894500000000000000000000000000000000000000000000000000000000587809c70000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000800000000000000000000000000000000000000000000000000000000000000023cdffacc60000000000000000000000000000000000000000000000000000000052ef6b2c00000000000000000000000000000000000000000000000000000000adfca15e000000000000000000000000000000000000000000000000000000007a0ed62700000000000000000000000000000000000000000000000000000000a7cd63b700000000000000000000000000000000000000000000000000000000fe10226d0000000000000000000000000000000000000000000000000000000079823c9a000000000000000000000000000000000000000000000000000000004fc07d7500000000000000000000000000000000000000000000000000000000d86970d800000000000000000000000000000000000000000000000000000000fd791f3c000000000000000000000000000000000000000000000000000000009d1b5a81000000000000000000000000000000000000000000000000000000007b30c8da000000000000000000000000000000000000000000000000000000008665b15000000000000000000000000000000000000000000000000000000000631f4bac000000000000000000000000000000000000000000000000000000000ec6b0b7000000000000000000000000000000000000000000000000000000001b60e62600000000000000000000000000000000000000000000000000000000e39d3bff0000000000000000000000000000000000000000000000000000000033ce93fe000000000000000000000000000000000000000000000000000000000ef240a000000000000000000000000000000000000000000000000000000000fe26699e000000000000000000000000000000000000000000000000000000003960738200000000000000000000000000000000000000000000000000000000af6a2dcd00000000000000000000000000000000000000000000000000000000a1954fc500000000000000000000000000000000000000000000000000000000a39980a00000000000000000000000000000000000000000000000000000000046657fe90000000000000000000000000000000000000000000000000000000018e3a941000000000000000000000000000000000000000000000000000000003db920ce0000000000000000000000000000000000000000000000000000000029b98c6700000000000000000000000000000000000000000000000000000000bd7c541200000000000000000000000000000000000000000000000000000000c3bbd2d700000000000000000000000000000000000000000000000000000000e81e0ba100000000000000000000000000000000000000000000000000000000facd743b000000000000000000000000000000000000000000000000000000009cd939e40000000000000000000000000000000000000000000000000000000056142d7a0000000000000000000000000000000000000000000000000000000074f4d30d00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008000000000000000000000000000000000000000000000000000000000000000066c0960f900000000000000000000000000000000000000000000000000000000b473318e00000000000000000000000000000000000000000000000000000000042901c700000000000000000000000000000000000000000000000000000000263b7f8e00000000000000000000000000000000000000000000000000000000e4948f4300000000000000000000000000000000000000000000000000000000eb67241900000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008000000000000000000000000000000000000000000000000000000000000000040c4dd81000000000000000000000000000000000000000000000000000000000ce9dcf16000000000000000000000000000000000000000000000000000000007739cbe700000000000000000000000000000000000000000000000000000000a9a2d18a0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000800000000000000000000000000000000000000000000000000000000000000005e58bb63900000000000000000000000000000000000000000000000000000000f235757f000000000000000000000000000000000000000000000000000000001cc5d10300000000000000000000000000000000000000000000000000000000be6f11cf000000000000000000000000000000000000000000000000000000004623c91d00000000000000000000000000000000000000000000000000000000000000000000000000000000dc7c3d03845efe2c4a9e758a70a68ba6bba9fac4000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000080000000000000000000000000000000000000000000000000000000000000000873fb92970000000000000000000000000000000000000000000000000000000036d4eb840000000000000000000000000000000000000000000000000000000027ae4c16000000000000000000000000000000000000000000000000000000000551448c000000000000000000000000000000000000000000000000000000008043760a00000000000000000000000000000000000000000000000000000000beda4b12000000000000000000000000000000000000000000000000000000001733894500000000000000000000000000000000000000000000000000000000587809c7000000000000000000000000000000000000000000000000000000000000000000000000000000007444de636699f080ca1c033528d2bb3705b391ce0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000800000000000000000000000000000000000000000000000000000000000000023cdffacc60000000000000000000000000000000000000000000000000000000052ef6b2c00000000000000000000000000000000000000000000000000000000adfca15e000000000000000000000000000000000000000000000000000000007a0ed62700000000000000000000000000000000000000000000000000000000a7cd63b700000000000000000000000000000000000000000000000000000000fe10226d0000000000000000000000000000000000000000000000000000000079823c9a000000000000000000000000000000000000000000000000000000004fc07d7500000000000000000000000000000000000000000000000000000000d86970d800000000000000000000000000000000000000000000000000000000fd791f3c000000000000000000000000000000000000000000000000000000009d1b5a81000000000000000000000000000000000000000000000000000000007b30c8da000000000000000000000000000000000000000000000000000000008665b15000000000000000000000000000000000000000000000000000000000631f4bac000000000000000000000000000000000000000000000000000000000ec6b0b7000000000000000000000000000000000000000000000000000000001b60e62600000000000000000000000000000000000000000000000000000000e39d3bff0000000000000000000000000000000000000000000000000000000033ce93fe000000000000000000000000000000000000000000000000000000000ef240a000000000000000000000000000000000000000000000000000000000fe26699e000000000000000000000000000000000000000000000000000000003960738200000000000000000000000000000000000000000000000000000000af6a2dcd00000000000000000000000000000000000000000000000000000000a1954fc500000000000000000000000000000000000000000000000000000000a39980a00000000000000000000000000000000000000000000000000000000046657fe90000000000000000000000000000000000000000000000000000000018e3a941000000000000000000000000000000000000000000000000000000003db920ce0000000000000000000000000000000000000000000000000000000029b98c6700000000000000000000000000000000000000000000000000000000bd7c541200000000000000000000000000000000000000000000000000000000c3bbd2d700000000000000000000000000000000000000000000000000000000e81e0ba100000000000000000000000000000000000000000000000000000000facd743b000000000000000000000000000000000000000000000000000000009cd939e40000000000000000000000000000000000000000000000000000000056142d7a0000000000000000000000000000000000000000000000000000000074f4d30d000000000000000000000000000000000000000000000000000000000000000000000000000000000ae41f9fc8a83fbc6062ba956224ab86fa6d150700000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000008000000000000000000000000000000000000000000000000000000000000000066c0960f900000000000000000000000000000000000000000000000000000000b473318e00000000000000000000000000000000000000000000000000000000042901c700000000000000000000000000000000000000000000000000000000263b7f8e00000000000000000000000000000000000000000000000000000000e4948f4300000000000000000000000000000000000000000000000000000000eb6724190000000000000000000000000000000000000000000000000000000000000000000000000000000069b8cda4c8e66a0b51fc82834458e087039db2ab00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000008000000000000000000000000000000000000000000000000000000000000000040c4dd81000000000000000000000000000000000000000000000000000000000ce9dcf16000000000000000000000000000000000000000000000000000000007739cbe700000000000000000000000000000000000000000000000000000000a9a2d18a000000000000000000000000000000000000000000000000000000000000000000000000000000002e64926be35412f7710a3e097ba076740bf97cc00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000800000000000000000000000000000000000000000000000000000000000000005e58bb63900000000000000000000000000000000000000000000000000000000f235757f000000000000000000000000000000000000000000000000000000001cc5d10300000000000000000000000000000000000000000000000000000000be6f11cf000000000000000000000000000000000000000000000000000000004623c91d0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000010041ed824a0000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000001a00000000000000000000000000000000000000000000000000000000000000f800100089b29c64a520d9033da5a4f80c6f74132cbd44142c6afc5913c26f0487d0100067d16a5485875b4249040bf421f53e869337fe118ec747cf40a4c777e5f00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000fa00000000000000000000000000000000000000000000000000000000000000fc00000000000000000000000000000000000000000000000000000000064ef2a90000000000000000000000000000000000000000000000000000000000000000d000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000fe0000000000000000000000000000000000000000000000000000000000008007000000000000000000000000000000000000000000000000000000000000800600000000000000000000000000000000000000000000000000000000044aa2000000000000000000000000000000000000000000000000000000000000000320000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000d0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000002600000000000000000000000000000000000000000000000000000000000000d600000000000000000000000000000000000000000000000000000000000000d800000000000000000000000000000000000000000000000000000000000000da00000000000000000000000000000000000000000000000000000000000000dc00000000000000000000000000000000000000000000000000000000000000ac4e9f18c170000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000000c00000000000000000000000000000000000000000000000000000000000001800000000000000000000000000000000000000000000000000000000000000240000000000000000000000000000000000000000000000000000000000000030000000000000000000000000000000000000000000000000000000000000003c000000000000000000000000000000000000000000000000000000000000004800000000000000000000000000000000000000000000000000000000000000540000000000000000000000000000000000000000000000000000000000000060000000000000000000000000000000000000000000000000000000000000006c000000000000000000000000000000000000000000000000000000000000007800000000000000000000000000000000000000000000000000000000000000840000000000000000000000000000000000000000000000000000000000000090000000000000000000000000000000000000000000000000000000000000009c0010000911c610c6e91d050e608ac4f5db8b08c33bb032a57f70899cdd250a75e00000000000000000000000000000000000000000000000000000000000080020000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000a000000000000000000000000000000000000000000000000000000000000000000100012f42627ab0dd09d78d8a25f459e3b3caf2126668fdfc19887eb5cbf4de00000000000000000000000000000000000000000000000000000000000080030000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000a000000000000000000000000000000000000000000000000000000000000000000100008fd05a39ae3ccc0c081732b2c09b783810773a66d6429cfb03d813a69200000000000000000000000000000000000000000000000000000000000080040000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000a00000000000000000000000000000000000000000000000000000000000000000010000475ebeaf64663ebad3ab3fd14b6e985f576c816a66f84bda5a1825310700000000000000000000000000000000000000000000000000000000000080050000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000a00000000000000000000000000000000000000000000000000000000000000000010005c1731dded081c794319523b82102fd09237011e23e0dda219b1a81479900000000000000000000000000000000000000000000000000000000000080060000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000a0000000000000000000000000000000000000000000000000000000000000000001000075efc5d3c37f1861e7c9f7f12c5c71f7b98c8e96bc1ae750441942911a00000000000000000000000000000000000000000000000000000000000080080000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000a0000000000000000000000000000000000000000000000000000000000000000001000071fb47c4855b3cee15acfc19af66272afb61ae2196cdf8f0af81316c2200000000000000000000000000000000000000000000000000000000000080090000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000a0000000000000000000000000000000000000000000000000000000000000000001000139d95a414e7910bb755fecc60531a8c7ba6cc49c2fbd763df8541e4fae000000000000000000000000000000000000000000000000000000000000800a0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000a000000000000000000000000000000000000000000000000000000000000000000100021f8bc6a6311dc169f267fafb32fa14724539b5488a9c62788b158e8fcd000000000000000000000000000000000000000000000000000000000000800b0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000a00000000000000000000000000000000000000000000000000000000000000000010009adf7ebf8227ee5d057438bf502d132ed4c7017255f16f691286f3dd7b3000000000000000000000000000000000000000000000000000000000000800c0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000a00000000000000000000000000000000000000000000000000000000000000000010000e1073ab7b4226bb86ca2746fbf1ecb305e23c61240b900c4e0ea161a99000000000000000000000000000000000000000000000000000000000000800e0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000a000000000000000000000000000000000000000000000000000000000000000000100005bc7e5e9f6718a7a59ba32849b08a12d957bcf517cb6ba68faf03983ba000000000000000000000000000000000000000000000000000000000000800f0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000a0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+  "transparentUpgrade": {
+    "facetCuts": [
+      {
+        "facet": "0x0000000000000000000000000000000000000000",
+        "selectors": [
+          "0x73fb9297",
+          "0x36d4eb84",
+          "0x27ae4c16",
+          "0x0551448c",
+          "0x8043760a",
+          "0xbeda4b12",
+          "0x17338945",
+          "0x587809c7"
+        ],
+        "action": 2,
+        "isFreezable": false
+      },
+      {
+        "facet": "0x0000000000000000000000000000000000000000",
+        "selectors": [
+          "0xcdffacc6",
+          "0x52ef6b2c",
+          "0xadfca15e",
+          "0x7a0ed627",
+          "0xa7cd63b7",
+          "0xfe10226d",
+          "0x79823c9a",
+          "0x4fc07d75",
+          "0xd86970d8",
+          "0xfd791f3c",
+          "0x9d1b5a81",
+          "0x7b30c8da",
+          "0x8665b150",
+          "0x631f4bac",
+          "0x0ec6b0b7",
+          "0x1b60e626",
+          "0xe39d3bff",
+          "0x33ce93fe",
+          "0x0ef240a0",
+          "0xfe26699e",
+          "0x39607382",
+          "0xaf6a2dcd",
+          "0xa1954fc5",
+          "0xa39980a0",
+          "0x46657fe9",
+          "0x18e3a941",
+          "0x3db920ce",
+          "0x29b98c67",
+          "0xbd7c5412",
+          "0xc3bbd2d7",
+          "0xe81e0ba1",
+          "0xfacd743b",
+          "0x9cd939e4",
+          "0x56142d7a",
+          "0x74f4d30d"
+        ],
+        "action": 2,
+        "isFreezable": false
+      },
+      {
+        "facet": "0x0000000000000000000000000000000000000000",
+        "selectors": [
+          "0x6c0960f9",
+          "0xb473318e",
+          "0x042901c7",
+          "0x263b7f8e",
+          "0xe4948f43",
+          "0xeb672419"
+        ],
+        "action": 2,
+        "isFreezable": false
+      },
+      {
+        "facet": "0x0000000000000000000000000000000000000000",
+        "selectors": [
+          "0x0c4dd810",
+          "0xce9dcf16",
+          "0x7739cbe7",
+          "0xa9a2d18a"
+        ],
+        "action": 2,
+        "isFreezable": false
+      },
+      {
+        "facet": "0x0000000000000000000000000000000000000000",
+        "selectors": [
+          "0xe58bb639",
+          "0xf235757f",
+          "0x1cc5d103",
+          "0xbe6f11cf",
+          "0x4623c91d"
+        ],
+        "action": 2,
+        "isFreezable": false
+      },
+      {
+        "facet": "0xdC7c3D03845EfE2c4a9E758A70a68BA6bba9FaC4",
+        "selectors": [
+          "0x73fb9297",
+          "0x36d4eb84",
+          "0x27ae4c16",
+          "0x0551448c",
+          "0x8043760a",
+          "0xbeda4b12",
+          "0x17338945",
+          "0x587809c7"
+        ],
+        "action": 0,
+        "isFreezable": false
+      },
+      {
+        "facet": "0x7444DE636699F080cA1C033528D2bB3705B391Ce",
+        "selectors": [
+          "0xcdffacc6",
+          "0x52ef6b2c",
+          "0xadfca15e",
+          "0x7a0ed627",
+          "0xa7cd63b7",
+          "0xfe10226d",
+          "0x79823c9a",
+          "0x4fc07d75",
+          "0xd86970d8",
+          "0xfd791f3c",
+          "0x9d1b5a81",
+          "0x7b30c8da",
+          "0x8665b150",
+          "0x631f4bac",
+          "0x0ec6b0b7",
+          "0x1b60e626",
+          "0xe39d3bff",
+          "0x33ce93fe",
+          "0x0ef240a0",
+          "0xfe26699e",
+          "0x39607382",
+          "0xaf6a2dcd",
+          "0xa1954fc5",
+          "0xa39980a0",
+          "0x46657fe9",
+          "0x18e3a941",
+          "0x3db920ce",
+          "0x29b98c67",
+          "0xbd7c5412",
+          "0xc3bbd2d7",
+          "0xe81e0ba1",
+          "0xfacd743b",
+          "0x9cd939e4",
+          "0x56142d7a",
+          "0x74f4d30d"
+        ],
+        "action": 0,
+        "isFreezable": false
+      },
+      {
+        "facet": "0x0aE41F9fc8A83FBC6062bA956224AB86fA6D1507",
+        "selectors": [
+          "0x6c0960f9",
+          "0xb473318e",
+          "0x042901c7",
+          "0x263b7f8e",
+          "0xe4948f43",
+          "0xeb672419"
+        ],
+        "action": 0,
+        "isFreezable": true
+      },
+      {
+        "facet": "0x69b8cdA4c8E66A0b51Fc82834458e087039dB2Ab",
+        "selectors": [
+          "0x0c4dd810",
+          "0xce9dcf16",
+          "0x7739cbe7",
+          "0xa9a2d18a"
+        ],
+        "action": 0,
+        "isFreezable": true
+      },
+      {
+        "facet": "0x2E64926BE35412f7710A3E097Ba076740bF97CC0",
+        "selectors": [
+          "0xe58bb639",
+          "0xf235757f",
+          "0x1cc5d103",
+          "0xbe6f11cf",
+          "0x4623c91d"
+        ],
+        "action": 0,
+        "isFreezable": true
+      }
+    ],
+    "initAddress": "0xdb876240F01A6dd38F5EFC4EcEFe52e5C13dB3C7",
+    "initCalldata": "0x1ed824a0000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000001a00000000000000000000000000000000000000000000000000000000000000f800100089b29c64a520d9033da5a4f80c6f74132cbd44142c6afc5913c26f0487d0100067d16a5485875b4249040bf421f53e869337fe118ec747cf40a4c777e5f00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000fa00000000000000000000000000000000000000000000000000000000000000fc00000000000000000000000000000000000000000000000000000000064ef2a90000000000000000000000000000000000000000000000000000000000000000d000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000fe0000000000000000000000000000000000000000000000000000000000008007000000000000000000000000000000000000000000000000000000000000800600000000000000000000000000000000000000000000000000000000044aa2000000000000000000000000000000000000000000000000000000000000000320000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000d0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000002600000000000000000000000000000000000000000000000000000000000000d600000000000000000000000000000000000000000000000000000000000000d800000000000000000000000000000000000000000000000000000000000000da00000000000000000000000000000000000000000000000000000000000000dc00000000000000000000000000000000000000000000000000000000000000ac4e9f18c170000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000000c00000000000000000000000000000000000000000000000000000000000001800000000000000000000000000000000000000000000000000000000000000240000000000000000000000000000000000000000000000000000000000000030000000000000000000000000000000000000000000000000000000000000003c000000000000000000000000000000000000000000000000000000000000004800000000000000000000000000000000000000000000000000000000000000540000000000000000000000000000000000000000000000000000000000000060000000000000000000000000000000000000000000000000000000000000006c000000000000000000000000000000000000000000000000000000000000007800000000000000000000000000000000000000000000000000000000000000840000000000000000000000000000000000000000000000000000000000000090000000000000000000000000000000000000000000000000000000000000009c0010000911c610c6e91d050e608ac4f5db8b08c33bb032a57f70899cdd250a75e00000000000000000000000000000000000000000000000000000000000080020000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000a000000000000000000000000000000000000000000000000000000000000000000100012f42627ab0dd09d78d8a25f459e3b3caf2126668fdfc19887eb5cbf4de00000000000000000000000000000000000000000000000000000000000080030000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000a000000000000000000000000000000000000000000000000000000000000000000100008fd05a39ae3ccc0c081732b2c09b783810773a66d6429cfb03d813a69200000000000000000000000000000000000000000000000000000000000080040000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000a00000000000000000000000000000000000000000000000000000000000000000010000475ebeaf64663ebad3ab3fd14b6e985f576c816a66f84bda5a1825310700000000000000000000000000000000000000000000000000000000000080050000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000a00000000000000000000000000000000000000000000000000000000000000000010005c1731dded081c794319523b82102fd09237011e23e0dda219b1a81479900000000000000000000000000000000000000000000000000000000000080060000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000a0000000000000000000000000000000000000000000000000000000000000000001000075efc5d3c37f1861e7c9f7f12c5c71f7b98c8e96bc1ae750441942911a00000000000000000000000000000000000000000000000000000000000080080000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000a0000000000000000000000000000000000000000000000000000000000000000001000071fb47c4855b3cee15acfc19af66272afb61ae2196cdf8f0af81316c2200000000000000000000000000000000000000000000000000000000000080090000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000a0000000000000000000000000000000000000000000000000000000000000000001000139d95a414e7910bb755fecc60531a8c7ba6cc49c2fbd763df8541e4fae000000000000000000000000000000000000000000000000000000000000800a0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000a000000000000000000000000000000000000000000000000000000000000000000100021f8bc6a6311dc169f267fafb32fa14724539b5488a9c62788b158e8fcd000000000000000000000000000000000000000000000000000000000000800b0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000a00000000000000000000000000000000000000000000000000000000000000000010009adf7ebf8227ee5d057438bf502d132ed4c7017255f16f691286f3dd7b3000000000000000000000000000000000000000000000000000000000000800c0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000a00000000000000000000000000000000000000000000000000000000000000000010000e1073ab7b4226bb86ca2746fbf1ecb305e23c61240b900c4e0ea161a99000000000000000000000000000000000000000000000000000000000000800e0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000a000000000000000000000000000000000000000000000000000000000000000000100005bc7e5e9f6718a7a59ba32849b08a12d957bcf517cb6ba68faf03983ba000000000000000000000000000000000000000000000000000000000000800f0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000a00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000"
+  },
+  "executeUpgradeCalldata": "0x36d4eb84000000000000000000000000000000000000000000000000000000000000004000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000060000000000000000000000000db876240f01a6dd38f5efc4ecefe52e5c13db3c70000000000000000000000000000000000000000000000000000000000001680000000000000000000000000000000000000000000000000000000000000000a000000000000000000000000000000000000000000000000000000000000014000000000000000000000000000000000000000000000000000000000000002e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000009400000000000000000000000000000000000000000000000000000000000000a600000000000000000000000000000000000000000000000000000000000000ba00000000000000000000000000000000000000000000000000000000000000d40000000000000000000000000000000000000000000000000000000000000124000000000000000000000000000000000000000000000000000000000000013a000000000000000000000000000000000000000000000000000000000000014c00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000080000000000000000000000000000000000000000000000000000000000000000873fb92970000000000000000000000000000000000000000000000000000000036d4eb840000000000000000000000000000000000000000000000000000000027ae4c16000000000000000000000000000000000000000000000000000000000551448c000000000000000000000000000000000000000000000000000000008043760a00000000000000000000000000000000000000000000000000000000beda4b12000000000000000000000000000000000000000000000000000000001733894500000000000000000000000000000000000000000000000000000000587809c70000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000800000000000000000000000000000000000000000000000000000000000000023cdffacc60000000000000000000000000000000000000000000000000000000052ef6b2c00000000000000000000000000000000000000000000000000000000adfca15e000000000000000000000000000000000000000000000000000000007a0ed62700000000000000000000000000000000000000000000000000000000a7cd63b700000000000000000000000000000000000000000000000000000000fe10226d0000000000000000000000000000000000000000000000000000000079823c9a000000000000000000000000000000000000000000000000000000004fc07d7500000000000000000000000000000000000000000000000000000000d86970d800000000000000000000000000000000000000000000000000000000fd791f3c000000000000000000000000000000000000000000000000000000009d1b5a81000000000000000000000000000000000000000000000000000000007b30c8da000000000000000000000000000000000000000000000000000000008665b15000000000000000000000000000000000000000000000000000000000631f4bac000000000000000000000000000000000000000000000000000000000ec6b0b7000000000000000000000000000000000000000000000000000000001b60e62600000000000000000000000000000000000000000000000000000000e39d3bff0000000000000000000000000000000000000000000000000000000033ce93fe000000000000000000000000000000000000000000000000000000000ef240a000000000000000000000000000000000000000000000000000000000fe26699e000000000000000000000000000000000000000000000000000000003960738200000000000000000000000000000000000000000000000000000000af6a2dcd00000000000000000000000000000000000000000000000000000000a1954fc500000000000000000000000000000000000000000000000000000000a39980a00000000000000000000000000000000000000000000000000000000046657fe90000000000000000000000000000000000000000000000000000000018e3a941000000000000000000000000000000000000000000000000000000003db920ce0000000000000000000000000000000000000000000000000000000029b98c6700000000000000000000000000000000000000000000000000000000bd7c541200000000000000000000000000000000000000000000000000000000c3bbd2d700000000000000000000000000000000000000000000000000000000e81e0ba100000000000000000000000000000000000000000000000000000000facd743b000000000000000000000000000000000000000000000000000000009cd939e40000000000000000000000000000000000000000000000000000000056142d7a0000000000000000000000000000000000000000000000000000000074f4d30d00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008000000000000000000000000000000000000000000000000000000000000000066c0960f900000000000000000000000000000000000000000000000000000000b473318e00000000000000000000000000000000000000000000000000000000042901c700000000000000000000000000000000000000000000000000000000263b7f8e00000000000000000000000000000000000000000000000000000000e4948f4300000000000000000000000000000000000000000000000000000000eb67241900000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008000000000000000000000000000000000000000000000000000000000000000040c4dd81000000000000000000000000000000000000000000000000000000000ce9dcf16000000000000000000000000000000000000000000000000000000007739cbe700000000000000000000000000000000000000000000000000000000a9a2d18a0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000800000000000000000000000000000000000000000000000000000000000000005e58bb63900000000000000000000000000000000000000000000000000000000f235757f000000000000000000000000000000000000000000000000000000001cc5d10300000000000000000000000000000000000000000000000000000000be6f11cf000000000000000000000000000000000000000000000000000000004623c91d00000000000000000000000000000000000000000000000000000000000000000000000000000000dc7c3d03845efe2c4a9e758a70a68ba6bba9fac4000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000080000000000000000000000000000000000000000000000000000000000000000873fb92970000000000000000000000000000000000000000000000000000000036d4eb840000000000000000000000000000000000000000000000000000000027ae4c16000000000000000000000000000000000000000000000000000000000551448c000000000000000000000000000000000000000000000000000000008043760a00000000000000000000000000000000000000000000000000000000beda4b12000000000000000000000000000000000000000000000000000000001733894500000000000000000000000000000000000000000000000000000000587809c7000000000000000000000000000000000000000000000000000000000000000000000000000000007444de636699f080ca1c033528d2bb3705b391ce0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000800000000000000000000000000000000000000000000000000000000000000023cdffacc60000000000000000000000000000000000000000000000000000000052ef6b2c00000000000000000000000000000000000000000000000000000000adfca15e000000000000000000000000000000000000000000000000000000007a0ed62700000000000000000000000000000000000000000000000000000000a7cd63b700000000000000000000000000000000000000000000000000000000fe10226d0000000000000000000000000000000000000000000000000000000079823c9a000000000000000000000000000000000000000000000000000000004fc07d7500000000000000000000000000000000000000000000000000000000d86970d800000000000000000000000000000000000000000000000000000000fd791f3c000000000000000000000000000000000000000000000000000000009d1b5a81000000000000000000000000000000000000000000000000000000007b30c8da000000000000000000000000000000000000000000000000000000008665b15000000000000000000000000000000000000000000000000000000000631f4bac000000000000000000000000000000000000000000000000000000000ec6b0b7000000000000000000000000000000000000000000000000000000001b60e62600000000000000000000000000000000000000000000000000000000e39d3bff0000000000000000000000000000000000000000000000000000000033ce93fe000000000000000000000000000000000000000000000000000000000ef240a000000000000000000000000000000000000000000000000000000000fe26699e000000000000000000000000000000000000000000000000000000003960738200000000000000000000000000000000000000000000000000000000af6a2dcd00000000000000000000000000000000000000000000000000000000a1954fc500000000000000000000000000000000000000000000000000000000a39980a00000000000000000000000000000000000000000000000000000000046657fe90000000000000000000000000000000000000000000000000000000018e3a941000000000000000000000000000000000000000000000000000000003db920ce0000000000000000000000000000000000000000000000000000000029b98c6700000000000000000000000000000000000000000000000000000000bd7c541200000000000000000000000000000000000000000000000000000000c3bbd2d700000000000000000000000000000000000000000000000000000000e81e0ba100000000000000000000000000000000000000000000000000000000facd743b000000000000000000000000000000000000000000000000000000009cd939e40000000000000000000000000000000000000000000000000000000056142d7a0000000000000000000000000000000000000000000000000000000074f4d30d000000000000000000000000000000000000000000000000000000000000000000000000000000000ae41f9fc8a83fbc6062ba956224ab86fa6d150700000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000008000000000000000000000000000000000000000000000000000000000000000066c0960f900000000000000000000000000000000000000000000000000000000b473318e00000000000000000000000000000000000000000000000000000000042901c700000000000000000000000000000000000000000000000000000000263b7f8e00000000000000000000000000000000000000000000000000000000e4948f4300000000000000000000000000000000000000000000000000000000eb6724190000000000000000000000000000000000000000000000000000000000000000000000000000000069b8cda4c8e66a0b51fc82834458e087039db2ab00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000008000000000000000000000000000000000000000000000000000000000000000040c4dd81000000000000000000000000000000000000000000000000000000000ce9dcf16000000000000000000000000000000000000000000000000000000007739cbe700000000000000000000000000000000000000000000000000000000a9a2d18a000000000000000000000000000000000000000000000000000000000000000000000000000000002e64926be35412f7710a3e097ba076740bf97cc00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000800000000000000000000000000000000000000000000000000000000000000005e58bb63900000000000000000000000000000000000000000000000000000000f235757f000000000000000000000000000000000000000000000000000000001cc5d10300000000000000000000000000000000000000000000000000000000be6f11cf000000000000000000000000000000000000000000000000000000004623c91d0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000010041ed824a0000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000001a00000000000000000000000000000000000000000000000000000000000000f800100089b29c64a520d9033da5a4f80c6f74132cbd44142c6afc5913c26f0487d0100067d16a5485875b4249040bf421f53e869337fe118ec747cf40a4c777e5f00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000fa00000000000000000000000000000000000000000000000000000000000000fc00000000000000000000000000000000000000000000000000000000064ef2a90000000000000000000000000000000000000000000000000000000000000000d000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000fe0000000000000000000000000000000000000000000000000000000000008007000000000000000000000000000000000000000000000000000000000000800600000000000000000000000000000000000000000000000000000000044aa2000000000000000000000000000000000000000000000000000000000000000320000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000d0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000002600000000000000000000000000000000000000000000000000000000000000d600000000000000000000000000000000000000000000000000000000000000d800000000000000000000000000000000000000000000000000000000000000da00000000000000000000000000000000000000000000000000000000000000dc00000000000000000000000000000000000000000000000000000000000000ac4e9f18c170000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000000c00000000000000000000000000000000000000000000000000000000000001800000000000000000000000000000000000000000000000000000000000000240000000000000000000000000000000000000000000000000000000000000030000000000000000000000000000000000000000000000000000000000000003c000000000000000000000000000000000000000000000000000000000000004800000000000000000000000000000000000000000000000000000000000000540000000000000000000000000000000000000000000000000000000000000060000000000000000000000000000000000000000000000000000000000000006c000000000000000000000000000000000000000000000000000000000000007800000000000000000000000000000000000000000000000000000000000000840000000000000000000000000000000000000000000000000000000000000090000000000000000000000000000000000000000000000000000000000000009c0010000911c610c6e91d050e608ac4f5db8b08c33bb032a57f70899cdd250a75e00000000000000000000000000000000000000000000000000000000000080020000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000a000000000000000000000000000000000000000000000000000000000000000000100012f42627ab0dd09d78d8a25f459e3b3caf2126668fdfc19887eb5cbf4de00000000000000000000000000000000000000000000000000000000000080030000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000a000000000000000000000000000000000000000000000000000000000000000000100008fd05a39ae3ccc0c081732b2c09b783810773a66d6429cfb03d813a69200000000000000000000000000000000000000000000000000000000000080040000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000a00000000000000000000000000000000000000000000000000000000000000000010000475ebeaf64663ebad3ab3fd14b6e985f576c816a66f84bda5a1825310700000000000000000000000000000000000000000000000000000000000080050000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000a00000000000000000000000000000000000000000000000000000000000000000010005c1731dded081c794319523b82102fd09237011e23e0dda219b1a81479900000000000000000000000000000000000000000000000000000000000080060000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000a0000000000000000000000000000000000000000000000000000000000000000001000075efc5d3c37f1861e7c9f7f12c5c71f7b98c8e96bc1ae750441942911a00000000000000000000000000000000000000000000000000000000000080080000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000a0000000000000000000000000000000000000000000000000000000000000000001000071fb47c4855b3cee15acfc19af66272afb61ae2196cdf8f0af81316c2200000000000000000000000000000000000000000000000000000000000080090000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000a0000000000000000000000000000000000000000000000000000000000000000001000139d95a414e7910bb755fecc60531a8c7ba6cc49c2fbd763df8541e4fae000000000000000000000000000000000000000000000000000000000000800a0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000a000000000000000000000000000000000000000000000000000000000000000000100021f8bc6a6311dc169f267fafb32fa14724539b5488a9c62788b158e8fcd000000000000000000000000000000000000000000000000000000000000800b0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000a00000000000000000000000000000000000000000000000000000000000000000010009adf7ebf8227ee5d057438bf502d132ed4c7017255f16f691286f3dd7b3000000000000000000000000000000000000000000000000000000000000800c0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000a00000000000000000000000000000000000000000000000000000000000000000010000e1073ab7b4226bb86ca2746fbf1ecb305e23c61240b900c4e0ea161a99000000000000000000000000000000000000000000000000000000000000800e0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000a000000000000000000000000000000000000000000000000000000000000000000100005bc7e5e9f6718a7a59ba32849b08a12d957bcf517cb6ba68faf03983ba000000000000000000000000000000000000000000000000000000000000800f0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000a0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000"
+}
\ No newline at end of file
diff --git a/etc/upgrades/1693318788-virtual-block-timestamp/testnet2/facetCuts.json b/etc/upgrades/1693318788-virtual-block-timestamp/testnet2/facetCuts.json
new file mode 100644
index 000000000000..4dca4e604b2d
--- /dev/null
+++ b/etc/upgrades/1693318788-virtual-block-timestamp/testnet2/facetCuts.json
@@ -0,0 +1,188 @@
+[
+  {
+    "facet": "0x0000000000000000000000000000000000000000",
+    "selectors": [
+      "0x73fb9297",
+      "0x36d4eb84",
+      "0x27ae4c16",
+      "0x0551448c",
+      "0x8043760a",
+      "0xbeda4b12",
+      "0x17338945",
+      "0x587809c7"
+    ],
+    "action": 2,
+    "isFreezable": false
+  },
+  {
+    "facet": "0x0000000000000000000000000000000000000000",
+    "selectors": [
+      "0xcdffacc6",
+      "0x52ef6b2c",
+      "0xadfca15e",
+      "0x7a0ed627",
+      "0xa7cd63b7",
+      "0xfe10226d",
+      "0x79823c9a",
+      "0x4fc07d75",
+      "0xd86970d8",
+      "0xfd791f3c",
+      "0x9d1b5a81",
+      "0x7b30c8da",
+      "0x8665b150",
+      "0x631f4bac",
+      "0x0ec6b0b7",
+      "0x1b60e626",
+      "0xe39d3bff",
+      "0x33ce93fe",
+      "0x0ef240a0",
+      "0xfe26699e",
+      "0x39607382",
+      "0xaf6a2dcd",
+      "0xa1954fc5",
+      "0xa39980a0",
+      "0x46657fe9",
+      "0x18e3a941",
+      "0x3db920ce",
+      "0x29b98c67",
+      "0xbd7c5412",
+      "0xc3bbd2d7",
+      "0xe81e0ba1",
+      "0xfacd743b",
+      "0x9cd939e4",
+      "0x56142d7a",
+      "0x74f4d30d"
+    ],
+    "action": 2,
+    "isFreezable": false
+  },
+  {
+    "facet": "0x0000000000000000000000000000000000000000",
+    "selectors": [
+      "0x6c0960f9",
+      "0xb473318e",
+      "0x042901c7",
+      "0x263b7f8e",
+      "0xe4948f43",
+      "0xeb672419"
+    ],
+    "action": 2,
+    "isFreezable": false
+  },
+  {
+    "facet": "0x0000000000000000000000000000000000000000",
+    "selectors": [
+      "0x0c4dd810",
+      "0xce9dcf16",
+      "0x7739cbe7",
+      "0xa9a2d18a"
+    ],
+    "action": 2,
+    "isFreezable": false
+  },
+  {
+    "facet": "0x0000000000000000000000000000000000000000",
+    "selectors": [
+      "0xe58bb639",
+      "0xf235757f",
+      "0x1cc5d103",
+      "0xbe6f11cf",
+      "0x4623c91d"
+    ],
+    "action": 2,
+    "isFreezable": false
+  },
+  {
+    "facet": "0xdC7c3D03845EfE2c4a9E758A70a68BA6bba9FaC4",
+    "selectors": [
+      "0x73fb9297",
+      "0x36d4eb84",
+      "0x27ae4c16",
+      "0x0551448c",
+      "0x8043760a",
+      "0xbeda4b12",
+      "0x17338945",
+      "0x587809c7"
+    ],
+    "action": 0,
+    "isFreezable": false
+  },
+  {
+    "facet": "0x7444DE636699F080cA1C033528D2bB3705B391Ce",
+    "selectors": [
+      "0xcdffacc6",
+      "0x52ef6b2c",
+      "0xadfca15e",
+      "0x7a0ed627",
+      "0xa7cd63b7",
+      "0xfe10226d",
+      "0x79823c9a",
+      "0x4fc07d75",
+      "0xd86970d8",
+      "0xfd791f3c",
+      "0x9d1b5a81",
+      "0x7b30c8da",
+      "0x8665b150",
+      "0x631f4bac",
+      "0x0ec6b0b7",
+      "0x1b60e626",
+      "0xe39d3bff",
+      "0x33ce93fe",
+      "0x0ef240a0",
+      "0xfe26699e",
+      "0x39607382",
+      "0xaf6a2dcd",
+      "0xa1954fc5",
+      "0xa39980a0",
+      "0x46657fe9",
+      "0x18e3a941",
+      "0x3db920ce",
+      "0x29b98c67",
+      "0xbd7c5412",
+      "0xc3bbd2d7",
+      "0xe81e0ba1",
+      "0xfacd743b",
+      "0x9cd939e4",
+      "0x56142d7a",
+      "0x74f4d30d"
+    ],
+    "action": 0,
+    "isFreezable": false
+  },
+  {
+    "facet": "0x0aE41F9fc8A83FBC6062bA956224AB86fA6D1507",
+    "selectors": [
+      "0x6c0960f9",
+      "0xb473318e",
+      "0x042901c7",
+      "0x263b7f8e",
+      "0xe4948f43",
+      "0xeb672419"
+    ],
+    "action": 0,
+    "isFreezable": true
+  },
+  {
+    "facet": "0x69b8cdA4c8E66A0b51Fc82834458e087039dB2Ab",
+    "selectors": [
+      "0x0c4dd810",
+      "0xce9dcf16",
+      "0x7739cbe7",
+      "0xa9a2d18a"
+    ],
+    "action": 0,
+    "isFreezable": true
+  },
+  {
+    "facet": "0x2E64926BE35412f7710A3E097Ba076740bF97CC0",
+    "selectors": [
+      "0xe58bb639",
+      "0xf235757f",
+      "0x1cc5d103",
+      "0xbe6f11cf",
+      "0x4623c91d"
+    ],
+    "action": 0,
+    "isFreezable": true
+  }
+]
\ No newline at end of file
diff --git a/etc/upgrades/1693318788-virtual-block-timestamp/testnet2/facets.json b/etc/upgrades/1693318788-virtual-block-timestamp/testnet2/facets.json
new file mode 100644
index 000000000000..122b3dfd6e4d
--- /dev/null
+++ b/etc/upgrades/1693318788-virtual-block-timestamp/testnet2/facets.json
@@ -0,0 +1,22 @@
+{
+  "ExecutorFacet": {
+    "address": "0x69b8cdA4c8E66A0b51Fc82834458e087039dB2Ab",
+    "txHash": "0x0000000000000000000000000000000000000000000000000000000000000000"
+  },
+  "GovernanceFacet": {
+    "address": "0x2E64926BE35412f7710A3E097Ba076740bF97CC0",
+    "txHash": "0x0000000000000000000000000000000000000000000000000000000000000000"
+  },
+  "DiamondCutFacet": {
+    "address": "0xdC7c3D03845EfE2c4a9E758A70a68BA6bba9FaC4",
+    "txHash": "0x0000000000000000000000000000000000000000000000000000000000000000"
+  },
+  "GettersFacet": {
+    "address": "0x7444DE636699F080cA1C033528D2bB3705B391Ce",
+    "txHash": "0x0000000000000000000000000000000000000000000000000000000000000000"
+  },
+  "MailboxFacet": {
+    "address": "0x0aE41F9fc8A83FBC6062bA956224AB86fA6D1507",
+    "txHash": "0xf987dc0ee0b50a8003f153c2cff78db56202fac9c1cd6f374760c63f80f17f53"
+  }
+}
\ No newline at end of file
diff --git a/etc/upgrades/1693318788-virtual-block-timestamp/testnet2/l2Upgrade.json b/etc/upgrades/1693318788-virtual-block-timestamp/testnet2/l2Upgrade.json
new file mode 100644
index 000000000000..33bc8587bbbe
--- /dev/null
+++ b/etc/upgrades/1693318788-virtual-block-timestamp/testnet2/l2Upgrade.json
@@ -0,0 +1,211 @@
+{
+  "systemContracts": [
+    {
+      "name": "AccountCodeStorage",
+      "bytecodeHashes": [
+        "0x010000911c610c6e91d050e608ac4f5db8b08c33bb032a57f70899cdd250a75e"
+      ],
+      "address": "0x0000000000000000000000000000000000008002"
+    },
+    {
+      "name": "NonceHolder",
+      "bytecodeHashes": [
+        "0x0100012f42627ab0dd09d78d8a25f459e3b3caf2126668fdfc19887eb5cbf4de"
+      ],
+      "address": "0x0000000000000000000000000000000000008003"
+    },
+    {
+      "name": "KnownCodesStorage",
+      "bytecodeHashes": [
+        "0x0100008fd05a39ae3ccc0c081732b2c09b783810773a66d6429cfb03d813a692"
+      ],
+      "address": "0x0000000000000000000000000000000000008004"
+    },
+    {
+      "name": "ImmutableSimulator",
+      "bytecodeHashes": [
+        "0x010000475ebeaf64663ebad3ab3fd14b6e985f576c816a66f84bda5a18253107"
+      ],
+      "address": "0x0000000000000000000000000000000000008005"
+    },
+    {
+      "name": "ContractDeployer",
+      "bytecodeHashes": [
+        "0x010005c1731dded081c794319523b82102fd09237011e23e0dda219b1a814799"
+      ],
+      "address": "0x0000000000000000000000000000000000008006"
+    },
+    {
+      "name": "L1Messenger",
+      "bytecodeHashes": [
+        "0x01000075efc5d3c37f1861e7c9f7f12c5c71f7b98c8e96bc1ae750441942911a"
+      ],
+      "address": "0x0000000000000000000000000000000000008008"
+    },
+    {
+      "name": "MsgValueSimulator",
+      "bytecodeHashes": [
+        "0x01000071fb47c4855b3cee15acfc19af66272afb61ae2196cdf8f0af81316c22"
+      ],
+      "address": "0x0000000000000000000000000000000000008009"
+    },
+    {
+      "name": "L2EthToken",
+      "bytecodeHashes": [
+        "0x01000139d95a414e7910bb755fecc60531a8c7ba6cc49c2fbd763df8541e4fae"
+      ],
+      "address": "0x000000000000000000000000000000000000800a"
+    },
+    {
+      "name": "SystemContext",
+      "bytecodeHashes": [
+        "0x0100021f8bc6a6311dc169f267fafb32fa14724539b5488a9c62788b158e8fcd"
+      ],
+      "address": "0x000000000000000000000000000000000000800b"
+    },
+    {
+      "name": "BootloaderUtilities",
+      "bytecodeHashes": [
+        "0x010009adf7ebf8227ee5d057438bf502d132ed4c7017255f16f691286f3dd7b3"
+      ],
+      "address": "0x000000000000000000000000000000000000800c"
+    },
+    {
+      "name": "BytecodeCompressor",
+      "bytecodeHashes": [
+        "0x010000e1073ab7b4226bb86ca2746fbf1ecb305e23c61240b900c4e0ea161a99"
+      ],
+      "address": "0x000000000000000000000000000000000000800e"
+    },
+    {
+      "name": "ComplexUpgrader",
+      "bytecodeHashes": [
+        "0x0100005bc7e5e9f6718a7a59ba32849b08a12d957bcf517cb6ba68faf03983ba"
+      ],
+      "address": "0x000000000000000000000000000000000000800f"
+    }
+  ],
+  "defaultAA": {
+    "name": "DefaultAccount",
+    "bytecodeHashes": [
+      "0x0100067d16a5485875b4249040bf421f53e869337fe118ec747cf40a4c777e5f"
+    ]
+  },
+  "bootloader": {
+    "name": "Bootloader",
+    "bytecodeHashes": [
+      "0x0100089b29c64a520d9033da5a4f80c6f74132cbd44142c6afc5913c26f0487d"
+    ]
+  },
+  "forcedDeployments": [
+    {
+      "bytecodeHash": "0x010000911c610c6e91d050e608ac4f5db8b08c33bb032a57f70899cdd250a75e",
+      "newAddress": "0x0000000000000000000000000000000000008002",
+      "value": 0,
+      "input": "0x",
+      "callConstructor": false
+    },
+    {
+      "bytecodeHash": "0x0100012f42627ab0dd09d78d8a25f459e3b3caf2126668fdfc19887eb5cbf4de",
+      "newAddress": "0x0000000000000000000000000000000000008003",
+      "value": 0,
+      "input": "0x",
+      "callConstructor": false
+    },
+    {
+      "bytecodeHash": "0x0100008fd05a39ae3ccc0c081732b2c09b783810773a66d6429cfb03d813a692",
+      "newAddress": "0x0000000000000000000000000000000000008004",
+      "value": 0,
+      "input": "0x",
+      "callConstructor": false
+    },
+    {
+      "bytecodeHash": "0x010000475ebeaf64663ebad3ab3fd14b6e985f576c816a66f84bda5a18253107",
+      "newAddress": "0x0000000000000000000000000000000000008005",
+      "value": 0,
+      "input": "0x",
+      "callConstructor": false
+    },
+    {
+      "bytecodeHash": "0x010005c1731dded081c794319523b82102fd09237011e23e0dda219b1a814799",
+      "newAddress": "0x0000000000000000000000000000000000008006",
+      "value": 0,
+      "input": "0x",
+      "callConstructor": false
+    },
+    {
+      "bytecodeHash": "0x01000075efc5d3c37f1861e7c9f7f12c5c71f7b98c8e96bc1ae750441942911a",
+      "newAddress": "0x0000000000000000000000000000000000008008",
+      "value": 0,
+      "input": "0x",
+      "callConstructor": false
+    },
+    {
+      "bytecodeHash": "0x01000071fb47c4855b3cee15acfc19af66272afb61ae2196cdf8f0af81316c22",
+      "newAddress": "0x0000000000000000000000000000000000008009",
+      "value": 0,
+      "input": "0x",
+      "callConstructor": false
+    },
+    {
+      "bytecodeHash": "0x01000139d95a414e7910bb755fecc60531a8c7ba6cc49c2fbd763df8541e4fae",
+      "newAddress": "0x000000000000000000000000000000000000800a",
+      "value": 0,
+      "input": "0x",
+      "callConstructor": false
+    },
+    {
+      "bytecodeHash": "0x0100021f8bc6a6311dc169f267fafb32fa14724539b5488a9c62788b158e8fcd",
+      "newAddress": "0x000000000000000000000000000000000000800b",
+      "value": 0,
+      "input": "0x",
+      "callConstructor": false
+    },
+    {
+      "bytecodeHash": "0x010009adf7ebf8227ee5d057438bf502d132ed4c7017255f16f691286f3dd7b3",
+      "newAddress": "0x000000000000000000000000000000000000800c",
+      "value": 0,
+      "input": "0x",
+      "callConstructor": false
+    },
+    {
+      "bytecodeHash": "0x010000e1073ab7b4226bb86ca2746fbf1ecb305e23c61240b900c4e0ea161a99",
+      "newAddress": "0x000000000000000000000000000000000000800e",
+      "value": 0,
+      "input": "0x",
+      "callConstructor": false
+    },
+    {
+      "bytecodeHash": "0x0100005bc7e5e9f6718a7a59ba32849b08a12d957bcf517cb6ba68faf03983ba",
+      "newAddress": "0x000000000000000000000000000000000000800f",
+      "value": 0,
+      "input": "0x",
+      "callConstructor": false
+    }
+  ],
+  "forcedDeploymentCalldata": "0xe9f18c170000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000000c00000000000000000000000000000000000000000000000000000000000001800000000000000000000000000000000000000000000000000000000000000240000000000000000000000000000000000000000000000000000000000000030000000000000000000000000000000000000000000000000000000000000003c000000000000000000000000000000000000000000000000000000000000004800000000000000000000000000000000000000000000000000000000000000540000000000000000000000000000000000000000000000000000000000000060000000000000000000000000000000000000000000000000000000000000006c000000000000000000000000000000000000000000000000000000000000007800000000000000000000000000000000000000000000000000000000000000840000000000000000000000000000000000000000000000000000000000000090000000000000000000000000000000000000000000000000000000000000009c0010000911c610c6e91d050e608ac4f5db8b08c33bb032a57f70899cdd250a75e00000000000000000000000000000000000000000000000000000000000080020000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000a000000000000000000000000000000000000000000000000000000000000000000100012f42627ab0dd09d78d8a25f459e3b3caf2126668fdfc19887eb5cbf4de00000000000000000000000000000000000000000000000000000000000080030000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000a000000000000000000000000000000000000000000000000000000000000000000100008fd05a39ae3ccc0c081732b2c09b783810773a66d6429cfb03d813a69200000000000000000000000000000000000000000000000000000000000080040000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000a00000000000000000000000000000000000000000000000000000000000000000010000475ebeaf64663ebad3ab3fd14b6e985f576c816a66f84bda5a1825310700000000000000000000000000000000000000000000000000000000000080050000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000a00000000000000000000000000000000000000000000000000000000000000000010005c1731dded081c794319523b82102fd09237011e23e0dda219b1a81479900000000000000000000000000000000000000000000000000000000000080060000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000a0000000000000000000000000000000000000000000000000000000000000000001000075efc5d3c37f1861e7c9f7f12c5c71f7b98c8e96bc1ae750441942911a00000000000000000000000000000000000000000000000000000000000080080000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000a0000000000000000000000000000000000000000000000000000000000000000001000071fb47c4855b3cee15acfc19af66272afb61ae2196cdf8f0af81316c2200000000000000000000000000000000000000000000000000000000000080090000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000a0000000000000000000000000000000000000000000000000000000000000000001000139d95a414e7910bb755fecc60531a8c7ba6cc49c2fbd763df8541e4fae000000000000000000000000000000000000000000000000000000000000800a0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000a000000000000000000000000000000000000000000000000000000000000000000100021f8bc6a6311dc169f267fafb32fa14724539b5488a9c62788b158e8fcd000000000000000000000000000000000000000000000000000000000000800b0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000a00000000000000000000000000000000000000000000000000000000000000000010009adf7ebf8227ee5d057438bf502d132ed4c7017255f16f691286f3dd7b3000000000000000000000000000000000000000000000000000000000000800c0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000a00000000000000000000000000000000000000000000000000000000000000000010000e1073ab7b4226bb86ca2746fbf1ecb305e23c61240b900c4e0ea161a99000000000000000000000000000000000000000000000000000000000000800e0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000a000000000000000000000000000000000000000000000000000000000000000000100005bc7e5e9f6718a7a59ba32849b08a12d957bcf517cb6ba68faf03983ba000000000000000000000000000000000000000000000000000000000000800f0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000a00000000000000000000000000000000000000000000000000000000000000000",
+  "calldata": "0xe9f18c170000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000000c00000000000000000000000000000000000000000000000000000000000001800000000000000000000000000000000000000000000000000000000000000240000000000000000000000000000000000000000000000000000000000000030000000000000000000000000000000000000000000000000000000000000003c000000000000000000000000000000000000000000000000000000000000004800000000000000000000000000000000000000000000000000000000000000540000000000000000000000000000000000000000000000000000000000000060000000000000000000000000000000000000000000000000000000000000006c000000000000000000000000000000000000000000000000000000000000007800000000000000000000000000000000000000000000000000000000000000840000000000000000000000000000000000000000000000000000000000000090000000000000000000000000000000000000000000000000000000000000009c0010000911c610c6e91d050e608ac4f5db8b08c33bb032a57f70899cdd250a75e00000000000000000000000000000000000000000000000000000000000080020000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000a000000000000000000000000000000000000000000000000000000000000000000100012f42627ab0dd09d78d8a25f459e3b3caf2126668fdfc19887eb5cbf4de00000000000000000000000000000000000000000000000000000000000080030000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000a000000000000000000000000000000000000000000000000000000000000000000100008fd05a39ae3ccc0c081732b2c09b783810773a66d6429cfb03d813a69200000000000000000000000000000000000000000000000000000000000080040000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000a00000000000000000000000000000000000000000000000000000000000000000010000475ebeaf64663ebad3ab3fd14b6e985f576c816a66f84bda5a1825310700000000000000000000000000000000000000000000000000000000000080050000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000a00000000000000000000000000000000000000000000000000000000000000000010005c1731dded081c794319523b82102fd09237011e23e0dda219b1a81479900000000000000000000000000000000000000000000000000000000000080060000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000a0000000000000000000000000000000000000000000000000000000000000000001000075efc5d3c37f1861e7c9f7f12c5c71f7b98c8e96bc1ae750441942911a00000000000000000000000000000000000000000000000000000000000080080000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000a0000000000000000000000000000000000000000000000000000000000000000001000071fb47c4855b3cee15acfc19af66272afb61ae2196cdf8f0af81316c2200000000000000000000000000000000000000000000000000000000000080090000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000a0000000000000000000000000000000000000000000000000000000000000000001000139d95a414e7910bb755fecc60531a8c7ba6cc49c2fbd763df8541e4fae000000000000000000000000000000000000000000000000000000000000800a0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000a000000000000000000000000000000000000000000000000000000000000000000100021f8bc6a6311dc169f267fafb32fa14724539b5488a9c62788b158e8fcd000000000000000000000000000000000000000000000000000000000000800b0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000a00000000000000000000000000000000000000000000000000000000000000000010009adf7ebf8227ee5d057438bf502d132ed4c7017255f16f691286f3dd7b3000000000000000000000000000000000000000000000000000000000000800c0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000a00000000000000000000000000000000000000000000000000000000000000000010000e1073ab7b4226bb86ca2746fbf1ecb305e23c61240b900c4e0ea161a99000000000000000000000000000000000000000000000000000000000000800e0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000a000000000000000000000000000000000000000000000000000000000000000000100005bc7e5e9f6718a7a59ba32849b08a12d957bcf517cb6ba68faf03983ba000000000000000000000000000000000000000000000000000000000000800f0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000a00000000000000000000000000000000000000000000000000000000000000000",
+  "tx": {
+    "txType": 254,
+    "from": "0x0000000000000000000000000000000000008007",
+    "to": "0x0000000000000000000000000000000000008006",
+    "gasLimit": 72000000,
+    "gasPerPubdataByteLimit": 800,
+    "maxFeePerGas": 0,
+    "maxPriorityFeePerGas": 0,
+    "paymaster": 0,
+    "nonce": "13",
+    "value": 0,
+    "reserved": [
+      0,
+      0,
+      0,
+      0
+    ],
+    "data": "0xe9f18c170000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000000c00000000000000000000000000000000000000000000000000000000000001800000000000000000000000000000000000000000000000000000000000000240000000000000000000000000000000000000000000000000000000000000030000000000000000000000000000000000000000000000000000000000000003c000000000000000000000000000000000000000000000000000000000000004800000000000000000000000000000000000000000000000000000000000000540000000000000000000000000000000000000000000000000000000000000060000000000000000000000000000000000000000000000000000000000000006c000000000000000000000000000000000000000000000000000000000000007800000000000000000000000000000000000000000000000000000000000000840000000000000000000000000000000000000000000000000000000000000090000000000000000000000000000000000000000000000000000000000000009c0010000911c610c6e91d050e608ac4f5db8b08c33bb032a57f70899cdd250a75e00000000000000000000000000000000000000000000000000000000000080020000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000a000000000000000000000000000000000000000000000000000000000000000000100012f42627ab0dd09d78d8a25f459e3b3caf2126668fdfc19887eb5cbf4de00000000000000000000000000000000000000000000000000000000000080030000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000a000000000000000000000000000000000000000000000000000000000000000000100008fd05a39ae3ccc0c081732b2c09b783810773a66d6429cfb03d813a69200000000000000000000000000000000000000000000000000000000000080040000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000a00000000000000000000000000000000000000000000000000000000000000000010000475ebeaf64663ebad3ab3fd14b6e985f576c816a66f84bda5a1825310700000000000000000000000000000000000000000000000000000000000080050000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000a00000000000000000000000000000000000000000000000000000000000000000010005c1731dded081c794319523b82102fd09237011e23e0dda219b1a81479900000000000000000000000000000000000000000000000000000000000080060000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000a0000000000000000000000000000000000000000000000000000000000000000001000075efc5d3c37f1861e7c9f7f12c5c71f7b98c8e96bc1ae750441942911a00000000000000000000000000000000000000000000000000000000000080080000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000a0000000000000000000000000000000000000000000000000000000000000000001000071fb47c4855b3cee15acfc19af66272afb61ae2196cdf8f0af81316c2200000000000000000000000000000000000000000000000000000000000080090000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000a0000000000000000000000000000000000000000000000000000000000000000001000139d95a414e7910bb755fecc60531a8c7ba6cc49c2fbd763df8541e4fae000000000000000000000000000000000000000000000000000000000000800a0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000a000000000000000000000000000000000000000000000000000000000000000000100021f8bc6a6311dc169f267fafb32fa14724539b5488a9c62788b158e8fcd000000000000000000000000000000000000000000000000000000000000800b0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000a00000000000000000000000000000000000000000000000000000000000000000010009adf7ebf8227ee5d057438bf502d132ed4c7017255f16f691286f3dd7b3000000000000000000000000000000000000000000000000000000000000800c0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000a00000000000000000000000000000000000000000000000000000000000000000010000e1073ab7b4226bb86ca2746fbf1ecb305e23c61240b900c4e0ea161a99000000000000000000000000000000000000000000000000000000000000800e0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000a000000000000000000000000000000000000000000000000000000000000000000100005bc7e5e9f6718a7a59ba32849b08a12d957bcf517cb6ba68faf03983ba000000000000000000000000000000000000000000000000000000000000800f0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000a00000000000000000000000000000000000000000000000000000000000000000",
+    "signature": "0x",
+    "factoryDeps": [],
+    "paymasterInput": "0x",
+    "reservedDynamic": "0x"
+  }
+}
\ No newline at end of file
diff --git a/etc/upgrades/1693318788-virtual-block-timestamp/testnet2/transactions.json b/etc/upgrades/1693318788-virtual-block-timestamp/testnet2/transactions.json
new file mode 100644
index 000000000000..203c9e4c0b5a
--- /dev/null
+++ b/etc/upgrades/1693318788-virtual-block-timestamp/testnet2/transactions.json
@@ -0,0 +1,246 @@
+{
+  "proposeUpgradeTx": {
+    "l2ProtocolUpgradeTx": {
+      "txType": 254,
+      "from": "0x0000000000000000000000000000000000008007",
+      "to": "0x0000000000000000000000000000000000008006",
+      "gasLimit": 72000000,
+      "gasPerPubdataByteLimit": 800,
+      "maxFeePerGas": 0,
+      "maxPriorityFeePerGas": 0,
+      "paymaster": 0,
+      "nonce": "13",
+      "value": 0,
+      "reserved": [
+        0,
+        0,
+        0,
+        0
+      ],
+      "data": "0xe9f18c170000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000000c00000000000000000000000000000000000000000000000000000000000001800000000000000000000000000000000000000000000000000000000000000240000000000000000000000000000000000000000000000000000000000000030000000000000000000000000000000000000000000000000000000000000003c000000000000000000000000000000000000000000000000000000000000004800000000000000000000000000000000000000000000000000000000000000540000000000000000000000000000000000000000000000000000000000000060000000000000000000000000000000000000000000000000000000000000006c000000000000000000000000000000000000000000000000000000000000007800000000000000000000000000000000000000000000000000000000000000840000000000000000000000000000000000000000000000000000000000000090000000000000000000000000000000000000000000000000000000000000009c0010000911c610c6e91d050e608ac4f5db8b08c33bb032a57f70899cdd250a75e00000000000000000000000000000000000000000000000000000000000080020000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000a000000000000000000000000000000000000000000000000000000000000000000100012f42627ab0dd09d78d8a25f459e3b3caf2126668fdfc19887eb5cbf4de00000000000000000000000000000000000000000000000000000000000080030000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000a000000000000000000000000000000000000000000000000000000000000000000100008fd05a39ae3ccc0c081732b2c09b783810773a66d6429cfb03d813a69200000000000000000000000000000000000000000000000000000000000080040000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000a00000000000000000000000000000000000000000000000000000000000000000010000475ebeaf64663ebad3ab3fd14b6e985f576c816a66f84bda5a1825310700000000000000000000000000000000000000000000000000000000000080050000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000a00000000000000000000000000000000000000000000000000000000000000000010005c1731dded081c794319523b82102fd09237011e23e0dda219b1a81479900000000000000000000000000000000000000000000000000000000000080060000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000a0000000000000000000000000000000000000000000000000000000000000000001000075efc5d3c37f1861e7c9f7f12c5c71f7b98c8e96bc1ae750441942911a00000000000000000000000000000000000000000000000000000000000080080000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000a0000000000000000000000000000000000000000000000000000000000000000001000071fb47c4855b3cee15acfc19af66272afb61ae2196cdf8f0af81316c2200000000000000000000000000000000000000000000000000000000000080090000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000a0000000000000000000000000000000000000000000000000000000000000000001000139d95a414e7910bb755fecc60531a8c7ba6cc49c2fbd763df8541e4fae000000000000000000000000000000000000000000000000000000000000800a0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000a000000000000000000000000000000000000000000000000000000000000000000100021f8bc6a6311dc169f267fafb32fa14724539b5488a9c62788b158e8fcd000000000000000000000000000000000000000000000000000000000000800b0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000a00000000000000000000000000000000000000000000000000000000000000000010009adf7ebf8227ee5d057438bf502d132ed4c7017255f16f691286f3dd7b3000000000000000000000000000000000000000000000000000000000000800c0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000a00000000000000000000000000000000000000000000000000000000000000000010000e1073ab7b4226bb86ca2746fbf1ecb305e23c61240b900c4e0ea161a99000000000000000000000000000000000000000000000000000000000000800e0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000a000000000000000000000000000000000000000000000000000000000000000000100005bc7e5e9f6718a7a59ba32849b08a12d957bcf517cb6ba68faf03983ba000000000000000000000000000000000000000000000000000000000000800f0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000a00000000000000000000000000000000000000000000000000000000000000000",
+      "signature": "0x",
+      "factoryDeps": [],
+      "paymasterInput": "0x",
+      "reservedDynamic": "0x"
+    },
+    "bootloaderHash": "0x0100089b29c64a520d9033da5a4f80c6f74132cbd44142c6afc5913c26f0487d",
+    "defaultAccountHash": "0x0100067d16a5485875b4249040bf421f53e869337fe118ec747cf40a4c777e5f",
+    "verifier": "0x0000000000000000000000000000000000000000",
+    "verifierParams": {
+      "recursionNodeLevelVkHash": "0x0000000000000000000000000000000000000000000000000000000000000000",
+      "recursionLeafLevelVkHash": "0x0000000000000000000000000000000000000000000000000000000000000000",
+      "recursionCircuitsSetVksHash": "0x0000000000000000000000000000000000000000000000000000000000000000"
+    },
+    "l1ContractsUpgradeCalldata": "0x",
+    "postUpgradeCalldata": "0x",
+    "upgradeTimestamp": {
+      "type": "BigNumber",
+      "hex": "0x64f080c0"
+    },
+    "factoryDeps": [],
+    "newProtocolVersion": "13",
+    "newAllowList": "0x0000000000000000000000000000000000000000"
+  },
+  "l1upgradeCalldata": "0x1ed824a0000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000001a00000000000000000000000000000000000000000000000000000000000000f800100089b29c64a520d9033da5a4f80c6f74132cbd44142c6afc5913c26f0487d0100067d16a5485875b4249040bf421f53e869337fe118ec747cf40a4c777e5f00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000fa00000000000000000000000000000000000000000000000000000000000000fc00000000000000000000000000000000000000000000000000000000064f080c0000000000000000000000000000000000000000000000000000000000000000d000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000fe0000000000000000000000000000000000000000000000000000000000008007000000000000000000000000000000000000000000000000000000000000800600000000000000000000000000000000000000000000000000000000044aa2000000000000000000000000000000000000000000000000000000000000000320000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000d0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000002600000000000000000000000000000000000000000000000000000000000000d600000000000000000000000000000000000000000000000000000000000000d800000000000000000000000000000000000000000000000000000000000000da00000000000000000000000000000000000000000000000000000000000000dc00000000000000000000000000000000000000000000000000000000000000ac4e9f18c170000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000000c00000000000000000000000000000000000000000000000000000000000001800000000000000000000000000000000000000000000000000000000000000240000000000000000000000000000000000000000000000000000000000000030000000000000000000000000000000000000000000000000000000000000003c000000000000000000000000000000000000000000000000000000000000004800000000000000000000000000000000000000000000000000000000000000540000000000000000000000000000000000000000000000000000000000000060000000000000000000000000000000000000000000000000000000000000006c000000000000000000000000000000000000000000000000000000000000007800000000000000000000000000000000000000000000000000000000000000840000000000000000000000000000000000000000000000000000000000000090000000000000000000000000000000000000000000000000000000000000009c0010000911c610c6e91d050e608ac4f5db8b08c33bb032a57f70899cdd250a75e00000000000000000000000000000000000000000000000000000000000080020000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000a000000000000000000000000000000000000000000000000000000000000000000100012f42627ab0dd09d78d8a25f459e3b3caf2126668fdfc19887eb5cbf4de00000000000000000000000000000000000000000000000000000000000080030000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000a000000000000000000000000000000000000000000000000000000000000000000100008fd05a39ae3ccc0c081732b2c09b783810773a66d6429cfb03d813a69200000000000000000000000000000000000000000000000000000000000080040000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000a00000000000000000000000000000000000000000000000000000000000000000010000475ebeaf64663ebad3ab3fd14b6e985f576c816a66f84bda5a1825310700000000000000000000000000000000000000000000000000000000000080050000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000a00000000000000000000000000000000000000000000000000000000000000000010005c1731dded081c794319523b82102fd09237011e23e0dda219b1a81479900000000000000000000000000000000000000000000000000000000000080060000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000a0000000000000000000000000000000000000000000000000000000000000000001000075efc5d3c37f1861e7c9f7f12c5c71f7b98c8e96bc1ae750441942911a00000000000000000000000000000000000000000000000000000000000080080000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000a0000000000000000000000000000000000000000000000000000000000000000001000071fb47c4855b3cee15acfc19af66272afb61ae2196cdf8f0af81316c2200000000000000000000000000000000000000000000000000000000000080090000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000a0000000000000000000000000000000000000000000000000000000000000000001000139d95a414e7910bb755fecc60531a8c7ba6cc49c2fbd763df8541e4fae000000000000000000000000000000000000000000000000000000000000800a0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000a000000000000000000000000000000000000000000000000000000000000000000100021f8bc6a6311dc169f267fafb32fa14724539b5488a9c62788b158e8fcd000000000000000000000000000000000000000000000000000000000000800b0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000a00000000000000000000000000000000000000000000000000000000000000000010009adf7ebf8227ee5d057438bf502d132ed4c7017255f16f691286f3dd7b3000000000000000000000000000000000000000000000000000000000000800c0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000a00000000000000000000000000000000000000000000000000000000000000000010000e1073ab7b4226bb86ca2746fbf1ecb305e23c61240b900c4e0ea161a99000000000000000000000000000000000000000000000000000000000000800e0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000a000000000000000000000000000000000000000000000000000000000000000000100005bc7e5e9f6718a7a59ba32849b08a12d957bcf517cb6ba68faf03983ba000000000000000000000000000000000000000000000000000000000000800f0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000a00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+  "upgradeAddress": "0x70EEdd750Ce140c6320a721D3e6Ff62c80e29DB8",
+  "protocolVersion": "13",
+  "diamondUpgradeProposalId": {
+    "type": "BigNumber",
+    "hex": "0x08"
+  },
+  "upgradeTimestamp": "1693483200",
+  "proposeTransparentUpgradeCalldata": "0x8043760a00000000000000000000000000000000000000000000000000000000000000400000000000000000000000000000000000000000000000000000000000000008000000000000000000000000000000000000000000000000000000000000006000000000000000000000000070eedd750ce140c6320a721d3e6ff62c80e29db80000000000000000000000000000000000000000000000000000000000001680000000000000000000000000000000000000000000000000000000000000000a000000000000000000000000000000000000000000000000000000000000014000000000000000000000000000000000000000000000000000000000000002e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000009400000000000000000000000000000000000000000000000000000000000000a600000000000000000000000000000000000000000000000000000000000000ba00000000000000000000000000000000000000000000000000000000000000d40000000000000000000000000000000000000000000000000000000000000124000000000000000000000000000000000000000000000000000000000000013a000000000000000000000000000000000000000000000000000000000000014c00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000080000000000000000000000000000000000000000000000000000000000000000873fb92970000000000000000000000000000000000000000000000000000000036d4eb840000000000000000000000000000000000000000000000000000000027ae4c16000000000000000000000000000000000000000000000000000000000551448c000000000000000000000000000000000000000000000000000000008043760a00000000000000000000000000000000000000000000000000000000beda4b12000000000000000000000000000000000000000000000000000000001733894500000000000000000000000000000000000000000000000000000000587809c70000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000800000000000000000000000000000000000000000000000000000000000000023cdffacc60000000000000000000000000000000000000000000000000000000052ef6b2c00000000000000000000000000000000000000000000000000000000adfca15e000000000000000000000000000000000000000000000000000000007a0ed62700000000000000000000000000000000000000000000000000000000a7cd63b700000000000000000000000000000000000000000000000000000000fe10226d0000000000000000000000000000000000000000000000000000000079823c9a000000000000000000000000000000000000000000000000000000004fc07d7500000000000000000000000000000000000000000000000000000000d86970d800000000000000000000000000000000000000000000000000000000fd791f3c000000000000000000000000000000000000000000000000000000009d1b5a81000000000000000000000000000000000000000000000000000000007b30c8da000000000000000000000000000000000000000000000000000000008665b15000000000000000000000000000000000000000000000000000000000631f4bac000000000000000000000000000000000000000000000000000000000ec6b0b7000000000000000000000000000000000000000000000000000000001b60e62600000000000000000000000000000000000000000000000000000000e39d3bff0000000000000000000000000000000000000000000000000000000033ce93fe000000000000000000000000000000000000000000000000000000000ef240a000000000000000000000000000000000000000000000000000000000fe26699e000000000000000000000000000000000000000000000000000000003960738200000000000000000000000000000000000000000000000000000000af6a2dcd00000000000000000000000000000000000000000000000000000000a1954fc500000000000000000000000000000000000000000000000000000000a39980a00000000000000000000000000000000000000000000000000000000046657fe90000000000000000000000000000000000000000000000000000000018e3a941000000000000000000000000000000000000000000000000000000003db920ce0000000000000000000000000000000000000000000000000000000029b98c6700000000000000000000000000000000000000000000000000000000bd7c541200000000000000000000000000000000000000000000000000000000c3bbd2d700000000000000000000000000000000000000000000000000000000e81e0ba100000000000000000000000000000000000000000000000000000000facd743b000000000000000000000000000000000000000000000000000000009cd939e40000000000000000000000000000000000000000000000000000000056142d7a0000000000000000000000000000000000000000000000000000000074f4d30d00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008000000000000000000000000000000000000000000000000000000000000000066c0960f900000000000000000000000000000000000000000000000000000000b473318e00000000000000000000000000000000000000000000000000000000042901c700000000000000000000000000000000000000000000000000000000263b7f8e00000000000000000000000000000000000000000000000000000000e4948f4300000000000000000000000000000000000000000000000000000000eb67241900000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008000000000000000000000000000000000000000000000000000000000000000040c4dd81000000000000000000000000000000000000000000000000000000000ce9dcf16000000000000000000000000000000000000000000000000000000007739cbe700000000000000000000000000000000000000000000000000000000a9a2d18a0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000800000000000000000000000000000000000000000000000000000000000000005e58bb63900000000000000000000000000000000000000000000000000000000f235757f000000000000000000000000000000000000000000000000000000001cc5d10300000000000000000000000000000000000000000000000000000000be6f11cf000000000000000000000000000000000000000000000000000000004623c91d00000000000000000000000000000000000000000000000000000000000000000000000000000000dc7c3d03845efe2c4a9e758a70a68ba6bba9fac4000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000080000000000000000000000000000000000000000000000000000000000000000873fb92970000000000000000000000000000000000000000000000000000000036d4eb840000000000000000000000000000000000000000000000000000000027ae4c16000000000000000000000000000000000000000000000000000000000551448c000000000000000000000000000000000000000000000000000000008043760a00000000000000000000000000000000000000000000000000000000beda4b12000000000000000000000000000000000000000000000000000000001733894500000000000000000000000000000000000000000000000000000000587809c7000000000000000000000000000000000000000000000000000000000000000000000000000000007444de636699f080ca1c033528d2bb3705b391ce0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000800000000000000000000000000000000000000000000000000000000000000023cdffacc60000000000000000000000000000000000000000000000000000000052ef6b2c00000000000000000000000000000000000000000000000000000000adfca15e000000000000000000000000000000000000000000000000000000007a0ed62700000000000000000000000000000000000000000000000000000000a7cd63b700000000000000000000000000000000000000000000000000000000fe10226d0000000000000000000000000000000000000000000000000000000079823c9a000000000000000000000000000000000000000000000000000000004fc07d7500000000000000000000000000000000000000000000000000000000d86970d800000000000000000000000000000000000000000000000000000000fd791f3c000000000000000000000000000000000000000000000000000000009d1b5a81000000000000000000000000000000000000000000000000000000007b30c8da000000000000000000000000000000000000000000000000000000008665b15000000000000000000000000000000000000000000000000000000000631f4bac000000000000000000000000000000000000000000000000000000000ec6b0b7000000000000000000000000000000000000000000000000000000001b60e62600000000000000000000000000000000000000000000000000000000e39d3bff0000000000000000000000000000000000000000000000000000000033ce93fe000000000000000000000000000000000000000000000000000000000ef240a000000000000000000000000000000000000000000000000000000000fe26699e000000000000000000000000000000000000000000000000000000003960738200000000000000000000000000000000000000000000000000000000af6a2dcd00000000000000000000000000000000000000000000000000000000a1954fc500000000000000000000000000000000000000000000000000000000a39980a00000000000000000000000000000000000000000000000000000000046657fe90000000000000000000000000000000000000000000000000000000018e3a941000000000000000000000000000000000000000000000000000000003db920ce0000000000000000000000000000000000000000000000000000000029b98c6700000000000000000000000000000000000000000000000000000000bd7c541200000000000000000000000000000000000000000000000000000000c3bbd2d700000000000000000000000000000000000000000000000000000000e81e0ba100000000000000000000000000000000000000000000000000000000facd743b000000000000000000000000000000000000000000000000000000009cd939e40000000000000000000000000000000000000000000000000000000056142d7a0000000000000000000000000000000000000000000000000000000074f4d30d000000000000000000000000000000000000000000000000000000000000000000000000000000000ae41f9fc8a83fbc6062ba956224ab86fa6d150700000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000008000000000000000000000000000000000000000000000000000000000000000066c0960f900000000000000000000000000000000000000000000000000000000b473318e00000000000000000000000000000000000000000000000000000000042901c700000000000000000000000000000000000000000000000000000000263b7f8e00000000000000000000000000000000000000000000000000000000e4948f4300000000000000000000000000000000000000000000000000000000eb6724190000000000000000000000000000000000000000000000000000000000000000000000000000000069b8cda4c8e66a0b51fc82834458e087039db2ab00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000008000000000000000000000000000000000000000000000000000000000000000040c4dd81000000000000000000000000000000000000000000000000000000000ce9dcf16000000000000000000000000000000000000000000000000000000007739cbe700000000000000000000000000000000000000000000000000000000a9a2d18a000000000000000000000000000000000000000000000000000000000000000000000000000000002e64926be35412f7710a3e097ba076740bf97cc00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000800000000000000000000000000000000000000000000000000000000000000005e58bb63900000000000000000000000000000000000000000000000000000000f235757f000000000000000000000000000000000000000000000000000000001cc5d10300000000000000000000000000000000000000000000000000000000be6f11cf000000000000000000000000000000000000000000000000000000004623c91d0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000010041ed824a0000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000001a00000000000000000000000000000000000000000000000000000000000000f800100089b29c64a520d9033da5a4f80c6f74132cbd44142c6afc5913c26f0487d0100067d16a5485875b4249040bf421f53e869337fe118ec747cf40a4c777e5f00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000fa00000000000000000000000000000000000000000000000000000000000000fc00000000000000000000000000000000000000000000000000000000064f080c0000000000000000000000000000000000000000000000000000000000000000d000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000fe0000000000000000000000000000000000000000000000000000000000008007000000000000000000000000000000000000000000000000000000000000800600000000000000000000000000000000000000000000000000000000044aa2000000000000000000000000000000000000000000000000000000000000000320000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000d0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000002600000000000000000000000000000000000000000000000000000000000000d600000000000000000000000000000000000000000000000000000000000000d800000000000000000000000000000000000000000000000000000000000000da00000000000000000000000000000000000000000000000000000000000000dc00000000000000000000000000000000000000000000000000000000000000ac4e9f18c170000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000000c00000000000000000000000000000000000000000000000000000000000001800000000000000000000000000000000000000000000000000000000000000240000000000000000000000000000000000000000000000000000000000000030000000000000000000000000000000000000000000000000000000000000003c000000000000000000000000000000000000000000000000000000000000004800000000000000000000000000000000000000000000000000000000000000540000000000000000000000000000000000000000000000000000000000000060000000000000000000000000000000000000000000000000000000000000006c000000000000000000000000000000000000000000000000000000000000007800000000000000000000000000000000000000000000000000000000000000840000000000000000000000000000000000000000000000000000000000000090000000000000000000000000000000000000000000000000000000000000009c0010000911c610c6e91d050e608ac4f5db8b08c33bb032a57f70899cdd250a75e00000000000000000000000000000000000000000000000000000000000080020000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000a000000000000000000000000000000000000000000000000000000000000000000100012f42627ab0dd09d78d8a25f459e3b3caf2126668fdfc19887eb5cbf4de00000000000000000000000000000000000000000000000000000000000080030000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000a000000000000000000000000000000000000000000000000000000000000000000100008fd05a39ae3ccc0c081732b2c09b783810773a66d6429cfb03d813a69200000000000000000000000000000000000000000000000000000000000080040000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000a00000000000000000000000000000000000000000000000000000000000000000010000475ebeaf64663ebad3ab3fd14b6e985f576c816a66f84bda5a1825310700000000000000000000000000000000000000000000000000000000000080050000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000a00000000000000000000000000000000000000000000000000000000000000000010005c1731dded081c794319523b82102fd09237011e23e0dda219b1a81479900000000000000000000000000000000000000000000000000000000000080060000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000a0000000000000000000000000000000000000000000000000000000000000000001000075efc5d3c37f1861e7c9f7f12c5c71f7b98c8e96bc1ae750441942911a00000000000000000000000000000000000000000000000000000000000080080000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000a0000000000000000000000000000000000000000000000000000000000000000001000071fb47c4855b3cee15acfc19af66272afb61ae2196cdf8f0af81316c2200000000000000000000000000000000000000000000000000000000000080090000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000a0000000000000000000000000000000000000000000000000000000000000000001000139d95a414e7910bb755fecc60531a8c7ba6cc49c2fbd763df8541e4fae000000000000000000000000000000000000000000000000000000000000800a0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000a000000000000000000000000000000000000000000000000000000000000000000100021f8bc6a6311dc169f267fafb32fa14724539b5488a9c62788b158e8fcd000000000000000000000000000000000000000000000000000000000000800b0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000a00000000000000000000000000000000000000000000000000000000000000000010009adf7ebf8227ee5d057438bf502d132ed4c7017255f16f691286f3dd7b3000000000000000000000000000000000000000000000000000000000000800c0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000a00000000000000000000000000000000000000000000000000000000000000000010000e1073ab7b4226bb86ca2746fbf1ecb305e23c61240b900c4e0ea161a99000000000000000000000000000000000000000000000000000000000000800e0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000a000000000000000000000000000000000000000000000000000000000000000000100005bc7e5e9f6718a7a59ba32849b08a12d957bcf517cb6ba68faf03983ba000000000000000000000000000000000000000000000000000000000000800f0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000a0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+  "transparentUpgrade": {
+    "facetCuts": [
+      {
+        "facet": "0x0000000000000000000000000000000000000000",
+        "selectors": [
+          "0x73fb9297",
+          "0x36d4eb84",
+          "0x27ae4c16",
+          "0x0551448c",
+          "0x8043760a",
+          "0xbeda4b12",
+          "0x17338945",
+          "0x587809c7"
+        ],
+        "action": 2,
+        "isFreezable": false
+      },
+      {
+        "facet": "0x0000000000000000000000000000000000000000",
+        "selectors": [
+          "0xcdffacc6",
+          "0x52ef6b2c",
+          "0xadfca15e",
+          "0x7a0ed627",
+          "0xa7cd63b7",
+          "0xfe10226d",
+          "0x79823c9a",
+          "0x4fc07d75",
+          "0xd86970d8",
+          "0xfd791f3c",
+          "0x9d1b5a81",
+          "0x7b30c8da",
+          "0x8665b150",
+          "0x631f4bac",
+          "0x0ec6b0b7",
+          "0x1b60e626",
+          "0xe39d3bff",
+          "0x33ce93fe",
+          "0x0ef240a0",
+          "0xfe26699e",
+          "0x39607382",
+          "0xaf6a2dcd",
+          "0xa1954fc5",
+          "0xa39980a0",
+          "0x46657fe9",
+          "0x18e3a941",
+          "0x3db920ce",
+          "0x29b98c67",
+          "0xbd7c5412",
+          "0xc3bbd2d7",
+          "0xe81e0ba1",
+          "0xfacd743b",
+          "0x9cd939e4",
+          "0x56142d7a",
+          "0x74f4d30d"
+        ],
+        "action": 2,
+        "isFreezable": false
+      },
+      {
+        "facet": "0x0000000000000000000000000000000000000000",
+        "selectors": [
+          "0x6c0960f9",
+          "0xb473318e",
+          "0x042901c7",
+          "0x263b7f8e",
+          "0xe4948f43",
+          "0xeb672419"
+        ],
+        "action": 2,
+        "isFreezable": false
+      },
+      {
+        "facet": "0x0000000000000000000000000000000000000000",
+        "selectors": [
+          "0x0c4dd810",
+          "0xce9dcf16",
+          "0x7739cbe7",
+          "0xa9a2d18a"
+        ],
+        "action": 2,
+        "isFreezable": false
+      },
+      {
+        "facet": "0x0000000000000000000000000000000000000000",
+        "selectors": [
+          "0xe58bb639",
+          "0xf235757f",
+          "0x1cc5d103",
+          "0xbe6f11cf",
+          "0x4623c91d"
+        ],
+        "action": 2,
+        "isFreezable": false
+      },
+      {
+        "facet": "0xdC7c3D03845EfE2c4a9E758A70a68BA6bba9FaC4",
+        "selectors": [
+          "0x73fb9297",
+          "0x36d4eb84",
+          "0x27ae4c16",
+          "0x0551448c",
+          "0x8043760a",
+          "0xbeda4b12",
+          "0x17338945",
+          "0x587809c7"
+        ],
+        "action": 0,
+        "isFreezable": false
+      },
+      {
+        "facet": "0x7444DE636699F080cA1C033528D2bB3705B391Ce",
+        "selectors": [
+          "0xcdffacc6",
+          "0x52ef6b2c",
+          "0xadfca15e",
+          "0x7a0ed627",
+          "0xa7cd63b7",
+          "0xfe10226d",
+          "0x79823c9a",
+          "0x4fc07d75",
+          "0xd86970d8",
+          "0xfd791f3c",
+          "0x9d1b5a81",
+          "0x7b30c8da",
+          "0x8665b150",
+          "0x631f4bac",
+          "0x0ec6b0b7",
+          "0x1b60e626",
+          "0xe39d3bff",
+          "0x33ce93fe",
+          "0x0ef240a0",
+          "0xfe26699e",
+          "0x39607382",
+          "0xaf6a2dcd",
+          "0xa1954fc5",
+          "0xa39980a0",
+          "0x46657fe9",
+          "0x18e3a941",
+          "0x3db920ce",
+          "0x29b98c67",
+          "0xbd7c5412",
+          "0xc3bbd2d7",
+          "0xe81e0ba1",
+          "0xfacd743b",
+          "0x9cd939e4",
+          "0x56142d7a",
+          "0x74f4d30d"
+        ],
+        "action": 0,
+        "isFreezable": false
+      },
+      {
+        "facet": "0x0aE41F9fc8A83FBC6062bA956224AB86fA6D1507",
+        "selectors": [
+          "0x6c0960f9",
+          "0xb473318e",
+          "0x042901c7",
+          "0x263b7f8e",
+          "0xe4948f43",
+          "0xeb672419"
+        ],
+        "action": 0,
+        "isFreezable": true
+      },
+      {
+        "facet": "0x69b8cdA4c8E66A0b51Fc82834458e087039dB2Ab",
+        "selectors": [
+          "0x0c4dd810",
+          "0xce9dcf16",
+          "0x7739cbe7",
+          "0xa9a2d18a"
+        ],
+        "action": 0,
+        "isFreezable": true
+      },
+      {
+        "facet": "0x2E64926BE35412f7710A3E097Ba076740bF97CC0",
+        "selectors": [
+          "0xe58bb639",
+          "0xf235757f",
+          "0x1cc5d103",
+          "0xbe6f11cf",
+          "0x4623c91d"
+        ],
+        "action": 0,
+        "isFreezable": true
+      }
+    ],
+    "initAddress": "0x70EEdd750Ce140c6320a721D3e6Ff62c80e29DB8",
+    "initCalldata": "0x1ed824a0000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000001a00000000000000000000000000000000000000000000000000000000000000f800100089b29c64a520d9033da5a4f80c6f74132cbd44142c6afc5913c26f0487d0100067d16a5485875b4249040bf421f53e869337fe118ec747cf40a4c777e5f00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000fa00000000000000000000000000000000000000000000000000000000000000fc00000000000000000000000000000000000000000000000000000000064f080c0000000000000000000000000000000000000000000000000000000000000000d000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000fe0000000000000000000000000000000000000000000000000000000000008007000000000000000000000000000000000000000000000000000000000000800600000000000000000000000000000000000000000000000000000000044aa2000000000000000000000000000000000000000000000000000000000000000320000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000d0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000002600000000000000000000000000000000000000000000000000000000000000d600000000000000000000000000000000000000000000000000000000000000d800000000000000000000000000000000000000000000000000000000000000da00000000000000000000000000000000000000000000000000000000000000dc00000000000000000000000000000000000000000000000000000000000000ac4e9f18c170000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000000c00000000000000000000000000000000000000000000000000000000000001800000000000000000000000000000000000000000000000000000000000000240000000000000000000000000000000000000000000000000000000000000030000000000000000000000000000000000000000000000000000000000000003c000000000000000000000000000000000000000000000000000000000000004800000000000000000000000000000000000000000000000000000000000000540000000000000000000000000000000000000000000000000000000000000060000000000000000000000000000000000000000000000000000000000000006c000000000000000000000000000000000000000000000000000000000000007800000000000000000000000000000000000000000000000000000000000000840000000000000000000000000000000000000000000000000000000000000090000000000000000000000000000000000000000000000000000000000000009c0010000911c610c6e91d050e608ac4f5db8b08c33bb032a57f70899cdd250a75e00000000000000000000000000000000000000000000000000000000000080020000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000a000000000000000000000000000000000000000000000000000000000000000000100012f42627ab0dd09d78d8a25f459e3b3caf2126668fdfc19887eb5cbf4de00000000000000000000000000000000000000000000000000000000000080030000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000a000000000000000000000000000000000000000000000000000000000000000000100008fd05a39ae3ccc0c081732b2c09b783810773a66d6429cfb03d813a69200000000000000000000000000000000000000000000000000000000000080040000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000a00000000000000000000000000000000000000000000000000000000000000000010000475ebeaf64663ebad3ab3fd14b6e985f576c816a66f84bda5a1825310700000000000000000000000000000000000000000000000000000000000080050000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000a00000000000000000000000000000000000000000000000000000000000000000010005c1731dded081c794319523b82102fd09237011e23e0dda219b1a81479900000000000000000000000000000000000000000000000000000000000080060000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000a0000000000000000000000000000000000000000000000000000000000000000001000075efc5d3c37f1861e7c9f7f12c5c71f7b98c8e96bc1ae750441942911a00000000000000000000000000000000000000000000000000000000000080080000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000a0000000000000000000000000000000000000000000000000000000000000000001000071fb47c4855b3cee15acfc19af66272afb61ae2196cdf8f0af81316c2200000000000000000000000000000000000000000000000000000000000080090000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000a0000000000000000000000000000000000000000000000000000000000000000001000139d95a414e7910bb755fecc60531a8c7ba6cc49c2fbd763df8541e4fae000000000000000000000000000000000000000000000000000000000000800a0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000a000000000000000000000000000000000000000000000000000000000000000000100021f8bc6a6311dc169f267fafb32fa14724539b5488a9c62788b158e8fcd000000000000000000000000000000000000000000000000000000000000800b0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000a00000000000000000000000000000000000000000000000000000000000000000010009adf7ebf8227ee5d057438bf502d132ed4c7017255f16f691286f3dd7b3000000000000000000000000000000000000000000000000000000000000800c0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000a00000000000000000000000000000000000000000000000000000000000000000010000e1073ab7b4226bb86ca2746fbf1ecb305e23c61240b900c4e0ea161a99000000000000000000000000000000000000000000000000000000000000800e0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000a000000000000000000000000000000000000000000000000000000000000000000100005bc7e5e9f6718a7a59ba32849b08a12d957bcf517cb6ba68faf03983ba000000000000000000000000000000000000000000000000000000000000800f0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000a00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000"
+  },
+  "executeUpgradeCalldata": "0x36d4eb8400000000000000000000000000000000000000000000000000000000000000400000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000006000000000000000000000000070eedd750ce140c6320a721d3e6ff62c80e29db80000000000000000000000000000000000000000000000000000000000001680000000000000000000000000000000000000000000000000000000000000000a000000000000000000000000000000000000000000000000000000000000014000000000000000000000000000000000000000000000000000000000000002e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000009400000000000000000000000000000000000000000000000000000000000000a600000000000000000000000000000000000000000000000000000000000000ba00000000000000000000000000000000000000000000000000000000000000d40000000000000000000000000000000000000000000000000000000000000124000000000000000000000000000000000000000000000000000000000000013a000000000000000000000000000000000000000000000000000000000000014c00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000080000000000000000000000000000000000000000000000000000000000000000873fb92970000000000000000000000000000000000000000000000000000000036d4eb840000000000000000000000000000000000000000000000000000000027ae4c16000000000000000000000000000000000000000000000000000000000551448c000000000000000000000000000000000000000000000000000000008043760a00000000000000000000000000000000000000000000000000000000beda4b12000000000000000000000000000000000000000000000000000000001733894500000000000000000000000000000000000000000000000000000000587809c70000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000800000000000000000000000000000000000000000000000000000000000000023cdffacc60000000000000000000000000000000000000000000000000000000052ef6b2c00000000000000000000000000000000000000000000000000000000adfca15e000000000000000000000000000000000000000000000000000000007a0ed62700000000000000000000000000000000000000000000000000000000a7cd63b700000000000000000000000000000000000000000000000000000000fe10226d0000000000000000000000000000000000000000000000000000000079823c9a000000000000000000000000000000000000000000000000000000004fc07d7500000000000000000000000000000000000000000000000000000000d86970d800000000000000000000000000000000000000000000000000000000fd791f3c000000000000000000000000000000000000000000000000000000009d1b5a81000000000000000000000000000000000000000000000000000000007b30c8da000000000000000000000000000000000000000000000000000000008665b15000000000000000000000000000000000000000000000000000000000631f4bac000000000000000000000000000000000000000000000000000000000ec6b0b7000000000000000000000000000000000000000000000000000000001b60e62600000000000000000000000000000000000000000000000000000000e39d3bff0000000000000000000000000000000000000000000000000000000033ce93fe000000000000000000000000000000000000000000000000000000000ef240a000000000000000000000000000000000000000000000000000000000fe26699e000000000000000000000000000000000000000000000000000000003960738200000000000000000000000000000000000000000000000000000000af6a2dcd00000000000000000000000000000000000000000000000000000000a1954fc500000000000000000000000000000000000000000000000000000000a39980a00000000000000000000000000000000000000000000000000000000046657fe90000000000000000000000000000000000000000000000000000000018e3a941000000000000000000000000000000000000000000000000000000003db920ce0000000000000000000000000000000000000000000000000000000029b98c6700000000000000000000000000000000000000000000000000000000bd7c541200000000000000000000000000000000000000000000000000000000c3bbd2d700000000000000000000000000000000000000000000000000000000e81e0ba100000000000000000000000000000000000000000000000000000000facd743b000000000000000000000000000000000000000000000000000000009cd939e40000000000000000000000000000000000000000000000000000000056142d7a0000000000000000000000000000000000000000000000000000000074f4d30d00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008000000000000000000000000000000000000000000000000000000000000000066c0960f900000000000000000000000000000000000000000000000000000000b473318e00000000000000000000000000000000000000000000000000000000042901c700000000000000000000000000000000000000000000000000000000263b7f8e00000000000000000000000000000000000000000000000000000000e4948f4300000000000000000000000000000000000000000000000000000000eb67241900000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008000000000000000000000000000000000000000000000000000000000000000040c4dd81000000000000000000000000000000000000000000000000000000000ce9dcf16000000000000000000000000000000000000000000000000000000007739cbe700000000000000000000000000000000000000000000000000000000a9a2d18a0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000800000000000000000000000000000000000000000000000000000000000000005e58bb63900000000000000000000000000000000000000000000000000000000f235757f000000000000000000000000000000000000000000000000000000001cc5d10300000000000000000000000000000000000000000000000000000000be6f11cf000000000000000000000000000000000000000000000000000000004623c91d00000000000000000000000000000000000000000000000000000000000000000000000000000000dc7c3d03845efe2c4a9e758a70a68ba6bba9fac4000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000080000000000000000000000000000000000000000000000000000000000000000873fb92970000000000000000000000000000000000000000000000000000000036d4eb840000000000000000000000000000000000000000000000000000000027ae4c16000000000000000000000000000000000000000000000000000000000551448c000000000000000000000000000000000000000000000000000000008043760a00000000000000000000000000000000000000000000000000000000beda4b12000000000000000000000000000000000000000000000000000000001733894500000000000000000000000000000000000000000000000000000000587809c7000000000000000000000000000000000000000000000000000000000000000000000000000000007444de636699f080ca1c033528d2bb3705b391ce0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000800000000000000000000000000000000000000000000000000000000000000023cdffacc60000000000000000000000000000000000000000000000000000000052ef6b2c00000000000000000000000000000000000000000000000000000000adfca15e000000000000000000000000000000000000000000000000000000007a0ed62700000000000000000000000000000000000000000000000000000000a7cd63b700000000000000000000000000000000000000000000000000000000fe10226d0000000000000000000000000000000000000000000000000000000079823c9a000000000000000000000000000000000000000000000000000000004fc07d7500000000000000000000000000000000000000000000000000000000d86970d800000000000000000000000000000000000000000000000000000000fd791f3c000000000000000000000000000000000000000000000000000000009d1b5a81000000000000000000000000000000000000000000000000000000007b30c8da000000000000000000000000000000000000000000000000000000008665b15000000000000000000000000000000000000000000000000000000000631f4bac000000000000000000000000000000000000000000000000000000000ec6b0b7000000000000000000000000000000000000000000000000000000001b60e62600000000000000000000000000000000000000000000000000000000e39d3bff0000000000000000000000000000000000000000000000000000000033ce93fe000000000000000000000000000000000000000000000000000000000ef240a000000000000000000000000000000000000000000000000000000000fe26699e000000000000000000000000000000000000000000000000000000003960738200000000000000000000000000000000000000000000000000000000af6a2dcd00000000000000000000000000000000000000000000000000000000a1954fc500000000000000000000000000000000000000000000000000000000a39980a00000000000000000000000000000000000000000000000000000000046657fe90000000000000000000000000000000000000000000000000000000018e3a941000000000000000000000000000000000000000000000000000000003db920ce0000000000000000000000000000000000000000000000000000000029b98c6700000000000000000000000000000000000000000000000000000000bd7c541200000000000000000000000000000000000000000000000000000000c3bbd2d700000000000000000000000000000000000000000000000000000000e81e0ba100000000000000000000000000000000000000000000000000000000facd743b000000000000000000000000000000000000000000000000000000009cd939e40000000000000000000000000000000000000000000000000000000056142d7a0000000000000000000000000000000000000000000000000000000074f4d30d000000000000000000000000000000000000000000000000000000000000000000000000000000000ae41f9fc8a83fbc6062ba956224ab86fa6d150700000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000008000000000000000000000000000000000000000000000000000000000000000066c0960f900000000000000000000000000000000000000000000000000000000b473318e00000000000000000000000000000000000000000000000000000000042901c700000000000000000000000000000000000000000000000000000000263b7f8e00000000000000000000000000000000000000000000000000000000e4948f4300000000000000000000000000000000000000000000000000000000eb6724190000000000000000000000000000000000000000000000000000000000000000000000000000000069b8cda4c8e66a0b51fc82834458e087039db2ab00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000008000000000000000000000000000000000000000000000000000000000000000040c4dd81000000000000000000000000000000000000000000000000000000000ce9dcf16000000000000000000000000000000000000000000000000000000007739cbe700000000000000000000000000000000000000000000000000000000a9a2d18a000000000000000000000000000000000000000000000000000000000000000000000000000000002e64926be35412f7710a3e097ba076740bf97cc00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000800000000000000000000000000000000000000000000000000000000000000005e58bb63900000000000000000000000000000000000000000000000000000000f235757f000000000000000000000000000000000000000000000000000000001cc5d10300000000000000000000000000000000000000000000000000000000be6f11cf000000000000000000000000000000000000000000000000000000004623c91d0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000010041ed824a0000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000001a00000000000000000000000000000000000000000000000000000000000000f800100089b29c64a520d9033da5a4f80c6f74132cbd44142c6afc5913c26f0487d0100067d16a5485875b4249040bf421f53e869337fe118ec747cf40a4c777e5f00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000fa00000000000000000000000000000000000000000000000000000000000000fc00000000000000000000000000000000000000000000000000000000064f080c0000000000000000000000000000000000000000000000000000000000000000d000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000fe0000000000000000000000000000000000000000000000000000000000008007000000000000000000000000000000000000000000000000000000000000800600000000000000000000000000000000000000000000000000000000044aa2000000000000000000000000000000000000000000000000000000000000000320000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000d0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000002600000000000000000000000000000000000000000000000000000000000000d600000000000000000000000000000000000000000000000000000000000000d800000000000000000000000000000000000000000000000000000000000000da00000000000000000000000000000000000000000000000000000000000000dc00000000000000000000000000000000000000000000000000000000000000ac4e9f18c170000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000000c00000000000000000000000000000000000000000000000000000000000001800000000000000000000000000000000000000000000000000000000000000240000000000000000000000000000000000000000000000000000000000000030000000000000000000000000000000000000000000000000000000000000003c000000000000000000000000000000000000000000000000000000000000004800000000000000000000000000000000000000000000000000000000000000540000000000000000000000000000000000000000000000000000000000000060000000000000000000000000000000000000000000000000000000000000006c000000000000000000000000000000000000000000000000000000000000007800000000000000000000000000000000000000000000000000000000000000840000000000000000000000000000000000000000000000000000000000000090000000000000000000000000000000000000000000000000000000000000009c0010000911c610c6e91d050e608ac4f5db8b08c33bb032a57f70899cdd250a75e00000000000000000000000000000000000000000000000000000000000080020000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000a000000000000000000000000000000000000000000000000000000000000000000100012f42627ab0dd09d78d8a25f459e3b3caf2126668fdfc19887eb5cbf4de00000000000000000000000000000000000000000000000000000000000080030000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000a000000000000000000000000000000000000000000000000000000000000000000100008fd05a39ae3ccc0c081732b2c09b783810773a66d6429cfb03d813a69200000000000000000000000000000000000000000000000000000000000080040000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000a00000000000000000000000000000000000000000000000000000000000000000010000475ebeaf64663ebad3ab3fd14b6e985f576c816a66f84bda5a1825310700000000000000000000000000000000000000000000000000000000000080050000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000a00000000000000000000000000000000000000000000000000000000000000000010005c1731dded081c794319523b82102fd09237011e23e0dda219b1a81479900000000000000000000000000000000000000000000000000000000000080060000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000a0000000000000000000000000000000000000000000000000000000000000000001000075efc5d3c37f1861e7c9f7f12c5c71f7b98c8e96bc1ae750441942911a00000000000000000000000000000000000000000000000000000000000080080000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000a0000000000000000000000000000000000000000000000000000000000000000001000071fb47c4855b3cee15acfc19af66272afb61ae2196cdf8f0af81316c2200000000000000000000000000000000000000000000000000000000000080090000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000a0000000000000000000000000000000000000000000000000000000000000000001000139d95a414e7910bb755fecc60531a8c7ba6cc49c2fbd763df8541e4fae000000000000000000000000000000000000000000000000000000000000800a0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000a000000000000000000000000000000000000000000000000000000000000000000100021f8bc6a6311dc169f267fafb32fa14724539b5488a9c62788b158e8fcd000000000000000000000000000000000000000000000000000000000000800b0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000a00000000000000000000000000000000000000000000000000000000000000000010009adf7ebf8227ee5d057438bf502d132ed4c7017255f16f691286f3dd7b3000000000000000000000000000000000000000000000000000000000000800c0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000a00000000000000000000000000000000000000000000000000000000000000000010000e1073ab7b4226bb86ca2746fbf1ecb305e23c61240b900c4e0ea161a99000000000000000000000000000000000000000000000000000000000000800e0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000a000000000000000000000000000000000000000000000000000000000000000000100005bc7e5e9f6718a7a59ba32849b08a12d957bcf517cb6ba68faf03983ba000000000000000000000000000000000000000000000000000000000000800f0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000a0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000"
+}
\ No newline at end of file
diff --git a/etc/upgrades/1693905748-virtual-block-timestamp-fixed/README.md b/etc/upgrades/1693905748-virtual-block-timestamp-fixed/README.md
new file mode 100644
index 000000000000..d29a05d392d6
--- /dev/null
+++ b/etc/upgrades/1693905748-virtual-block-timestamp-fixed/README.md
@@ -0,0 +1,7 @@
+# Note on virtual block timestamp fixed upgrade
+
+After the release of the previous `1693318788-virtual-block-timestamp` upgrade, there was an issue discovered that
+affected the first transaction right after the ending of the upgrade. With this upgrade, this issue has been fixed.
+
+Note, that while on stage/testnet only `Bootloader` and `SystemContext` are updated (to patch the bug), on mainnet we
+need to do the full upgrade (since the previous version had not been rolled out on mainnet yet).
diff --git a/etc/upgrades/1693905748-virtual-block-timestamp-fixed/common.json b/etc/upgrades/1693905748-virtual-block-timestamp-fixed/common.json
new file mode 100644
index 000000000000..02205de8d971
--- /dev/null
+++ b/etc/upgrades/1693905748-virtual-block-timestamp-fixed/common.json
@@ -0,0 +1,5 @@
+{
+  "name": "virtual-block-timestamp-fixed",
+  "creationTimestamp": 1693905748,
+  "protocolVersion": "14"
+}
\ No newline at end of file
diff --git a/etc/upgrades/1693905748-virtual-block-timestamp-fixed/mainnet2/facetCuts.json b/etc/upgrades/1693905748-virtual-block-timestamp-fixed/mainnet2/facetCuts.json
new file mode 100644
index 000000000000..0356a0cee4b2
--- /dev/null
+++ b/etc/upgrades/1693905748-virtual-block-timestamp-fixed/mainnet2/facetCuts.json
@@ -0,0 +1,188 @@
+[
+  {
+    "facet": "0x0000000000000000000000000000000000000000",
+    "selectors": [
+      "0x73fb9297",
+      "0x36d4eb84",
+      "0x27ae4c16",
+      "0x0551448c",
+      "0x8043760a",
+      "0xbeda4b12",
+      "0x17338945",
+      "0x587809c7"
+    ],
+    "action": 2,
+    "isFreezable": false
+  },
+  {
+    "facet": "0x0000000000000000000000000000000000000000",
+    "selectors": [
+      "0xcdffacc6",
+      "0x52ef6b2c",
+      "0xadfca15e",
+      "0x7a0ed627",
+      "0xa7cd63b7",
+      "0xfe10226d",
+      "0x79823c9a",
+      "0x4fc07d75",
+      "0xd86970d8",
+      "0xfd791f3c",
+      "0x9d1b5a81",
+      "0x7b30c8da",
+      "0x8665b150",
+      "0x631f4bac",
+      "0x0ec6b0b7",
+      "0x1b60e626",
+      "0xe39d3bff",
+      "0x33ce93fe",
+      "0x0ef240a0",
+      "0xfe26699e",
+      "0x39607382",
+      "0xaf6a2dcd",
+      "0xa1954fc5",
+      "0xa39980a0",
+      "0x46657fe9",
+      "0x18e3a941",
+      "0x3db920ce",
+      "0x29b98c67",
+      "0xbd7c5412",
+      "0xc3bbd2d7",
+      "0xe81e0ba1",
+      "0xfacd743b",
+      "0x9cd939e4",
+      "0x56142d7a",
+      "0x74f4d30d"
+    ],
+    "action": 2,
+    "isFreezable": false
+  },
+  {
+    "facet": "0x0000000000000000000000000000000000000000",
+    "selectors": [
+      "0x6c0960f9",
+      "0xb473318e",
+      "0x042901c7",
+      "0x263b7f8e",
+      "0xe4948f43",
+      "0xeb672419"
+    ],
+    "action": 2,
+    "isFreezable": false
+  },
+  {
+    "facet": "0x0000000000000000000000000000000000000000",
+    "selectors": [
+      "0x0c4dd810",
+      "0xce9dcf16",
+      "0x7739cbe7",
+      "0xa9a2d18a"
+    ],
+    "action": 2,
+    "isFreezable": false
+  },
+  {
+    "facet": "0x0000000000000000000000000000000000000000",
+    "selectors": [
+      "0xe58bb639",
+      "0xf235757f",
+      "0x1cc5d103",
+      "0xbe6f11cf",
+      "0x4623c91d"
+    ],
+    "action": 2,
+    "isFreezable": false
+  },
+  {
+    "facet": "0xdC7c3D03845EfE2c4a9E758A70a68BA6bba9FaC4",
+    "selectors": [
+      "0x73fb9297",
+      "0x36d4eb84",
+      "0x27ae4c16",
+      "0x0551448c",
+      "0x8043760a",
+      "0xbeda4b12",
+      "0x17338945",
+      "0x587809c7"
+    ],
+    "action": 0,
+    "isFreezable": false
+  },
+  {
+    "facet": "0x7444DE636699F080cA1C033528D2bB3705B391Ce",
+    "selectors": [
+      "0xcdffacc6",
+      "0x52ef6b2c",
+      "0xadfca15e",
+      "0x7a0ed627",
+      "0xa7cd63b7",
+      "0xfe10226d",
+      "0x79823c9a",
+      "0x4fc07d75",
+      "0xd86970d8",
+      "0xfd791f3c",
+      "0x9d1b5a81",
+      "0x7b30c8da",
+      "0x8665b150",
+      "0x631f4bac",
+      "0x0ec6b0b7",
+      "0x1b60e626",
+      "0xe39d3bff",
+      "0x33ce93fe",
+      "0x0ef240a0",
+      "0xfe26699e",
+      "0x39607382",
+      "0xaf6a2dcd",
+      "0xa1954fc5",
+      "0xa39980a0",
+      "0x46657fe9",
+      "0x18e3a941",
+      "0x3db920ce",
+      "0x29b98c67",
+      "0xbd7c5412",
+      "0xc3bbd2d7",
+      "0xe81e0ba1",
+      "0xfacd743b",
+      "0x9cd939e4",
+      "0x56142d7a",
+      "0x74f4d30d"
+    ],
+    "action": 0,
+    "isFreezable": false
+  },
+  {
+    "facet": "0x62aA95ac4740A367746A664C4C69034d52E968EF",
+    "selectors": [
+      "0x6c0960f9",
+      "0xb473318e",
+      "0x042901c7",
+      "0x263b7f8e",
+      "0xe4948f43",
+      "0xeb672419"
+    ],
+    "action": 0,
+    "isFreezable": true
+  },
+  {
+    "facet": "0x7Ed066718Dfb1b2B04D94780Eca92b67ECF3330b",
+    "selectors": [
+      "0x0c4dd810",
+      "0xce9dcf16",
+      "0x7739cbe7",
+      "0xa9a2d18a"
+    ],
+    "action": 0,
+    "isFreezable": true
+  },
+  {
+    "facet": "0x2E64926BE35412f7710A3E097Ba076740bF97CC0",
+    "selectors": [
+      "0xe58bb639",
+      "0xf235757f",
+      "0x1cc5d103",
+      "0xbe6f11cf",
+      "0x4623c91d"
+    ],
+    "action": 0,
+    "isFreezable": true
+  }
+]
\ No newline at end of file
diff --git a/etc/upgrades/1693905748-virtual-block-timestamp-fixed/mainnet2/facets.json b/etc/upgrades/1693905748-virtual-block-timestamp-fixed/mainnet2/facets.json
new file mode 100644
index 000000000000..c46371fe2763
--- /dev/null
+++ b/etc/upgrades/1693905748-virtual-block-timestamp-fixed/mainnet2/facets.json
@@ -0,0 +1,22 @@
+{
+  "ExecutorFacet": {
+    "address": "0x7Ed066718Dfb1b2B04D94780Eca92b67ECF3330b",
+    "txHash": "0xbd9c116c1a4432a21ced6e6400ed70ec21a1b0572258f9bf004a7a133e09b6d3"
+  },
+  "GovernanceFacet": {
+    "address": "0x2E64926BE35412f7710A3E097Ba076740bF97CC0",
+    "txHash": "0x0000000000000000000000000000000000000000000000000000000000000000"
+  },
+  "DiamondCutFacet": {
+    "address": "0xdC7c3D03845EfE2c4a9E758A70a68BA6bba9FaC4",
+    "txHash": "0x0000000000000000000000000000000000000000000000000000000000000000"
+  },
+  "GettersFacet": {
+    "address": "0x7444DE636699F080cA1C033528D2bB3705B391Ce",
+    "txHash": "0x0000000000000000000000000000000000000000000000000000000000000000"
+  },
+  "MailboxFacet": {
+    "address": "0x62aA95ac4740A367746A664C4C69034d52E968EF",
+    "txHash": "0x0000000000000000000000000000000000000000000000000000000000000000"
+  }
+}
\ No newline at end of file
diff --git a/etc/upgrades/1693905748-virtual-block-timestamp-fixed/mainnet2/l2Upgrade.json b/etc/upgrades/1693905748-virtual-block-timestamp-fixed/mainnet2/l2Upgrade.json
new file mode 100644
index 000000000000..70ac985e4821
--- /dev/null
+++ b/etc/upgrades/1693905748-virtual-block-timestamp-fixed/mainnet2/l2Upgrade.json
@@ -0,0 +1,211 @@
+{
+  "systemContracts": [
+    {
+      "name": "AccountCodeStorage",
+      "bytecodeHashes": [
+        "0x010000911c610c6e91d050e608ac4f5db8b08c33bb032a57f70899cdd250a75e"
+      ],
+      "address": "0x0000000000000000000000000000000000008002"
+    },
+    {
+      "name": "NonceHolder",
+      "bytecodeHashes": [
+        "0x0100012f42627ab0dd09d78d8a25f459e3b3caf2126668fdfc19887eb5cbf4de"
+      ],
+      "address": "0x0000000000000000000000000000000000008003"
+    },
+    {
+      "name": "KnownCodesStorage",
+      "bytecodeHashes": [
+        "0x0100008fd05a39ae3ccc0c081732b2c09b783810773a66d6429cfb03d813a692"
+      ],
+      "address": "0x0000000000000000000000000000000000008004"
+    },
+    {
+      "name": "ImmutableSimulator",
+      "bytecodeHashes": [
+        "0x010000475ebeaf64663ebad3ab3fd14b6e985f576c816a66f84bda5a18253107"
+      ],
+      "address": "0x0000000000000000000000000000000000008005"
+    },
+    {
+      "name": "ContractDeployer",
+      "bytecodeHashes": [
+        "0x010005c1731dded081c794319523b82102fd09237011e23e0dda219b1a814799"
+      ],
+      "address": "0x0000000000000000000000000000000000008006"
+    },
+    {
+      "name": "L1Messenger",
+      "bytecodeHashes": [
+        "0x01000075efc5d3c37f1861e7c9f7f12c5c71f7b98c8e96bc1ae750441942911a"
+      ],
+      "address": "0x0000000000000000000000000000000000008008"
+    },
+    {
+      "name": "MsgValueSimulator",
+      "bytecodeHashes": [
+        "0x01000071fb47c4855b3cee15acfc19af66272afb61ae2196cdf8f0af81316c22"
+      ],
+      "address": "0x0000000000000000000000000000000000008009"
+    },
+    {
+      "name": "L2EthToken",
+      "bytecodeHashes": [
+        "0x01000139d95a414e7910bb755fecc60531a8c7ba6cc49c2fbd763df8541e4fae"
+      ],
+      "address": "0x000000000000000000000000000000000000800a"
+    },
+    {
+      "name": "SystemContext",
+      "bytecodeHashes": [
+        "0x0100021f60c503126f404845b8cd748b0fa2e71cd99e14462008009e6fe1ab03"
+      ],
+      "address": "0x000000000000000000000000000000000000800b"
+    },
+    {
+      "name": "BootloaderUtilities",
+      "bytecodeHashes": [
+        "0x010009adf7ebf8227ee5d057438bf502d132ed4c7017255f16f691286f3dd7b3"
+      ],
+      "address": "0x000000000000000000000000000000000000800c"
+    },
+    {
+      "name": "BytecodeCompressor",
+      "bytecodeHashes": [
+        "0x010000e1073ab7b4226bb86ca2746fbf1ecb305e23c61240b900c4e0ea161a99"
+      ],
+      "address": "0x000000000000000000000000000000000000800e"
+    },
+    {
+      "name": "ComplexUpgrader",
+      "bytecodeHashes": [
+        "0x0100005bc7e5e9f6718a7a59ba32849b08a12d957bcf517cb6ba68faf03983ba"
+      ],
+      "address": "0x000000000000000000000000000000000000800f"
+    }
+  ],
+  "defaultAA": {
+    "name": "DefaultAccount",
+    "bytecodeHashes": [
+      "0x0100067d16a5485875b4249040bf421f53e869337fe118ec747cf40a4c777e5f"
+    ]
+  },
+  "bootloader": {
+    "name": "Bootloader",
+    "bytecodeHashes": [
+      "0x0100089b8a2f2e6a20ba28f02c9e0ed0c13d702932364561a0ea61621f65f0a8"
+    ]
+  },
+  "forcedDeployments": [
+    {
+      "bytecodeHash": "0x010000911c610c6e91d050e608ac4f5db8b08c33bb032a57f70899cdd250a75e",
+      "newAddress": "0x0000000000000000000000000000000000008002",
+      "value": 0,
+      "input": "0x",
+      "callConstructor": false
+    },
+    {
+      "bytecodeHash": "0x0100012f42627ab0dd09d78d8a25f459e3b3caf2126668fdfc19887eb5cbf4de",
+      "newAddress": "0x0000000000000000000000000000000000008003",
+      "value": 0,
+      "input": "0x",
+      "callConstructor": false
+    },
+    {
+      "bytecodeHash": "0x0100008fd05a39ae3ccc0c081732b2c09b783810773a66d6429cfb03d813a692",
+      "newAddress": "0x0000000000000000000000000000000000008004",
+      "value": 0,
+      "input": "0x",
+      "callConstructor": false
+    },
+    {
+      "bytecodeHash": "0x010000475ebeaf64663ebad3ab3fd14b6e985f576c816a66f84bda5a18253107",
+      "newAddress": "0x0000000000000000000000000000000000008005",
+      "value": 0,
+      "input": "0x",
+      "callConstructor": false
+    },
+    {
+      "bytecodeHash": "0x010005c1731dded081c794319523b82102fd09237011e23e0dda219b1a814799",
+      "newAddress": "0x0000000000000000000000000000000000008006",
+      "value": 0,
+      "input": "0x",
+      "callConstructor": false
+    },
+    {
+      "bytecodeHash": "0x01000075efc5d3c37f1861e7c9f7f12c5c71f7b98c8e96bc1ae750441942911a",
+      "newAddress": "0x0000000000000000000000000000000000008008",
+      "value": 0,
+      "input": "0x",
+      "callConstructor": false
+    },
+    {
+      "bytecodeHash": "0x01000071fb47c4855b3cee15acfc19af66272afb61ae2196cdf8f0af81316c22",
+      "newAddress": "0x0000000000000000000000000000000000008009",
+      "value": 0,
+      "input": "0x",
+      "callConstructor": false
+    },
+    {
+      "bytecodeHash": "0x01000139d95a414e7910bb755fecc60531a8c7ba6cc49c2fbd763df8541e4fae",
+      "newAddress": "0x000000000000000000000000000000000000800a",
+      "value": 0,
+      "input": "0x",
+      "callConstructor": false
+    },
+    {
+      "bytecodeHash": "0x0100021f60c503126f404845b8cd748b0fa2e71cd99e14462008009e6fe1ab03",
+      "newAddress": "0x000000000000000000000000000000000000800b",
+      "value": 0,
+      "input": "0x",
+      "callConstructor": false
+    },
+    {
+      "bytecodeHash": "0x010009adf7ebf8227ee5d057438bf502d132ed4c7017255f16f691286f3dd7b3",
+      "newAddress": "0x000000000000000000000000000000000000800c",
+      "value": 0,
+      "input": "0x",
+      "callConstructor": false
+    },
+    {
+      "bytecodeHash": "0x010000e1073ab7b4226bb86ca2746fbf1ecb305e23c61240b900c4e0ea161a99",
+      "newAddress": "0x000000000000000000000000000000000000800e",
+      "value": 0,
+      "input": "0x",
+      "callConstructor": false
+    },
+    {
+      "bytecodeHash": "0x0100005bc7e5e9f6718a7a59ba32849b08a12d957bcf517cb6ba68faf03983ba",
+      "newAddress": "0x000000000000000000000000000000000000800f",
+      "value": 0,
+      "input": "0x",
+      "callConstructor": false
+    }
+  ],
+  "forcedDeploymentCalldata": "0xe9f18c170000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000000c00000000000000000000000000000000000000000000000000000000000001800000000000000000000000000000000000000000000000000000000000000240000000000000000000000000000000000000000000000000000000000000030000000000000000000000000000000000000000000000000000000000000003c000000000000000000000000000000000000000000000000000000000000004800000000000000000000000000000000000000000000000000000000000000540000000000000000000000000000000000000000000000000000000000000060000000000000000000000000000000000000000000000000000000000000006c000000000000000000000000000000000000000000000000000000000000007800000000000000000000000000000000000000000000000000000000000000840000000000000000000000000000000000000000000000000000000000000090000000000000000000000000000000000000000000000000000000000000009c0010000911c610c6e91d050e608ac4f5db8b08c33bb032a57f70899cdd250a75e00000000000000000000000000000000000000000000000000000000000080020000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000a000000000000000000000000000000000000000000000000000000000000000000100012f42627ab0dd09d78d8a25f459e3b3caf2126668fdfc19887eb5cbf4de00000000000000000000000000000000000000000000000000000000000080030000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000a000000000000000000000000000000000000000000000000000000000000000000100008fd05a39ae3ccc0c081732b2c09b783810773a66d6429cfb03d813a69200000000000000000000000000000000000000000000000000000000000080040000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000a00000000000000000000000000000000000000000000000000000000000000000010000475ebeaf64663ebad3ab3fd14b6e985f576c816a66f84bda5a1825310700000000000000000000000000000000000000000000000000000000000080050000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000a00000000000000000000000000000000000000000000000000000000000000000010005c1731dded081c794319523b82102fd09237011e23e0dda219b1a81479900000000000000000000000000000000000000000000000000000000000080060000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000a0000000000000000000000000000000000000000000000000000000000000000001000075efc5d3c37f1861e7c9f7f12c5c71f7b98c8e96bc1ae750441942911a00000000000000000000000000000000000000000000000000000000000080080000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000a0000000000000000000000000000000000000000000000000000000000000000001000071fb47c4855b3cee15acfc19af66272afb61ae2196cdf8f0af81316c2200000000000000000000000000000000000000000000000000000000000080090000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000a0000000000000000000000000000000000000000000000000000000000000000001000139d95a414e7910bb755fecc60531a8c7ba6cc49c2fbd763df8541e4fae000000000000000000000000000000000000000000000000000000000000800a0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000a000000000000000000000000000000000000000000000000000000000000000000100021f60c503126f404845b8cd748b0fa2e71cd99e14462008009e6fe1ab03000000000000000000000000000000000000000000000000000000000000800b0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000a00000000000000000000000000000000000000000000000000000000000000000010009adf7ebf8227ee5d057438bf502d132ed4c7017255f16f691286f3dd7b3000000000000000000000000000000000000000000000000000000000000800c0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000a00000000000000000000000000000000000000000000000000000000000000000010000e1073ab7b4226bb86ca2746fbf1ecb305e23c61240b900c4e0ea161a99000000000000000000000000000000000000000000000000000000000000800e0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000a000000000000000000000000000000000000000000000000000000000000000000100005bc7e5e9f6718a7a59ba32849b08a12d957bcf517cb6ba68faf03983ba000000000000000000000000000000000000000000000000000000000000800f0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000a00000000000000000000000000000000000000000000000000000000000000000",
+  "calldata": "0xe9f18c170000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000000c00000000000000000000000000000000000000000000000000000000000001800000000000000000000000000000000000000000000000000000000000000240000000000000000000000000000000000000000000000000000000000000030000000000000000000000000000000000000000000000000000000000000003c000000000000000000000000000000000000000000000000000000000000004800000000000000000000000000000000000000000000000000000000000000540000000000000000000000000000000000000000000000000000000000000060000000000000000000000000000000000000000000000000000000000000006c000000000000000000000000000000000000000000000000000000000000007800000000000000000000000000000000000000000000000000000000000000840000000000000000000000000000000000000000000000000000000000000090000000000000000000000000000000000000000000000000000000000000009c0010000911c610c6e91d050e608ac4f5db8b08c33bb032a57f70899cdd250a75e00000000000000000000000000000000000000000000000000000000000080020000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000a000000000000000000000000000000000000000000000000000000000000000000100012f42627ab0dd09d78d8a25f459e3b3caf2126668fdfc19887eb5cbf4de00000000000000000000000000000000000000000000000000000000000080030000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000a000000000000000000000000000000000000000000000000000000000000000000100008fd05a39ae3ccc0c081732b2c09b783810773a66d6429cfb03d813a69200000000000000000000000000000000000000000000000000000000000080040000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000a00000000000000000000000000000000000000000000000000000000000000000010000475ebeaf64663ebad3ab3fd14b6e985f576c816a66f84bda5a1825310700000000000000000000000000000000000000000000000000000000000080050000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000a00000000000000000000000000000000000000000000000000000000000000000010005c1731dded081c794319523b82102fd09237011e23e0dda219b1a81479900000000000000000000000000000000000000000000000000000000000080060000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000a0000000000000000000000000000000000000000000000000000000000000000001000075efc5d3c37f1861e7c9f7f12c5c71f7b98c8e96bc1ae750441942911a00000000000000000000000000000000000000000000000000000000000080080000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000a0000000000000000000000000000000000000000000000000000000000000000001000071fb47c4855b3cee15acfc19af66272afb61ae2196cdf8f0af81316c2200000000000000000000000000000000000000000000000000000000000080090000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000a0000000000000000000000000000000000000000000000000000000000000000001000139d95a414e7910bb755fecc60531a8c7ba6cc49c2fbd763df8541e4fae000000000000000000000000000000000000000000000000000000000000800a0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000a000000000000000000000000000000000000000000000000000000000000000000100021f60c503126f404845b8cd748b0fa2e71cd99e14462008009e6fe1ab03000000000000000000000000000000000000000000000000000000000000800b0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000a00000000000000000000000000000000000000000000000000000000000000000010009adf7ebf8227ee5d057438bf502d132ed4c7017255f16f691286f3dd7b3000000000000000000000000000000000000000000000000000000000000800c0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000a00000000000000000000000000000000000000000000000000000000000000000010000e1073ab7b4226bb86ca2746fbf1ecb305e23c61240b900c4e0ea161a99000000000000000000000000000000000000000000000000000000000000800e0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000a000000000000000000000000000000000000000000000000000000000000000000100005bc7e5e9f6718a7a59ba32849b08a12d957bcf517cb6ba68faf03983ba000000000000000000000000000000000000000000000000000000000000800f0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000a00000000000000000000000000000000000000000000000000000000000000000",
+  "tx": {
+    "txType": 254,
+    "from": "0x0000000000000000000000000000000000008007",
+    "to": "0x0000000000000000000000000000000000008006",
+    "gasLimit": 72000000,
+    "gasPerPubdataByteLimit": 800,
+    "maxFeePerGas": 0,
+    "maxPriorityFeePerGas": 0,
+    "paymaster": 0,
+    "nonce": "14",
+    "value": 0,
+    "reserved": [
+      0,
+      0,
+      0,
+      0
+    ],
+    "data": "0xe9f18c170000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000000c00000000000000000000000000000000000000000000000000000000000001800000000000000000000000000000000000000000000000000000000000000240000000000000000000000000000000000000000000000000000000000000030000000000000000000000000000000000000000000000000000000000000003c000000000000000000000000000000000000000000000000000000000000004800000000000000000000000000000000000000000000000000000000000000540000000000000000000000000000000000000000000000000000000000000060000000000000000000000000000000000000000000000000000000000000006c000000000000000000000000000000000000000000000000000000000000007800000000000000000000000000000000000000000000000000000000000000840000000000000000000000000000000000000000000000000000000000000090000000000000000000000000000000000000000000000000000000000000009c0010000911c610c6e91d050e608ac4f5db8b08c33bb032a57f70899cdd250a75e00000000000000000000000000000000000000000000000000000000000080020000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000a000000000000000000000000000000000000000000000000000000000000000000100012f42627ab0dd09d78d8a25f459e3b3caf2126668fdfc19887eb5cbf4de00000000000000000000000000000000000000000000000000000000000080030000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000a000000000000000000000000000000000000000000000000000000000000000000100008fd05a39ae3ccc0c081732b2c09b783810773a66d6429cfb03d813a69200000000000000000000000000000000000000000000000000000000000080040000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000a00000000000000000000000000000000000000000000000000000000000000000010000475ebeaf64663ebad3ab3fd14b6e985f576c816a66f84bda5a1825310700000000000000000000000000000000000000000000000000000000000080050000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000a00000000000000000000000000000000000000000000000000000000000000000010005c1731dded081c794319523b82102fd09237011e23e0dda219b1a81479900000000000000000000000000000000000000000000000000000000000080060000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000a0000000000000000000000000000000000000000000000000000000000000000001000075efc5d3c37f1861e7c9f7f12c5c71f7b98c8e96bc1ae750441942911a00000000000000000000000000000000000000000000000000000000000080080000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000a0000000000000000000000000000000000000000000000000000000000000000001000071fb47c4855b3cee15acfc19af66272afb61ae2196cdf8f0af81316c2200000000000000000000000000000000000000000000000000000000000080090000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000a0000000000000000000000000000000000000000000000000000000000000000001000139d95a414e7910bb755fecc60531a8c7ba6cc49c2fbd763df8541e4fae000000000000000000000000000000000000000000000000000000000000800a0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000a000000000000000000000000000000000000000000000000000000000000000000100021f60c503126f404845b8cd748b0fa2e71cd99e14462008009e6fe1ab03000000000000000000000000000000000000000000000000000000000000800b0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000a00000000000000000000000000000000000000000000000000000000000000000010009adf7ebf8227ee5d057438bf502d132ed4c7017255f16f691286f3dd7b3000000000000000000000000000000000000000000000000000000000000800c0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000a00000000000000000000000000000000000000000000000000000000000000000010000e1073ab7b4226bb86ca2746fbf1ecb305e23c61240b900c4e0ea161a99000000000000000000000000000000000000000000000000000000000000800e0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000a000000000000000000000000000000000000000000000000000000000000000000100005bc7e5e9f6718a7a59ba32849b08a12d957bcf517cb6ba68faf03983ba000000000000000000000000000000000000000000000000000000000000800f0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000a00000000000000000000000000000000000000000000000000000000000000000",
+    "signature": "0x",
+    "factoryDeps": [],
+    "paymasterInput": "0x",
+    "reservedDynamic": "0x"
+  }
+}
\ No newline at end of file
diff --git a/etc/upgrades/1693905748-virtual-block-timestamp-fixed/mainnet2/transactions.json b/etc/upgrades/1693905748-virtual-block-timestamp-fixed/mainnet2/transactions.json
new file mode 100644
index 000000000000..3025aac18481
--- /dev/null
+++ b/etc/upgrades/1693905748-virtual-block-timestamp-fixed/mainnet2/transactions.json
@@ -0,0 +1,246 @@
+{
+  "proposeUpgradeTx": {
+    "l2ProtocolUpgradeTx": {
+      "txType": 254,
+      "from": "0x0000000000000000000000000000000000008007",
+      "to": "0x0000000000000000000000000000000000008006",
+      "gasLimit": 72000000,
+      "gasPerPubdataByteLimit": 800,
+      "maxFeePerGas": 0,
+      "maxPriorityFeePerGas": 0,
+      "paymaster": 0,
+      "nonce": "14",
+      "value": 0,
+      "reserved": [
+        0,
+        0,
+        0,
+        0
+      ],
+      "data": "0xe9f18c170000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000000c00000000000000000000000000000000000000000000000000000000000001800000000000000000000000000000000000000000000000000000000000000240000000000000000000000000000000000000000000000000000000000000030000000000000000000000000000000000000000000000000000000000000003c000000000000000000000000000000000000000000000000000000000000004800000000000000000000000000000000000000000000000000000000000000540000000000000000000000000000000000000000000000000000000000000060000000000000000000000000000000000000000000000000000000000000006c000000000000000000000000000000000000000000000000000000000000007800000000000000000000000000000000000000000000000000000000000000840000000000000000000000000000000000000000000000000000000000000090000000000000000000000000000000000000000000000000000000000000009c0010000911c610c6e91d050e608ac4f5db8b08c33bb032a57f70899cdd250a75e00000000000000000000000000000000000000000000000000000000000080020000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000a000000000000000000000000000000000000000000000000000000000000000000100012f42627ab0dd09d78d8a25f459e3b3caf2126668fdfc19887eb5cbf4de00000000000000000000000000000000000000000000000000000000000080030000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000a000000000000000000000000000000000000000000000000000000000000000000100008fd05a39ae3ccc0c081732b2c09b783810773a66d6429cfb03d813a69200000000000000000000000000000000000000000000000000000000000080040000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000a00000000000000000000000000000000000000000000000000000000000000000010000475ebeaf64663ebad3ab3fd14b6e985f576c816a66f84bda5a1825310700000000000000000000000000000000000000000000000000000000000080050000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000a00000000000000000000000000000000000000000000000000000000000000000010005c1731dded081c794319523b82102fd09237011e23e0dda219b1a81479900000000000000000000000000000000000000000000000000000000000080060000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000a0000000000000000000000000000000000000000000000000000000000000000001000075efc5d3c37f1861e7c9f7f12c5c71f7b98c8e96bc1ae750441942911a00000000000000000000000000000000000000000000000000000000000080080000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000a0000000000000000000000000000000000000000000000000000000000000000001000071fb47c4855b3cee15acfc19af66272afb61ae2196cdf8f0af81316c2200000000000000000000000000000000000000000000000000000000000080090000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000a0000000000000000000000000000000000000000000000000000000000000000001000139d95a414e7910bb755fecc60531a8c7ba6cc49c2fbd763df8541e4fae000000000000000000000000000000000000000000000000000000000000800a0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000a000000000000000000000000000000000000000000000000000000000000000000100021f60c503126f404845b8cd748b0fa2e71cd99e14462008009e6fe1ab03000000000000000000000000000000000000000000000000000000000000800b0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000a00000000000000000000000000000000000000000000000000000000000000000010009adf7ebf8227ee5d057438bf502d132ed4c7017255f16f691286f3dd7b3000000000000000000000000000000000000000000000000000000000000800c0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000a00000000000000000000000000000000000000000000000000000000000000000010000e1073ab7b4226bb86ca2746fbf1ecb305e23c61240b900c4e0ea161a99000000000000000000000000000000000000000000000000000000000000800e0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000a000000000000000000000000000000000000000000000000000000000000000000100005bc7e5e9f6718a7a59ba32849b08a12d957bcf517cb6ba68faf03983ba000000000000000000000000000000000000000000000000000000000000800f0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000a00000000000000000000000000000000000000000000000000000000000000000",
+      "signature": "0x",
+      "factoryDeps": [],
+      "paymasterInput": "0x",
+      "reservedDynamic": "0x"
+    },
+    "bootloaderHash": "0x0100089b8a2f2e6a20ba28f02c9e0ed0c13d702932364561a0ea61621f65f0a8",
+    "defaultAccountHash": "0x0100067d16a5485875b4249040bf421f53e869337fe118ec747cf40a4c777e5f",
+    "verifier": "0x0000000000000000000000000000000000000000",
+    "verifierParams": {
+      "recursionNodeLevelVkHash": "0x0000000000000000000000000000000000000000000000000000000000000000",
+      "recursionLeafLevelVkHash": "0x0000000000000000000000000000000000000000000000000000000000000000",
+      "recursionCircuitsSetVksHash": "0x0000000000000000000000000000000000000000000000000000000000000000"
+    },
+    "l1ContractsUpgradeCalldata": "0x",
+    "postUpgradeCalldata": "0x",
+    "upgradeTimestamp": {
+      "type": "BigNumber",
+      "hex": "0x64f9a628"
+    },
+    "factoryDeps": [],
+    "newProtocolVersion": "14",
+    "newAllowList": "0x0000000000000000000000000000000000000000"
+  },
+  "l1upgradeCalldata": "0x1ed824a0000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000001a00000000000000000000000000000000000000000000000000000000000000f800100089b8a2f2e6a20ba28f02c9e0ed0c13d702932364561a0ea61621f65f0a80100067d16a5485875b4249040bf421f53e869337fe118ec747cf40a4c777e5f00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000fa00000000000000000000000000000000000000000000000000000000000000fc00000000000000000000000000000000000000000000000000000000064f9a628000000000000000000000000000000000000000000000000000000000000000e000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000fe0000000000000000000000000000000000000000000000000000000000008007000000000000000000000000000000000000000000000000000000000000800600000000000000000000000000000000000000000000000000000000044aa2000000000000000000000000000000000000000000000000000000000000000320000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000e0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000002600000000000000000000000000000000000000000000000000000000000000d600000000000000000000000000000000000000000000000000000000000000d800000000000000000000000000000000000000000000000000000000000000da00000000000000000000000000000000000000000000000000000000000000dc00000000000000000000000000000000000000000000000000000000000000ac4e9f18c170000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000000c00000000000000000000000000000000000000000000000000000000000001800000000000000000000000000000000000000000000000000000000000000240000000000000000000000000000000000000000000000000000000000000030000000000000000000000000000000000000000000000000000000000000003c000000000000000000000000000000000000000000000000000000000000004800000000000000000000000000000000000000000000000000000000000000540000000000000000000000000000000000000000000000000000000000000060000000000000000000000000000000000000000000000000000000000000006c000000000000000000000000000000000000000000000000000000000000007800000000000000000000000000000000000000000000000000000000000000840000000000000000000000000000000000000000000000000000000000000090000000000000000000000000000000000000000000000000000000000000009c0010000911c610c6e91d050e608ac4f5db8b08c33bb032a57f70899cdd250a75e00000000000000000000000000000000000000000000000000000000000080020000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000a000000000000000000000000000000000000000000000000000000000000000000100012f42627ab0dd09d78d8a25f459e3b3caf2126668fdfc19887eb5cbf4de00000000000000000000000000000000000000000000000000000000000080030000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000a000000000000000000000000000000000000000000000000000000000000000000100008fd05a39ae3ccc0c081732b2c09b783810773a66d6429cfb03d813a69200000000000000000000000000000000000000000000000000000000000080040000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000a00000000000000000000000000000000000000000000000000000000000000000010000475ebeaf64663ebad3ab3fd14b6e985f576c816a66f84bda5a1825310700000000000000000000000000000000000000000000000000000000000080050000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000a00000000000000000000000000000000000000000000000000000000000000000010005c1731dded081c794319523b82102fd09237011e23e0dda219b1a81479900000000000000000000000000000000000000000000000000000000000080060000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000a0000000000000000000000000000000000000000000000000000000000000000001000075efc5d3c37f1861e7c9f7f12c5c71f7b98c8e96bc1ae750441942911a00000000000000000000000000000000000000000000000000000000000080080000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000a0000000000000000000000000000000000000000000000000000000000000000001000071fb47c4855b3cee15acfc19af66272afb61ae2196cdf8f0af81316c2200000000000000000000000000000000000000000000000000000000000080090000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000a0000000000000000000000000000000000000000000000000000000000000000001000139d95a414e7910bb755fecc60531a8c7ba6cc49c2fbd763df8541e4fae000000000000000000000000000000000000000000000000000000000000800a0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000a000000000000000000000000000000000000000000000000000000000000000000100021f60c503126f404845b8cd748b0fa2e71cd99e14462008009e6fe1ab03000000000000000000000000000000000000000000000000000000000000800b0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000a00000000000000000000000000000000000000000000000000000000000000000010009adf7ebf8227ee5d057438bf502d132ed4c7017255f16f691286f3dd7b3000000000000000000000000000000000000000000000000000000000000800c0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000a00000000000000000000000000000000000000000000000000000000000000000010000e1073ab7b4226bb86ca2746fbf1ecb305e23c61240b900c4e0ea161a99000000000000000000000000000000000000000000000000000000000000800e0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000a000000000000000000000000000000000000000000000000000000000000000000100005bc7e5e9f6718a7a59ba32849b08a12d957bcf517cb6ba68faf03983ba000000000000000000000000000000000000000000000000000000000000800f0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000a00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+  "upgradeAddress": "0x91Ca046daD8c3Db41f296267E1720d9C940f613d",
+  "protocolVersion": "14",
+  "diamondUpgradeProposalId": {
+    "type": "BigNumber",
+    "hex": "0x07"
+  },
+  "upgradeTimestamp": "1694082600",
+  "proposeTransparentUpgradeCalldata": "0x8043760a00000000000000000000000000000000000000000000000000000000000000400000000000000000000000000000000000000000000000000000000000000007000000000000000000000000000000000000000000000000000000000000006000000000000000000000000091ca046dad8c3db41f296267e1720d9c940f613d0000000000000000000000000000000000000000000000000000000000001680000000000000000000000000000000000000000000000000000000000000000a000000000000000000000000000000000000000000000000000000000000014000000000000000000000000000000000000000000000000000000000000002e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000009400000000000000000000000000000000000000000000000000000000000000a600000000000000000000000000000000000000000000000000000000000000ba00000000000000000000000000000000000000000000000000000000000000d40000000000000000000000000000000000000000000000000000000000000124000000000000000000000000000000000000000000000000000000000000013a000000000000000000000000000000000000000000000000000000000000014c00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000080000000000000000000000000000000000000000000000000000000000000000873fb92970000000000000000000000000000000000000000000000000000000036d4eb840000000000000000000000000000000000000000000000000000000027ae4c16000000000000000000000000000000000000000000000000000000000551448c000000000000000000000000000000000000000000000000000000008043760a00000000000000000000000000000000000000000000000000000000beda4b12000000000000000000000000000000000000000000000000000000001733894500000000000000000000000000000000000000000000000000000000587809c70000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000800000000000000000000000000000000000000000000000000000000000000023cdffacc60000000000000000000000000000000000000000000000000000000052ef6b2c00000000000000000000000000000000000000000000000000000000adfca15e000000000000000000000000000000000000000000000000000000007a0ed62700000000000000000000000000000000000000000000000000000000a7cd63b700000000000000000000000000000000000000000000000000000000fe10226d0000000000000000000000000000000000000000000000000000000079823c9a000000000000000000000000000000000000000000000000000000004fc07d7500000000000000000000000000000000000000000000000000000000d86970d800000000000000000000000000000000000000000000000000000000fd791f3c000000000000000000000000000000000000000000000000000000009d1b5a81000000000000000000000000000000000000000000000000000000007b30c8da000000000000000000000000000000000000000000000000000000008665b15000000000000000000000000000000000000000000000000000000000631f4bac000000000000000000000000000000000000000000000000000000000ec6b0b7000000000000000000000000000000000000000000000000000000001b60e62600000000000000000000000000000000000000000000000000000000e39d3bff0000000000000000000000000000000000000000000000000000000033ce93fe000000000000000000000000000000000000000000000000000000000ef240a000000000000000000000000000000000000000000000000000000000fe26699e000000000000000000000000000000000000000000000000000000003960738200000000000000000000000000000000000000000000000000000000af6a2dcd00000000000000000000000000000000000000000000000000000000a1954fc500000000000000000000000000000000000000000000000000000000a39980a00000000000000000000000000000000000000000000000000000000046657fe90000000000000000000000000000000000000000000000000000000018e3a941000000000000000000000000000000000000000000000000000000003db920ce0000000000000000000000000000000000000000000000000000000029b98c6700000000000000000000000000000000000000000000000000000000bd7c541200000000000000000000000000000000000000000000000000000000c3bbd2d700000000000000000000000000000000000000000000000000000000e81e0ba100000000000000000000000000000000000000000000000000000000facd743b000000000000000000000000000000000000000000000000000000009cd939e40000000000000000000000000000000000000000000000000000000056142d7a0000000000000000000000000000000000000000000000000000000074f4d30d00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008000000000000000000000000000000000000000000000000000000000000000066c0960f900000000000000000000000000000000000000000000000000000000b473318e00000000000000000000000000000000000000000000000000000000042901c700000000000000000000000000000000000000000000000000000000263b7f8e00000000000000000000000000000000000000000000000000000000e4948f4300000000000000000000000000000000000000000000000000000000eb67241900000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008000000000000000000000000000000000000000000000000000000000000000040c4dd81000000000000000000000000000000000000000000000000000000000ce9dcf16000000000000000000000000000000000000000000000000000000007739cbe700000000000000000000000000000000000000000000000000000000a9a2d18a0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000800000000000000000000000000000000000000000000000000000000000000005e58bb63900000000000000000000000000000000000000000000000000000000f235757f000000000000000000000000000000000000000000000000000000001cc5d10300000000000000000000000000000000000000000000000000000000be6f11cf000000000000000000000000000000000000000000000000000000004623c91d00000000000000000000000000000000000000000000000000000000000000000000000000000000dc7c3d03845efe2c4a9e758a70a68ba6bba9fac4000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000080000000000000000000000000000000000000000000000000000000000000000873fb92970000000000000000000000000000000000000000000000000000000036d4eb840000000000000000000000000000000000000000000000000000000027ae4c16000000000000000000000000000000000000000000000000000000000551448c000000000000000000000000000000000000000000000000000000008043760a00000000000000000000000000000000000000000000000000000000beda4b12000000000000000000000000000000000000000000000000000000001733894500000000000000000000000000000000000000000000000000000000587809c7000000000000000000000000000000000000000000000000000000000000000000000000000000007444de636699f080ca1c033528d2bb3705b391ce0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000800000000000000000000000000000000000000000000000000000000000000023cdffacc60000000000000000000000000000000000000000000000000000000052ef6b2c00000000000000000000000000000000000000000000000000000000adfca15e000000000000000000000000000000000000000000000000000000007a0ed62700000000000000000000000000000000000000000000000000000000a7cd63b700000000000000000000000000000000000000000000000000000000fe10226d0000000000000000000000000000000000000000000000000000000079823c9a000000000000000000000000000000000000000000000000000000004fc07d7500000000000000000000000000000000000000000000000000000000d86970d800000000000000000000000000000000000000000000000000000000fd791f3c000000000000000000000000000000000000000000000000000000009d1b5a81000000000000000000000000000000000000000000000000000000007b30c8da000000000000000000000000000000000000000000000000000000008665b15000000000000000000000000000000000000000000000000000000000631f4bac000000000000000000000000000000000000000000000000000000000ec6b0b7000000000000000000000000000000000000000000000000000000001b60e62600000000000000000000000000000000000000000000000000000000e39d3bff0000000000000000000000000000000000000000000000000000000033ce93fe000000000000000000000000000000000000000000000000000000000ef240a000000000000000000000000000000000000000000000000000000000fe26699e000000000000000000000000000000000000000000000000000000003960738200000000000000000000000000000000000000000000000000000000af6a2dcd00000000000000000000000000000000000000000000000000000000a1954fc500000000000000000000000000000000000000000000000000000000a39980a00000000000000000000000000000000000000000000000000000000046657fe90000000000000000000000000000000000000000000000000000000018e3a941000000000000000000000000000000000000000000000000000000003db920ce0000000000000000000000000000000000000000000000000000000029b98c6700000000000000000000000000000000000000000000000000000000bd7c541200000000000000000000000000000000000000000000000000000000c3bbd2d700000000000000000000000000000000000000000000000000000000e81e0ba100000000000000000000000000000000000000000000000000000000facd743b000000000000000000000000000000000000000000000000000000009cd939e40000000000000000000000000000000000000000000000000000000056142d7a0000000000000000000000000000000000000000000000000000000074f4d30d0000000000000000000000000000000000000000000000000000000000000000000000000000000062aa95ac4740a367746a664c4c69034d52e968ef00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000008000000000000000000000000000000000000000000000000000000000000000066c0960f900000000000000000000000000000000000000000000000000000000b473318e00000000000000000000000000000000000000000000000000000000042901c700000000000000000000000000000000000000000000000000000000263b7f8e00000000000000000000000000000000000000000000000000000000e4948f4300000000000000000000000000000000000000000000000000000000eb672419000000000000000000000000000000000000000000000000000000000000000000000000000000007ed066718dfb1b2b04d94780eca92b67ecf3330b00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000008000000000000000000000000000000000000000000000000000000000000000040c4dd81000000000000000000000000000000000000000000000000000000000ce9dcf16000000000000000000000000000000000000000000000000000000007739cbe700000000000000000000000000000000000000000000000000000000a9a2d18a000000000000000000000000000000000000000000000000000000000000000000000000000000002e64926be35412f7710a3e097ba076740bf97cc00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000800000000000000000000000000000000000000000000000000000000000000005e58bb63900000000000000000000000000000000000000000000000000000000f235757f000000000000000000000000000000000000000000000000000000001cc5d10300000000000000000000000000000000000000000000000000000000be6f11cf000000000000000000000000000000000000000000000000000000004623c91d0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000010041ed824a0000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000001a00000000000000000000000000000000000000000000000000000000000000f800100089b8a2f2e6a20ba28f02c9e0ed0c13d702932364561a0ea61621f65f0a80100067d16a5485875b4249040bf421f53e869337fe118ec747cf40a4c777e5f00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000fa00000000000000000000000000000000000000000000000000000000000000fc00000000000000000000000000000000000000000000000000000000064f9a628000000000000000000000000000000000000000000000000000000000000000e000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000fe0000000000000000000000000000000000000000000000000000000000008007000000000000000000000000000000000000000000000000000000000000800600000000000000000000000000000000000000000000000000000000044aa2000000000000000000000000000000000000000000000000000000000000000320000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000e0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000002600000000000000000000000000000000000000000000000000000000000000d600000000000000000000000000000000000000000000000000000000000000d800000000000000000000000000000000000000000000000000000000000000da00000000000000000000000000000000000000000000000000000000000000dc00000000000000000000000000000000000000000000000000000000000000ac4e9f18c170000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000000c00000000000000000000000000000000000000000000000000000000000001800000000000000000000000000000000000000000000000000000000000000240000000000000000000000000000000000000000000000000000000000000030000000000000000000000000000000000000000000000000000000000000003c000000000000000000000000000000000000000000000000000000000000004800000000000000000000000000000000000000000000000000000000000000540000000000000000000000000000000000000000000000000000000000000060000000000000000000000000000000000000000000000000000000000000006c000000000000000000000000000000000000000000000000000000000000007800000000000000000000000000000000000000000000000000000000000000840000000000000000000000000000000000000000000000000000000000000090000000000000000000000000000000000000000000000000000000000000009c0010000911c610c6e91d050e608ac4f5db8b08c33bb032a57f70899cdd250a75e00000000000000000000000000000000000000000000000000000000000080020000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000a000000000000000000000000000000000000000000000000000000000000000000100012f42627ab0dd09d78d8a25f459e3b3caf2126668fdfc19887eb5cbf4de00000000000000000000000000000000000000000000000000000000000080030000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000a000000000000000000000000000000000000000000000000000000000000000000100008fd05a39ae3ccc0c081732b2c09b783810773a66d6429cfb03d813a69200000000000000000000000000000000000000000000000000000000000080040000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000a00000000000000000000000000000000000000000000000000000000000000000010000475ebeaf64663ebad3ab3fd14b6e985f576c816a66f84bda5a1825310700000000000000000000000000000000000000000000000000000000000080050000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000a00000000000000000000000000000000000000000000000000000000000000000010005c1731dded081c794319523b82102fd09237011e23e0dda219b1a81479900000000000000000000000000000000000000000000000000000000000080060000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000a0000000000000000000000000000000000000000000000000000000000000000001000075efc5d3c37f1861e7c9f7f12c5c71f7b98c8e96bc1ae750441942911a00000000000000000000000000000000000000000000000000000000000080080000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000a0000000000000000000000000000000000000000000000000000000000000000001000071fb47c4855b3cee15acfc19af66272afb61ae2196cdf8f0af81316c2200000000000000000000000000000000000000000000000000000000000080090000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000a0000000000000000000000000000000000000000000000000000000000000000001000139d95a414e7910bb755fecc60531a8c7ba6cc49c2fbd763df8541e4fae000000000000000000000000000000000000000000000000000000000000800a0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000a000000000000000000000000000000000000000000000000000000000000000000100021f60c503126f404845b8cd748b0fa2e71cd99e14462008009e6fe1ab03000000000000000000000000000000000000000000000000000000000000800b0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000a00000000000000000000000000000000000000000000000000000000000000000010009adf7ebf8227ee5d057438bf502d132ed4c7017255f16f691286f3dd7b3000000000000000000000000000000000000000000000000000000000000800c0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000a00000000000000000000000000000000000000000000000000000000000000000010000e1073ab7b4226bb86ca2746fbf1ecb305e23c61240b900c4e0ea161a99000000000000000000000000000000000000000000000000000000000000800e0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000a000000000000000000000000000000000000000000000000000000000000000000100005bc7e5e9f6718a7a59ba32849b08a12d957bcf517cb6ba68faf03983ba000000000000000000000000000000000000000000000000000000000000800f0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000a0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+  "transparentUpgrade": {
+    "facetCuts": [
+      {
+        "facet": "0x0000000000000000000000000000000000000000",
+        "selectors": [
+          "0x73fb9297",
+          "0x36d4eb84",
+          "0x27ae4c16",
+          "0x0551448c",
+          "0x8043760a",
+          "0xbeda4b12",
+          "0x17338945",
+          "0x587809c7"
+        ],
+        "action": 2,
+        "isFreezable": false
+      },
+      {
+        "facet": "0x0000000000000000000000000000000000000000",
+        "selectors": [
+          "0xcdffacc6",
+          "0x52ef6b2c",
+          "0xadfca15e",
+          "0x7a0ed627",
+          "0xa7cd63b7",
+          "0xfe10226d",
+          "0x79823c9a",
+          "0x4fc07d75",
+          "0xd86970d8",
+          "0xfd791f3c",
+          "0x9d1b5a81",
+          "0x7b30c8da",
+          "0x8665b150",
+          "0x631f4bac",
+          "0x0ec6b0b7",
+          "0x1b60e626",
+          "0xe39d3bff",
+          "0x33ce93fe",
+          "0x0ef240a0",
+          "0xfe26699e",
+          "0x39607382",
+          "0xaf6a2dcd",
+          "0xa1954fc5",
+          "0xa39980a0",
+          "0x46657fe9",
+          "0x18e3a941",
+          "0x3db920ce",
+          "0x29b98c67",
+          "0xbd7c5412",
+          "0xc3bbd2d7",
+          "0xe81e0ba1",
+          "0xfacd743b",
+          "0x9cd939e4",
+          "0x56142d7a",
+          "0x74f4d30d"
+        ],
+        "action": 2,
+        "isFreezable": false
+      },
+      {
+        "facet": "0x0000000000000000000000000000000000000000",
+        "selectors": [
+          "0x6c0960f9",
+          "0xb473318e",
+          "0x042901c7",
+          "0x263b7f8e",
+          "0xe4948f43",
+          "0xeb672419"
+        ],
+        "action": 2,
+        "isFreezable": false
+      },
+      {
+        "facet": "0x0000000000000000000000000000000000000000",
+        "selectors": [
+          "0x0c4dd810",
+          "0xce9dcf16",
+          "0x7739cbe7",
+          "0xa9a2d18a"
+        ],
+        "action": 2,
+        "isFreezable": false
+      },
+      {
+        "facet": "0x0000000000000000000000000000000000000000",
+        "selectors": [
+          "0xe58bb639",
+          "0xf235757f",
+          "0x1cc5d103",
+          "0xbe6f11cf",
+          "0x4623c91d"
+        ],
+        "action": 2,
+        "isFreezable": false
+      },
+      {
+        "facet": "0xdC7c3D03845EfE2c4a9E758A70a68BA6bba9FaC4",
+        "selectors": [
+          "0x73fb9297",
+          "0x36d4eb84",
+          "0x27ae4c16",
+          "0x0551448c",
+          "0x8043760a",
+          "0xbeda4b12",
+          "0x17338945",
+          "0x587809c7"
+        ],
+        "action": 0,
+        "isFreezable": false
+      },
+      {
+        "facet": "0x7444DE636699F080cA1C033528D2bB3705B391Ce",
+        "selectors": [
+          "0xcdffacc6",
+          "0x52ef6b2c",
+          "0xadfca15e",
+          "0x7a0ed627",
+          "0xa7cd63b7",
+          "0xfe10226d",
+          "0x79823c9a",
+          "0x4fc07d75",
+          "0xd86970d8",
+          "0xfd791f3c",
+          "0x9d1b5a81",
+          "0x7b30c8da",
+          "0x8665b150",
+          "0x631f4bac",
+          "0x0ec6b0b7",
+          "0x1b60e626",
+          "0xe39d3bff",
+          "0x33ce93fe",
+          "0x0ef240a0",
+          "0xfe26699e",
+          "0x39607382",
+          "0xaf6a2dcd",
+          "0xa1954fc5",
+          "0xa39980a0",
+          "0x46657fe9",
+          "0x18e3a941",
+          "0x3db920ce",
+          "0x29b98c67",
+          "0xbd7c5412",
+          "0xc3bbd2d7",
+          "0xe81e0ba1",
+          "0xfacd743b",
+          "0x9cd939e4",
+          "0x56142d7a",
+          "0x74f4d30d"
+        ],
+        "action": 0,
+        "isFreezable": false
+      },
+      {
+        "facet": "0x62aA95ac4740A367746A664C4C69034d52E968EF",
+        "selectors": [
+          "0x6c0960f9",
+          "0xb473318e",
+          "0x042901c7",
+          "0x263b7f8e",
+          "0xe4948f43",
+          "0xeb672419"
+        ],
+        "action": 0,
+        "isFreezable": true
+      },
+      {
+        "facet": "0x7Ed066718Dfb1b2B04D94780Eca92b67ECF3330b",
+        "selectors": [
+          "0x0c4dd810",
+          "0xce9dcf16",
+          "0x7739cbe7",
+          "0xa9a2d18a"
+        ],
+        "action": 0,
+        "isFreezable": true
+      },
+      {
+        "facet": "0x2E64926BE35412f7710A3E097Ba076740bF97CC0",
+        "selectors": [
+          "0xe58bb639",
+          "0xf235757f",
+          "0x1cc5d103",
+          "0xbe6f11cf",
+          "0x4623c91d"
+        ],
+        "action": 0,
+        "isFreezable": true
+      }
+    ],
+    "initAddress": "0x91Ca046daD8c3Db41f296267E1720d9C940f613d",
+    "initCalldata": "0x1ed824a0000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000001a00000000000000000000000000000000000000000000000000000000000000f800100089b8a2f2e6a20ba28f02c9e0ed0c13d702932364561a0ea61621f65f0a80100067d16a5485875b4249040bf421f53e869337fe118ec747cf40a4c777e5f00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000fa00000000000000000000000000000000000000000000000000000000000000fc00000000000000000000000000000000000000000000000000000000064f9a628000000000000000000000000000000000000000000000000000000000000000e000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000fe0000000000000000000000000000000000000000000000000000000000008007000000000000000000000000000000000000000000000000000000000000800600000000000000000000000000000000000000000000000000000000044aa2000000000000000000000000000000000000000000000000000000000000000320000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000e0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000002600000000000000000000000000000000000000000000000000000000000000d600000000000000000000000000000000000000000000000000000000000000d800000000000000000000000000000000000000000000000000000000000000da00000000000000000000000000000000000000000000000000000000000000dc00000000000000000000000000000000000000000000000000000000000000ac4e9f18c170000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000000c00000000000000000000000000000000000000000000000000000000000001800000000000000000000000000000000000000000000000000000000000000240000000000000000000000000000000000000000000000000000000000000030000000000000000000000000000000000000000000000000000000000000003c000000000000000000000000000000000000000000000000000000000000004800000000000000000000000000000000000000000000000000000000000000540000000000000000000000000000000000000000000000000000000000000060000000000000000000000000000000000000000000000000000000000000006c000000000000000000000000000000000000000000000000000000000000007800000000000000000000000000000000000000000000000000000000000000840000000000000000000000000000000000000000000000000000000000000090000000000000000000000000000000000000000000000000000000000000009c0010000911c610c6e91d050e608ac4f5db8b08c33bb032a57f70899cdd250a75e00000000000000000000000000000000000000000000000000000000000080020000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000a000000000000000000000000000000000000000000000000000000000000000000100012f42627ab0dd09d78d8a25f459e3b3caf2126668fdfc19887eb5cbf4de00000000000000000000000000000000000000000000000000000000000080030000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000a000000000000000000000000000000000000000000000000000000000000000000100008fd05a39ae3ccc0c081732b2c09b783810773a66d6429cfb03d813a69200000000000000000000000000000000000000000000000000000000000080040000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000a00000000000000000000000000000000000000000000000000000000000000000010000475ebeaf64663ebad3ab3fd14b6e985f576c816a66f84bda5a1825310700000000000000000000000000000000000000000000000000000000000080050000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000a00000000000000000000000000000000000000000000000000000000000000000010005c1731dded081c794319523b82102fd09237011e23e0dda219b1a81479900000000000000000000000000000000000000000000000000000000000080060000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000a0000000000000000000000000000000000000000000000000000000000000000001000075efc5d3c37f1861e7c9f7f12c5c71f7b98c8e96bc1ae750441942911a00000000000000000000000000000000000000000000000000000000000080080000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000a0000000000000000000000000000000000000000000000000000000000000000001000071fb47c4855b3cee15acfc19af66272afb61ae2196cdf8f0af81316c2200000000000000000000000000000000000000000000000000000000000080090000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000a0000000000000000000000000000000000000000000000000000000000000000001000139d95a414e7910bb755fecc60531a8c7ba6cc49c2fbd763df8541e4fae000000000000000000000000000000000000000000000000000000000000800a0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000a000000000000000000000000000000000000000000000000000000000000000000100021f60c503126f404845b8cd748b0fa2e71cd99e14462008009e6fe1ab03000000000000000000000000000000000000000000000000000000000000800b0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000a00000000000000000000000000000000000000000000000000000000000000000010009adf7ebf8227ee5d057438bf502d132ed4c7017255f16f691286f3dd7b3000000000000000000000000000000000000000000000000000000000000800c0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000a00000000000000000000000000000000000000000000000000000000000000000010000e1073ab7b4226bb86ca2746fbf1ecb305e23c61240b900c4e0ea161a99000000000000000000000000000000000000000000000000000000000000800e0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000a000000000000000000000000000000000000000000000000000000000000000000100005bc7e5e9f6718a7a59ba32849b08a12d957bcf517cb6ba68faf03983ba000000000000000000000000000000000000000000000000000000000000800f0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000a00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000"
+  },
+  "executeUpgradeCalldata": "0x36d4eb8400000000000000000000000000000000000000000000000000000000000000400000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000006000000000000000000000000091ca046dad8c3db41f296267e1720d9c940f613d0000000000000000000000000000000000000000000000000000000000001680000000000000000000000000000000000000000000000000000000000000000a000000000000000000000000000000000000000000000000000000000000014000000000000000000000000000000000000000000000000000000000000002e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000009400000000000000000000000000000000000000000000000000000000000000a600000000000000000000000000000000000000000000000000000000000000ba00000000000000000000000000000000000000000000000000000000000000d40000000000000000000000000000000000000000000000000000000000000124000000000000000000000000000000000000000000000000000000000000013a000000000000000000000000000000000000000000000000000000000000014c00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000080000000000000000000000000000000000000000000000000000000000000000873fb92970000000000000000000000000000000000000000000000000000000036d4eb840000000000000000000000000000000000000000000000000000000027ae4c16000000000000000000000000000000000000000000000000000000000551448c000000000000000000000000000000000000000000000000000000008043760a00000000000000000000000000000000000000000000000000000000beda4b12000000000000000000000000000000000000000000000000000000001733894500000000000000000000000000000000000000000000000000000000587809c70000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000800000000000000000000000000000000000000000000000000000000000000023cdffacc60000000000000000000000000000000000000000000000000000000052ef6b2c00000000000000000000000000000000000000000000000000000000adfca15e000000000000000000000000000000000000000000000000000000007a0ed62700000000000000000000000000000000000000000000000000000000a7cd63b700000000000000000000000000000000000000000000000000000000fe10226d0000000000000000000000000000000000000000000000000000000079823c9a000000000000000000000000000000000000000000000000000000004fc07d7500000000000000000000000000000000000000000000000000000000d86970d800000000000000000000000000000000000000000000000000000000fd791f3c000000000000000000000000000000000000000000000000000000009d1b5a81000000000000000000000000000000000000000000000000000000007b30c8da000000000000000000000000000000000000000000000000000000008665b15000000000000000000000000000000000000000000000000000000000631f4bac000000000000000000000000000000000000000000000000000000000ec6b0b7000000000000000000000000000000000000000000000000000000001b60e62600000000000000000000000000000000000000000000000000000000e39d3bff0000000000000000000000000000000000000000000000000000000033ce93fe000000000000000000000000000000000000000000000000000000000ef240a000000000000000000000000000000000000000000000000000000000fe26699e000000000000000000000000000000000000000000000000000000003960738200000000000000000000000000000000000000000000000000000000af6a2dcd00000000000000000000000000000000000000000000000000000000a1954fc500000000000000000000000000000000000000000000000000000000a39980a00000000000000000000000000000000000000000000000000000000046657fe90000000000000000000000000000000000000000000000000000000018e3a941000000000000000000000000000000000000000000000000000000003db920ce0000000000000000000000000000000000000000000000000000000029b98c6700000000000000000000000000000000000000000000000000000000bd7c541200000000000000000000000000000000000000000000000000000000c3bbd2d700000000000000000000000000000000000000000000000000000000e81e0ba100000000000000000000000000000000000000000000000000000000facd743b000000000000000000000000000000000000000000000000000000009cd939e40000000000000000000000000000000000000000000000000000000056142d7a0000000000000000000000000000000000000000000000000000000074f4d30d00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008000000000000000000000000000000000000000000000000000000000000000066c0960f900000000000000000000000000000000000000000000000000000000b473318e00000000000000000000000000000000000000000000000000000000042901c700000000000000000000000000000000000000000000000000000000263b7f8e00000000000000000000000000000000000000000000000000000000e4948f4300000000000000000000000000000000000000000000000000000000eb67241900000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008000000000000000000000000000000000000000000000000000000000000000040c4dd81000000000000000000000000000000000000000000000000000000000ce9dcf16000000000000000000000000000000000000000000000000000000007739cbe700000000000000000000000000000000000000000000000000000000a9a2d18a0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000800000000000000000000000000000000000000000000000000000000000000005e58bb63900000000000000000000000000000000000000000000000000000000f235757f000000000000000000000000000000000000000000000000000000001cc5d10300000000000000000000000000000000000000000000000000000000be6f11cf000000000000000000000000000000000000000000000000000000004623c91d00000000000000000000000000000000000000000000000000000000000000000000000000000000dc7c3d03845efe2c4a9e758a70a68ba6bba9fac4000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000080000000000000000000000000000000000000000000000000000000000000000873fb92970000000000000000000000000000000000000000000000000000000036d4eb840000000000000000000000000000000000000000000000000000000027ae4c16000000000000000000000000000000000000000000000000000000000551448c000000000000000000000000000000000000000000000000000000008043760a00000000000000000000000000000000000000000000000000000000beda4b12000000000000000000000000000000000000000000000000000000001733894500000000000000000000000000000000000000000000000000000000587809c7000000000000000000000000000000000000000000000000000000000000000000000000000000007444de636699f080ca1c033528d2bb3705b391ce0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000800000000000000000000000000000000000000000000000000000000000000023cdffacc60000000000000000000000000000000000000000000000000000000052ef6b2c00000000000000000000000000000000000000000000000000000000adfca15e000000000000000000000000000000000000000000000000000000007a0ed62700000000000000000000000000000000000000000000000000000000a7cd63b700000000000000000000000000000000000000000000000000000000fe10226d0000000000000000000000000000000000000000000000000000000079823c9a000000000000000000000000000000000000000000000000000000004fc07d7500000000000000000000000000000000000000000000000000000000d86970d800000000000000000000000000000000000000000000000000000000fd791f3c000000000000000000000000000000000000000000000000000000009d1b5a81000000000000000000000000000000000000000000000000000000007b30c8da000000000000000000000000000000000000000000000000000000008665b15000000000000000000000000000000000000000000000000000000000631f4bac000000000000000000000000000000000000000000000000000000000ec6b0b7000000000000000000000000000000000000000000000000000000001b60e62600000000000000000000000000000000000000000000000000000000e39d3bff0000000000000000000000000000000000000000000000000000000033ce93fe000000000000000000000000000000000000000000000000000000000ef240a000000000000000000000000000000000000000000000000000000000fe26699e000000000000000000000000000000000000000000000000000000003960738200000000000000000000000000000000000000000000000000000000af6a2dcd00000000000000000000000000000000000000000000000000000000a1954fc500000000000000000000000000000000000000000000000000000000a39980a00000000000000000000000000000000000000000000000000000000046657fe90000000000000000000000000000000000000000000000000000000018e3a941000000000000000000000000000000000000000000000000000000003db920ce0000000000000000000000000000000000000000000000000000000029b98c6700000000000000000000000000000000000000000000000000000000bd7c541200000000000000000000000000000000000000000000000000000000c3bbd2d700000000000000000000000000000000000000000000000000000000e81e0ba100000000000000000000000000000000000000000000000000000000facd743b000000000000000000000000000000000000000000000000000000009cd939e40000000000000000000000000000000000000000000000000000000056142d7a0000000000000000000000000000000000000000000000000000000074f4d30d0000000000000000000000000000000000000000000000000000000000000000000000000000000062aa95ac4740a367746a664c4c69034d52e968ef00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000008000000000000000000000000000000000000000000000000000000000000000066c0960f900000000000000000000000000000000000000000000000000000000b473318e00000000000000000000000000000000000000000000000000000000042901c700000000000000000000000000000000000000000000000000000000263b7f8e00000000000000000000000000000000000000000000000000000000e4948f4300000000000000000000000000000000000000000000000000000000eb672419000000000000000000000000000000000000000000000000000000000000000000000000000000007ed066718dfb1b2b04d94780eca92b67ecf3330b00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000008000000000000000000000000000000000000000000000000000000000000000040c4dd81000000000000000000000000000000000000000000000000000000000ce9dcf16000000000000000000000000000000000000000000000000000000007739cbe700000000000000000000000000000000000000000000000000000000a9a2d18a000000000000000000000000000000000000000000000000000000000000000000000000000000002e64926be35412f7710a3e097ba076740bf97cc00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000800000000000000000000000000000000000000000000000000000000000000005e58bb63900000000000000000000000000000000000000000000000000000000f235757f000000000000000000000000000000000000000000000000000000001cc5d10300000000000000000000000000000000000000000000000000000000be6f11cf000000000000000000000000000000000000000000000000000000004623c91d0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000010041ed824a0000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000001a00000000000000000000000000000000000000000000000000000000000000f800100089b8a2f2e6a20ba28f02c9e0ed0c13d702932364561a0ea61621f65f0a80100067d16a5485875b4249040bf421f53e869337fe118ec747cf40a4c777e5f00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000fa00000000000000000000000000000000000000000000000000000000000000fc00000000000000000000000000000000000000000000000000000000064f9a628000000000000000000000000000000000000000000000000000000000000000e000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000fe0000000000000000000000000000000000000000000000000000000000008007000000000000000000000000000000000000000000000000000000000000800600000000000000000000000000000000000000000000000000000000044aa2000000000000000000000000000000000000000000000000000000000000000320000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000e0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000002600000000000000000000000000000000000000000000000000000000000000d600000000000000000000000000000000000000000000000000000000000000d800000000000000000000000000000000000000000000000000000000000000da00000000000000000000000000000000000000000000000000000000000000dc00000000000000000000000000000000000000000000000000000000000000ac4e9f18c170000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000000c00000000000000000000000000000000000000000000000000000000000001800000000000000000000000000000000000000000000000000000000000000240000000000000000000000000000000000000000000000000000000000000030000000000000000000000000000000000000000000000000000000000000003c000000000000000000000000000000000000000000000000000000000000004800000000000000000000000000000000000000000000000000000000000000540000000000000000000000000000000000000000000000000000000000000060000000000000000000000000000000000000000000000000000000000000006c000000000000000000000000000000000000000000000000000000000000007800000000000000000000000000000000000000000000000000000000000000840000000000000000000000000000000000000000000000000000000000000090000000000000000000000000000000000000000000000000000000000000009c0010000911c610c6e91d050e608ac4f5db8b08c33bb032a57f70899cdd250a75e00000000000000000000000000000000000000000000000000000000000080020000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000a000000000000000000000000000000000000000000000000000000000000000000100012f42627ab0dd09d78d8a25f459e3b3caf2126668fdfc19887eb5cbf4de00000000000000000000000000000000000000000000000000000000000080030000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000a000000000000000000000000000000000000000000000000000000000000000000100008fd05a39ae3ccc0c081732b2c09b783810773a66d6429cfb03d813a69200000000000000000000000000000000000000000000000000000000000080040000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000a00000000000000000000000000000000000000000000000000000000000000000010000475ebeaf64663ebad3ab3fd14b6e985f576c816a66f84bda5a1825310700000000000000000000000000000000000000000000000000000000000080050000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000a00000000000000000000000000000000000000000000000000000000000000000010005c1731dded081c794319523b82102fd09237011e23e0dda219b1a81479900000000000000000000000000000000000000000000000000000000000080060000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000a0000000000000000000000000000000000000000000000000000000000000000001000075efc5d3c37f1861e7c9f7f12c5c71f7b98c8e96bc1ae750441942911a00000000000000000000000000000000000000000000000000000000000080080000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000a0000000000000000000000000000000000000000000000000000000000000000001000071fb47c4855b3cee15acfc19af66272afb61ae2196cdf8f0af81316c2200000000000000000000000000000000000000000000000000000000000080090000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000a0000000000000000000000000000000000000000000000000000000000000000001000139d95a414e7910bb755fecc60531a8c7ba6cc49c2fbd763df8541e4fae000000000000000000000000000000000000000000000000000000000000800a0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000a000000000000000000000000000000000000000000000000000000000000000000100021f60c503126f404845b8cd748b0fa2e71cd99e14462008009e6fe1ab03000000000000000000000000000000000000000000000000000000000000800b0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000a00000000000000000000000000000000000000000000000000000000000000000010009adf7ebf8227ee5d057438bf502d132ed4c7017255f16f691286f3dd7b3000000000000000000000000000000000000000000000000000000000000800c0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000a00000000000000000000000000000000000000000000000000000000000000000010000e1073ab7b4226bb86ca2746fbf1ecb305e23c61240b900c4e0ea161a99000000000000000000000000000000000000000000000000000000000000800e0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000a000000000000000000000000000000000000000000000000000000000000000000100005bc7e5e9f6718a7a59ba32849b08a12d957bcf517cb6ba68faf03983ba000000000000000000000000000000000000000000000000000000000000800f0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000a0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000"
+}
\ No newline at end of file
diff --git a/etc/upgrades/1693905748-virtual-block-timestamp-fixed/stage2/l2Upgrade.json b/etc/upgrades/1693905748-virtual-block-timestamp-fixed/stage2/l2Upgrade.json
new file mode 100644
index 000000000000..4f1536a85525
--- /dev/null
+++ b/etc/upgrades/1693905748-virtual-block-timestamp-fixed/stage2/l2Upgrade.json
@@ -0,0 +1,51 @@
+{
+  "systemContracts": [
+    {
+      "name": "SystemContext",
+      "bytecodeHashes": [
+        "0x0100021f60c503126f404845b8cd748b0fa2e71cd99e14462008009e6fe1ab03"
+      ],
+      "address": "0x000000000000000000000000000000000000800b"
+    }
+  ],
+  "bootloader": {
+    "name": "Bootloader",
+    "bytecodeHashes": [
+      "0x0100089b8a2f2e6a20ba28f02c9e0ed0c13d702932364561a0ea61621f65f0a8"
+    ]
+  },
+  "forcedDeployments": [
+    {
+      "bytecodeHash": "0x0100021f60c503126f404845b8cd748b0fa2e71cd99e14462008009e6fe1ab03",
+      "newAddress": "0x000000000000000000000000000000000000800b",
+      "value": 0,
+      "input": "0x",
+      "callConstructor": false
+    }
+  ],
+  "forcedDeploymentCalldata": "0xe9f18c170000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000200100021f60c503126f404845b8cd748b0fa2e71cd99e14462008009e6fe1ab03000000000000000000000000000000000000000000000000000000000000800b0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000a00000000000000000000000000000000000000000000000000000000000000000",
+  "calldata": "0xe9f18c170000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000200100021f60c503126f404845b8cd748b0fa2e71cd99e14462008009e6fe1ab03000000000000000000000000000000000000000000000000000000000000800b0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000a00000000000000000000000000000000000000000000000000000000000000000",
+  "tx": {
+    "txType": 254,
+    "from": "0x0000000000000000000000000000000000008007",
+    "to": "0x0000000000000000000000000000000000008006",
+    "gasLimit": 72000000,
+    "gasPerPubdataByteLimit": 800,
+    "maxFeePerGas": 0,
+    "maxPriorityFeePerGas": 0,
+    "paymaster": 0,
+    "nonce": "14",
+    "value": 0,
+    "reserved": [
+      0,
+      0,
+      0,
+      0
+    ],
+    "data": "0xe9f18c170000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000200100021f60c503126f404845b8cd748b0fa2e71cd99e14462008009e6fe1ab03000000000000000000000000000000000000000000000000000000000000800b0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000a00000000000000000000000000000000000000000000000000000000000000000",
+    "signature": "0x",
+    "factoryDeps": [],
+    "paymasterInput": "0x",
+    "reservedDynamic": "0x"
+  }
+}
\ No newline at end of file
diff --git a/etc/upgrades/1693905748-virtual-block-timestamp-fixed/stage2/transactions.json b/etc/upgrades/1693905748-virtual-block-timestamp-fixed/stage2/transactions.json
new file mode 100644
index 000000000000..97c542dc85e3
--- /dev/null
+++ b/etc/upgrades/1693905748-virtual-block-timestamp-fixed/stage2/transactions.json
@@ -0,0 +1,59 @@
+{
+  "proposeUpgradeTx": {
+    "l2ProtocolUpgradeTx": {
+      "txType": 254,
+      "from": "0x0000000000000000000000000000000000008007",
+      "to": "0x0000000000000000000000000000000000008006",
+      "gasLimit": 72000000,
+      "gasPerPubdataByteLimit": 800,
+      "maxFeePerGas": 0,
+      "maxPriorityFeePerGas": 0,
+      "paymaster": 0,
+      "nonce": "14",
+      "value": 0,
+      "reserved": [
+        0,
+        0,
+        0,
+        0
+      ],
+      "data": "0xe9f18c170000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000200100021f60c503126f404845b8cd748b0fa2e71cd99e14462008009e6fe1ab03000000000000000000000000000000000000000000000000000000000000800b0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000a00000000000000000000000000000000000000000000000000000000000000000",
+      "signature": "0x",
+      "factoryDeps": [],
+      "paymasterInput": "0x",
+      "reservedDynamic": "0x"
+    },
+    "bootloaderHash": "0x0100089b8a2f2e6a20ba28f02c9e0ed0c13d702932364561a0ea61621f65f0a8",
+    "defaultAccountHash": "0x0000000000000000000000000000000000000000000000000000000000000000",
+    "verifier": "0x0000000000000000000000000000000000000000",
+    "verifierParams": {
+      "recursionNodeLevelVkHash": "0x0000000000000000000000000000000000000000000000000000000000000000",
+      "recursionLeafLevelVkHash": "0x0000000000000000000000000000000000000000000000000000000000000000",
+      "recursionCircuitsSetVksHash": "0x0000000000000000000000000000000000000000000000000000000000000000"
+    },
+    "l1ContractsUpgradeCalldata": "0x",
+    "postUpgradeCalldata": "0x",
+    "upgradeTimestamp": {
+      "type": "BigNumber",
+      "hex": "0x64f6e4b0"
+    },
+    "factoryDeps": [],
+    "newProtocolVersion": "14",
+    "newAllowList": "0x0000000000000000000000000000000000000000"
+  },
+  "l1upgradeCalldata": "0x1ed824a0000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000001a000000000000000000000000000000000000000000000000000000000000005e00100089b8a2f2e6a20ba28f02c9e0ed0c13d702932364561a0ea61621f65f0a800000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000060000000000000000000000000000000000000000000000000000000000000006200000000000000000000000000000000000000000000000000000000064f6e4b0000000000000000000000000000000000000000000000000000000000000000e000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000fe0000000000000000000000000000000000000000000000000000000000008007000000000000000000000000000000000000000000000000000000000000800600000000000000000000000000000000000000000000000000000000044aa2000000000000000000000000000000000000000000000000000000000000000320000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000e00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000026000000000000000000000000000000000000000000000000000000000000003c000000000000000000000000000000000000000000000000000000000000003e0000000000000000000000000000000000000000000000000000000000000040000000000000000000000000000000000000000000000000000000000000004200000000000000000000000000000000000000000000000000000000000000124e9f18c170000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000200100021f60c503126f404845b8cd748b0fa2e71cd99e14462008009e6fe1ab03000000000000000000000000000000000000000000000000000000000000800b0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000a00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+  "upgradeAddress": "0xdb876240F01A6dd38F5EFC4EcEFe52e5C13dB3C7",
+  "protocolVersion": "14",
+  "diamondUpgradeProposalId": {
+    "type": "BigNumber",
+    "hex": "0x05"
+  },
+  "upgradeTimestamp": "1693902000",
+  "proposeTransparentUpgradeCalldata": "0x8043760a000000000000000000000000000000000000000000000000000000000000004000000000000000000000000000000000000000000000000000000000000000050000000000000000000000000000000000000000000000000000000000000060000000000000000000000000db876240f01a6dd38f5efc4ecefe52e5c13db3c70000000000000000000000000000000000000000000000000000000000000080000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000006641ed824a0000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000001a000000000000000000000000000000000000000000000000000000000000005e00100089b8a2f2e6a20ba28f02c9e0ed0c13d702932364561a0ea61621f65f0a800000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000060000000000000000000000000000000000000000000000000000000000000006200000000000000000000000000000000000000000000000000000000064f6e4b0000000000000000000000000000000000000000000000000000000000000000e000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000fe0000000000000000000000000000000000000000000000000000000000008007000000000000000000000000000000000000000000000000000000000000800600000000000000000000000000000000000000000000000000000000044aa2000000000000000000000000000000000000000000000000000000000000000320000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000e00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000026000000000000000000000000000000000000000000000000000000000000003c000000000000000000000000000000000000000000000000000000000000003e0000000000000000000000000000000000000000000000000000000000000040000000000000000000000000000000000000000000000000000000000000004200000000000000000000000000000000000000000000000000000000000000124e9f18c170000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000200100021f60c503126f404845b8cd748b0fa2e71cd99e14462008009e6fe1ab03000000000000000000000000000000000000000000000000000000000000800b0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000a0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+  "transparentUpgrade": {
+    "facetCuts": [],
+    "initAddress": "0xdb876240F01A6dd38F5EFC4EcEFe52e5C13dB3C7",
+    "initCalldata": "0x1ed824a0000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000001a000000000000000000000000000000000000000000000000000000000000005e00100089b8a2f2e6a20ba28f02c9e0ed0c13d702932364561a0ea61621f65f0a800000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000060000000000000000000000000000000000000000000000000000000000000006200000000000000000000000000000000000000000000000000000000064f6e4b0000000000000000000000000000000000000000000000000000000000000000e000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000fe0000000000000000000000000000000000000000000000000000000000008007000000000000000000000000000000000000000000000000000000000000800600000000000000000000000000000000000000000000000000000000044aa2000000000000000000000000000000000000000000000000000000000000000320000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000e00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000026000000000000000000000000000000000000000000000000000000000000003c000000000000000000000000000000000000000000000000000000000000003e0000000000000000000000000000000000000000000000000000000000000040000000000000000000000000000000000000000000000000000000000000004200000000000000000000000000000000000000000000000000000000000000124e9f18c170000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000200100021f60c503126f404845b8cd748b0fa2e71cd99e14462008009e6fe1ab03000000000000000000000000000000000000000000000000000000000000800b0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000a00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000"
+  },
+  "executeUpgradeCalldata": "0x36d4eb84000000000000000000000000000000000000000000000000000000000000004000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000060000000000000000000000000db876240f01a6dd38f5efc4ecefe52e5c13db3c70000000000000000000000000000000000000000000000000000000000000080000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000006641ed824a0000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000001a000000000000000000000000000000000000000000000000000000000000005e00100089b8a2f2e6a20ba28f02c9e0ed0c13d702932364561a0ea61621f65f0a800000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000060000000000000000000000000000000000000000000000000000000000000006200000000000000000000000000000000000000000000000000000000064f6e4b0000000000000000000000000000000000000000000000000000000000000000e000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000fe0000000000000000000000000000000000000000000000000000000000008007000000000000000000000000000000000000000000000000000000000000800600000000000000000000000000000000000000000000000000000000044aa2000000000000000000000000000000000000000000000000000000000000000320000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000e00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000026000000000000000000000000000000000000000000000000000000000000003c000000000000000000000000000000000000000000000000000000000000003e0000000000000000000000000000000000000000000000000000000000000040000000000000000000000000000000000000000000000000000000000000004200000000000000000000000000000000000000000000000000000000000000124e9f18c170000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000200100021f60c503126f404845b8cd748b0fa2e71cd99e14462008009e6fe1ab03000000000000000000000000000000000000000000000000000000000000800b0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000a0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000"
+}
\ No newline at end of file
diff --git a/etc/upgrades/1693905748-virtual-block-timestamp-fixed/testnet2/l2Upgrade.json b/etc/upgrades/1693905748-virtual-block-timestamp-fixed/testnet2/l2Upgrade.json
new file mode 100644
index 000000000000..4f1536a85525
--- /dev/null
+++ b/etc/upgrades/1693905748-virtual-block-timestamp-fixed/testnet2/l2Upgrade.json
@@ -0,0 +1,51 @@
+{
+  "systemContracts": [
+    {
+      "name": "SystemContext",
+      "bytecodeHashes": [
+        "0x0100021f60c503126f404845b8cd748b0fa2e71cd99e14462008009e6fe1ab03"
+      ],
+      "address": "0x000000000000000000000000000000000000800b"
+    }
+  ],
+  "bootloader": {
+    "name": "Bootloader",
+    "bytecodeHashes": [
+      "0x0100089b8a2f2e6a20ba28f02c9e0ed0c13d702932364561a0ea61621f65f0a8"
+    ]
+  },
+  "forcedDeployments": [
+    {
+      "bytecodeHash": "0x0100021f60c503126f404845b8cd748b0fa2e71cd99e14462008009e6fe1ab03",
+      "newAddress": "0x000000000000000000000000000000000000800b",
+      "value": 0,
+      "input": "0x",
+      "callConstructor": false
+    }
+  ],
+  "forcedDeploymentCalldata": "0xe9f18c170000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000200100021f60c503126f404845b8cd748b0fa2e71cd99e14462008009e6fe1ab03000000000000000000000000000000000000000000000000000000000000800b0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000a00000000000000000000000000000000000000000000000000000000000000000",
+  "calldata": "0xe9f18c170000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000200100021f60c503126f404845b8cd748b0fa2e71cd99e14462008009e6fe1ab03000000000000000000000000000000000000000000000000000000000000800b0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000a00000000000000000000000000000000000000000000000000000000000000000",
+  "tx": {
+    "txType": 254,
+    "from": "0x0000000000000000000000000000000000008007",
+    "to": "0x0000000000000000000000000000000000008006",
+    "gasLimit": 72000000,
+    "gasPerPubdataByteLimit": 800,
+    "maxFeePerGas": 0,
+    "maxPriorityFeePerGas": 0,
+    "paymaster": 0,
+    "nonce": "14",
+    "value": 0,
+    "reserved": [
+      0,
+      0,
+      0,
+      0
+    ],
+    "data": "0xe9f18c170000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000200100021f60c503126f404845b8cd748b0fa2e71cd99e14462008009e6fe1ab03000000000000000000000000000000000000000000000000000000000000800b0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000a00000000000000000000000000000000000000000000000000000000000000000",
+    "signature": "0x",
+    "factoryDeps": [],
+    "paymasterInput": "0x",
+    "reservedDynamic": "0x"
+  }
+}
\ No newline at end of file
diff --git a/etc/upgrades/1693905748-virtual-block-timestamp-fixed/testnet2/transactions.json b/etc/upgrades/1693905748-virtual-block-timestamp-fixed/testnet2/transactions.json
new file mode 100644
index 000000000000..447be459dc48
--- /dev/null
+++ b/etc/upgrades/1693905748-virtual-block-timestamp-fixed/testnet2/transactions.json
@@ -0,0 +1,59 @@
+{
+  "proposeUpgradeTx": {
+    "l2ProtocolUpgradeTx": {
+      "txType": 254,
+      "from": "0x0000000000000000000000000000000000008007",
+      "to": "0x0000000000000000000000000000000000008006",
+      "gasLimit": 72000000,
+      "gasPerPubdataByteLimit": 800,
+      "maxFeePerGas": 0,
+      "maxPriorityFeePerGas": 0,
+      "paymaster": 0,
+      "nonce": "14",
+      "value": 0,
+      "reserved": [
+        0,
+        0,
+        0,
+        0
+      ],
+      "data": "0xe9f18c170000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000200100021f60c503126f404845b8cd748b0fa2e71cd99e14462008009e6fe1ab03000000000000000000000000000000000000000000000000000000000000800b0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000a00000000000000000000000000000000000000000000000000000000000000000",
+      "signature": "0x",
+      "factoryDeps": [],
+      "paymasterInput": "0x",
+      "reservedDynamic": "0x"
+    },
+    "bootloaderHash": "0x0100089b8a2f2e6a20ba28f02c9e0ed0c13d702932364561a0ea61621f65f0a8",
+    "defaultAccountHash": "0x0000000000000000000000000000000000000000000000000000000000000000",
+    "verifier": "0x0000000000000000000000000000000000000000",
+    "verifierParams": {
+      "recursionNodeLevelVkHash": "0x0000000000000000000000000000000000000000000000000000000000000000",
+      "recursionLeafLevelVkHash": "0x0000000000000000000000000000000000000000000000000000000000000000",
+      "recursionCircuitsSetVksHash": "0x0000000000000000000000000000000000000000000000000000000000000000"
+    },
+    "l1ContractsUpgradeCalldata": "0x",
+    "postUpgradeCalldata": "0x",
+    "upgradeTimestamp": {
+      "type": "BigNumber",
+      "hex": "0x64f70a30"
+    },
+    "factoryDeps": [],
+    "newProtocolVersion": "14",
+    "newAllowList": "0x0000000000000000000000000000000000000000"
+  },
+  "l1upgradeCalldata": "0x1ed824a0000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000001a000000000000000000000000000000000000000000000000000000000000005e00100089b8a2f2e6a20ba28f02c9e0ed0c13d702932364561a0ea61621f65f0a800000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000060000000000000000000000000000000000000000000000000000000000000006200000000000000000000000000000000000000000000000000000000064f70a30000000000000000000000000000000000000000000000000000000000000000e000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000fe0000000000000000000000000000000000000000000000000000000000008007000000000000000000000000000000000000000000000000000000000000800600000000000000000000000000000000000000000000000000000000044aa2000000000000000000000000000000000000000000000000000000000000000320000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000e00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000026000000000000000000000000000000000000000000000000000000000000003c000000000000000000000000000000000000000000000000000000000000003e0000000000000000000000000000000000000000000000000000000000000040000000000000000000000000000000000000000000000000000000000000004200000000000000000000000000000000000000000000000000000000000000124e9f18c170000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000200100021f60c503126f404845b8cd748b0fa2e71cd99e14462008009e6fe1ab03000000000000000000000000000000000000000000000000000000000000800b0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000a00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+  "upgradeAddress": "0x70EEdd750Ce140c6320a721D3e6Ff62c80e29DB8",
+  "protocolVersion": "14",
+  "diamondUpgradeProposalId": {
+    "type": "BigNumber",
+    "hex": "0x09"
+  },
+  "upgradeTimestamp": "1693911600",
+  "proposeTransparentUpgradeCalldata": "0x8043760a00000000000000000000000000000000000000000000000000000000000000400000000000000000000000000000000000000000000000000000000000000009000000000000000000000000000000000000000000000000000000000000006000000000000000000000000070eedd750ce140c6320a721d3e6ff62c80e29db80000000000000000000000000000000000000000000000000000000000000080000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000006641ed824a0000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000001a000000000000000000000000000000000000000000000000000000000000005e00100089b8a2f2e6a20ba28f02c9e0ed0c13d702932364561a0ea61621f65f0a800000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000060000000000000000000000000000000000000000000000000000000000000006200000000000000000000000000000000000000000000000000000000064f70a30000000000000000000000000000000000000000000000000000000000000000e000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000fe0000000000000000000000000000000000000000000000000000000000008007000000000000000000000000000000000000000000000000000000000000800600000000000000000000000000000000000000000000000000000000044aa2000000000000000000000000000000000000000000000000000000000000000320000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000e00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000026000000000000000000000000000000000000000000000000000000000000003c000000000000000000000000000000000000000000000000000000000000003e0000000000000000000000000000000000000000000000000000000000000040000000000000000000000000000000000000000000000000000000000000004200000000000000000000000000000000000000000000000000000000000000124e9f18c170000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000200100021f60c503126f404845b8cd748b0fa2e71cd99e14462008009e6fe1ab03000000000000000000000000000000000000000000000000000000000000800b0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000a0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+  "transparentUpgrade": {
+    "facetCuts": [],
+    "initAddress": "0x70EEdd750Ce140c6320a721D3e6Ff62c80e29DB8",
+    "initCalldata": "0x1ed824a0000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000001a000000000000000000000000000000000000000000000000000000000000005e00100089b8a2f2e6a20ba28f02c9e0ed0c13d702932364561a0ea61621f65f0a800000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000060000000000000000000000000000000000000000000000000000000000000006200000000000000000000000000000000000000000000000000000000064f70a30000000000000000000000000000000000000000000000000000000000000000e000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000fe0000000000000000000000000000000000000000000000000000000000008007000000000000000000000000000000000000000000000000000000000000800600000000000000000000000000000000000000000000000000000000044aa2000000000000000000000000000000000000000000000000000000000000000320000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000e00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000026000000000000000000000000000000000000000000000000000000000000003c000000000000000000000000000000000000000000000000000000000000003e0000000000000000000000000000000000000000000000000000000000000040000000000000000000000000000000000000000000000000000000000000004200000000000000000000000000000000000000000000000000000000000000124e9f18c170000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000200100021f60c503126f404845b8cd748b0fa2e71cd99e14462008009e6fe1ab03000000000000000000000000000000000000000000000000000000000000800b0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000a00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000"
+  },
+  "executeUpgradeCalldata": "0x36d4eb8400000000000000000000000000000000000000000000000000000000000000400000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000006000000000000000000000000070eedd750ce140c6320a721d3e6ff62c80e29db80000000000000000000000000000000000000000000000000000000000000080000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000006641ed824a0000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000001a000000000000000000000000000000000000000000000000000000000000005e00100089b8a2f2e6a20ba28f02c9e0ed0c13d702932364561a0ea61621f65f0a800000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000060000000000000000000000000000000000000000000000000000000000000006200000000000000000000000000000000000000000000000000000000064f70a30000000000000000000000000000000000000000000000000000000000000000e000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000fe0000000000000000000000000000000000000000000000000000000000008007000000000000000000000000000000000000000000000000000000000000800600000000000000000000000000000000000000000000000000000000044aa2000000000000000000000000000000000000000000000000000000000000000320000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000e00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000026000000000000000000000000000000000000000000000000000000000000003c000000000000000000000000000000000000000000000000000000000000003e0000000000000000000000000000000000000000000000000000000000000040000000000000000000000000000000000000000000000000000000000000004200000000000000000000000000000000000000000000000000000000000000124e9f18c170000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000200100021f60c503126f404845b8cd748b0fa2e71cd99e14462008009e6fe1ab03000000000000000000000000000000000000000000000000000000000000800b0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000a0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000"
+}
\ No newline at end of file
diff --git a/etc/upgrades/1695203585-missing-constraint-in-circuit/common.json b/etc/upgrades/1695203585-missing-constraint-in-circuit/common.json
new file mode 100644
index 000000000000..06930d72b323
--- /dev/null
+++ b/etc/upgrades/1695203585-missing-constraint-in-circuit/common.json
@@ -0,0 +1,5 @@
+{
+  "name": "missing-constraint-in-circuit",
+  "creationTimestamp": 1695203585,
+  "protocolVersion": "15"
+}
\ No newline at end of file
diff --git a/etc/upgrades/1695203585-missing-constraint-in-circuit/stage2/crypto.json b/etc/upgrades/1695203585-missing-constraint-in-circuit/stage2/crypto.json
new file mode 100644
index 000000000000..c53a681f1863
--- /dev/null
+++ b/etc/upgrades/1695203585-missing-constraint-in-circuit/stage2/crypto.json
@@ -0,0 +1,7 @@
+{
+  "keys": {
+    "recursionNodeLevelVkHash": "0x1186ec268d49f1905f8d9c1e9d39fc33e98c74f91d91a21b8f7ef78bd09a8db8",
+    "recursionLeafLevelVkHash": "0x101e08b00193e529145ee09823378ef51a3bc8966504064f1f6ba3f1ba863210",
+    "recursionCircuitsSetVksHash": "0x236c97bfbe75ff507e03909fae32a78be3a70d1b468b183f430010810284ed45"
+  }
+}
\ No newline at end of file
diff --git a/etc/upgrades/1695203585-missing-constraint-in-circuit/stage2/transactions.json b/etc/upgrades/1695203585-missing-constraint-in-circuit/stage2/transactions.json
new file mode 100644
index 000000000000..71d506231b73
--- /dev/null
+++ b/etc/upgrades/1695203585-missing-constraint-in-circuit/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": "0x236c97bfbe75ff507e03909fae32a78be3a70d1b468b183f430010810284ed45"
+    },
+    "l1ContractsUpgradeCalldata": "0x",
+    "postUpgradeCalldata": "0x",
+    "upgradeTimestamp": {
+      "type": "BigNumber",
+      "hex": "0x650ad0b0"
+    },
+    "factoryDeps": [],
+    "newProtocolVersion": "15",
+    "newAllowList": "0x0000000000000000000000000000000000000000"
+  },
+  "l1upgradeCalldata": "0x1ed824a0000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000001a000000000000000000000000000000000000000000000000000000000000004a00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001186ec268d49f1905f8d9c1e9d39fc33e98c74f91d91a21b8f7ef78bd09a8db8101e08b00193e529145ee09823378ef51a3bc8966504064f1f6ba3f1ba863210236c97bfbe75ff507e03909fae32a78be3a70d1b468b183f430010810284ed4500000000000000000000000000000000000000000000000000000000000004c000000000000000000000000000000000000000000000000000000000000004e000000000000000000000000000000000000000000000000000000000650ad0b0000000000000000000000000000000000000000000000000000000000000000f0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000260000000000000000000000000000000000000000000000000000000000000028000000000000000000000000000000000000000000000000000000000000002a000000000000000000000000000000000000000000000000000000000000002c000000000000000000000000000000000000000000000000000000000000002e000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+  "upgradeAddress": "0xdb876240F01A6dd38F5EFC4EcEFe52e5C13dB3C7",
+  "protocolVersion": "15",
+  "diamondUpgradeProposalId": {
+    "type": "BigNumber",
+    "hex": "0x06"
+  },
+  "upgradeTimestamp": "1695207600",
+  "proposeTransparentUpgradeCalldata": "0x8043760a000000000000000000000000000000000000000000000000000000000000004000000000000000000000000000000000000000000000000000000000000000060000000000000000000000000000000000000000000000000000000000000060000000000000000000000000db876240f01a6dd38f5efc4ecefe52e5c13db3c70000000000000000000000000000000000000000000000000000000000000080000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000005241ed824a0000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000001a000000000000000000000000000000000000000000000000000000000000004a00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001186ec268d49f1905f8d9c1e9d39fc33e98c74f91d91a21b8f7ef78bd09a8db8101e08b00193e529145ee09823378ef51a3bc8966504064f1f6ba3f1ba863210236c97bfbe75ff507e03909fae32a78be3a70d1b468b183f430010810284ed4500000000000000000000000000000000000000000000000000000000000004c000000000000000000000000000000000000000000000000000000000000004e000000000000000000000000000000000000000000000000000000000650ad0b0000000000000000000000000000000000000000000000000000000000000000f0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000260000000000000000000000000000000000000000000000000000000000000028000000000000000000000000000000000000000000000000000000000000002a000000000000000000000000000000000000000000000000000000000000002c000000000000000000000000000000000000000000000000000000000000002e00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+  "transparentUpgrade": {
+    "facetCuts": [],
+    "initAddress": "0xdb876240F01A6dd38F5EFC4EcEFe52e5C13dB3C7",
+    "initCalldata": "0x1ed824a0000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000001a000000000000000000000000000000000000000000000000000000000000004a00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001186ec268d49f1905f8d9c1e9d39fc33e98c74f91d91a21b8f7ef78bd09a8db8101e08b00193e529145ee09823378ef51a3bc8966504064f1f6ba3f1ba863210236c97bfbe75ff507e03909fae32a78be3a70d1b468b183f430010810284ed4500000000000000000000000000000000000000000000000000000000000004c000000000000000000000000000000000000000000000000000000000000004e000000000000000000000000000000000000000000000000000000000650ad0b0000000000000000000000000000000000000000000000000000000000000000f0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000260000000000000000000000000000000000000000000000000000000000000028000000000000000000000000000000000000000000000000000000000000002a000000000000000000000000000000000000000000000000000000000000002c000000000000000000000000000000000000000000000000000000000000002e000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000"
+  },
+  "executeUpgradeCalldata": "0x36d4eb84000000000000000000000000000000000000000000000000000000000000004000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000060000000000000000000000000db876240f01a6dd38f5efc4ecefe52e5c13db3c70000000000000000000000000000000000000000000000000000000000000080000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000005241ed824a0000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000001a000000000000000000000000000000000000000000000000000000000000004a00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001186ec268d49f1905f8d9c1e9d39fc33e98c74f91d91a21b8f7ef78bd09a8db8101e08b00193e529145ee09823378ef51a3bc8966504064f1f6ba3f1ba863210236c97bfbe75ff507e03909fae32a78be3a70d1b468b183f430010810284ed4500000000000000000000000000000000000000000000000000000000000004c000000000000000000000000000000000000000000000000000000000000004e000000000000000000000000000000000000000000000000000000000650ad0b0000000000000000000000000000000000000000000000000000000000000000f0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000260000000000000000000000000000000000000000000000000000000000000028000000000000000000000000000000000000000000000000000000000000002a000000000000000000000000000000000000000000000000000000000000002c000000000000000000000000000000000000000000000000000000000000002e00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000"
+}
\ No newline at end of file
diff --git a/infrastructure/protocol-upgrade/src/crypto/crypto.ts b/infrastructure/protocol-upgrade/src/crypto/crypto.ts
index 98a2a8468972..78c013b94790 100644
--- a/infrastructure/protocol-upgrade/src/crypto/crypto.ts
+++ b/infrastructure/protocol-upgrade/src/crypto/crypto.ts
@@ -10,8 +10,8 @@ function saveVerificationKeys(
     recursionCircuitsSetVksHash: BytesLike,
     environment: string
 ) {
-    recursionNodeLevelVkHash = recursionNodeLevelVkHash ?? process.env.CONTRACTS_RECURSION_LEAF_LEVEL_VK_HASH;
-    recursionLeafLevelVkHash = recursionLeafLevelVkHash ?? process.env.CONTRACTS_RECURSION_NODE_LEVEL_VK_HASH;
+    recursionNodeLevelVkHash = recursionNodeLevelVkHash ?? process.env.CONTRACTS_RECURSION_NODE_LEVEL_VK_HASH;
+    recursionLeafLevelVkHash = recursionLeafLevelVkHash ?? process.env.CONTRACTS_RECURSION_LEAF_LEVEL_VK_HASH;
     recursionCircuitsSetVksHash = recursionCircuitsSetVksHash ?? process.env.CONTRACTS_RECURSION_CIRCUITS_SET_VKS_HASH;
     const verificationParams: VerifierParams = {
         recursionNodeLevelVkHash,
diff --git a/infrastructure/protocol-upgrade/src/transaction.ts b/infrastructure/protocol-upgrade/src/transaction.ts
index 6ff23180dc50..82de44e0fbeb 100644
--- a/infrastructure/protocol-upgrade/src/transaction.ts
+++ b/infrastructure/protocol-upgrade/src/transaction.ts
@@ -84,6 +84,28 @@ export interface ProposedUpgrade {
     newAllowList: string;
 }
 
+function buildNoopL2UpgradeTx(): L2CanonicalTransaction {
+    // L1 contract considers transaction with `txType` = 0 as noop.
+    return {
+        txType: 0,
+        from: ethers.constants.AddressZero,
+        to: ethers.constants.AddressZero,
+        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'
+    };
+}
+
 export function buildProposeUpgrade(
     upgradeTimestamp: ethers.BigNumber,
     newProtocolVersion: number,
@@ -101,6 +123,7 @@ export function buildProposeUpgrade(
     defaultAccountHash = defaultAccountHash ?? ethers.constants.HashZero;
     l1ContractsUpgradeCalldata = l1ContractsUpgradeCalldata ?? '0x';
     postUpgradeCalldata = postUpgradeCalldata ?? '0x';
+    l2ProtocolUpgradeTx = l2ProtocolUpgradeTx ?? buildNoopL2UpgradeTx();
     return {
         l2ProtocolUpgradeTx,
         bootloaderHash,
diff --git a/infrastructure/zk/src/config.ts b/infrastructure/zk/src/config.ts
index efe8c7b9c4cc..9b1c4aa68ea1 100644
--- a/infrastructure/zk/src/config.ts
+++ b/infrastructure/zk/src/config.ts
@@ -28,7 +28,9 @@ const CONFIG_FILES = [
     'fri_witness_generator.toml',
     'fri_prover_group.toml',
     'proof_data_handler.toml',
-    'fri_witness_vector_generator.toml'
+    'fri_witness_vector_generator.toml',
+    'fri_prover_gateway.toml',
+    'fri_proof_compressor.toml'
 ];
 
 function loadConfigFile(path: string) {
@@ -60,7 +62,7 @@ export function collectVariables(config: any, prefix: string = ''): Map<string,
                 } else {
                     // It's a plain array, so join the elements into a string.
                     const variableName = `${prefix}${keyUppercase}`;
-                    variables.set(variableName, config[key].join(','));
+                    variables.set(variableName, `"${config[key].join(',')}"`);
                 }
             } else {
                 // It's a map object: parse it recursively.
diff --git a/infrastructure/zk/src/contract.ts b/infrastructure/zk/src/contract.ts
index c0c4d04d97fb..2063810d4e6c 100644
--- a/infrastructure/zk/src/contract.ts
+++ b/infrastructure/zk/src/contract.ts
@@ -62,7 +62,7 @@ export async function initializeWethToken(args: any[] = []) {
     );
 }
 
-export async function deployL2(args: any[] = [], includePaymaster?: boolean) {
+export async function deployL2(args: any[] = [], includePaymaster?: boolean, includeWETH?: boolean) {
     await utils.confirmAction();
 
     const isLocalSetup = process.env.ZKSYNC_LOCAL_SETUP;
@@ -81,7 +81,9 @@ export async function deployL2(args: any[] = [], includePaymaster?: boolean) {
         await utils.spawn(`${baseCommandL2} deploy-testnet-paymaster ${args.join(' ')} | tee -a deployL2.log`);
     }
 
-    await utils.spawn(`${baseCommandL2} deploy-l2-weth ${args.join(' ')} | tee -a deployL2.log`);
+    if (includeWETH) {
+        await utils.spawn(`${baseCommandL2} deploy-l2-weth ${args.join(' ')} | tee -a deployL2.log`);
+    }
 
     await utils.spawn(`${baseCommandL2} deploy-force-deploy-upgrader ${args.join(' ')} | tee -a deployL2.log`);
 
@@ -95,7 +97,9 @@ export async function deployL2(args: any[] = [], includePaymaster?: boolean) {
     ];
     updateContractsEnv(l2DeployLog, l2DeploymentEnvVars);
 
-    await utils.spawn(`${baseCommandL1} initialize-weth-bridges ${args.join(' ')} | tee -a deployL1.log`);
+    if (includeWETH) {
+        await utils.spawn(`${baseCommandL1} initialize-weth-bridges ${args.join(' ')} | tee -a deployL1.log`);
+    }
 
     const l1DeployLog = fs.readFileSync('deployL1.log').toString();
     const l1DeploymentEnvVars = ['CONTRACTS_L2_WETH_BRIDGE_ADDR'];
diff --git a/infrastructure/zk/src/docker.ts b/infrastructure/zk/src/docker.ts
index db8e0fb5b6a4..56f83d41e37e 100644
--- a/infrastructure/zk/src/docker.ts
+++ b/infrastructure/zk/src/docker.ts
@@ -15,7 +15,9 @@ const IMAGES = [
     'witness-generator',
     'prover-fri',
     'prover-gpu-fri',
-    'witness-vector-generator'
+    'witness-vector-generator',
+    'prover-fri-gateway',
+    'proof-fri-compressor'
 ];
 const UNIX_TIMESTAMP = Date.now();
 
@@ -69,7 +71,9 @@ function defaultTagList(image: string, imageTagSha: string, imageTagShaTS: strin
         'witness-generator',
         'prover-fri',
         'prover-gpu-fri',
-        'witness-vector-generator'
+        'witness-vector-generator',
+        'prover-fri-gateway',
+        'proof-fri-compressor'
     ].includes(image)
         ? ['latest2.0', `2.0-${imageTagSha}`, `2.0-${imageTagShaTS}`]
         : [`latest2.0`];
diff --git a/infrastructure/zk/src/index.ts b/infrastructure/zk/src/index.ts
index 3772b6699b3f..479a0889317f 100644
--- a/infrastructure/zk/src/index.ts
+++ b/infrastructure/zk/src/index.ts
@@ -19,6 +19,7 @@ import { command as completion } from './completion';
 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 * as env from './env';
 
 const COMMANDS = [
@@ -41,6 +42,7 @@ const COMMANDS = [
     config,
     clean,
     compiler,
+    verifyUpgrade,
     env.command,
     completion(program as Command)
 ];
diff --git a/infrastructure/zk/src/init.ts b/infrastructure/zk/src/init.ts
index 729bb4297232..d44be33da13a 100644
--- a/infrastructure/zk/src/init.ts
+++ b/infrastructure/zk/src/init.ts
@@ -42,7 +42,7 @@ export async function init(skipSubmodulesCheckout: boolean) {
     await announced('Deploying L1 contracts', contract.redeployL1([]));
     await announced('Initializing validator', contract.initializeValidator());
     await announced('Initialize L1 allow list', contract.initializeL1AllowList());
-    await announced('Deploying L2 contracts', contract.deployL2([], true));
+    await announced('Deploying L2 contracts', contract.deployL2([], true, true));
     await announced('Initializing L2 WETH token', contract.initializeWethToken());
 }
 
@@ -63,7 +63,7 @@ export async function reinit() {
     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));
+    await announced('Deploying L2 contracts', contract.deployL2([], true, true));
     await announced('Initializing L2 WETH token', contract.initializeWethToken());
 }
 
@@ -77,8 +77,7 @@ export async function lightweightInit() {
     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));
-    await announced('Initializing L2 WETH token', contract.initializeWethToken());
+    await announced('Deploying L2 contracts', contract.deployL2([], true, false));
 }
 
 // Wrapper that writes an announcement and completion notes for each executed task.
diff --git a/infrastructure/zk/src/test/test.ts b/infrastructure/zk/src/test/test.ts
index 4017bda32459..c28484d12af2 100644
--- a/infrastructure/zk/src/test/test.ts
+++ b/infrastructure/zk/src/test/test.ts
@@ -1,3 +1,4 @@
+import chalk from 'chalk';
 import { Command } from 'commander';
 import * as utils from '../utils';
 
@@ -20,7 +21,18 @@ export async function js() {
 export async function rust(options: string[]) {
     await db.resetTest();
 
-    let cmd = `cargo test --release ${options.join(' ')}`;
+    let result = await utils.exec('cargo install --list');
+    let test_runner = 'cargo nextest run';
+    if (!result.stdout.includes('cargo-nextest')) {
+        console.warn(
+            chalk.bold.red(
+                `cargo-nextest is missing, please run "cargo install cargo-nextest". Falling back to "cargo test".`
+            )
+        );
+        test_runner = 'cargo test';
+    }
+
+    let cmd = `${test_runner} --release ${options.join(' ')}`;
     console.log(`running unit tests with '${cmd}'`);
 
     await utils.spawn(cmd);
diff --git a/infrastructure/zk/src/verify-upgrade.ts b/infrastructure/zk/src/verify-upgrade.ts
new file mode 100644
index 000000000000..409cdf37cfd4
--- /dev/null
+++ b/infrastructure/zk/src/verify-upgrade.ts
@@ -0,0 +1,526 @@
+import { Command } from 'commander';
+import fs from 'fs';
+import path from 'path';
+import { ethers } from 'ethers';
+
+// Command to verify the correctness of our protocol upgrades among all the environments.
+//
+// Currently it shows the summary of all the upgrades, and does the basic checks to make sure
+// that the SystemContracts are assigned to the correct addresses, and that we pass correct information
+// in Forced deployment calls.
+
+// Things that it DOES NOT check yet are (these will come in future PRs):
+// - facets
+// - correctness of the bytecode hashes
+// - that the final transaction's calldata is matching all the contents in the JSON files.
+
+const UPGRADES_DIR = 'etc/upgrades';
+
+// The first protocol version where launched the upgrade system was 12.
+// So setting this constant to the protocol version before (11).
+const LAST_PROTOCOL_VERSION_BEFORE_UPGRADE_SYSTEM = 11;
+
+// Hardcoded list of system contract names to their corresponding addresses.
+const SYSTEM_CONTRACT_MAP: Map<string, string> = new Map([
+    ['AccountCodeStorage', '0x0000000000000000000000000000000000008002'],
+    ['NonceHolder', '0x0000000000000000000000000000000000008003'],
+    ['KnownCodesStorage', '0x0000000000000000000000000000000000008004'],
+    ['ImmutableSimulator', '0x0000000000000000000000000000000000008005'],
+    ['ContractDeployer', '0x0000000000000000000000000000000000008006'],
+    // 0x8007 is a ForceDeployer address (which is not a system contract, but conventional address)
+    ['L1Messenger', '0x0000000000000000000000000000000000008008'],
+    ['MsgValueSimulator', '0x0000000000000000000000000000000000008009'],
+    ['L2EthToken', '0x000000000000000000000000000000000000800a'],
+    ['SystemContext', '0x000000000000000000000000000000000000800b'],
+    ['BootloaderUtilities', '0x000000000000000000000000000000000000800c'],
+    ['BytecodeCompressor', '0x000000000000000000000000000000000000800e'],
+    ['ComplexUpgrader', '0x000000000000000000000000000000000000800f']
+]);
+
+// State of the system contracts at a given protocol version and environment.
+// Contains information on whether this contract was updated in this protocol release.
+type SystemContractState = {
+    bytecode: string;
+    previousBytecode: string | null;
+    wasChanged: boolean;
+};
+
+const reset = '\x1b[0m';
+const bold = '\x1b[1m';
+const red = '\x1b[31m';
+const green = '\x1b[32m';
+
+// State of a single chain (environment) at some protocol version.
+type ChainState = {
+    // Directory where given config is located.
+    dir: string;
+
+    // Map from name to system contracts
+    systemContracts: Map<string, SystemContractState>;
+
+    bootloader: SystemContractState;
+    defaultAA: SystemContractState;
+};
+
+// State of the whole ecosystem at a given protocol version.
+type ChainsAtProtocolVersion = {
+    // mainnet and testnet might NOT be updated to a given version
+    // this happens only if we found a serious bug while updating stage (or testnet).
+    mainnet2: ChainState | null;
+    testnet2: ChainState | null;
+    stage2: ChainState;
+    upgradeName: string;
+    creationTimestamp: string;
+    protocolVersion: number;
+};
+
+type ProtocolVersion = number;
+
+type ChainStateHistory = Map<ProtocolVersion, ChainsAtProtocolVersion>;
+
+// Type with SystemContracts that is read from the upgrade JSON file.
+type SystemContract = {
+    name: string;
+    bytecodeHashes: string[];
+    address: string | null;
+};
+
+// Type that is read from the upgrade JSON file - about the ForcedDeployment,
+// where we can push any bytecode into any address.
+type ForcedDeployment = {
+    bytecodeHash: string;
+    newAddress: string;
+    value: number;
+    input: string;
+    callConstructor: boolean;
+};
+
+function createSystemContractState(
+    currentState: SystemContract | null,
+    prevState: SystemContractState | null
+): SystemContractState {
+    if (currentState == null && prevState == null) {
+        throw new Error('Both current and prev are null');
+    }
+    if (currentState == null) {
+        let result: SystemContractState = {
+            bytecode: prevState!.bytecode,
+            previousBytecode: null,
+            wasChanged: false
+        };
+        return result;
+    }
+    if (currentState.bytecodeHashes.length != 1) {
+        throw new Error('Invalid bytecode hash count');
+    }
+
+    let currentBytecode = currentState.bytecodeHashes[0];
+    let previousBytecode = prevState ? prevState.bytecode : null;
+
+    let result: SystemContractState = {
+        bytecode: currentBytecode,
+        previousBytecode: previousBytecode,
+        wasChanged: currentBytecode != previousBytecode
+    };
+    return result;
+}
+
+function loadChainState(chainStateDir: string, previousChainState: ChainState | null): ChainState | null {
+    // Directory might not exist, if we're not updating this environment at this version.
+    if (!fs.existsSync(chainStateDir)) {
+        return null;
+    }
+
+    let l2Upgrade = loadJSON(chainStateDir, 'l2Upgrade.json');
+
+    let defaultAA = previousChainState
+        ? createSystemContractState(l2Upgrade['defaultAA'], previousChainState.defaultAA)
+        : createSystemContractState(l2Upgrade['defaultAA'], null);
+    let bootloader = previousChainState
+        ? createSystemContractState(l2Upgrade['bootloader'], previousChainState.defaultAA)
+        : createSystemContractState(l2Upgrade['bootloader'], null);
+
+    let sysContracts: SystemContract[] = l2Upgrade['systemContracts'];
+    let newEntries: Map<string, SystemContractState> = new Map();
+    if (previousChainState) {
+        previousChainState.systemContracts.forEach((entry, key) => {
+            newEntries.set(key, {
+                bytecode: entry.bytecode,
+                previousBytecode: null,
+                wasChanged: false
+            });
+        });
+    }
+    sysContracts.forEach((element) => {
+        if (SYSTEM_CONTRACT_MAP.get(element.name) == null) {
+            throw new Error(`Invalid system contract name ${element.name}`);
+        }
+        if (SYSTEM_CONTRACT_MAP.get(element.name) != element.address) {
+            throw new Error(`Invalid address for contract ${element.name}`);
+        }
+        let previous = newEntries.get(element.name);
+        if (element.bytecodeHashes.length != 1) {
+            throw new Error(`Invalid bytecode hashes count ${element.name}`);
+        }
+
+        newEntries.set(element.name, {
+            bytecode: element.bytecodeHashes[0],
+            previousBytecode: previous ? previous.bytecode : null,
+            wasChanged: true
+        });
+    });
+
+    let result: ChainState = {
+        dir: chainStateDir,
+        systemContracts: newEntries,
+        bootloader: bootloader,
+        defaultAA: defaultAA
+    };
+
+    return result;
+}
+
+function loadChainStateHistoryFromDisk(): ChainStateHistory {
+    let result: ChainStateHistory = new Map();
+    let lastProtocolVersion = LAST_PROTOCOL_VERSION_BEFORE_UPGRADE_SYSTEM;
+    let prevMainnet2: ChainState | null = null;
+    let prevTestnet2: ChainState | null = null;
+    let prevStage2: ChainState | null = null;
+
+    fs.readdirSync(UPGRADES_DIR).forEach((file) => {
+        // Assuming that upgrade directories are sorted in increasing order.
+        const upgradePath = path.join(UPGRADES_DIR, file);
+        let details = getUpgradeDetails(upgradePath);
+        let newProtocolVersion = Number(details['protocolVersion']);
+        if (newProtocolVersion != lastProtocolVersion + 1) {
+            throw new Error(
+                `Protocol version didn't increase when parsing ${file} previous: ${lastProtocolVersion} new: ${newProtocolVersion}`
+            );
+        }
+        lastProtocolVersion = newProtocolVersion;
+
+        let mainnet2 = loadChainState(path.join(upgradePath, 'mainnet2'), prevMainnet2);
+        if (mainnet2) {
+            prevMainnet2 = mainnet2;
+        }
+        let testnet2 = loadChainState(path.join(upgradePath, 'testnet2'), prevTestnet2);
+        if (testnet2) {
+            prevTestnet2 = testnet2;
+        }
+        // We always expect staging to be updated.
+        let stage2 = loadChainState(path.join(upgradePath, 'stage2'), prevStage2)!;
+        prevStage2 = stage2;
+
+        let chainsAtProtocolVersion: ChainsAtProtocolVersion = {
+            mainnet2: mainnet2,
+            testnet2: testnet2,
+            stage2: stage2,
+            upgradeName: details['name'],
+            creationTimestamp: new Date(details['creationTimestamp'] * 1000).toUTCString(),
+            protocolVersion: newProtocolVersion
+        };
+
+        result.set(newProtocolVersion, chainsAtProtocolVersion);
+    });
+
+    return result;
+}
+
+// Creates a short summary string, about the changes that happened for a given environment with a
+// given protocol version.
+// B - means that Bootloader hash was changed, AA that defaultAA hash was changed.
+// It also prints the information on how many system contracts were changed.
+function getChangeSummary(chainState: ChainState | null): string {
+    if (chainState == null) {
+        return '---';
+    }
+    let result = '';
+    if (chainState.bootloader.wasChanged) {
+        result += 'B, ';
+    }
+    if (chainState.defaultAA.wasChanged) {
+        result += 'AA, ';
+    }
+    let sysContractChanges = 0;
+    chainState.systemContracts.forEach((entry) => {
+        if (entry.wasChanged) {
+            sysContractChanges += 1;
+        }
+    });
+    if (sysContractChanges > 0) {
+        result += `${sysContractChanges} SYS, `;
+    }
+
+    return result;
+}
+
+function printSummary(history: ChainStateHistory) {
+    let upgrades: string[][] = [['Protocol Version', 'Upgrade name', 'Creation Time', 'stage', 'testnet', 'mainnet']];
+
+    history.forEach((chainAtProtocol, protocolVersion) => {
+        let row: string[] = [
+            protocolVersion.toString(),
+            chainAtProtocol.upgradeName,
+            chainAtProtocol.creationTimestamp,
+            getChangeSummary(chainAtProtocol.stage2),
+            getChangeSummary(chainAtProtocol.testnet2),
+            getChangeSummary(chainAtProtocol.mainnet2)
+        ];
+        upgrades.push(row);
+    });
+    console.log(renderTable(upgrades));
+}
+
+function checkBytecodeConsistency(chain1: ChainState, chain2: ChainState) {
+    if (chain1.bootloader.bytecode != chain2.bootloader.bytecode) {
+        throw new Error(`Inconsistent bootloader bytecode`);
+    }
+    if (chain1.defaultAA.bytecode != chain2.defaultAA.bytecode) {
+        throw new Error(`Inconsistent AA bytecode`);
+    }
+
+    for (const key of chain1.systemContracts.keys()) {
+        if (!chain2.systemContracts.has(key)) {
+            throw new Error(`Missing system contract ${key}`);
+        } else {
+            const value1 = chain1.systemContracts.get(key)!;
+            const value2 = chain2.systemContracts.get(key)!;
+            if (value1.bytecode !== value2.bytecode) {
+                throw new Error(`Different bytecode for ${key}`);
+            }
+        }
+    }
+    for (const key of chain2.systemContracts.keys()) {
+        if (!chain1.systemContracts.has(key)) {
+            throw new Error(`Missing system contract ${key}`);
+        }
+    }
+}
+
+// Check that the system contracts bytecodes for a given protocol version are the same
+// in all the environments.
+function checkBytecodeConsistencyBetweenEnvironments(history: ChainStateHistory) {
+    console.log('\n== Checking bytecode consistency between environments');
+    history.forEach((chainAtProtocol, protocolVersion) => {
+        try {
+            process.stdout.write(`Protocol ${protocolVersion} :`);
+            if (chainAtProtocol.testnet2) {
+                process.stdout.write(' testnet2 ');
+                checkBytecodeConsistency(chainAtProtocol.testnet2, chainAtProtocol.stage2);
+            }
+            if (chainAtProtocol.mainnet2) {
+                process.stdout.write(' mainnet2 ');
+                checkBytecodeConsistency(chainAtProtocol.mainnet2, chainAtProtocol.stage2);
+            }
+            process.stdout.write(`${green}${bold}[PASS]${reset}\n`);
+        } catch (error) {
+            if (error instanceof Error) {
+                process.stdout.write(`${red}${bold}[FAIL]${reset}: ${error.message}\n`);
+            } else {
+                throw error;
+            }
+        }
+    });
+}
+
+function checkForceDeploymentForChainState(chainState: ChainState) {
+    let l2Upgrade = loadJSON(chainState.dir, 'l2Upgrade.json');
+    let forceDeploymentMap: Map<string, ForcedDeployment> = new Map();
+
+    let nextForcedDeployments: ForcedDeployment[] = l2Upgrade['forcedDeployments'];
+    for (const deployment of nextForcedDeployments) {
+        if (forceDeploymentMap.has(deployment.bytecodeHash)) {
+            throw new Error(`${red}Bytecode force deployed twice: ${deployment.bytecodeHash}${reset}`);
+        }
+        if (deployment.value != 0) {
+            throw new Error(`${red}Force deployment wrong value for ${deployment.bytecodeHash}${reset}`);
+        }
+        if (deployment.input != '0x') {
+            throw new Error(`${red}Force deployment wrong input for ${deployment.bytecodeHash}${reset}`);
+        }
+        if (deployment.callConstructor != false) {
+            throw new Error(`${red}Force deployment wrong call Constructor for ${deployment.bytecodeHash}${reset}`);
+        }
+
+        forceDeploymentMap.set(deployment.bytecodeHash, deployment);
+    }
+
+    chainState.systemContracts.forEach((systemContractState, key) => {
+        if (systemContractState.wasChanged) {
+            if (!forceDeploymentMap.get(systemContractState.bytecode)) {
+                throw new Error(`Missing force deployment for bytecode for ${key}`);
+            }
+            if (forceDeploymentMap.get(systemContractState.bytecode)!.newAddress != SYSTEM_CONTRACT_MAP.get(key)!) {
+                throw new Error(`Wrong deployment address`);
+            }
+            forceDeploymentMap.delete(systemContractState.bytecode);
+        }
+    });
+    if (forceDeploymentMap.size > 0) {
+        throw new Error('Force deployment has additional entries');
+    }
+
+    if (
+        l2Upgrade['forcedDeploymentCalldata'] != l2Upgrade['calldata'] ||
+        l2Upgrade['calldata'] != l2Upgrade['tx']['data']
+    ) {
+        throw new Error(`forcedDeployment calldata and calldata or tx data doesn't match`);
+    }
+    // Calldata to parse (hexadecimal string)
+    const calldata = l2Upgrade['calldata'];
+
+    // Create an instance of defaultAbiCoder
+    const contractInterface = new ethers.utils.Interface(forcedDeploymentABI);
+
+    const decodedData = contractInterface.decodeFunctionData('forceDeployOnAddresses', calldata);
+
+    // Compare force deployments
+
+    if (decodedData['_deployments'].length != nextForcedDeployments.length) {
+        throw new Error(
+            `${red}Calldata deployments size ${nextForcedDeployments.length} doesnt match forced Deployments ${decodedData['_deployments'].length} ${reset}`
+        );
+    }
+
+    for (let i = 0; i < nextForcedDeployments.length; i++) {
+        if (decodedData['_deployments'][i].bytecodeHash != nextForcedDeployments[i].bytecodeHash) {
+            throw new Error(`${red}Bytecode hash differs for ${i}${reset}`);
+        }
+        if (
+            decodedData['_deployments'][i].newAddress.toLowerCase() != nextForcedDeployments[i].newAddress.toLowerCase()
+        ) {
+            throw new Error(
+                `${red}Address differs for ${i} - ${decodedData['_deployments'][i].newAddress} vs ${nextForcedDeployments[i].newAddress} ${reset}`
+            );
+        }
+        if (decodedData['_deployments'][i].value != nextForcedDeployments[i].value) {
+            throw new Error(`${red}Value differs for ${i}  ${reset}`);
+        }
+        if (decodedData['_deployments'][i].input != nextForcedDeployments[i].input) {
+            throw new Error(`${red}Input differs for ${i}  ${reset}`);
+        }
+        if (decodedData['_deployments'][i].callConstructor != nextForcedDeployments[i].callConstructor) {
+            throw new Error(`${red}Call constructor differs for ${i}  ${reset}`);
+        }
+    }
+}
+
+function checkForceDeployments(history: ChainStateHistory) {
+    console.log('\n== Checking force deployments');
+    history.forEach((chainAtProtocol, protocolVersion) => {
+        try {
+            process.stdout.write(`Protocol ${protocolVersion} :`);
+            process.stdout.write(' stage2 ');
+            checkForceDeploymentForChainState(chainAtProtocol.stage2);
+            if (chainAtProtocol.testnet2) {
+                process.stdout.write(' testnet2 ');
+                checkForceDeploymentForChainState(chainAtProtocol.testnet2);
+            }
+            if (chainAtProtocol.mainnet2) {
+                process.stdout.write(' mainnet2 ');
+                checkForceDeploymentForChainState(chainAtProtocol.mainnet2);
+            }
+            process.stdout.write(`${green}${bold}[PASS]${reset}\n`);
+        } catch (error) {
+            if (error instanceof Error) {
+                process.stdout.write(`${red}${bold}[FAIL]${reset}: ${error.message}\n`);
+            } else {
+                throw error;
+            }
+        }
+    });
+}
+
+function checks(history: ChainStateHistory) {
+    console.log('=== Starting checks ====');
+    checkBytecodeConsistencyBetweenEnvironments(history);
+    checkForceDeployments(history);
+}
+
+const forcedDeploymentABI = [
+    {
+        inputs: [
+            {
+                components: [
+                    {
+                        internalType: 'bytes32',
+                        name: 'bytecodeHash',
+                        type: 'bytes32'
+                    },
+                    {
+                        internalType: 'address',
+                        name: 'newAddress',
+                        type: 'address'
+                    },
+                    {
+                        internalType: 'bool',
+                        name: 'callConstructor',
+                        type: 'bool'
+                    },
+                    {
+                        internalType: 'uint256',
+                        name: 'value',
+                        type: 'uint256'
+                    },
+                    {
+                        internalType: 'bytes',
+                        name: 'input',
+                        type: 'bytes'
+                    }
+                ],
+                internalType: 'struct ContractDeployer.ForceDeployment[]',
+                name: '_deployments',
+                type: 'tuple[]'
+            }
+        ],
+        name: 'forceDeployOnAddresses',
+        outputs: [],
+        stateMutability: 'payable',
+        type: 'function'
+    }
+];
+
+function renderTable(data: string[][]): string {
+    // Calculate column widths based on maximum cell width in each column
+    const colWidths = Array(data[0].length).fill(0);
+    for (let row of data) {
+        for (let [i, cell] of row.entries()) {
+            colWidths[i] = Math.max(colWidths[i], cell.length);
+        }
+    }
+
+    // Generate horizontal separator line
+    const separator = '+' + colWidths.map((width) => '-'.repeat(width + 2)).join('+') + '+';
+
+    // Render each row
+    const rows = data.map((row) => {
+        return '|' + row.map((cell, i) => ` ${cell.padEnd(colWidths[i])} `).join('|') + '|';
+    });
+
+    // Combine rows with separators
+    return separator + '\n' + rows.join('\n' + separator + '\n') + '\n' + separator;
+}
+
+function getUpgradeDetails(upgradeDir: string) {
+    const p = path.join(upgradeDir, 'common.json');
+
+    const fileContent = fs.readFileSync(p, 'utf-8');
+
+    let contents = JSON.parse(fileContent);
+    return contents;
+}
+
+function loadJSON(dir: string, file: string) {
+    const p = path.join(dir, file);
+    const fileContent = fs.readFileSync(p, 'utf-8');
+    let contents = JSON.parse(fileContent);
+    return contents;
+}
+
+export const command = new Command('verify-upgrade')
+    .description('Verify system upgrades')
+    .action(async (_cmd: Command) => {
+        let chainUpgradeHistory = loadChainStateHistoryFromDisk();
+        printSummary(chainUpgradeHistory);
+        checks(chainUpgradeHistory);
+    });
diff --git a/prover/CHANGELOG.md b/prover/CHANGELOG.md
deleted file mode 100644
index 00d80d30a75e..000000000000
--- a/prover/CHANGELOG.md
+++ /dev/null
@@ -1,82 +0,0 @@
-# Changelog
-
-## [5.30.1](https://github.com/matter-labs/zksync-2-dev/compare/prover-v5.30.0...prover-v5.30.1) (2023-08-11)
-
-
-### Bug Fixes
-
-* **prover-fri:** GPU proving use init_cs_for_external_proving with hints ([#2347](https://github.com/matter-labs/zksync-2-dev/issues/2347)) ([ca6866c](https://github.com/matter-labs/zksync-2-dev/commit/ca6866c6ef68a25e650ce8e5a4e97c42e064f292))
-
-## [5.30.0](https://github.com/matter-labs/zksync-2-dev/compare/prover-v5.29.0...prover-v5.30.0) (2023-08-09)
-
-
-### Features
-
-* **db:** Configure statement timeout for Postgres ([#2317](https://github.com/matter-labs/zksync-2-dev/issues/2317)) ([afdbb6b](https://github.com/matter-labs/zksync-2-dev/commit/afdbb6b94d9e43b9659ff5d3428f2d9a7827b29f))
-* **house-keeper:** refactor periodic job to be reusable by adding in lib ([#2333](https://github.com/matter-labs/zksync-2-dev/issues/2333)) ([ad72a16](https://github.com/matter-labs/zksync-2-dev/commit/ad72a1691b661b2b4eeaefd29375a8987b485715))
-* **prover-fri:** Add concurrent circuit synthesis for FRI GPU prover ([#2326](https://github.com/matter-labs/zksync-2-dev/issues/2326)) ([aef3491](https://github.com/matter-labs/zksync-2-dev/commit/aef3491cd6af01840dd4fe5b7e530028916ffa8f))
-
-
-### Bug Fixes
-
-* **prover:** Kill prover process for edge-case in crypto thread code ([#2334](https://github.com/matter-labs/zksync-2-dev/issues/2334)) ([f2b5e1a](https://github.com/matter-labs/zksync-2-dev/commit/f2b5e1a2fcbe3053e372f15992e592bc0c32a88f))
-
-## [5.29.0](https://github.com/matter-labs/zksync-2-dev/compare/prover-v5.28.2...prover-v5.29.0) (2023-08-07)
-
-
-### Features
-
-* **prover-fri-gpu:** use witness vector for proving ([#2310](https://github.com/matter-labs/zksync-2-dev/issues/2310)) ([0f9d5ee](https://github.com/matter-labs/zksync-2-dev/commit/0f9d5eea9b053abcc380c74a61d24031f9f79563))
-
-## [5.28.2](https://github.com/matter-labs/zksync-2-dev/compare/prover-v5.28.1...prover-v5.28.2) (2023-08-04)
-
-
-### Bug Fixes
-
-* **doc:** update vk setup data generator doc ([#2322](https://github.com/matter-labs/zksync-2-dev/issues/2322)) ([bda18b0](https://github.com/matter-labs/zksync-2-dev/commit/bda18b0670827e7a190146147724cb1a754c55e9))
-
-## [5.28.1](https://github.com/matter-labs/zksync-2-dev/compare/prover-v5.28.0...prover-v5.28.1) (2023-08-04)
-
-
-### Bug Fixes
-
-* **docs:** Add doc for FRI prover and update doc for vk-setup data ([#2311](https://github.com/matter-labs/zksync-2-dev/issues/2311)) ([5e3b706](https://github.com/matter-labs/zksync-2-dev/commit/5e3b7069cb53bdd229c44014533742afa26bd247))
-
-## [5.28.0](https://github.com/matter-labs/zksync-2-dev/compare/prover-v5.27.0...prover-v5.28.0) (2023-08-04)
-
-
-### Features
-
-* **crypto-update:** update crypto deps zkevm_circuits + boojum  to fix Main VM failures ([#2255](https://github.com/matter-labs/zksync-2-dev/issues/2255)) ([d0f2f87](https://github.com/matter-labs/zksync-2-dev/commit/d0f2f876e3c477b0eccf9646a89ca2b0f9855736))
-* **prover-fri:** Added vk commitment generator in CI ([#2265](https://github.com/matter-labs/zksync-2-dev/issues/2265)) ([8ad75e0](https://github.com/matter-labs/zksync-2-dev/commit/8ad75e04b0a49dee34c6fa7e3b81a21392afa186))
-* **prover-fri:** Integrate GPU proving ([#2269](https://github.com/matter-labs/zksync-2-dev/issues/2269)) ([1c6ed33](https://github.com/matter-labs/zksync-2-dev/commit/1c6ed33781553f989ed73dd2ca6547040066a940))
-* **prover-server-split:** Enable prover UT in CI ([#2253](https://github.com/matter-labs/zksync-2-dev/issues/2253)) ([79df2a1](https://github.com/matter-labs/zksync-2-dev/commit/79df2a1a147b00fc394be315bc9a3b4cb1fe7bea))
-* **prover-server-split:** unify cargo.lock for prover component ([#2248](https://github.com/matter-labs/zksync-2-dev/issues/2248)) ([0393463](https://github.com/matter-labs/zksync-2-dev/commit/0393463b15ac98a1bbf0156198e0d27d3aa92412))
-* **setup-data-fri:** use improved method for GpuSetup data ([#2305](https://github.com/matter-labs/zksync-2-dev/issues/2305)) ([997efed](https://github.com/matter-labs/zksync-2-dev/commit/997efedc3eb6655d58a2ca7e52fe38badeada518))
-* Update RockDB bindings ([#2208](https://github.com/matter-labs/zksync-2-dev/issues/2208)) ([211f548](https://github.com/matter-labs/zksync-2-dev/commit/211f548fa9945b7ed5328026e526cd72c09f6a94))
-* **vk-setup-data-fri:** expose GPU setup & seggegate GPU setup loading based on feature flag ([#2271](https://github.com/matter-labs/zksync-2-dev/issues/2271)) ([bfcab21](https://github.com/matter-labs/zksync-2-dev/commit/bfcab21c8656ce9c6524aef119a01b5013404cac))
-
-
-### Bug Fixes
-
-* **api:** Fix bytes deserialization by bumping web3 crate version  ([#2240](https://github.com/matter-labs/zksync-2-dev/issues/2240)) ([59ef24a](https://github.com/matter-labs/zksync-2-dev/commit/59ef24afa6ceddf506a9ac7c4b1e9fc292311095))
-* **prover:** Panics in `send_report` will make provers crash ([#2273](https://github.com/matter-labs/zksync-2-dev/issues/2273)) ([85974d3](https://github.com/matter-labs/zksync-2-dev/commit/85974d3f9482307e0dbad0ec179e80886dafa42e))
-
-## [5.25.0](https://github.com/matter-labs/zksync-2-dev/compare/prover-v5.24.0...prover-v5.25.0) (2023-08-02)
-
-
-### Features
-
-* **crypto-update:** update crypto deps zkevm_circuits + boojum  to fix Main VM failures ([#2255](https://github.com/matter-labs/zksync-2-dev/issues/2255)) ([d0f2f87](https://github.com/matter-labs/zksync-2-dev/commit/d0f2f876e3c477b0eccf9646a89ca2b0f9855736))
-* **prover-fri:** Added vk commitment generator in CI ([#2265](https://github.com/matter-labs/zksync-2-dev/issues/2265)) ([8ad75e0](https://github.com/matter-labs/zksync-2-dev/commit/8ad75e04b0a49dee34c6fa7e3b81a21392afa186))
-* **prover-fri:** Integrate GPU proving ([#2269](https://github.com/matter-labs/zksync-2-dev/issues/2269)) ([1c6ed33](https://github.com/matter-labs/zksync-2-dev/commit/1c6ed33781553f989ed73dd2ca6547040066a940))
-* **prover-server-split:** Enable prover UT in CI ([#2253](https://github.com/matter-labs/zksync-2-dev/issues/2253)) ([79df2a1](https://github.com/matter-labs/zksync-2-dev/commit/79df2a1a147b00fc394be315bc9a3b4cb1fe7bea))
-* **prover-server-split:** unify cargo.lock for prover component ([#2248](https://github.com/matter-labs/zksync-2-dev/issues/2248)) ([0393463](https://github.com/matter-labs/zksync-2-dev/commit/0393463b15ac98a1bbf0156198e0d27d3aa92412))
-* Update RockDB bindings ([#2208](https://github.com/matter-labs/zksync-2-dev/issues/2208)) ([211f548](https://github.com/matter-labs/zksync-2-dev/commit/211f548fa9945b7ed5328026e526cd72c09f6a94))
-* **vk-setup-data-fri:** expose GPU setup & seggegate GPU setup loading based on feature flag ([#2271](https://github.com/matter-labs/zksync-2-dev/issues/2271)) ([bfcab21](https://github.com/matter-labs/zksync-2-dev/commit/bfcab21c8656ce9c6524aef119a01b5013404cac))
-
-
-### Bug Fixes
-
-* **api:** Fix bytes deserialization by bumping web3 crate version  ([#2240](https://github.com/matter-labs/zksync-2-dev/issues/2240)) ([59ef24a](https://github.com/matter-labs/zksync-2-dev/commit/59ef24afa6ceddf506a9ac7c4b1e9fc292311095))
-* **prover:** Panics in `send_report` will make provers crash ([#2273](https://github.com/matter-labs/zksync-2-dev/issues/2273)) ([85974d3](https://github.com/matter-labs/zksync-2-dev/commit/85974d3f9482307e0dbad0ec179e80886dafa42e))
diff --git a/prover/Cargo.toml b/prover/Cargo.toml
deleted file mode 100644
index 0e1b27fd334d..000000000000
--- a/prover/Cargo.toml
+++ /dev/null
@@ -1,22 +0,0 @@
-[workspace]
-members = [
-    # lib
-    "prover_fri_utils",
-    "prover_fri_types",
-
-    # binaries
-    "prover",
-    "circuit_synthesizer",
-    "setup_key_generator_and_server",
-    "witness_generator",
-    "vk_setup_data_generator_server_fri",
-    "prover_fri",
-    "witness_vector_generator"
-]
-
-resolver = "2"
-
-# for `perf` profiling
-[profile.perf]
-inherits = "release"
-debug = true
diff --git a/prover/circuit_synthesizer/Cargo.toml b/prover/circuit_synthesizer/Cargo.toml
deleted file mode 100644
index 089e5fd07875..000000000000
--- a/prover/circuit_synthesizer/Cargo.toml
+++ /dev/null
@@ -1,32 +0,0 @@
-[package]
-name = "zksync_circuit_synthesizer"
-version = "0.1.0"
-edition = "2021"
-
-[[bin]]
-name = "zksync_circuit_synthesizer"
-path = "src/main.rs"
-
-[dependencies]
-zksync_dal = { path = "../../core/lib/dal", version = "1.0" }
-zksync_types = { path = "../../core/lib/types", version = "1.0" }
-zksync_queued_job_processor = { path = "../../core/lib/queued_job_processor", version = "1.0" }
-zksync_config = { path = "../../core/lib/config", version = "1.0" }
-zksync_object_store = { path = "../../core/lib/object_store", version = "1.0" }
-zksync_utils = { path = "../../core/lib/utils", version = "1.0" }
-zksync_prover_fri_utils = { path = "../prover_fri_utils", version = "1.0" }
-vlog = { path = "../../core/lib/vlog", version = "1.0" }
-prometheus_exporter = { path = "../../core/lib/prometheus_exporter", version = "1.0" }
-zksync_prover_utils = { path = "../../core/lib/prover_utils", version = "1.0" }
-zksync_verification_key_generator_and_server = { path = "../../core/bin/verification_key_generator_and_server", version = "1.0" }
-
-zkevm_test_harness = { git = "https://github.com/matter-labs/era-zkevm_test_harness.git", tag = "v1.3.3-rc1"}
-
-prover-service = { git = "https://github.com/matter-labs/era-heavy-ops-service.git", branch = "v1.3.2", features=["legacy"], default-features=false}
-
-structopt = "0.3.26"
-tokio = { version = "1.23.0", features = ["full"] }
-futures = "0.3"
-ctrlc = { version = "3.1", features = ["termination"] }
-local-ip-address = "0.5.0"
-metrics = "0.20"
diff --git a/prover/circuit_synthesizer/rust-toolchain.toml b/prover/circuit_synthesizer/rust-toolchain.toml
deleted file mode 100644
index 5d56faf9ae08..000000000000
--- a/prover/circuit_synthesizer/rust-toolchain.toml
+++ /dev/null
@@ -1,2 +0,0 @@
-[toolchain]
-channel = "nightly"
diff --git a/prover/circuit_synthesizer/src/circuit_synthesizer.rs b/prover/circuit_synthesizer/src/circuit_synthesizer.rs
deleted file mode 100644
index 2ea348282d9f..000000000000
--- a/prover/circuit_synthesizer/src/circuit_synthesizer.rs
+++ /dev/null
@@ -1,312 +0,0 @@
-use std::option::Option;
-use std::time::Duration;
-use std::time::Instant;
-
-use local_ip_address::local_ip;
-use prover_service::prover::{Prover, ProvingAssembly};
-use prover_service::remote_synth::serialize_job;
-use tokio::task::JoinHandle;
-use tokio::time::sleep;
-use zkevm_test_harness::abstract_zksync_circuit::concrete_circuits::ZkSyncCircuit;
-use zkevm_test_harness::bellman::plonk::better_better_cs::cs::Circuit;
-use zkevm_test_harness::pairing::bn256::Bn256;
-use zkevm_test_harness::witness::oracle::VmWitnessOracle;
-
-use zksync_config::configs::prover_group::ProverGroupConfig;
-use zksync_config::configs::CircuitSynthesizerConfig;
-use zksync_config::ProverConfigs;
-use zksync_dal::ConnectionPool;
-use zksync_object_store::{CircuitKey, ObjectStore, ObjectStoreError, ObjectStoreFactory};
-use zksync_prover_fri_utils::socket_utils::send_assembly;
-use zksync_prover_utils::numeric_index_to_circuit_name;
-use zksync_prover_utils::region_fetcher::{get_region, get_zone};
-use zksync_queued_job_processor::{async_trait, JobProcessor};
-use zksync_types::{protocol_version::L1VerifierConfig, proofs::{GpuProverInstanceStatus, SocketAddress}};
-
-#[derive(Debug)]
-pub enum CircuitSynthesizerError {
-    InvalidGroupCircuits(u8),
-    InvalidCircuitId(u8),
-    InputLoadFailed(ObjectStoreError),
-}
-
-pub struct CircuitSynthesizer {
-    config: CircuitSynthesizerConfig,
-    blob_store: Box<dyn ObjectStore>,
-    allowed_circuit_types: Option<Vec<String>>,
-    region: String,
-    zone: String,
-    vk_commitments: L1VerifierConfig,
-    prover_connection_pool: ConnectionPool,
-}
-
-impl CircuitSynthesizer {
-    pub async fn new(
-        config: CircuitSynthesizerConfig,
-        prover_groups: ProverGroupConfig,
-        store_factory: &ObjectStoreFactory,
-        vk_commitments: L1VerifierConfig,
-        prover_connection_pool: ConnectionPool,
-    ) -> Result<Self, CircuitSynthesizerError> {
-        let is_specialized = prover_groups.is_specialized_group_id(config.prover_group_id);
-        let allowed_circuit_types = if is_specialized {
-            let types = prover_groups
-                .get_circuit_ids_for_group_id(config.prover_group_id)
-                .ok_or(CircuitSynthesizerError::InvalidGroupCircuits(
-                    config.prover_group_id,
-                ))?
-                .into_iter()
-                .map(|id| {
-                    numeric_index_to_circuit_name(id)
-                        .map(|x| (id, x.to_owned()))
-                        .ok_or(CircuitSynthesizerError::InvalidCircuitId(id))
-                })
-                .collect::<Result<Vec<_>, CircuitSynthesizerError>>()?;
-            Some(types)
-        } else {
-            None
-        };
-
-        vlog::info!(
-            "Configured for group [{}], circuits: {allowed_circuit_types:?}",
-            config.prover_group_id
-        );
-
-        Ok(Self {
-            config,
-            blob_store: store_factory.create_store().await,
-            allowed_circuit_types: allowed_circuit_types
-                .map(|x| x.into_iter().map(|x| x.1).collect()),
-            region: get_region().await,
-            zone: get_zone().await,
-            vk_commitments,
-            prover_connection_pool,
-        })
-    }
-
-    pub fn synthesize(
-        circuit: ZkSyncCircuit<Bn256, VmWitnessOracle<Bn256>>,
-    ) -> (ProvingAssembly, u8) {
-        let start_instant = Instant::now();
-
-        let mut assembly = Prover::new_proving_assembly();
-        circuit
-            .synthesize(&mut assembly)
-            .expect("circuit synthesize failed");
-
-        let circuit_type = numeric_index_to_circuit_name(circuit.numeric_circuit_type()).unwrap();
-
-        vlog::info!(
-            "Finished circuit synthesis for circuit: {circuit_type} took {:?}",
-            start_instant.elapsed()
-        );
-        metrics::histogram!(
-            "server.circuit_synthesizer.synthesize",
-            start_instant.elapsed(),
-            "circuit_type" => circuit_type,
-        );
-
-        // we don't perform assembly finalization here since it increases the assembly size significantly due to padding.
-        (assembly, circuit.numeric_circuit_type())
-    }
-}
-
-#[async_trait]
-impl JobProcessor for CircuitSynthesizer {
-    type Job = ZkSyncCircuit<Bn256, VmWitnessOracle<Bn256>>;
-    type JobId = u32;
-    type JobArtifacts = (ProvingAssembly, u8);
-    const SERVICE_NAME: &'static str = "CircuitSynthesizer";
-
-    async fn get_next_job(&self) -> Option<(Self::JobId, Self::Job)> {
-        vlog::trace!(
-            "Attempting to fetch job types: {:?}",
-            self.allowed_circuit_types
-        );
-        let mut storage = self.prover_connection_pool.access_storage().await;
-        let protocol_versions = storage
-            .protocol_versions_dal()
-            .protocol_version_for(&self.vk_commitments)
-            .await;
-
-        let prover_job = match &self.allowed_circuit_types {
-            Some(types) => {
-                storage
-                    .prover_dal()
-                    .get_next_prover_job_by_circuit_types(types.clone(), &protocol_versions)
-                    .await
-            }
-            None => storage.prover_dal().get_next_prover_job(&protocol_versions).await,
-        }?;
-
-        let circuit_key = CircuitKey {
-            block_number: prover_job.block_number,
-            sequence_number: prover_job.sequence_number,
-            circuit_type: &prover_job.circuit_type,
-            aggregation_round: prover_job.aggregation_round,
-        };
-        let input = self
-            .blob_store
-            .get(circuit_key)
-            .await
-            .map_err(CircuitSynthesizerError::InputLoadFailed)
-            .unwrap_or_else(|err| panic!("{err:?}"));
-
-        Some((prover_job.id, input))
-    }
-
-    async fn save_failure(&self, job_id: Self::JobId, _started_at: Instant, error: String) {
-        self.prover_connection_pool
-            .access_storage()
-            .await
-            .prover_dal()
-            .save_proof_error(job_id, error, self.config.max_attempts)
-            .await;
-    }
-
-    async fn process_job(
-        &self,
-        job: Self::Job,
-        _started_at: Instant,
-    ) -> JoinHandle<Self::JobArtifacts> {
-        tokio::task::spawn_blocking(move || Self::synthesize(job))
-    }
-
-    async fn save_result(
-        &self,
-        job_id: Self::JobId,
-        _started_at: Instant,
-        (assembly, circuit_id): Self::JobArtifacts,
-    ) {
-        vlog::trace!(
-            "Finished circuit synthesis for job: {job_id} in region: {}",
-            self.region
-        );
-
-        let now = Instant::now();
-        let mut serialized: Vec<u8> = vec![];
-        serialize_job(&assembly, job_id as usize, circuit_id, &mut serialized);
-
-        vlog::trace!(
-            "Serialized circuit assembly for job {job_id} in {:?}",
-            now.elapsed()
-        );
-
-        let now = Instant::now();
-        let mut attempts = 0;
-
-        while now.elapsed() < self.config.prover_instance_wait_timeout() {
-            let prover = self
-                .prover_connection_pool
-                .access_storage()
-                .await
-                .gpu_prover_queue_dal()
-                .lock_available_prover(
-                    self.config.gpu_prover_queue_timeout(),
-                    self.config.prover_group_id,
-                    self.region.clone(),
-                    self.zone.clone(),
-                )
-                .await;
-
-            if let Some(address) = prover {
-                let result = send_assembly(job_id, &mut serialized, &address);
-                handle_send_result(
-                    &result,
-                    job_id,
-                    &address,
-                    &self.prover_connection_pool,
-                    self.region.clone(),
-                    self.zone.clone(),
-                )
-                    .await;
-
-                if result.is_ok() {
-                    return;
-                }
-                // We'll retry with another prover again, no point in dropping the results.
-
-                vlog::warn!(
-                    "Could not send assembly to {address:?}. Prover group {}, region {}, \
-                         circuit id {circuit_id}, send attempt {attempts}.",
-                    self.config.prover_group_id,
-                    self.region
-                );
-                attempts += 1;
-            } else {
-                sleep(self.config.prover_instance_poll_time()).await;
-            }
-        }
-        vlog::trace!(
-            "Not able to get any free prover instance for sending assembly for job: {job_id}"
-        );
-    }
-}
-
-async fn handle_send_result(
-    result: &Result<(Duration, u64), String>,
-    job_id: u32,
-    address: &SocketAddress,
-    pool: &ConnectionPool,
-    region: String,
-    zone: String,
-) {
-    match result {
-        Ok((elapsed, len)) => {
-            let local_ip = local_ip().expect("Failed obtaining local IP address");
-            let blob_size_in_gb = len / (1024 * 1024 * 1024);
-
-            // region: logs
-
-            vlog::trace!(
-                "Sent assembly of size: {blob_size_in_gb}GB successfully, took: {elapsed:?} \
-                 for job: {job_id} by: {local_ip:?} to: {address:?}"
-            );
-            metrics::histogram!(
-                "server.circuit_synthesizer.blob_sending_time",
-                *elapsed,
-                "blob_size_in_gb" => blob_size_in_gb.to_string(),
-            );
-
-            // endregion
-
-            pool.access_storage()
-                .await
-                .prover_dal()
-                .update_status(job_id, "in_gpu_proof")
-                .await;
-        }
-
-        Err(err) => {
-            vlog::trace!(
-                "Failed sending assembly to address: {address:?}, socket not reachable \
-                 reason: {err}"
-            );
-
-            // mark prover instance in gpu_prover_queue dead
-            pool.access_storage()
-                .await
-                .gpu_prover_queue_dal()
-                .update_prover_instance_status(
-                    address.clone(),
-                    GpuProverInstanceStatus::Dead,
-                    0,
-                    region,
-                    zone,
-                )
-                .await;
-
-            let prover_config = ProverConfigs::from_env().non_gpu;
-            // mark the job as failed
-            pool.access_storage()
-                .await
-                .prover_dal()
-                .save_proof_error(
-                    job_id,
-                    "prover instance unreachable".to_string(),
-                    prover_config.max_attempts,
-                )
-                .await;
-        }
-    }
-}
diff --git a/prover/circuit_synthesizer/src/main.rs b/prover/circuit_synthesizer/src/main.rs
deleted file mode 100644
index 6191b0ad521b..000000000000
--- a/prover/circuit_synthesizer/src/main.rs
+++ /dev/null
@@ -1,80 +0,0 @@
-use prometheus_exporter::run_prometheus_exporter;
-use structopt::StructOpt;
-use tokio::{sync::oneshot, sync::watch};
-
-use zksync_config::configs::{
-    AlertsConfig, CircuitSynthesizerConfig, PrometheusConfig, ProverGroupConfig,
-};
-use zksync_dal::connection::DbVariant;
-use zksync_dal::ConnectionPool;
-use zksync_object_store::ObjectStoreFactory;
-use zksync_queued_job_processor::JobProcessor;
-use zksync_verification_key_server::get_cached_commitments;
-use zksync_utils::wait_for_tasks::wait_for_tasks;
-
-use crate::circuit_synthesizer::CircuitSynthesizer;
-
-mod circuit_synthesizer;
-
-#[derive(Debug, StructOpt)]
-#[structopt(name = "TODO", about = "TODO")]
-struct Opt {
-    /// Number of times circuit_synthesizer should be run.
-    #[structopt(short = "n", long = "n_iterations")]
-    number_of_iterations: Option<usize>,
-}
-
-#[tokio::main]
-async fn main() {
-    vlog::init();
-    let opt = Opt::from_args();
-    let config: CircuitSynthesizerConfig = CircuitSynthesizerConfig::from_env();
-    let pool = ConnectionPool::builder(DbVariant::Prover).build().await;
-    let vk_commitments = get_cached_commitments();
-
-    let circuit_synthesizer = CircuitSynthesizer::new(
-        config.clone(),
-        ProverGroupConfig::from_env(),
-        &ObjectStoreFactory::from_env(),
-        vk_commitments,
-        pool,
-    )
-        .await
-        .unwrap_or_else(|err| {
-            vlog::error!("Could not initialize synthesizer: {err:?}");
-            panic!("Could not initialize synthesizer: {err:?}");
-        });
-
-    let (stop_sender, stop_receiver) = watch::channel(false);
-
-    let (stop_signal_sender, stop_signal_receiver) = oneshot::channel();
-    let mut stop_signal_sender = Some(stop_signal_sender);
-    ctrlc::set_handler(move || {
-        if let Some(stop_signal_sender) = stop_signal_sender.take() {
-            stop_signal_sender.send(()).ok();
-        }
-    })
-        .expect("Error setting Ctrl+C handler");
-
-    vlog::info!("Starting circuit synthesizer");
-    let prometheus_config = PrometheusConfig {
-        listener_port: config.prometheus_listener_port,
-        pushgateway_url: config.prometheus_pushgateway_url,
-        push_interval_ms: config.prometheus_push_interval_ms,
-    };
-    let tasks = vec![
-        run_prometheus_exporter(prometheus_config.listener_port, None),
-        tokio::spawn(circuit_synthesizer.run(stop_receiver, opt.number_of_iterations)),
-    ];
-
-    let particular_crypto_alerts = Some(AlertsConfig::from_env().sporadic_crypto_errors_substrs);
-    let graceful_shutdown = None::<futures::future::Ready<()>>;
-    let tasks_allowed_to_finish = false;
-    tokio::select! {
-        _ = wait_for_tasks(tasks, particular_crypto_alerts, graceful_shutdown, tasks_allowed_to_finish) => {},
-        _ = stop_signal_receiver => {
-            vlog::info!("Stop signal received, shutting down");
-        }
-    };
-    stop_sender.send(true).ok();
-}
diff --git a/prover/prover/Cargo.toml b/prover/prover/Cargo.toml
deleted file mode 100644
index eb3f2adc13ed..000000000000
--- a/prover/prover/Cargo.toml
+++ /dev/null
@@ -1,47 +0,0 @@
-[package]
-name = "zksync_prover"
-version = "1.0.0"
-edition = "2018"
-authors = ["The Matter Labs Team <hello@matterlabs.dev>"]
-homepage = "https://zksync.io/"
-repository = "https://github.com/matter-labs/zksync-era"
-license = "MIT OR Apache-2.0"
-keywords = ["blockchain", "zksync"]
-categories = ["cryptography"]
-publish = false # We don't want to publish our binaries.
-
-[dependencies]
-zksync_dal = { path = "../../core/lib/dal", version = "1.0" }
-zksync_config = { path = "../../core/lib/config", version = "1.0" }
-zksync_utils = {path = "../../core/lib/utils", version = "1.0" }
-zksync_prover_utils = {path = "../../core/lib/prover_utils", version = "1.0" }
-zksync_circuit_breaker = {path = "../../core/lib/circuit_breaker", version = "1.0" }
-zksync_eth_client = {path = "../../core/lib/eth_client", version = "1.0" }
-zksync_types = { path = "../../core/lib/types", version = "1.0" }
-prometheus_exporter = { path = "../../core/lib/prometheus_exporter", version = "1.0" }
-vlog = { path = "../../core/lib/vlog", version = "1.0" }
-zksync_verification_key_generator_and_server = { path = "../../core/bin/verification_key_generator_and_server", version = "1.0" }
-zksync_object_store = { path = "../../core/lib/object_store", version = "1.0" }
-setup_key_generator_and_server = { path = "../setup_key_generator_and_server", version = "1.0" }
-
-
-api = { git = "https://github.com/matter-labs/era-heavy-ops-service.git", branch = "v1.3.3", features=["gpu"], default-features=false}
-prover-service = { git = "https://github.com/matter-labs/era-heavy-ops-service.git", tag = "v1.3.3-rc1", features=["gpu"], default-features=false}
-
-zkevm_test_harness = { git = "https://github.com/matter-labs/era-zkevm_test_harness.git", tag = "v1.3.3-rc1"}
-
-
-tokio = { version = "1", features = ["time"] }
-futures = { version = "0.3", features = ["compat"] }
-ctrlc = { version = "3.1", features = ["termination"] }
-thiserror = "1.0"
-chrono = "0.4"
-serde_json = "1.0"
-ethabi = "18.0.0"
-metrics = "0.20"
-hex = "0.4"
-serde = { version = "1.0", features = ["derive"] }
-bincode = "1.3.2"
-reqwest = { version = "0.11", features = ["blocking"] }
-queues = "1.1.0"
-local-ip-address = "0.5.0"
diff --git a/prover/prover/README.md b/prover/prover/README.md
deleted file mode 100644
index 2d70cf056d4b..000000000000
--- a/prover/prover/README.md
+++ /dev/null
@@ -1,8 +0,0 @@
-# Readme
-
-For compiling locally (no cuda) set `features=["legacy"], default-features=false` for:
-
-- `./Cargo.toml`: `heavy-ops-service` dependency.
-- `../setup_key_generator_and_server/Cargo.toml`: `api` and `prover-service` dependencies.
-
-**! Don't push those changes !**
diff --git a/prover/prover/rust-toolchain.toml b/prover/prover/rust-toolchain.toml
deleted file mode 100644
index 271800cb2f37..000000000000
--- a/prover/prover/rust-toolchain.toml
+++ /dev/null
@@ -1,2 +0,0 @@
-[toolchain]
-channel = "nightly"
\ No newline at end of file
diff --git a/prover/prover/src/artifact_provider.rs b/prover/prover/src/artifact_provider.rs
deleted file mode 100644
index 9122fe56a5b2..000000000000
--- a/prover/prover/src/artifact_provider.rs
+++ /dev/null
@@ -1,22 +0,0 @@
-use prover_service::ArtifactProvider;
-use std::io::Read;
-use zkevm_test_harness::abstract_zksync_circuit::concrete_circuits::ZkSyncVerificationKey;
-use zkevm_test_harness::pairing::bn256::Bn256;
-use zksync_setup_key_server::get_setup_for_circuit_type;
-use zksync_verification_key_server::get_vk_for_circuit_type;
-
-#[derive(Debug)]
-pub struct ProverArtifactProvider;
-
-impl ArtifactProvider for ProverArtifactProvider {
-    type ArtifactError = String;
-
-    fn get_setup(&self, circuit_id: u8) -> Result<Box<dyn Read>, Self::ArtifactError> {
-        Ok(get_setup_for_circuit_type(circuit_id))
-    }
-
-    fn get_vk(&self, circuit_id: u8) -> Result<ZkSyncVerificationKey<Bn256>, Self::ArtifactError> {
-        let vk = get_vk_for_circuit_type(circuit_id);
-        Ok(ZkSyncVerificationKey::from_verification_key_and_numeric_type(circuit_id, vk))
-    }
-}
diff --git a/prover/prover/src/main.rs b/prover/prover/src/main.rs
deleted file mode 100644
index eb9987191196..000000000000
--- a/prover/prover/src/main.rs
+++ /dev/null
@@ -1,202 +0,0 @@
-use std::env;
-use std::sync::Arc;
-use tokio::sync::Mutex;
-
-use api::gpu_prover;
-use local_ip_address::local_ip;
-use prover_service::run_prover::run_prover_with_remote_synthesizer;
-use queues::Buffer;
-use tokio::{sync::oneshot, task::JoinHandle};
-
-use zksync_config::{
-    configs::{api::PrometheusConfig, prover_group::ProverGroupConfig, AlertsConfig},
-    ApiConfig, ProverConfig, ProverConfigs,
-};
-use zksync_dal::{connection::DbVariant, ConnectionPool};
-use zksync_object_store::ObjectStoreFactory;
-use zksync_prover_utils::region_fetcher::{get_region, get_zone};
-use zksync_types::proofs::{GpuProverInstanceStatus, SocketAddress};
-use zksync_utils::wait_for_tasks::wait_for_tasks;
-
-use crate::artifact_provider::ProverArtifactProvider;
-use crate::prover::ProverReporter;
-use crate::prover_params::ProverParams;
-use crate::socket_listener::incoming_socket_listener;
-use crate::synthesized_circuit_provider::SynthesizedCircuitProvider;
-
-mod artifact_provider;
-mod prover;
-mod prover_params;
-mod socket_listener;
-mod synthesized_circuit_provider;
-
-async fn graceful_shutdown() {
-    let pool = ConnectionPool::singleton(DbVariant::Prover).build().await;
-    let host = local_ip().expect("Failed obtaining local IP address");
-    let port = ProverConfigs::from_env().non_gpu.assembly_receiver_port;
-    let region = get_region().await;
-    let zone = get_zone().await;
-    let address = SocketAddress { host, port };
-    pool.clone()
-        .access_storage()
-        .await
-        .gpu_prover_queue_dal()
-        .update_prover_instance_status(address, GpuProverInstanceStatus::Dead, 0, region, zone)
-        .await;
-}
-
-fn get_ram_per_gpu() -> u64 {
-    let device_info = gpu_prover::cuda_bindings::device_info(0).unwrap();
-    let ram_in_gb: u64 = device_info.total / (1024 * 1024 * 1024);
-    vlog::info!("Detected RAM per GPU: {:?} GB", ram_in_gb);
-    ram_in_gb
-}
-
-fn get_prover_config_for_machine_type() -> (ProverConfig, u8) {
-    let prover_configs = ProverConfigs::from_env();
-    let actual_num_gpus = match gpu_prover::cuda_bindings::devices() {
-        Ok(gpus) => gpus as u8,
-        Err(err) => {
-            vlog::error!("unable to get number of GPUs: {err:?}");
-            panic!("unable to get number of GPUs: {:?}", err);
-        }
-    };
-    vlog::info!("detected number of gpus: {}", actual_num_gpus);
-    let ram_in_gb = get_ram_per_gpu();
-
-    match actual_num_gpus {
-        1 => {
-            vlog::info!("Detected machine type with 1 GPU and 80GB RAM");
-            (prover_configs.one_gpu_eighty_gb_mem, actual_num_gpus)
-        }
-        2 => {
-            if ram_in_gb > 39 {
-                vlog::info!("Detected machine type with 2 GPU and 80GB RAM");
-                (prover_configs.two_gpu_eighty_gb_mem, actual_num_gpus)
-            } else {
-                vlog::info!("Detected machine type with 2 GPU and 40GB RAM");
-                (prover_configs.two_gpu_forty_gb_mem, actual_num_gpus)
-            }
-        }
-        4 => {
-            vlog::info!("Detected machine type with 4 GPU and 80GB RAM");
-            (prover_configs.four_gpu_eighty_gb_mem, actual_num_gpus)
-        }
-        _ => panic!("actual_num_gpus: {} not supported yet", actual_num_gpus),
-    }
-}
-
-#[tokio::main]
-async fn main() {
-    vlog::init();
-    vlog::trace!("starting prover");
-    let (prover_config, num_gpu) = get_prover_config_for_machine_type();
-
-    let prometheus_config = PrometheusConfig {
-        listener_port: prover_config.prometheus_port,
-        ..ApiConfig::from_env().prometheus
-    };
-
-    let region = get_region().await;
-    let zone = get_zone().await;
-
-    let (stop_signal_sender, stop_signal_receiver) = oneshot::channel();
-    let mut stop_signal_sender = Some(stop_signal_sender);
-    ctrlc::set_handler(move || {
-        if let Some(sender) = stop_signal_sender.take() {
-            sender.send(()).ok();
-        }
-    })
-    .expect("Error setting Ctrl+C handler");
-
-    zksync_prover_utils::ensure_initial_setup_keys_present(
-        &prover_config.initial_setup_key_path,
-        &prover_config.key_download_url,
-    );
-    env::set_var("CRS_FILE", prover_config.initial_setup_key_path.clone());
-    // We don't have a graceful shutdown process for the prover, so `_stop_sender` is unused.
-    // Though we still need to create a channel because circuit breaker expects `stop_receiver`.
-    let (_stop_sender, stop_receiver) = tokio::sync::watch::channel(false);
-
-    let circuit_ids = ProverGroupConfig::from_env()
-        .get_circuit_ids_for_group_id(prover_config.specialized_prover_group_id);
-
-    vlog::info!(
-        "Starting proof generation for circuits: {circuit_ids:?} \
-         in region: {region} and zone: {zone} with group-id: {}",
-        prover_config.specialized_prover_group_id
-    );
-    let mut tasks: Vec<JoinHandle<()>> = vec![];
-
-    tasks.push(prometheus_exporter::run_prometheus_exporter(
-        prometheus_config.listener_port,
-        None,
-    ));
-
-    let assembly_queue = Buffer::new(prover_config.assembly_queue_capacity);
-    let shared_assembly_queue = Arc::new(Mutex::new(assembly_queue));
-    let producer = shared_assembly_queue.clone();
-    let consumer = shared_assembly_queue.clone();
-    let local_ip = local_ip().expect("Failed obtaining local IP address");
-    let address = SocketAddress {
-        host: local_ip,
-        port: prover_config.assembly_receiver_port,
-    };
-    vlog::info!("local IP address is: {:?}", local_ip);
-
-    tasks.push(tokio::task::spawn(incoming_socket_listener(
-        local_ip,
-        prover_config.assembly_receiver_port,
-        producer,
-        ConnectionPool::singleton(DbVariant::Prover).build().await,
-        prover_config.specialized_prover_group_id,
-        region.clone(),
-        zone.clone(),
-        num_gpu,
-    )));
-
-    let params = ProverParams::new(&prover_config);
-    let store_factory = ObjectStoreFactory::from_env();
-
-    let circuit_provider_pool = ConnectionPool::singleton(DbVariant::Prover).build().await;
-    tasks.push(tokio::task::spawn_blocking(move || {
-        let rt_handle = tokio::runtime::Handle::current();
-        let synthesized_circuit_provider = SynthesizedCircuitProvider::new(
-            consumer,
-            circuit_provider_pool,
-            address,
-            region,
-            zone,
-            rt_handle.clone(),
-        );
-        let prover_job_reporter = ProverReporter::new(prover_config, &store_factory, rt_handle);
-        run_prover_with_remote_synthesizer(
-            synthesized_circuit_provider,
-            ProverArtifactProvider,
-            prover_job_reporter,
-            circuit_ids,
-            params,
-        )
-    }));
-
-    let particular_crypto_alerts = Some(AlertsConfig::from_env().sporadic_crypto_errors_substrs);
-    let graceful_shutdown = Some(graceful_shutdown());
-    let tasks_allowed_to_finish = false;
-    tokio::select! {
-        _ = wait_for_tasks(tasks, particular_crypto_alerts, graceful_shutdown, tasks_allowed_to_finish) => {},
-        _ = stop_signal_receiver => {
-            vlog::info!("Stop signal received, shutting down");
-
-            // BEWARE, HERE BE DRAGONS.
-            // This is necessary because of blocking prover. See end of functions for more details.
-            std::process::exit(0);
-        },
-    };
-
-    // BEWARE, HERE BE DRAGONS.
-    // The process hangs here if we panic outside `run_prover_with_remote_synthesizer`.
-    // Given the task is spawned as blocking, it's in a different thread that can't be cancelled on demand.
-    // See: https://docs.rs/tokio/latest/tokio/task/fn.spawn_blocking.html for more information
-    // Follow [PR](https://github.com/matter-labs/zksync-2-dev/pull/2129) for logic behind it
-    std::process::exit(-1);
-}
diff --git a/prover/prover/src/prover.rs b/prover/prover/src/prover.rs
deleted file mode 100644
index 9025c71a92e6..000000000000
--- a/prover/prover/src/prover.rs
+++ /dev/null
@@ -1,308 +0,0 @@
-use std::{env, time::Duration};
-
-use prover_service::JobResult::{Failure, ProofGenerated};
-use prover_service::{JobReporter, JobResult};
-use tokio::runtime::Handle;
-use zkevm_test_harness::abstract_zksync_circuit::concrete_circuits::ZkSyncProof;
-use zkevm_test_harness::pairing::bn256::Bn256;
-
-use zksync_config::ProverConfig;
-use zksync_dal::StorageProcessor;
-use zksync_dal::{connection::DbVariant, ConnectionPool};
-use zksync_object_store::{Bucket, ObjectStore, ObjectStoreFactory};
-use zksync_types::proofs::ProverJobMetadata;
-
-#[derive(Debug)]
-pub struct ProverReporter {
-    rt_handle: Handle,
-    pool: ConnectionPool,
-    config: ProverConfig,
-    processed_by: String,
-    object_store: Box<dyn ObjectStore>,
-}
-
-fn assembly_debug_blob_url(job_id: usize, circuit_id: u8) -> String {
-    format!("assembly_debugging_{}_{}.bin", job_id, circuit_id)
-}
-
-impl ProverReporter {
-    pub(crate) fn new(
-        config: ProverConfig,
-        store_factory: &ObjectStoreFactory,
-        rt_handle: Handle,
-    ) -> Self {
-        let pool = rt_handle.block_on(ConnectionPool::singleton(DbVariant::Prover).build());
-        Self {
-            pool,
-            config,
-            processed_by: env::var("POD_NAME").unwrap_or("Unknown".to_string()),
-            object_store: rt_handle.block_on(store_factory.create_store()),
-            rt_handle,
-        }
-    }
-
-    fn handle_successful_proof_generation(
-        &self,
-        job_id: usize,
-        proof: ZkSyncProof<Bn256>,
-        duration: Duration,
-        index: usize,
-    ) {
-        let circuit_type = self.get_circuit_type(job_id);
-        let serialized = bincode::serialize(&proof).expect("Failed to serialize proof");
-        vlog::info!(
-            "Successfully generated proof with id {:?} and type: {} for index: {}. Size: {:?}KB took: {:?}",
-            job_id,
-            circuit_type,
-            index,
-            serialized.len() >> 10,
-            duration,
-        );
-        metrics::histogram!(
-            "server.prover.proof_generation_time",
-            duration,
-            "circuit_type" => circuit_type,
-        );
-        let job_id = job_id as u32;
-        self.rt_handle.block_on(async {
-            let mut connection = self.pool.access_storage().await;
-            let mut transaction = connection.start_transaction().await;
-
-            // BEWARE, HERE BE DRAGONS.
-            // `send_report` method is called in an operating system thread,
-            // which is in charge of saving proof output (ok, errored, etc.).
-            // The code that calls it is in a thread that does not check it's status.
-            // If the thread panics, proofs will be generated, but their status won't be saved.
-            // So a prover will work like this:
-            // Pick task, execute task, prepare task to be saved, be restarted as nothing happens.
-            // The error prevents the "fake" work by killing the prover, which causes it to restart.
-            // A proper fix would be to have the thread signal it was dead or be watched from outside.
-            // Given we want to deprecate old prover, this is the quick and dirty hack I'm not proud of.
-            let result = transaction
-                .prover_dal()
-                .save_proof(job_id, duration, serialized, &self.processed_by)
-                .await;
-            if let Err(e) = result {
-                vlog::warn!("panicked inside heavy-ops thread: {e:?}; exiting...");
-                std::process::exit(-1);
-            }
-            self.get_prover_job_metadata_by_id_and_exit_if_error(&mut transaction, job_id)
-                .await;
-            transaction.commit().await;
-        });
-    }
-
-    fn get_circuit_type(&self, job_id: usize) -> String {
-        let prover_job_metadata = self.rt_handle.block_on(async {
-            let mut connection = self.pool.access_storage().await;
-            self.get_prover_job_metadata_by_id_and_exit_if_error(&mut connection, job_id as u32)
-                .await
-        });
-        prover_job_metadata.circuit_type
-    }
-
-    async fn get_prover_job_metadata_by_id_and_exit_if_error(
-        &self,
-        connection: &mut StorageProcessor<'_>,
-        job_id: u32,
-    ) -> ProverJobMetadata {
-        // BEWARE, HERE BE DRAGONS.
-        // `send_report` method is called in an operating system thread,
-        // which is in charge of saving proof output (ok, errored, etc.).
-        // The code that calls it is in a thread that does not check it's status.
-        // If the thread panics, proofs will be generated, but their status won't be saved.
-        // So a prover will work like this:
-        // Pick task, execute task, prepare task to be saved, be restarted as nothing happens.
-        // The error prevents the "fake" work by killing the prover, which causes it to restart.
-        // A proper fix would be to have the thread signal it was dead or be watched from outside.
-        // Given we want to deprecate old prover, this is the quick and dirty hack I'm not proud of.
-        let result = connection.prover_dal().get_prover_job_by_id(job_id).await;
-        let prover_job_metadata = match result {
-            Ok(option) => option,
-            Err(e) => {
-                vlog::warn!("panicked inside heavy-ops thread: {e:?}; exiting...");
-                std::process::exit(-1);
-            }
-        };
-        match prover_job_metadata {
-            Some(val) => val,
-            None => {
-                vlog::error!("No job with id: {} exist; exiting...", job_id);
-                std::process::exit(-1);
-            }
-        }
-    }
-}
-
-impl JobReporter for ProverReporter {
-    fn send_report(&mut self, report: JobResult) {
-        match report {
-            Failure(job_id, error) => {
-                vlog::error!(
-                    "Failed to generate proof for id {:?}. error reason; {}",
-                    job_id,
-                    error
-                );
-                self.rt_handle.block_on(async {
-                    let result = self
-                        .pool
-                        .access_storage()
-                        .await
-                        .prover_dal()
-                        .save_proof_error(job_id as u32, error, self.config.max_attempts)
-                        .await;
-                    // BEWARE, HERE BE DRAGONS.
-                    // `send_report` method is called in an operating system thread,
-                    // which is in charge of saving proof output (ok, errored, etc.).
-                    // The code that calls it is in a thread that does not check it's status.
-                    // If the thread panics, proofs will be generated, but their status won't be saved.
-                    // So a prover will work like this:
-                    // Pick task, execute task, prepare task to be saved, be restarted as nothing happens.
-                    // The error prevents the "fake" work by killing the prover, which causes it to restart.
-                    // A proper fix would be to have the thread signal it was dead or be watched from outside.
-                    // Given we want to deprecate old prover, this is the quick and dirty hack I'm not proud of.
-                    if let Err(e) = result {
-                        vlog::warn!("panicked inside heavy-ops thread: {e:?}; exiting...");
-                        std::process::exit(-1);
-                    }
-                });
-            }
-
-            ProofGenerated(job_id, duration, proof, index) => {
-                self.handle_successful_proof_generation(job_id, proof, duration, index);
-            }
-
-            JobResult::Synthesized(job_id, duration) => {
-                let circuit_type = self.get_circuit_type(job_id);
-                vlog::trace!(
-                    "Successfully synthesized circuit with id {:?} and type: {}. took: {:?}",
-                    job_id,
-                    circuit_type,
-                    duration,
-                );
-                metrics::histogram!(
-                    "server.prover.circuit_synthesis_time",
-                    duration,
-                    "circuit_type" => circuit_type,
-                );
-            }
-
-            JobResult::AssemblyFinalized(job_id, duration) => {
-                let circuit_type = self.get_circuit_type(job_id);
-                vlog::trace!(
-                    "Successfully finalized assembly with id {:?} and type: {}. took: {:?}",
-                    job_id,
-                    circuit_type,
-                    duration,
-                );
-                metrics::histogram!(
-                    "server.prover.assembly_finalize_time",
-                    duration,
-                    "circuit_type" => circuit_type,
-                );
-            }
-
-            JobResult::SetupLoaded(job_id, duration, cache_miss) => {
-                let circuit_type = self.get_circuit_type(job_id);
-                vlog::trace!(
-                    "Successfully setup loaded with id {:?} and type: {}. \
-                     took: {:?} and had cache_miss: {}",
-                    job_id,
-                    circuit_type,
-                    duration,
-                    cache_miss
-                );
-                metrics::histogram!(
-                    "server.prover.setup_load_time",
-                    duration,
-                    "circuit_type" => circuit_type.clone()
-                );
-                metrics::counter!(
-                    "server.prover.setup_loading_cache_miss",
-                    1,
-                    "circuit_type" => circuit_type
-                );
-            }
-
-            JobResult::AssemblyEncoded(job_id, duration) => {
-                let circuit_type = self.get_circuit_type(job_id);
-                vlog::trace!(
-                    "Successfully encoded assembly with id {:?} and type: {}. took: {:?}",
-                    job_id,
-                    circuit_type,
-                    duration,
-                );
-                metrics::histogram!(
-                    "server.prover.assembly_encoding_time",
-                    duration,
-                    "circuit_type" => circuit_type,
-                );
-            }
-
-            JobResult::AssemblyDecoded(job_id, duration) => {
-                let circuit_type = self.get_circuit_type(job_id);
-                vlog::trace!(
-                    "Successfully decoded assembly with id {:?} and type: {}. took: {:?}",
-                    job_id,
-                    circuit_type,
-                    duration,
-                );
-                metrics::histogram!(
-                    "server.prover.assembly_decoding_time",
-                    duration,
-                    "circuit_type" => circuit_type,
-                );
-            }
-
-            JobResult::FailureWithDebugging(job_id, circuit_id, assembly, error) => {
-                vlog::trace!(
-                    "Failed assembly decoding for job-id {} and circuit-type: {}. error: {}",
-                    job_id,
-                    circuit_id,
-                    error,
-                );
-                let blob_url = assembly_debug_blob_url(job_id, circuit_id);
-                let put_task = self
-                    .object_store
-                    .put_raw(Bucket::ProverJobs, &blob_url, assembly);
-                self.rt_handle
-                    .block_on(put_task)
-                    .expect("Failed saving debug assembly to GCS");
-            }
-
-            JobResult::AssemblyTransferred(job_id, duration) => {
-                let circuit_type = self.get_circuit_type(job_id);
-                vlog::trace!(
-                    "Successfully transferred assembly with id {:?} and type: {}. took: {:?}",
-                    job_id,
-                    circuit_type,
-                    duration,
-                );
-                metrics::histogram!(
-                    "server.prover.assembly_transferring_time",
-                    duration,
-                    "circuit_type" => circuit_type,
-                );
-            }
-
-            JobResult::ProverWaitedIdle(prover_id, duration) => {
-                vlog::trace!(
-                    "Prover wait idle time: {:?} for prover-id: {:?}",
-                    duration,
-                    prover_id
-                );
-                metrics::histogram!("server.prover.prover_wait_idle_time", duration,);
-            }
-
-            JobResult::SetupLoaderWaitedIdle(duration) => {
-                vlog::trace!("Setup load wait idle time: {:?}", duration);
-                metrics::histogram!("server.prover.setup_load_wait_wait_idle_time", duration,);
-            }
-
-            JobResult::SchedulerWaitedIdle(duration) => {
-                vlog::trace!("Scheduler wait idle time: {:?}", duration);
-                metrics::histogram!("server.prover.scheduler_wait_idle_time", duration,);
-            }
-        }
-    }
-}
diff --git a/prover/prover/src/prover_params.rs b/prover/prover/src/prover_params.rs
deleted file mode 100644
index 558e9058ed61..000000000000
--- a/prover/prover/src/prover_params.rs
+++ /dev/null
@@ -1,36 +0,0 @@
-use std::time::Duration;
-
-use prover_service::Params;
-
-use zksync_config::ProverConfig;
-
-#[derive(Debug)]
-pub struct ProverParams {
-    number_of_threads: u8,
-    polling_duration: Duration,
-    number_of_setup_slots: u8,
-}
-
-impl ProverParams {
-    pub(crate) fn new(config: &ProverConfig) -> Self {
-        Self {
-            number_of_threads: config.number_of_threads as u8,
-            polling_duration: Duration::from_millis(config.polling_duration_in_millis),
-            number_of_setup_slots: config.number_of_setup_slots,
-        }
-    }
-}
-
-impl Params for ProverParams {
-    fn number_of_parallel_synthesis(&self) -> u8 {
-        self.number_of_threads
-    }
-
-    fn number_of_setup_slots(&self) -> u8 {
-        self.number_of_setup_slots
-    }
-
-    fn polling_duration(&self) -> Duration {
-        self.polling_duration
-    }
-}
diff --git a/prover/prover/src/socket_listener.rs b/prover/prover/src/socket_listener.rs
deleted file mode 100644
index 69e49a21cb2c..000000000000
--- a/prover/prover/src/socket_listener.rs
+++ /dev/null
@@ -1,117 +0,0 @@
-use crate::synthesized_circuit_provider::SharedAssemblyQueue;
-use queues::IsQueue;
-use std::net::{IpAddr, SocketAddr};
-use std::time::Instant;
-use zksync_dal::ConnectionPool;
-use zksync_types::proofs::{GpuProverInstanceStatus, SocketAddress};
-
-use tokio::{
-    io::copy,
-    net::{TcpListener, TcpStream},
-};
-
-#[allow(clippy::too_many_arguments)]
-pub async fn incoming_socket_listener(
-    host: IpAddr,
-    port: u16,
-    queue: SharedAssemblyQueue,
-    pool: ConnectionPool,
-    specialized_prover_group_id: u8,
-    region: String,
-    zone: String,
-    num_gpu: u8,
-) {
-    let listening_address = SocketAddr::new(host, port);
-    vlog::info!(
-        "Starting assembly receiver at host: {}, port: {}",
-        host,
-        port
-    );
-    let listener = TcpListener::bind(listening_address)
-        .await
-        .unwrap_or_else(|_| panic!("Failed binding address: {:?}", listening_address));
-    let address = SocketAddress { host, port };
-
-    let queue_capacity = queue.lock().await.capacity();
-    pool.access_storage()
-        .await
-        .gpu_prover_queue_dal()
-        .insert_prover_instance(
-            address.clone(),
-            queue_capacity,
-            specialized_prover_group_id,
-            region.clone(),
-            zone.clone(),
-            num_gpu,
-        )
-        .await;
-
-    let mut now = Instant::now();
-
-    loop {
-        let stream = match listener.accept().await {
-            Ok(stream) => stream.0,
-            Err(e) => {
-                panic!("could not accept connection: {:?}", e);
-            }
-        };
-        vlog::trace!(
-            "Received new assembly send connection, waited for {}ms.",
-            now.elapsed().as_millis()
-        );
-
-        handle_incoming_file(
-            stream,
-            queue.clone(),
-            pool.clone(),
-            address.clone(),
-            region.clone(),
-            zone.clone(),
-        )
-        .await;
-
-        now = Instant::now();
-    }
-}
-
-async fn handle_incoming_file(
-    mut stream: TcpStream,
-    queue: SharedAssemblyQueue,
-    pool: ConnectionPool,
-    address: SocketAddress,
-    region: String,
-    zone: String,
-) {
-    let mut assembly: Vec<u8> = vec![];
-    let started_at = Instant::now();
-    copy(&mut stream, &mut assembly)
-        .await
-        .expect("Failed reading from stream");
-    let file_size_in_gb = assembly.len() / (1024 * 1024 * 1024);
-    vlog::trace!(
-        "Read file of size: {}GB from stream took: {} seconds",
-        file_size_in_gb,
-        started_at.elapsed().as_secs()
-    );
-    // acquiring lock from queue and updating db must be done atomically otherwise it results in TOCTTOU
-    // Time-of-Check to Time-of-Use
-    let mut assembly_queue = queue.lock().await;
-    let (queue_free_slots, status) = {
-        assembly_queue
-            .add(assembly)
-            .expect("Failed saving assembly to queue");
-        let status = if assembly_queue.capacity() == assembly_queue.size() {
-            GpuProverInstanceStatus::Full
-        } else {
-            GpuProverInstanceStatus::Available
-        };
-        let queue_free_slots = assembly_queue.capacity() - assembly_queue.size();
-        (queue_free_slots, status)
-    };
-
-    pool.access_storage()
-        .await
-        .gpu_prover_queue_dal()
-        .update_prover_instance_status(address, status, queue_free_slots, region, zone)
-        .await;
-}
diff --git a/prover/prover/src/synthesized_circuit_provider.rs b/prover/prover/src/synthesized_circuit_provider.rs
deleted file mode 100644
index bb20391a3bae..000000000000
--- a/prover/prover/src/synthesized_circuit_provider.rs
+++ /dev/null
@@ -1,81 +0,0 @@
-use std::io::Cursor;
-use std::io::Read;
-use std::sync::Arc;
-use tokio::sync::Mutex;
-
-use prover_service::RemoteSynthesizer;
-use queues::{Buffer, IsQueue};
-
-use tokio::runtime::Handle;
-use zksync_dal::ConnectionPool;
-use zksync_types::proofs::SocketAddress;
-
-pub type SharedAssemblyQueue = Arc<Mutex<Buffer<Vec<u8>>>>;
-
-pub struct SynthesizedCircuitProvider {
-    rt_handle: Handle,
-    queue: SharedAssemblyQueue,
-    pool: ConnectionPool,
-    address: SocketAddress,
-    region: String,
-    zone: String,
-}
-
-impl SynthesizedCircuitProvider {
-    pub fn new(
-        queue: SharedAssemblyQueue,
-        pool: ConnectionPool,
-        address: SocketAddress,
-        region: String,
-        zone: String,
-        rt_handle: Handle,
-    ) -> Self {
-        Self {
-            rt_handle,
-            queue,
-            pool,
-            address,
-            region,
-            zone,
-        }
-    }
-}
-
-impl RemoteSynthesizer for SynthesizedCircuitProvider {
-    fn try_next(&mut self) -> Option<Box<dyn Read + Send + Sync>> {
-        let mut assembly_queue = self.rt_handle.block_on(async { self.queue.lock().await });
-        let is_full = assembly_queue.capacity() == assembly_queue.size();
-        return match assembly_queue.remove() {
-            Ok(blob) => {
-                let queue_free_slots = assembly_queue.capacity() - assembly_queue.size();
-                if is_full {
-                    self.rt_handle.block_on(async {
-                        self.pool
-                            .access_storage()
-                            .await
-                            .gpu_prover_queue_dal()
-                            .update_prover_instance_from_full_to_available(
-                                self.address.clone(),
-                                queue_free_slots,
-                                self.region.clone(),
-                                self.zone.clone(),
-                            )
-                            .await
-                    });
-                }
-                vlog::trace!(
-                    "Queue free slot {} for capacity {}",
-                    queue_free_slots,
-                    assembly_queue.capacity()
-                );
-                metrics::histogram!(
-                    "server.prover.queue_free_slots",
-                    queue_free_slots as f64,
-                    "queue_capacity" => assembly_queue.capacity().to_string()
-                );
-                Some(Box::new(Cursor::new(blob)))
-            }
-            Err(_) => None,
-        };
-    }
-}
diff --git a/prover/prover_fri/Cargo.toml b/prover/prover_fri/Cargo.toml
deleted file mode 100644
index dd3e64e1295c..000000000000
--- a/prover/prover_fri/Cargo.toml
+++ /dev/null
@@ -1,37 +0,0 @@
-[package]
-name = "zksync_prover_fri"
-version = "0.1.0"
-edition = "2021"
-
-# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
-
-[dependencies]
-zksync_types = { path = "../../core/lib/types", version = "1.0" }
-zksync_dal = { path = "../../core/lib/dal", version = "1.0" }
-zksync_config = { path = "../../core/lib/config", version = "1.0" }
-prometheus_exporter = { path = "../../core/lib/prometheus_exporter", version = "1.0" }
-vlog = { path = "../../core/lib/vlog", version = "1.0" }
-zksync_object_store = { path = "../../core/lib/object_store", version = "1.0" }
-zksync_prover_utils = {path = "../../core/lib/prover_utils", version = "1.0" }
-zksync_queued_job_processor = { path = "../../core/lib/queued_job_processor", version = "1.0" }
-zksync_prover_fri_utils = { path = "../prover_fri_utils", version = "1.0" }
-zksync_prover_fri_types = { path = "../prover_fri_types", version = "1.0" }
-zksync_utils = { path = "../../core/lib/utils", version = "1.0" }
-vk_setup_data_generator_server_fri = { path = "../vk_setup_data_generator_server_fri", version = "1.0" }
-shivini = {git = "https://github.com/matter-labs/shivini.git", branch ="main", optional = true, features = ["circuit_definitions", "zksync"]  }
-
-zkevm_test_harness = { git = "https://github.com/matter-labs/era-zkevm_test_harness.git", branch = "v1.4.0" }
-circuit_definitions = { git = "https://github.com/matter-labs/era-zkevm_test_harness.git", branch = "v1.4.0", features = ["log_tracing"]}
-
-tokio = { version = "1", features = ["time"] }
-futures = { version = "0.3", features = ["compat"] }
-ctrlc = { version = "3.1", features = ["termination"] }
-metrics = "0.20.0"
-serde = { version = "1.0", features = ["derive"] }
-async-trait = "0.1"
-queues = "1.1.0"
-local-ip-address = "0.5.0"
-
-[features]
-default = []
-gpu = ["shivini", "vk_setup_data_generator_server_fri/gpu"]
diff --git a/prover/prover_fri/README.md b/prover/prover_fri/README.md
deleted file mode 100644
index 801c30be3ce7..000000000000
--- a/prover/prover_fri/README.md
+++ /dev/null
@@ -1,9 +0,0 @@
-# FRI Prover
-
-## running cpu prover
-
-`zk f cargo +nightly-2023-05-31 run --release --bin zksync_prover_fri`
-
-## running gpu prover(requires CUDA 12.0+)
-
-`zk f cargo +nightly-2023-05-31 run --release -features "gpu" --bin zksync_prover_fri`
diff --git a/prover/prover_fri/src/gpu_prover_job_processor.rs b/prover/prover_fri/src/gpu_prover_job_processor.rs
deleted file mode 100644
index aa20bf0331b3..000000000000
--- a/prover/prover_fri/src/gpu_prover_job_processor.rs
+++ /dev/null
@@ -1,300 +0,0 @@
-#[cfg(feature = "gpu")]
-pub mod gpu_prover {
-    use std::collections::HashMap;
-    use std::{sync::Arc, time::Instant};
-
-    use queues::IsQueue;
-    use tokio::task::JoinHandle;
-    use zksync_prover_fri_types::circuit_definitions::base_layer_proof_config;
-    use zksync_prover_fri_types::circuit_definitions::boojum::algebraic_props::round_function::AbsorptionModeOverwrite;
-    use zksync_prover_fri_types::circuit_definitions::boojum::algebraic_props::sponge::GoldilocksPoseidon2Sponge;
-    use zksync_prover_fri_types::circuit_definitions::boojum::cs::implementations::pow::NoPow;
-    use zksync_prover_fri_types::circuit_definitions::boojum::cs::implementations::setup::FinalizationHintsForProver;
-    use zksync_prover_fri_types::circuit_definitions::boojum::cs::implementations::transcript::GoldilocksPoisedon2Transcript;
-    use zksync_prover_fri_types::circuit_definitions::boojum::worker::Worker;
-    use zksync_prover_fri_types::circuit_definitions::circuit_definitions::base_layer::ZkSyncBaseLayerProof;
-    use zksync_prover_fri_types::circuit_definitions::circuit_definitions::recursion_layer::ZkSyncRecursionLayerProof;
-    use zksync_vk_setup_data_server_fri::GpuProverSetupData;
-
-    use zksync_config::configs::fri_prover_group::{CircuitIdRoundTuple, FriProverGroupConfig};
-    use zksync_config::configs::FriProverConfig;
-    use zksync_dal::ConnectionPool;
-    use zksync_object_store::ObjectStore;
-    use zksync_prover_fri_types::{
-        CircuitWrapper, FriProofWrapper, ProverServiceDataKey, WitnessVectorArtifacts,
-    };
-    use zksync_queued_job_processor::{async_trait, JobProcessor};
-    use zksync_vk_setup_data_server_fri::get_setup_data_for_circuit_type;
-    use {
-        shivini::gpu_prove_from_external_witness_data,
-        shivini::synthesis_utils::init_base_layer_cs_for_repeated_proving,
-        shivini::synthesis_utils::init_recursive_layer_cs_for_repeated_proving,
-        shivini::ProverContext, zksync_vk_setup_data_server_fri::GoldilocksGpuProverSetupData,
-    };
-
-    use crate::utils::{
-        save_proof, setup_metadata_to_setup_data_key, verify_proof, ProverArtifacts,
-        SharedWitnessVectorQueue, F, H,
-    };
-
-    type DefaultTranscript = GoldilocksPoisedon2Transcript;
-    type DefaultTreeHasher = GoldilocksPoseidon2Sponge<AbsorptionModeOverwrite>;
-
-    pub enum SetupLoadMode {
-        FromMemory(HashMap<ProverServiceDataKey, Arc<GoldilocksGpuProverSetupData>>),
-        FromDisk,
-    }
-
-    pub struct Prover {
-        blob_store: Box<dyn ObjectStore>,
-        public_blob_store: Box<dyn ObjectStore>,
-        config: Arc<FriProverConfig>,
-        prover_connection_pool: ConnectionPool,
-        setup_load_mode: SetupLoadMode,
-        // Only pick jobs for the configured circuit id and aggregation rounds.
-        // Empty means all jobs are picked.
-        circuit_ids_for_round_to_be_proven: Vec<CircuitIdRoundTuple>,
-        witness_vector_queue: SharedWitnessVectorQueue,
-        prover_context: ProverContext,
-    }
-
-    impl Prover {
-        pub fn new(
-            blob_store: Box<dyn ObjectStore>,
-            public_blob_store: Box<dyn ObjectStore>,
-            config: FriProverConfig,
-            prover_connection_pool: ConnectionPool,
-            setup_load_mode: SetupLoadMode,
-            circuit_ids_for_round_to_be_proven: Vec<CircuitIdRoundTuple>,
-            witness_vector_queue: SharedWitnessVectorQueue,
-        ) -> Self {
-            Prover {
-                blob_store,
-                public_blob_store,
-                config: Arc::new(config),
-                prover_connection_pool,
-                setup_load_mode,
-                circuit_ids_for_round_to_be_proven,
-                witness_vector_queue,
-                prover_context: ProverContext::create()
-                    .expect("failed initializing gpu prover context"),
-            }
-        }
-
-        fn get_setup_data(&self, key: ProverServiceDataKey) -> Arc<GoldilocksGpuProverSetupData> {
-            match &self.setup_load_mode {
-                SetupLoadMode::FromMemory(cache) => cache
-                    .get(&key)
-                    .expect("Setup data not found in cache")
-                    .clone(),
-                SetupLoadMode::FromDisk => {
-                    let started_at = Instant::now();
-                    let artifact: GoldilocksGpuProverSetupData =
-                        get_setup_data_for_circuit_type(key.clone());
-                    metrics::histogram!(
-                        "prover_fri.prover.gpu_setup_data_load_time",
-                        started_at.elapsed(),
-                        "circuit_type" => key.circuit_id.to_string(),
-                    );
-                    Arc::new(artifact)
-                }
-            }
-        }
-
-        pub fn prove(
-            job: WitnessVectorArtifacts,
-            config: Arc<FriProverConfig>,
-            setup_data: Arc<GoldilocksGpuProverSetupData>,
-        ) -> ProverArtifacts {
-            let worker = Worker::new();
-            let started_at = Instant::now();
-            let (cs, proof_config, circuit_id) = match job.prover_job.circuit_wrapper.clone() {
-                CircuitWrapper::Base(base_circuit) => {
-                    let circuit_id = base_circuit.numeric_circuit_type();
-                    let cs = init_base_layer_cs_for_repeated_proving(
-                        base_circuit,
-                        &setup_data.finalization_hint,
-                    );
-                    (cs, base_layer_proof_config(), circuit_id)
-                }
-                CircuitWrapper::Recursive(recursive_circuit) => {
-                    let circuit_id = recursive_circuit.numeric_circuit_type();
-                    let cs = init_recursive_layer_cs_for_repeated_proving(
-                        recursive_circuit,
-                        &setup_data.finalization_hint,
-                    );
-                    (cs, base_layer_proof_config(), circuit_id)
-                }
-            };
-            vlog::info!(
-                "Successfully generated assembly without witness vector for job: {}, took: {:?}",
-                job.prover_job.job_id,
-                started_at.elapsed()
-            );
-            metrics::histogram!(
-                "prover_fri.prover.gpu_assembly_generation_time",
-                started_at.elapsed(),
-                "circuit_type" => circuit_id.to_string()
-            );
-            let started_at = Instant::now();
-            let proof = gpu_prove_from_external_witness_data::<
-                _,
-                DefaultTranscript,
-                DefaultTreeHasher,
-                NoPow,
-                _,
-            >(
-                cs,
-                &job.witness_vector,
-                proof_config,
-                &setup_data.setup,
-                &setup_data.vk,
-                (),
-                &worker,
-            )
-            .unwrap_or_else(|_| {
-                panic!(
-                    "failed generating GPU proof for id: {}",
-                    job.prover_job.job_id
-                )
-            });
-            metrics::histogram!(
-                "prover_fri.prover.gpu_proof_generation_time",
-                started_at.elapsed(),
-                "circuit_type" => circuit_id.to_string()
-            );
-            verify_proof(
-                &job.prover_job.circuit_wrapper,
-                &proof,
-                &setup_data.vk,
-                job.prover_job.job_id,
-            );
-            let proof_wrapper = match &job.prover_job.circuit_wrapper {
-                CircuitWrapper::Base(_) => {
-                    FriProofWrapper::Base(ZkSyncBaseLayerProof::from_inner(circuit_id, proof))
-                }
-                CircuitWrapper::Recursive(circuit) => FriProofWrapper::Recursive(
-                    ZkSyncRecursionLayerProof::from_inner(circuit_id, proof),
-                ),
-            };
-            ProverArtifacts::new(job.prover_job.block_number, proof_wrapper)
-        }
-    }
-
-    #[async_trait]
-    impl JobProcessor for Prover {
-        type Job = WitnessVectorArtifacts;
-        type JobId = u32;
-        type JobArtifacts = ProverArtifacts;
-
-        // we use smaller number here as the polling in done from the in-memory queue not DB
-        const POLLING_INTERVAL_MS: u64 = 200;
-        const MAX_BACKOFF_MS: u64 = 1_000;
-        const SERVICE_NAME: &'static str = "FriGpuProver";
-
-        async fn get_next_job(&self) -> Option<(Self::JobId, Self::Job)> {
-            let mut queue = self.witness_vector_queue.lock().await;
-            match queue.remove() {
-                Err(_) => None,
-                Ok(item) => {
-                    vlog::info!("Started GPU proving for job: {:?}", item.prover_job.job_id);
-                    Some((item.prover_job.job_id, item))
-                }
-            }
-        }
-
-        async fn save_failure(&self, job_id: Self::JobId, _started_at: Instant, error: String) {
-            self.prover_connection_pool
-                .access_storage()
-                .await
-                .fri_prover_jobs_dal()
-                .save_proof_error(job_id, error)
-                .await;
-        }
-
-        async fn process_job(
-            &self,
-            job: Self::Job,
-            _started_at: Instant,
-        ) -> JoinHandle<Self::JobArtifacts> {
-            let config = Arc::clone(&self.config);
-            let setup_data = self.get_setup_data(job.prover_job.setup_data_key.clone());
-            tokio::task::spawn_blocking(move || Self::prove(job, config, setup_data))
-        }
-
-        async fn save_result(
-            &self,
-            job_id: Self::JobId,
-            started_at: Instant,
-            artifacts: Self::JobArtifacts,
-        ) {
-            metrics::histogram!(
-                "prover_fri.prover.gpu_total_proving_time",
-                started_at.elapsed(),
-            );
-            let mut storage_processor = self.prover_connection_pool.access_storage().await;
-            save_proof(
-                job_id,
-                started_at,
-                artifacts,
-                &*self.blob_store,
-                &*self.public_blob_store,
-                &mut storage_processor,
-            )
-            .await;
-        }
-    }
-
-    pub fn load_setup_data_cache(config: &FriProverConfig) -> SetupLoadMode {
-        match config.setup_load_mode {
-            zksync_config::configs::fri_prover::SetupLoadMode::FromDisk => SetupLoadMode::FromDisk,
-            zksync_config::configs::fri_prover::SetupLoadMode::FromMemory => {
-                let mut cache = HashMap::new();
-                vlog::info!(
-                    "Loading setup data cache for group {}",
-                    &config.specialized_group_id
-                );
-                let prover_setup_metadata_list = FriProverGroupConfig::from_env()
-                    .get_circuit_ids_for_group_id(config.specialized_group_id)
-                    .expect(
-                        "At least one circuit should be configured for group when running in FromMemory mode",
-                    );
-                vlog::info!(
-                    "for group {} configured setup metadata are {:?}",
-                    &config.specialized_group_id,
-                    prover_setup_metadata_list
-                );
-                for prover_setup_metadata in prover_setup_metadata_list {
-                    let key = setup_metadata_to_setup_data_key(&prover_setup_metadata);
-                    let setup_data = get_setup_data_for_circuit_type(key.clone());
-                    cache.insert(key, Arc::new(setup_data));
-                }
-                SetupLoadMode::FromMemory(cache)
-            }
-        }
-    }
-
-    pub fn init_finalization_hints_cache(
-        config: &FriProverConfig,
-    ) -> HashMap<ProverServiceDataKey, Arc<FinalizationHintsForProver>> {
-        let mut cache = HashMap::new();
-        vlog::info!(
-            "Loading finalization hint for group {}",
-            &config.specialized_group_id
-        );
-        let group_config = FriProverGroupConfig::from_env();
-        let prover_setup_metadata_list = match config.setup_load_mode {
-            zksync_config::configs::fri_prover::SetupLoadMode::FromDisk => group_config.get_all_circuit_ids(),
-            zksync_config::configs::fri_prover::SetupLoadMode::FromMemory =>
-                group_config.get_circuit_ids_for_group_id(config.specialized_group_id).expect(
-                        "At least one circuit should be configured for group when running in FromMemory mode")
-        };
-
-        for prover_setup_metadata in prover_setup_metadata_list {
-            let key = setup_metadata_to_setup_data_key(&prover_setup_metadata);
-            let setup_data: GpuProverSetupData<F, H> = get_setup_data_for_circuit_type(key.clone());
-            cache.insert(key, Arc::new(setup_data.finalization_hint));
-        }
-        cache
-    }
-}
diff --git a/prover/prover_fri/src/lib.rs b/prover/prover_fri/src/lib.rs
deleted file mode 100644
index 5fdb260d40d6..000000000000
--- a/prover/prover_fri/src/lib.rs
+++ /dev/null
@@ -1,3 +0,0 @@
-#![feature(generic_const_exprs)]
-pub mod prover_job_processor;
-pub mod utils;
diff --git a/prover/prover_fri/src/main.rs b/prover/prover_fri/src/main.rs
deleted file mode 100644
index e284dc06f29c..000000000000
--- a/prover/prover_fri/src/main.rs
+++ /dev/null
@@ -1,163 +0,0 @@
-#![feature(generic_const_exprs)]
-
-use tokio::sync::watch::Receiver;
-use tokio::sync::{oneshot};
-use tokio::task::JoinHandle;
-
-use zksync_config::configs::fri_prover_group::{CircuitIdRoundTuple, FriProverGroupConfig};
-use zksync_config::configs::{FriProverConfig, PrometheusConfig};
-use zksync_config::{ApiConfig, ObjectStoreConfig};
-use zksync_dal::connection::DbVariant;
-use zksync_dal::ConnectionPool;
-use zksync_object_store::{ObjectStore, ObjectStoreFactory};
-
-use zksync_queued_job_processor::JobProcessor;
-use zksync_utils::wait_for_tasks::wait_for_tasks;
-
-mod gpu_prover_job_processor;
-mod prover_job_processor;
-mod utils;
-mod socket_listener;
-
-#[tokio::main]
-async fn main() {
-    vlog::init();
-    let sentry_guard = vlog::init_sentry();
-    let prover_config = FriProverConfig::from_env();
-    let prometheus_config = PrometheusConfig {
-        listener_port: prover_config.prometheus_port,
-        ..ApiConfig::from_env().prometheus
-    };
-
-    match sentry_guard {
-        Some(_) => vlog::info!(
-            "Starting Sentry url: {}",
-            std::env::var("MISC_SENTRY_URL").unwrap(),
-        ),
-        None => vlog::info!("No sentry url configured"),
-    }
-
-    let (stop_signal_sender, stop_signal_receiver) = oneshot::channel();
-    let mut stop_signal_sender = Some(stop_signal_sender);
-    ctrlc::set_handler(move || {
-        if let Some(sender) = stop_signal_sender.take() {
-            sender.send(()).ok();
-        }
-    })
-    .expect("Error setting Ctrl+C handler");
-
-    let (stop_sender, stop_receiver) = tokio::sync::watch::channel(false);
-    let blob_store = ObjectStoreFactory::from_env();
-    let public_blob_store = ObjectStoreFactory::new(ObjectStoreConfig::public_from_env())
-        .create_store()
-        .await;
-
-    vlog::info!("Starting FRI proof generation");
-    let pool = ConnectionPool::builder(DbVariant::Prover).build().await;
-    let circuit_ids_for_round_to_be_proven = FriProverGroupConfig::from_env()
-        .get_circuit_ids_for_group_id(prover_config.specialized_group_id)
-        .unwrap_or(vec![]);
-
-    let prover_tasks = get_prover_tasks(
-        prover_config,
-        stop_receiver,
-        blob_store,
-        public_blob_store,
-        pool,
-        circuit_ids_for_round_to_be_proven,
-    )
-    .await;
-
-    let mut tasks = vec![prometheus_exporter::run_prometheus_exporter(
-        prometheus_config.listener_port,
-        None,
-    )];
-    tasks.extend(prover_tasks);
-
-    let particular_crypto_alerts = None;
-    let graceful_shutdown = None::<futures::future::Ready<()>>;
-    let tasks_allowed_to_finish = false;
-    tokio::select! {
-        _ = wait_for_tasks(tasks, particular_crypto_alerts, graceful_shutdown, tasks_allowed_to_finish) => {},
-        _ = stop_signal_receiver => {
-            vlog::info!("Stop signal received, shutting down");
-        },
-    }
-
-    stop_sender.send(true).ok();
-}
-
-#[cfg(not(feature = "gpu"))]
-async fn get_prover_tasks(
-    prover_config: FriProverConfig,
-    stop_receiver: Receiver<bool>,
-    store_factory: ObjectStoreFactory,
-    public_blob_store: Box<dyn ObjectStore>,
-    pool: ConnectionPool,
-    circuit_ids_for_round_to_be_proven: Vec<CircuitIdRoundTuple>,
-) -> Vec<JoinHandle<()>> {
-    use crate::prover_job_processor::{load_setup_data_cache, Prover};
-
-    let setup_load_mode = load_setup_data_cache(&prover_config);
-    let prover = Prover::new(
-        store_factory.create_store().await,
-        public_blob_store,
-        prover_config,
-        pool,
-        setup_load_mode,
-        circuit_ids_for_round_to_be_proven,
-    );
-    vec![tokio::spawn(prover.run(stop_receiver, None))]
-}
-
-#[cfg(feature = "gpu")]
-async fn get_prover_tasks(
-    prover_config: FriProverConfig,
-    stop_receiver: Receiver<bool>,
-    store_factory: ObjectStoreFactory,
-    public_blob_store: Box<dyn ObjectStore>,
-    pool: ConnectionPool,
-    circuit_ids_for_round_to_be_proven: Vec<CircuitIdRoundTuple>,
-) -> Vec<JoinHandle<()>> {
-    use queues::Buffer;
-    use tokio::sync::Mutex;
-    use std::sync::Arc;
-    use gpu_prover_job_processor::gpu_prover;
-    use zksync_prover_utils::region_fetcher::get_zone;
-    use socket_listener::SocketListener;
-    use zksync_types::proofs::SocketAddress;
-    use local_ip_address::local_ip;
-
-    let setup_load_mode = gpu_prover::load_setup_data_cache(&prover_config);
-    let witness_vector_queue = Buffer::new(prover_config.queue_capacity);
-    let shared_witness_vector_queue = Arc::new(Mutex::new(witness_vector_queue));
-    let consumer = shared_witness_vector_queue.clone();
-    let prover = gpu_prover::Prover::new(
-        store_factory.create_store().await,
-        public_blob_store,
-        prover_config.clone(),
-        pool.clone(),
-        setup_load_mode,
-        circuit_ids_for_round_to_be_proven.clone(),
-        consumer,
-    );
-    let zone = get_zone().await;
-    let producer = shared_witness_vector_queue.clone();
-    let local_ip = local_ip().expect("Failed obtaining local IP address");
-    let address = SocketAddress {
-        host: local_ip,
-        port: prover_config.witness_vector_receiver_port,
-    };
-    vlog::info!("local IP address is: {:?}", local_ip);
-    let socket_listener = SocketListener::new(
-        address,
-        producer,
-        pool.clone(),
-        prover_config.specialized_group_id,
-        zone
-    );
-    vec![
-        tokio::spawn(socket_listener.listen_incoming_connections(stop_receiver.clone())),
-        tokio::spawn(prover.run(stop_receiver, None))
-    ]
-}
diff --git a/prover/prover_fri/src/prover_job_processor.rs b/prover/prover_fri/src/prover_job_processor.rs
deleted file mode 100644
index b5331640224a..000000000000
--- a/prover/prover_fri/src/prover_job_processor.rs
+++ /dev/null
@@ -1,265 +0,0 @@
-use std::collections::HashMap;
-use std::{sync::Arc, time::Instant};
-
-use tokio::task::JoinHandle;
-use zksync_prover_fri_types::circuit_definitions::aux_definitions::witness_oracle::VmWitnessOracle;
-use zksync_prover_fri_types::circuit_definitions::boojum::cs::implementations::pow::NoPow;
-use zksync_prover_fri_types::circuit_definitions::boojum::field::goldilocks::GoldilocksField;
-use zksync_prover_fri_types::circuit_definitions::boojum::worker::Worker;
-use zksync_prover_fri_types::circuit_definitions::circuit_definitions::base_layer::{
-    ZkSyncBaseLayerCircuit, ZkSyncBaseLayerProof,
-};
-use zksync_prover_fri_types::circuit_definitions::circuit_definitions::recursion_layer::{
-    ZkSyncRecursionLayerProof, ZkSyncRecursiveLayerCircuit,
-};
-use zksync_prover_fri_types::circuit_definitions::{
-    base_layer_proof_config, recursion_layer_proof_config, ZkSyncDefaultRoundFunction,
-};
-
-use zkevm_test_harness::prover_utils::{prove_base_layer_circuit, prove_recursion_layer_circuit};
-
-use zksync_config::configs::fri_prover_group::{CircuitIdRoundTuple, FriProverGroupConfig};
-use zksync_config::configs::FriProverConfig;
-use zksync_dal::ConnectionPool;
-use zksync_object_store::ObjectStore;
-use zksync_prover_fri_types::{CircuitWrapper, FriProofWrapper, ProverJob, ProverServiceDataKey};
-use zksync_prover_fri_utils::fetch_next_circuit;
-use zksync_queued_job_processor::{async_trait, JobProcessor};
-use zksync_vk_setup_data_server_fri::{
-    get_cpu_setup_data_for_circuit_type, GoldilocksProverSetupData,
-};
-
-use crate::utils::{save_proof, setup_metadata_to_setup_data_key, verify_proof, ProverArtifacts};
-
-pub enum SetupLoadMode {
-    FromMemory(HashMap<ProverServiceDataKey, Arc<GoldilocksProverSetupData>>),
-    FromDisk,
-}
-
-pub struct Prover {
-    blob_store: Box<dyn ObjectStore>,
-    public_blob_store: Box<dyn ObjectStore>,
-    config: Arc<FriProverConfig>,
-    prover_connection_pool: ConnectionPool,
-    setup_load_mode: SetupLoadMode,
-    // Only pick jobs for the configured circuit id and aggregation rounds.
-    // Empty means all jobs are picked.
-    circuit_ids_for_round_to_be_proven: Vec<CircuitIdRoundTuple>,
-}
-
-impl Prover {
-    pub fn new(
-        blob_store: Box<dyn ObjectStore>,
-        public_blob_store: Box<dyn ObjectStore>,
-        config: FriProverConfig,
-        prover_connection_pool: ConnectionPool,
-        setup_load_mode: SetupLoadMode,
-        circuit_ids_for_round_to_be_proven: Vec<CircuitIdRoundTuple>,
-    ) -> Self {
-        Prover {
-            blob_store,
-            public_blob_store,
-            config: Arc::new(config),
-            prover_connection_pool,
-            setup_load_mode,
-            circuit_ids_for_round_to_be_proven,
-        }
-    }
-
-    fn get_setup_data(&self, key: ProverServiceDataKey) -> Arc<GoldilocksProverSetupData> {
-        match &self.setup_load_mode {
-            SetupLoadMode::FromMemory(cache) => cache
-                .get(&key)
-                .expect("Setup data not found in cache")
-                .clone(),
-            SetupLoadMode::FromDisk => {
-                let started_at = Instant::now();
-                let artifact: GoldilocksProverSetupData =
-                    get_cpu_setup_data_for_circuit_type(key.clone());
-                metrics::histogram!(
-                    "prover_fri.prover.setup_data_load_time",
-                    started_at.elapsed(),
-                    "circuit_type" => key.circuit_id.to_string(),
-                );
-                Arc::new(artifact)
-            }
-        }
-    }
-
-    pub fn prove(
-        job: ProverJob,
-        config: Arc<FriProverConfig>,
-        setup_data: Arc<GoldilocksProverSetupData>,
-    ) -> ProverArtifacts {
-        let proof = match job.circuit_wrapper {
-            CircuitWrapper::Base(base_circuit) => {
-                Self::prove_base_layer(job.job_id, base_circuit, config, setup_data)
-            }
-            CircuitWrapper::Recursive(recursive_circuit) => {
-                Self::prove_recursive_layer(job.job_id, recursive_circuit, config, setup_data)
-            }
-        };
-        ProverArtifacts::new(job.block_number, proof)
-    }
-
-    fn prove_recursive_layer(
-        job_id: u32,
-        circuit: ZkSyncRecursiveLayerCircuit,
-        _config: Arc<FriProverConfig>,
-        artifact: Arc<GoldilocksProverSetupData>,
-    ) -> FriProofWrapper {
-        let worker = Worker::new();
-        let circuit_id = circuit.numeric_circuit_type();
-        let started_at = Instant::now();
-        let proof = prove_recursion_layer_circuit::<NoPow>(
-            circuit.clone(),
-            &worker,
-            recursion_layer_proof_config(),
-            &artifact.setup_base,
-            &artifact.setup,
-            &artifact.setup_tree,
-            &artifact.vk,
-            &artifact.vars_hint,
-            &artifact.wits_hint,
-            &artifact.finalization_hint,
-        );
-        metrics::histogram!(
-            "prover_fri.prover.proof_generation_time",
-            started_at.elapsed(),
-            "circuit_type" => circuit_id.to_string(),
-            "layer" => "recursive",
-        );
-        verify_proof(
-            &CircuitWrapper::Recursive(circuit),
-            &proof,
-            &artifact.vk,
-            job_id,
-        );
-        FriProofWrapper::Recursive(ZkSyncRecursionLayerProof::from_inner(circuit_id, proof))
-    }
-
-    fn prove_base_layer(
-        job_id: u32,
-        circuit: ZkSyncBaseLayerCircuit<
-            GoldilocksField,
-            VmWitnessOracle<GoldilocksField>,
-            ZkSyncDefaultRoundFunction,
-        >,
-        _config: Arc<FriProverConfig>,
-        artifact: Arc<GoldilocksProverSetupData>,
-    ) -> FriProofWrapper {
-        let worker = Worker::new();
-        let circuit_id = circuit.numeric_circuit_type();
-        let started_at = Instant::now();
-        let proof = prove_base_layer_circuit::<NoPow>(
-            circuit.clone(),
-            &worker,
-            base_layer_proof_config(),
-            &artifact.setup_base,
-            &artifact.setup,
-            &artifact.setup_tree,
-            &artifact.vk,
-            &artifact.vars_hint,
-            &artifact.wits_hint,
-            &artifact.finalization_hint,
-        );
-        metrics::histogram!(
-            "prover_fri.prover.proof_generation_time",
-            started_at.elapsed(),
-            "circuit_type" => circuit_id.to_string(),
-            "layer" => "base",
-        );
-        verify_proof(&CircuitWrapper::Base(circuit), &proof, &artifact.vk, job_id);
-        FriProofWrapper::Base(ZkSyncBaseLayerProof::from_inner(circuit_id, proof))
-    }
-}
-
-#[async_trait]
-impl JobProcessor for Prover {
-    type Job = ProverJob;
-    type JobId = u32;
-    type JobArtifacts = ProverArtifacts;
-    const SERVICE_NAME: &'static str = "FriCpuProver";
-
-    async fn get_next_job(&self) -> Option<(Self::JobId, Self::Job)> {
-        let mut storage = self.prover_connection_pool.access_storage().await;
-        let mut fri_prover_dal = storage.fri_prover_jobs_dal();
-        let prover_job = fetch_next_circuit(
-            &mut fri_prover_dal,
-            &*self.blob_store,
-            &self.circuit_ids_for_round_to_be_proven,
-        )
-        .await?;
-        Some((prover_job.job_id, prover_job))
-    }
-
-    async fn save_failure(&self, job_id: Self::JobId, _started_at: Instant, error: String) {
-        self.prover_connection_pool
-            .access_storage()
-            .await
-            .fri_prover_jobs_dal()
-            .save_proof_error(job_id, error)
-            .await;
-    }
-
-    async fn process_job(
-        &self,
-        job: Self::Job,
-        _started_at: Instant,
-    ) -> JoinHandle<Self::JobArtifacts> {
-        let config = Arc::clone(&self.config);
-        let setup_data = self.get_setup_data(job.setup_data_key.clone());
-        tokio::task::spawn_blocking(move || Self::prove(job, config, setup_data))
-    }
-
-    async fn save_result(
-        &self,
-        job_id: Self::JobId,
-        started_at: Instant,
-        artifacts: Self::JobArtifacts,
-    ) {
-        metrics::histogram!(
-            "prover_fri.prover.cpu_total_proving_time",
-            started_at.elapsed(),
-        );
-        let mut storage_processor = self.prover_connection_pool.access_storage().await;
-        save_proof(
-            job_id,
-            started_at,
-            artifacts,
-            &*self.blob_store,
-            &*self.public_blob_store,
-            &mut storage_processor,
-        )
-        .await;
-    }
-}
-
-pub fn load_setup_data_cache(config: &FriProverConfig) -> SetupLoadMode {
-    match config.setup_load_mode {
-        zksync_config::configs::fri_prover::SetupLoadMode::FromDisk => SetupLoadMode::FromDisk,
-        zksync_config::configs::fri_prover::SetupLoadMode::FromMemory => {
-            let mut cache = HashMap::new();
-            vlog::info!(
-                "Loading setup data cache for group {}",
-                &config.specialized_group_id
-            );
-            let prover_setup_metadata_list = FriProverGroupConfig::from_env()
-                .get_circuit_ids_for_group_id(config.specialized_group_id)
-                .expect(
-                    "At least one circuit should be configured for group when running in FromMemory mode",
-                );
-            vlog::info!(
-                "for group {} configured setup metadata are {:?}",
-                &config.specialized_group_id,
-                prover_setup_metadata_list
-            );
-            for prover_setup_metadata in prover_setup_metadata_list {
-                let key = setup_metadata_to_setup_data_key(&prover_setup_metadata);
-                let setup_data = get_cpu_setup_data_for_circuit_type(key.clone());
-                cache.insert(key, Arc::new(setup_data));
-            }
-            SetupLoadMode::FromMemory(cache)
-        }
-    }
-}
diff --git a/prover/prover_fri/src/socket_listener.rs b/prover/prover_fri/src/socket_listener.rs
deleted file mode 100644
index 6acfcdfce118..000000000000
--- a/prover/prover_fri/src/socket_listener.rs
+++ /dev/null
@@ -1,130 +0,0 @@
-use queues::IsQueue;
-use std::net::SocketAddr;
-use std::time::Instant;
-use zksync_dal::ConnectionPool;
-use zksync_types::proofs::{GpuProverInstanceStatus, SocketAddress};
-
-use crate::utils::SharedWitnessVectorQueue;
-use tokio::{
-    io::copy,
-    net::{TcpListener, TcpStream},
-};
-use tokio::sync::watch;
-use zksync_object_store::bincode;
-use zksync_prover_fri_types::WitnessVectorArtifacts;
-
-pub(crate) struct SocketListener {
-    address: SocketAddress,
-    queue: SharedWitnessVectorQueue,
-    pool: ConnectionPool,
-    specialized_prover_group_id: u8,
-    zone: String,
-}
-
-impl SocketListener {
-
-    pub fn new(
-        address: SocketAddress,
-        queue: SharedWitnessVectorQueue,
-        pool: ConnectionPool,
-        specialized_prover_group_id: u8,
-        zone: String,
-    ) -> Self {
-        Self {
-            address,
-            queue,
-            pool,
-            specialized_prover_group_id,
-            zone,
-        }
-    }
-    async fn init(&self) -> TcpListener {
-        let listening_address = SocketAddr::new(self.address.host, self.address.port);
-        vlog::info!(
-            "Starting assembly receiver at host: {}, port: {}",
-            self.address.host,
-            self.address.port
-        );
-        let listener = TcpListener::bind(listening_address)
-            .await
-            .unwrap_or_else(|_| panic!("Failed binding address: {:?}", listening_address));
-
-        let _lock = self.queue.lock().await;
-        self.pool
-            .access_storage()
-            .await
-            .fri_gpu_prover_queue_dal()
-            .insert_prover_instance(
-                self.address.clone(),
-                self.specialized_prover_group_id,
-                self.zone.clone(),
-            )
-            .await;
-        listener
-    }
-
-    pub async fn listen_incoming_connections(self, stop_receiver: watch::Receiver<bool>) {
-        let listener = self.init().await;
-        let mut now = Instant::now();
-        loop {
-            if *stop_receiver.borrow() {
-                vlog::warn!("Stop signal received, shutting down socket listener");
-                return;
-            }
-            let stream = match listener.accept().await {
-                Ok(stream) => stream.0,
-                Err(e) => {
-                    panic!("could not accept connection: {:?}", e);
-                }
-            };
-            vlog::trace!(
-                "Received new assembly send connection, waited for {}ms.",
-                now.elapsed().as_millis()
-            );
-
-            self.handle_incoming_file(stream).await;
-
-            now = Instant::now();
-        }
-    }
-
-    async fn handle_incoming_file(&self, mut stream: TcpStream) {
-        let mut assembly: Vec<u8> = vec![];
-        let started_at = Instant::now();
-        copy(&mut stream, &mut assembly)
-            .await
-            .expect("Failed reading from stream");
-        let file_size_in_gb = assembly.len() / (1024 * 1024 * 1024);
-        vlog::trace!(
-            "Read file of size: {}GB from stream took: {} seconds",
-            file_size_in_gb,
-            started_at.elapsed().as_secs()
-        );
-        metrics::histogram!(
-                "prover_fri.prover_fri.witness_vector_blob_time",
-                started_at.elapsed(),
-                "blob_size_in_gb" => file_size_in_gb.to_string(),
-        );
-        let witness_vector = bincode::deserialize::<WitnessVectorArtifacts>(&assembly)
-            .expect("Failed deserializing witness vector");
-        // acquiring lock from queue and updating db must be done atomically otherwise it results in TOCTTOU
-        // Time-of-Check to Time-of-Use
-        let mut queue = self.queue.lock().await;
-
-        queue
-            .add(witness_vector)
-            .expect("Failed saving witness vector to queue");
-        let status = if queue.capacity() == queue.size() {
-            GpuProverInstanceStatus::Full
-        } else {
-            GpuProverInstanceStatus::Available
-        };
-
-        self.pool
-            .access_storage()
-            .await
-            .fri_gpu_prover_queue_dal()
-            .update_prover_instance_status(self.address.clone(), status, self.zone.clone())
-            .await;
-    }
-}
diff --git a/prover/prover_fri/src/utils.rs b/prover/prover_fri/src/utils.rs
deleted file mode 100644
index 2353bef04a70..000000000000
--- a/prover/prover_fri/src/utils.rs
+++ /dev/null
@@ -1,142 +0,0 @@
-use std::sync::Arc;
-use std::time::Instant;
-
-use queues::{Buffer};
-use tokio::sync::Mutex;
-use zkevm_test_harness::prover_utils::{verify_base_layer_proof, verify_recursion_layer_proof};
-use zksync_prover_fri_types::circuit_definitions::boojum::algebraic_props::round_function::AbsorptionModeOverwrite;
-use zksync_prover_fri_types::circuit_definitions::boojum::algebraic_props::sponge::GoldilocksPoseidon2Sponge;
-use zksync_prover_fri_types::circuit_definitions::boojum::cs::implementations::pow::NoPow;
-use zksync_prover_fri_types::circuit_definitions::boojum::cs::implementations::proof::Proof;
-use zksync_prover_fri_types::circuit_definitions::boojum::cs::implementations::verifier::VerificationKey;
-use zksync_prover_fri_types::circuit_definitions::boojum::field::goldilocks::{
-    GoldilocksExt2, GoldilocksField,
-};
-use zksync_prover_fri_types::circuit_definitions::circuit_definitions::recursion_layer::ZkSyncRecursionLayerProof;
-
-use zksync_config::configs::fri_prover_group::CircuitIdRoundTuple;
-use zksync_dal::StorageProcessor;
-use zksync_object_store::ObjectStore;
-use zksync_prover_fri_types::{
-    CircuitWrapper, FriProofWrapper, ProverServiceDataKey, WitnessVectorArtifacts,
-};
-use zksync_prover_fri_utils::get_base_layer_circuit_id_for_recursive_layer;
-
-use zksync_types::L1BatchNumber;
-
-pub type F = GoldilocksField;
-pub type H = GoldilocksPoseidon2Sponge<AbsorptionModeOverwrite>;
-pub type EXT = GoldilocksExt2;
-
-pub type SharedWitnessVectorQueue = Arc<Mutex<Buffer<WitnessVectorArtifacts>>>;
-
-pub struct ProverArtifacts {
-    block_number: L1BatchNumber,
-    pub proof_wrapper: FriProofWrapper,
-}
-
-impl ProverArtifacts {
-    pub fn new(block_number: L1BatchNumber, proof_wrapper: FriProofWrapper) -> Self {
-        Self {
-            block_number,
-            proof_wrapper,
-        }
-    }
-}
-
-pub async fn save_proof(
-    job_id: u32,
-    started_at: Instant,
-    artifacts: ProverArtifacts,
-    blob_store: &dyn ObjectStore,
-    public_blob_store: &dyn ObjectStore,
-    storage_processor: &mut StorageProcessor<'_>,
-) {
-    vlog::info!(
-        "Successfully proven job: {}, took: {:?}",
-        job_id,
-        started_at.elapsed()
-    );
-    let proof = artifacts.proof_wrapper;
-
-    // We save the scheduler proofs in public bucket,
-    // so that it can be verified independently while we're doing shadow proving
-    let circuit_type = match &proof {
-        FriProofWrapper::Base(base) => base.numeric_circuit_type(),
-        FriProofWrapper::Recursive(recursive_circuit) => match recursive_circuit {
-            ZkSyncRecursionLayerProof::SchedulerCircuit(_) => {
-                public_blob_store
-                    .put(artifacts.block_number.0, &proof)
-                    .await
-                    .unwrap();
-                recursive_circuit.numeric_circuit_type()
-            }
-            _ => recursive_circuit.numeric_circuit_type(),
-        },
-    };
-
-    let blob_save_started_at = Instant::now();
-    let blob_url = blob_store.put(job_id, &proof).await.unwrap();
-    metrics::histogram!(
-            "prover_fri.prover.blob_save_time",
-            blob_save_started_at.elapsed(),
-            "circuit_type" => circuit_type.to_string(),
-    );
-
-    let mut transaction = storage_processor.start_transaction().await;
-    let job_metadata = transaction
-        .fri_prover_jobs_dal()
-        .save_proof(job_id, started_at.elapsed(), &blob_url)
-        .await;
-    if job_metadata.is_node_final_proof {
-        transaction
-            .fri_scheduler_dependency_tracker_dal()
-            .set_final_prover_job_id_for_l1_batch(
-                get_base_layer_circuit_id_for_recursive_layer(job_metadata.circuit_id),
-                job_id,
-                job_metadata.block_number,
-            )
-            .await;
-    }
-    transaction.commit().await;
-}
-
-pub fn verify_proof(
-    circuit_wrapper: &CircuitWrapper,
-    proof: &Proof<F, H, EXT>,
-    vk: &VerificationKey<F, H>,
-    job_id: u32,
-) {
-    let started_at = Instant::now();
-    let (is_valid, circuit_id) = match circuit_wrapper {
-        CircuitWrapper::Base(base_circuit) => (
-            verify_base_layer_proof::<NoPow>(&base_circuit, proof, vk),
-            base_circuit.numeric_circuit_type(),
-        ),
-        CircuitWrapper::Recursive(recursive_circuit) => (
-            verify_recursion_layer_proof::<NoPow>(&recursive_circuit, proof, vk),
-            recursive_circuit.numeric_circuit_type(),
-        ),
-    };
-    metrics::histogram!(
-        "prover_fri.prover.proof_verification_time",
-        started_at.elapsed(),
-        "circuit_type" => circuit_id.to_string(),
-    );
-    if !is_valid {
-        vlog::error!(
-            "Failed to verify base layer proof for job-id: {} circuit_type {}",
-            job_id,
-            circuit_id
-        );
-    }
-}
-
-pub fn setup_metadata_to_setup_data_key(
-    setup_metadata: &CircuitIdRoundTuple,
-) -> ProverServiceDataKey {
-    ProverServiceDataKey {
-        circuit_id: setup_metadata.circuit_id,
-        round: setup_metadata.aggregation_round.into(),
-    }
-}
diff --git a/prover/prover_fri/tests/basic_test.rs b/prover/prover_fri/tests/basic_test.rs
deleted file mode 100644
index 085b741fb3c4..000000000000
--- a/prover/prover_fri/tests/basic_test.rs
+++ /dev/null
@@ -1,70 +0,0 @@
-use std::sync::Arc;
-
-use zksync_config::configs::FriProverConfig;
-use zksync_config::ObjectStoreConfig;
-use zksync_object_store::{bincode, FriCircuitKey, ObjectStoreFactory};
-use zksync_types::proofs::AggregationRound;
-use zksync_types::L1BatchNumber;
-
-use serde::Serialize;
-use zksync_prover_fri::prover_job_processor::Prover;
-use zksync_prover_fri_types::{CircuitWrapper, ProverJob, ProverServiceDataKey};
-use zksync_vk_setup_data_server_fri::generate_cpu_base_layer_setup_data;
-
-fn compare_serialized<T: Serialize>(expected: &T, actual: &T) {
-    let serialized_expected = bincode::serialize(expected).unwrap();
-    let serialized_actual = bincode::serialize(actual).unwrap();
-    assert_eq!(serialized_expected, serialized_actual);
-}
-
-async fn prover_and_assert_base_layer(
-    expected_proof_id: u32,
-    circuit_id: u8,
-    block_number: L1BatchNumber,
-    sequence_number: usize,
-) {
-    let mut object_store_config = ObjectStoreConfig::from_env();
-    object_store_config.file_backed_base_path = "./tests/data/".to_owned();
-    let object_store = ObjectStoreFactory::new(object_store_config)
-        .create_store()
-        .await;
-    let expected_proof = object_store
-        .get(expected_proof_id)
-        .await
-        .expect("missing expected proof");
-
-    let aggregation_round = AggregationRound::BasicCircuits;
-    let blob_key = FriCircuitKey {
-        block_number,
-        circuit_id,
-        sequence_number,
-        depth: 0,
-        aggregation_round,
-    };
-    let circuit_wrapper = object_store.get(blob_key).await.expect("circuit missing");
-    let circuit = match &circuit_wrapper {
-        CircuitWrapper::Base(base) => base.clone(),
-        CircuitWrapper::Recursive(_) => {
-            panic!("Expected base layer circuit")
-        }
-    };
-    let setup_data = Arc::new(generate_cpu_base_layer_setup_data(circuit));
-    let setup_key = ProverServiceDataKey::new(circuit_id, aggregation_round);
-    let prover_job = ProverJob::new(block_number, expected_proof_id, circuit_wrapper, setup_key);
-    let artifacts = Prover::prove(
-        prover_job,
-        Arc::new(FriProverConfig::from_env()),
-        setup_data,
-    );
-    compare_serialized(&expected_proof, &artifacts.proof_wrapper);
-}
-
-// #[tokio::test]
-// async fn test_base_layer_main_vm_proof_gen() {
-//     prover_and_assert_base_layer(5176866, 1, L1BatchNumber(128623), 1086).await;
-// }
-
-#[tokio::test]
-async fn test_base_layer_sha256_proof_gen() {
-    prover_and_assert_base_layer(1293714, 6, L1BatchNumber(114499), 479).await;
-}
diff --git a/prover/prover_fri/tests/data/proofs_fri/proof_1293714.bin b/prover/prover_fri/tests/data/proofs_fri/proof_1293714.bin
deleted file mode 100644
index 1c74544b6953..000000000000
Binary files a/prover/prover_fri/tests/data/proofs_fri/proof_1293714.bin and /dev/null differ
diff --git a/prover/prover_fri/tests/data/proofs_fri/proof_5176866.bin b/prover/prover_fri/tests/data/proofs_fri/proof_5176866.bin
deleted file mode 100644
index 25c31b0ab2bb..000000000000
Binary files a/prover/prover_fri/tests/data/proofs_fri/proof_5176866.bin and /dev/null differ
diff --git a/prover/prover_fri/tests/data/prover_jobs_fri/114499_479_6_BasicCircuits_0.bin b/prover/prover_fri/tests/data/prover_jobs_fri/114499_479_6_BasicCircuits_0.bin
deleted file mode 100644
index 08d3efb362d0..000000000000
Binary files a/prover/prover_fri/tests/data/prover_jobs_fri/114499_479_6_BasicCircuits_0.bin and /dev/null differ
diff --git a/prover/prover_fri/tests/data/prover_jobs_fri/128623_1086_1_BasicCircuits_0.bin b/prover/prover_fri/tests/data/prover_jobs_fri/128623_1086_1_BasicCircuits_0.bin
deleted file mode 100644
index 14d95427c8c5..000000000000
Binary files a/prover/prover_fri/tests/data/prover_jobs_fri/128623_1086_1_BasicCircuits_0.bin and /dev/null differ
diff --git a/prover/prover_fri_types/Cargo.toml b/prover/prover_fri_types/Cargo.toml
deleted file mode 100644
index f4734b00a152..000000000000
--- a/prover/prover_fri_types/Cargo.toml
+++ /dev/null
@@ -1,13 +0,0 @@
-[package]
-name = "zksync_prover_fri_types"
-version = "1.0.0"
-edition = "2021"
-
-
-[dependencies]
-zksync_object_store = { path = "../../core/lib/object_store", version = "1.0" }
-zksync_types = { path = "../../core/lib/types", version = "1.0" }
-
-circuit_definitions = { git = "https://github.com/matter-labs/era-zkevm_test_harness.git", branch = "v1.4.0", features = ["log_tracing"]}
-
-serde = { version = "1.0", features = ["derive"] }
diff --git a/prover/prover_fri_types/README.md b/prover/prover_fri_types/README.md
deleted file mode 100644
index 7485656110e7..000000000000
--- a/prover/prover_fri_types/README.md
+++ /dev/null
@@ -1,8 +0,0 @@
-# FRI Prover types
-
-Lib contains types used by FRI prover and shared among
-
-- FRI prover
-- witness generator
-- vk and setup data generator
-- witness vector generator
diff --git a/prover/prover_fri_types/src/lib.rs b/prover/prover_fri_types/src/lib.rs
deleted file mode 100644
index 5ca1735f5d19..000000000000
--- a/prover/prover_fri_types/src/lib.rs
+++ /dev/null
@@ -1,115 +0,0 @@
-pub use circuit_definitions;
-
-use circuit_definitions::aux_definitions::witness_oracle::VmWitnessOracle;
-use circuit_definitions::boojum::cs::implementations::witness::WitnessVec;
-use circuit_definitions::boojum::field::goldilocks::GoldilocksField;
-use circuit_definitions::circuit_definitions::base_layer::ZkSyncBaseLayerCircuit;
-use circuit_definitions::circuit_definitions::base_layer::ZkSyncBaseLayerProof;
-use circuit_definitions::circuit_definitions::recursion_layer::ZkSyncRecursionLayerProof;
-use circuit_definitions::circuit_definitions::recursion_layer::ZkSyncRecursiveLayerCircuit;
-use circuit_definitions::ZkSyncDefaultRoundFunction;
-
-use zksync_object_store::serialize_using_bincode;
-use zksync_object_store::Bucket;
-use zksync_object_store::FriCircuitKey;
-use zksync_object_store::StoredObject;
-use zksync_types::proofs::AggregationRound;
-use zksync_types::L1BatchNumber;
-
-#[derive(serde::Serialize, serde::Deserialize, Clone)]
-pub enum CircuitWrapper {
-    Base(
-        ZkSyncBaseLayerCircuit<
-            GoldilocksField,
-            VmWitnessOracle<GoldilocksField>,
-            ZkSyncDefaultRoundFunction,
-        >,
-    ),
-    Recursive(ZkSyncRecursiveLayerCircuit),
-}
-
-impl StoredObject for CircuitWrapper {
-    const BUCKET: Bucket = Bucket::ProverJobsFri;
-    type Key<'a> = FriCircuitKey;
-
-    fn encode_key(key: Self::Key<'_>) -> String {
-        let FriCircuitKey {
-            block_number,
-            sequence_number,
-            circuit_id,
-            aggregation_round,
-            depth,
-        } = key;
-        format!("{block_number}_{sequence_number}_{circuit_id}_{aggregation_round:?}_{depth}.bin")
-    }
-
-    serialize_using_bincode!();
-}
-
-#[derive(serde::Serialize, serde::Deserialize)]
-pub enum FriProofWrapper {
-    Base(ZkSyncBaseLayerProof),
-    Recursive(ZkSyncRecursionLayerProof),
-}
-
-impl StoredObject for FriProofWrapper {
-    const BUCKET: Bucket = Bucket::ProofsFri;
-    type Key<'a> = u32;
-
-    fn encode_key(key: Self::Key<'_>) -> String {
-        format!("proof_{key}.bin")
-    }
-
-    serialize_using_bincode!();
-}
-
-#[derive(Clone, serde::Serialize, serde::Deserialize)]
-pub struct WitnessVectorArtifacts {
-    pub witness_vector: WitnessVec<GoldilocksField>,
-    pub prover_job: ProverJob,
-}
-
-impl WitnessVectorArtifacts {
-    pub fn new(witness_vector: WitnessVec<GoldilocksField>, prover_job: ProverJob) -> Self {
-        Self {
-            witness_vector,
-            prover_job,
-        }
-    }
-}
-
-#[derive(Clone, serde::Serialize, serde::Deserialize)]
-pub struct ProverJob {
-    pub block_number: L1BatchNumber,
-    pub job_id: u32,
-    pub circuit_wrapper: CircuitWrapper,
-    pub setup_data_key: ProverServiceDataKey,
-}
-
-impl ProverJob {
-    pub fn new(
-        block_number: L1BatchNumber,
-        job_id: u32,
-        circuit_wrapper: CircuitWrapper,
-        setup_data_key: ProverServiceDataKey,
-    ) -> Self {
-        Self {
-            block_number,
-            job_id,
-            circuit_wrapper,
-            setup_data_key,
-        }
-    }
-}
-
-#[derive(Debug, Clone, Eq, PartialEq, Hash, serde::Serialize, serde::Deserialize)]
-pub struct ProverServiceDataKey {
-    pub circuit_id: u8,
-    pub round: AggregationRound,
-}
-
-impl ProverServiceDataKey {
-    pub fn new(circuit_id: u8, round: AggregationRound) -> Self {
-        Self { circuit_id, round }
-    }
-}
diff --git a/prover/prover_fri_utils/Cargo.toml b/prover/prover_fri_utils/Cargo.toml
deleted file mode 100644
index b44612f3a554..000000000000
--- a/prover/prover_fri_utils/Cargo.toml
+++ /dev/null
@@ -1,17 +0,0 @@
-[package]
-name = "zksync_prover_fri_utils"
-version = "1.0.0"
-edition = "2021"
-
-# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
-
-[dependencies]
-zksync_object_store = { path = "../../core/lib/object_store", version = "1.0" }
-zksync_config = { path = "../../core/lib/config", version = "1.0" }
-zksync_types = { path = "../../core/lib/types", version = "1.0" }
-zksync_prover_fri_types = { path = "../prover_fri_types", version = "1.0" }
-zksync_dal = { path = "../../core/lib/dal", version = "1.0" }
-vlog = { path = "../../core/lib/vlog", version = "1.0" }
-
-serde = { version = "1.0", features = ["derive"] }
-metrics = "0.20.0"
diff --git a/prover/prover_fri_utils/src/lib.rs b/prover/prover_fri_utils/src/lib.rs
deleted file mode 100644
index 8f962a28445c..000000000000
--- a/prover/prover_fri_utils/src/lib.rs
+++ /dev/null
@@ -1,79 +0,0 @@
-pub mod socket_utils;
-
-use std::time::Instant;
-
-use zksync_config::configs::fri_prover_group::CircuitIdRoundTuple;
-use zksync_dal::fri_prover_dal::FriProverDal;
-use zksync_prover_fri_types::circuit_definitions::circuit_definitions::recursion_layer::base_circuit_type_into_recursive_leaf_circuit_type;
-use zksync_prover_fri_types::circuit_definitions::circuit_definitions::recursion_layer::ZkSyncRecursionLayerStorageType;
-use zksync_prover_fri_types::circuit_definitions::zkevm_circuits::scheduler::aux::BaseLayerCircuitType;
-
-use zksync_object_store::{FriCircuitKey, ObjectStore};
-use zksync_prover_fri_types::{CircuitWrapper, ProverJob, ProverServiceDataKey};
-
-pub async fn fetch_next_circuit(
-    fri_prover_dal: &mut FriProverDal<'_, '_>,
-    blob_store: &dyn ObjectStore,
-    circuit_ids_for_round_to_be_proven: &Vec<CircuitIdRoundTuple>,
-) -> Option<ProverJob> {
-    let prover_job = match &circuit_ids_for_round_to_be_proven.is_empty() {
-        false => {
-            // Specialized prover: proving subset of configured circuits.
-            fri_prover_dal
-                .get_next_job_for_circuit_id_round(&circuit_ids_for_round_to_be_proven)
-                .await
-        }
-        true => {
-            // Generalized prover: proving all circuits.
-            fri_prover_dal.get_next_job().await
-        }
-    }?;
-    vlog::info!("Started processing prover job: {:?}", prover_job);
-
-    let circuit_key = FriCircuitKey {
-        block_number: prover_job.block_number,
-        sequence_number: prover_job.sequence_number,
-        circuit_id: prover_job.circuit_id,
-        aggregation_round: prover_job.aggregation_round,
-        depth: prover_job.depth,
-    };
-    let started_at = Instant::now();
-    let input = blob_store
-        .get(circuit_key)
-        .await
-        .unwrap_or_else(|err| panic!("{err:?}"));
-    metrics::histogram!(
-                "prover_fri.prover.blob_fetch_time",
-                started_at.elapsed(),
-                "circuit_type" => prover_job.circuit_id.to_string(),
-                "aggregation_round" => format!("{:?}", prover_job.aggregation_round),
-    );
-    let setup_data_key = ProverServiceDataKey {
-        circuit_id: prover_job.circuit_id,
-        round: prover_job.aggregation_round,
-    };
-    Some(ProverJob::new(
-        prover_job.block_number,
-        prover_job.id,
-        input,
-        setup_data_key,
-    ))
-}
-
-pub fn get_recursive_layer_circuit_id_for_base_layer(base_layer_circuit_id: u8) -> u8 {
-    let recursive_circuit_type = base_circuit_type_into_recursive_leaf_circuit_type(
-        BaseLayerCircuitType::from_numeric_value(base_layer_circuit_id),
-    );
-    recursive_circuit_type as u8
-}
-
-pub fn get_base_layer_circuit_id_for_recursive_layer(recursive_layer_circuit_id: u8) -> u8 {
-    recursive_layer_circuit_id - ZkSyncRecursionLayerStorageType::NodeLayerCircuit as u8
-}
-
-pub fn get_numeric_circuit_id(circuit_wrapper: &CircuitWrapper) -> u8 {
-    match circuit_wrapper {
-        CircuitWrapper::Base(circuit) => circuit.numeric_circuit_type(),
-        CircuitWrapper::Recursive(circuit) => circuit.numeric_circuit_type(),
-    }
-}
diff --git a/prover/prover_fri_utils/src/socket_utils.rs b/prover/prover_fri_utils/src/socket_utils.rs
deleted file mode 100644
index 4637da310812..000000000000
--- a/prover/prover_fri_utils/src/socket_utils.rs
+++ /dev/null
@@ -1,64 +0,0 @@
-use std::io::copy;
-use std::io::ErrorKind;
-use std::io::Read;
-use std::net::SocketAddr;
-use std::net::TcpStream;
-use std::time::{Duration, Instant};
-use zksync_types::proofs::SocketAddress;
-
-pub fn send_assembly(
-    job_id: u32,
-    serialized: &mut Vec<u8>,
-    address: &SocketAddress,
-) -> Result<(Duration, u64), String> {
-    vlog::trace!(
-        "Sending assembly to {}:{}, job id {{{job_id}}}",
-        address.host,
-        address.port
-    );
-
-    let socket_address = SocketAddr::new(address.host, address.port);
-    let started_at = Instant::now();
-    let mut error_messages = vec![];
-
-    for _ in 0..10 {
-        match TcpStream::connect(socket_address) {
-            Ok(mut stream) => {
-                return send(&mut serialized.as_slice(), &mut stream)
-                    .map(|result| (started_at.elapsed(), result))
-                    .map_err(|err| format!("Could not send assembly to prover: {err:?}"));
-            }
-            Err(err) => {
-                error_messages.push(format!("{err:?}"));
-            }
-        }
-    }
-
-    Err(format!(
-        "Could not establish connection with prover after several attempts: {error_messages:?}"
-    ))
-}
-
-fn send(read: &mut impl Read, tcp: &mut TcpStream) -> std::io::Result<u64> {
-    let mut attempts = 10;
-    let mut last_result = Ok(0);
-
-    while attempts > 0 {
-        match copy(read, tcp) {
-            Ok(copied) => return Ok(copied),
-            Err(err) if can_be_retried(err.kind()) => {
-                attempts -= 1;
-                last_result = Err(err);
-            }
-            Err(err) => return Err(err),
-        }
-
-        std::thread::sleep(Duration::from_millis(50));
-    }
-
-    last_result
-}
-
-fn can_be_retried(err: ErrorKind) -> bool {
-    matches!(err, ErrorKind::TimedOut | ErrorKind::ConnectionRefused)
-}
diff --git a/prover/rust-toolchain b/prover/rust-toolchain
deleted file mode 100644
index b20e56df4487..000000000000
--- a/prover/rust-toolchain
+++ /dev/null
@@ -1 +0,0 @@
-nightly-2023-05-31
diff --git a/prover/setup_key_generator_and_server/Cargo.toml b/prover/setup_key_generator_and_server/Cargo.toml
deleted file mode 100644
index a918aaa0b0b8..000000000000
--- a/prover/setup_key_generator_and_server/Cargo.toml
+++ /dev/null
@@ -1,32 +0,0 @@
-[package]
-name = "setup_key_generator_and_server"
-version = "1.0.0"
-edition = "2018"
-authors = ["The Matter Labs Team <hello@matterlabs.dev>"]
-homepage = "https://zksync.io/"
-repository = "https://github.com/matter-labs/zksync-era"
-license = "MIT OR Apache-2.0"
-keywords = ["blockchain", "zksync"]
-categories = ["cryptography"]
-
-[lib]
-name = "zksync_setup_key_server"
-path = "src/lib.rs"
-
-[[bin]]
-name = "zksync_setup_key_generator"
-path = "src/main.rs"
-
-[dependencies]
-zksync_types = {path = "../../core/lib/types", version = "1.0" }
-vlog = { path = "../../core/lib/vlog", version = "1.0" }
-zksync_config = { path = "../../core/lib/config", version = "1.0" }
-
-circuit_testing = {git = "https://github.com/matter-labs/era-circuit_testing.git", branch = "main"}
-api = { git = "https://github.com/matter-labs/era-heavy-ops-service.git", tag = "v1.3.3-rc1", features=["gpu"], default-features=false}
-prover-service = { git = "https://github.com/matter-labs/era-heavy-ops-service.git", tag = "v1.3.3-rc1", features=["gpu"], default-features=false}
-zkevm_test_harness = { git = "https://github.com/matter-labs/era-zkevm_test_harness.git", tag = "v1.3.3-rc1"}
-
-
-structopt = "0.3.26"
-itertools = "0.10.5"
diff --git a/prover/setup_key_generator_and_server/src/lib.rs b/prover/setup_key_generator_and_server/src/lib.rs
deleted file mode 100644
index b96af2784714..000000000000
--- a/prover/setup_key_generator_and_server/src/lib.rs
+++ /dev/null
@@ -1,56 +0,0 @@
-use std::fs::File;
-use std::io::Read;
-use std::path::Path;
-
-use zkevm_test_harness::abstract_zksync_circuit::concrete_circuits::ZkSyncCircuit;
-use zkevm_test_harness::bellman::bn256::Bn256;
-use zkevm_test_harness::witness::oracle::VmWitnessOracle;
-use zkevm_test_harness::witness::recursive_aggregation::padding_aggregations;
-use zkevm_test_harness::witness::vk_set_generator::circuits_for_vk_generation;
-use zksync_types::circuit::GEOMETRY_CONFIG;
-
-use zksync_config::ProverConfigs;
-use zksync_types::circuit::{LEAF_SPLITTING_FACTOR, NODE_SPLITTING_FACTOR, SCHEDULER_UPPER_BOUND};
-pub fn get_setup_for_circuit_type(circuit_type: u8) -> Box<dyn Read> {
-    let filepath = get_setup_key_file_path(circuit_type);
-    vlog::info!("Fetching setup key from path: {}", filepath);
-    let file = File::open(filepath.clone())
-        .unwrap_or_else(|_| panic!("Failed reading setup key from path: {}", filepath));
-    Box::new(file)
-}
-
-pub fn get_circuits_for_vk() -> Vec<ZkSyncCircuit<Bn256, VmWitnessOracle<Bn256>>> {
-    ensure_setup_key_exist();
-    let padding_aggregations = padding_aggregations(NODE_SPLITTING_FACTOR);
-    circuits_for_vk_generation(
-        GEOMETRY_CONFIG,
-        LEAF_SPLITTING_FACTOR,
-        NODE_SPLITTING_FACTOR,
-        SCHEDULER_UPPER_BOUND,
-        padding_aggregations,
-    )
-}
-
-fn ensure_setup_key_exist() {
-    if !Path::new("setup_2^26.key").exists() {
-        panic!("File setup_2^26.key is required to be present in current directory.");
-    }
-}
-
-pub fn get_setup_key_write_file_path(circuit_type: u8) -> String {
-    let zksync_home = std::env::var("ZKSYNC_HOME").unwrap_or_else(|_| "/".into());
-    format!("{}/{}", zksync_home, get_setup_key_filename(circuit_type))
-}
-
-fn get_setup_key_file_path(circuit_type: u8) -> String {
-    let prover_config = ProverConfigs::from_env().non_gpu;
-    format!(
-        "{}/{}",
-        prover_config.setup_keys_path,
-        get_setup_key_filename(circuit_type)
-    )
-}
-
-fn get_setup_key_filename(circuit_type: u8) -> String {
-    format!("setup_{}_key.bin", circuit_type)
-}
diff --git a/prover/setup_key_generator_and_server/src/main.rs b/prover/setup_key_generator_and_server/src/main.rs
deleted file mode 100644
index bf9197d18691..000000000000
--- a/prover/setup_key_generator_and_server/src/main.rs
+++ /dev/null
@@ -1,54 +0,0 @@
-use api::Prover;
-use prover_service::utils::generate_setup_for_circuit;
-use prover_service::Setup;
-use std::env;
-use std::fs::File;
-use structopt::StructOpt;
-use zkevm_test_harness::abstract_zksync_circuit::concrete_circuits::ZkSyncCircuit;
-use zkevm_test_harness::bellman::bn256::Bn256;
-use zkevm_test_harness::witness::oracle::VmWitnessOracle;
-use zksync_setup_key_server::{get_circuits_for_vk, get_setup_key_write_file_path};
-
-#[derive(Debug, StructOpt)]
-#[structopt(
-    name = "Generate setup keys for individual circuit",
-    about = "Tool for generating setup key for individual circuit"
-)]
-struct Opt {
-    /// Numeric circuit type valid value from [0-17].
-    #[structopt(long)]
-    numeric_circuit: u8,
-}
-
-fn main() {
-    let opt = Opt::from_args();
-    env::set_var("CRS_FILE", "setup_2^26.key");
-    vlog::info!("Starting setup key generation!");
-    get_circuits_for_vk()
-        .into_iter()
-        .filter(|c| c.numeric_circuit_type() == opt.numeric_circuit)
-        .for_each(generate_setup_key_for_circuit);
-}
-
-fn generate_setup_key_for_circuit(circuit: ZkSyncCircuit<Bn256, VmWitnessOracle<Bn256>>) {
-    let mut prover = Prover::new();
-    let setup = generate_setup_for_circuit(&mut prover, &circuit);
-    save_setup_for_circuit_type(circuit.numeric_circuit_type(), setup);
-    vlog::info!(
-        "Finished setup key generation for circuit {:?} (id {:?})",
-        circuit.short_description(),
-        circuit.numeric_circuit_type()
-    );
-}
-
-fn save_setup_for_circuit_type(circuit_type: u8, setup: Setup) {
-    let filepath = get_setup_key_write_file_path(circuit_type);
-    vlog::info!("saving setup key to: {}", filepath);
-    let setup_file = File::create(&filepath).unwrap();
-    setup
-        .write(setup_file)
-        .expect("Failed saving setup key to file.");
-    let setup_file = File::open(filepath).expect("Unable to open file");
-    let size = setup_file.metadata().unwrap().len() as f64 / (1024.0 * 1024.0);
-    println!("Saved file size: {:?}MB", size);
-}
diff --git a/prover/vk_setup_data_generator_server_fri/Cargo.toml b/prover/vk_setup_data_generator_server_fri/Cargo.toml
deleted file mode 100644
index 7eb59dff834a..000000000000
--- a/prover/vk_setup_data_generator_server_fri/Cargo.toml
+++ /dev/null
@@ -1,46 +0,0 @@
-[package]
-name = "vk_setup_data_generator_server_fri"
-version = "1.0.0"
-edition = "2021"
-
-
-[[bin]]
-name = "zksync_vk_generator_fri"
-path = "src/main.rs"
-
-[[bin]]
-name = "zksync_setup_data_generator_fri"
-path = "src/setup_data_generator.rs"
-
-[lib]
-name = "zksync_vk_setup_data_server_fri"
-path = "src/lib.rs"
-
-[[bin]]
-name = "zksync_commitment_generator_fri"
-path = "src/commitment_generator.rs"
-
-[dependencies]
-vlog = { path = "../../core/lib/vlog", version = "1.0" }
-zksync_types = {path = "../../core/lib/types", version = "1.0" }
-zksync_prover_utils = {path = "../../core/lib/prover_utils", version = "1.0" }
-zksync_prover_fri_types = { path = "../prover_fri_types", version = "1.0" }
-
-zkevm_test_harness = { git = "https://github.com/matter-labs/era-zkevm_test_harness.git", branch = "v1.4.0"}
-circuit_definitions = { git = "https://github.com/matter-labs/era-zkevm_test_harness.git", branch = "v1.4.0", features = ["log_tracing"]}
-shivini = {git = "https://github.com/matter-labs/shivini.git", branch ="main", optional = true }
-zksync_config = { path = "../../core/lib/config", version = "1.0" }
-
-serde_json = "1.0"
-serde = { version = "1.0", features = ["derive"] }
-serde_derive = "1.0"
-itertools = "0.10.5"
-bincode = "1"
-structopt = "0.3.26"
-
-[dev-dependencies]
-proptest = "1.2.0"
-
-[features]
-default = []
-gpu = ["shivini"]
diff --git a/prover/vk_setup_data_generator_server_fri/README.md b/prover/vk_setup_data_generator_server_fri/README.md
deleted file mode 100644
index 2e30263d954b..000000000000
--- a/prover/vk_setup_data_generator_server_fri/README.md
+++ /dev/null
@@ -1,17 +0,0 @@
-# Setup data and VK generator and server
-
-## generating setup-data for specific circuit type
-
-`zk f cargo +nightly-2023-05-31 run --release --bin zksync_setup_data_generator_fri -- --numeric-circuit 1 --is_base_layer`
-
-## generating GPU setup-data for specific circuit type
-
-`zk f cargo +nightly-2023-05-31 run --features "gpu" --release --bin zksync_setup_data_generator_fri -- --numeric-circuit 1 --is_base_layer`
-
-## Generating VK's
-
-`cargo +nightly-2023-05-31 run --release --bin zksync_vk_generator_fri`
-
-## generating VK commitment for existing VK's
-
-`cargo +nightly-2023-05-31 run --release --bin zksync_commitment_generator_fri`
diff --git a/prover/vk_setup_data_generator_server_fri/data/finalization_hints_basic_1.bin b/prover/vk_setup_data_generator_server_fri/data/finalization_hints_basic_1.bin
deleted file mode 100644
index 473d8afbb503..000000000000
Binary files a/prover/vk_setup_data_generator_server_fri/data/finalization_hints_basic_1.bin and /dev/null differ
diff --git a/prover/vk_setup_data_generator_server_fri/data/finalization_hints_basic_10.bin b/prover/vk_setup_data_generator_server_fri/data/finalization_hints_basic_10.bin
deleted file mode 100644
index b0212ea3a9a6..000000000000
Binary files a/prover/vk_setup_data_generator_server_fri/data/finalization_hints_basic_10.bin and /dev/null differ
diff --git a/prover/vk_setup_data_generator_server_fri/data/finalization_hints_basic_11.bin b/prover/vk_setup_data_generator_server_fri/data/finalization_hints_basic_11.bin
deleted file mode 100644
index de5e238dd912..000000000000
Binary files a/prover/vk_setup_data_generator_server_fri/data/finalization_hints_basic_11.bin and /dev/null differ
diff --git a/prover/vk_setup_data_generator_server_fri/data/finalization_hints_basic_12.bin b/prover/vk_setup_data_generator_server_fri/data/finalization_hints_basic_12.bin
deleted file mode 100644
index de5e238dd912..000000000000
Binary files a/prover/vk_setup_data_generator_server_fri/data/finalization_hints_basic_12.bin and /dev/null differ
diff --git a/prover/vk_setup_data_generator_server_fri/data/finalization_hints_basic_13.bin b/prover/vk_setup_data_generator_server_fri/data/finalization_hints_basic_13.bin
deleted file mode 100644
index 4e84fea3f9ab..000000000000
Binary files a/prover/vk_setup_data_generator_server_fri/data/finalization_hints_basic_13.bin and /dev/null differ
diff --git a/prover/vk_setup_data_generator_server_fri/data/finalization_hints_basic_2.bin b/prover/vk_setup_data_generator_server_fri/data/finalization_hints_basic_2.bin
deleted file mode 100644
index 844f50aa0c62..000000000000
Binary files a/prover/vk_setup_data_generator_server_fri/data/finalization_hints_basic_2.bin and /dev/null differ
diff --git a/prover/vk_setup_data_generator_server_fri/data/finalization_hints_basic_3.bin b/prover/vk_setup_data_generator_server_fri/data/finalization_hints_basic_3.bin
deleted file mode 100644
index f0b996996a44..000000000000
Binary files a/prover/vk_setup_data_generator_server_fri/data/finalization_hints_basic_3.bin and /dev/null differ
diff --git a/prover/vk_setup_data_generator_server_fri/data/finalization_hints_basic_4.bin b/prover/vk_setup_data_generator_server_fri/data/finalization_hints_basic_4.bin
deleted file mode 100644
index 867b4ce0c270..000000000000
Binary files a/prover/vk_setup_data_generator_server_fri/data/finalization_hints_basic_4.bin and /dev/null differ
diff --git a/prover/vk_setup_data_generator_server_fri/data/finalization_hints_basic_5.bin b/prover/vk_setup_data_generator_server_fri/data/finalization_hints_basic_5.bin
deleted file mode 100644
index efed390e9107..000000000000
Binary files a/prover/vk_setup_data_generator_server_fri/data/finalization_hints_basic_5.bin and /dev/null differ
diff --git a/prover/vk_setup_data_generator_server_fri/data/finalization_hints_basic_6.bin b/prover/vk_setup_data_generator_server_fri/data/finalization_hints_basic_6.bin
deleted file mode 100644
index b8dbb8c2bda0..000000000000
Binary files a/prover/vk_setup_data_generator_server_fri/data/finalization_hints_basic_6.bin and /dev/null differ
diff --git a/prover/vk_setup_data_generator_server_fri/data/finalization_hints_basic_7.bin b/prover/vk_setup_data_generator_server_fri/data/finalization_hints_basic_7.bin
deleted file mode 100644
index 35d82d21ed62..000000000000
Binary files a/prover/vk_setup_data_generator_server_fri/data/finalization_hints_basic_7.bin and /dev/null differ
diff --git a/prover/vk_setup_data_generator_server_fri/data/finalization_hints_basic_8.bin b/prover/vk_setup_data_generator_server_fri/data/finalization_hints_basic_8.bin
deleted file mode 100644
index 64ca51d1b70d..000000000000
Binary files a/prover/vk_setup_data_generator_server_fri/data/finalization_hints_basic_8.bin and /dev/null differ
diff --git a/prover/vk_setup_data_generator_server_fri/data/finalization_hints_basic_9.bin b/prover/vk_setup_data_generator_server_fri/data/finalization_hints_basic_9.bin
deleted file mode 100644
index 047cadfec080..000000000000
Binary files a/prover/vk_setup_data_generator_server_fri/data/finalization_hints_basic_9.bin and /dev/null differ
diff --git a/prover/vk_setup_data_generator_server_fri/data/finalization_hints_leaf_10.bin b/prover/vk_setup_data_generator_server_fri/data/finalization_hints_leaf_10.bin
deleted file mode 100644
index 40624612c238..000000000000
Binary files a/prover/vk_setup_data_generator_server_fri/data/finalization_hints_leaf_10.bin and /dev/null differ
diff --git a/prover/vk_setup_data_generator_server_fri/data/finalization_hints_leaf_11.bin b/prover/vk_setup_data_generator_server_fri/data/finalization_hints_leaf_11.bin
deleted file mode 100644
index 048e794e82d1..000000000000
Binary files a/prover/vk_setup_data_generator_server_fri/data/finalization_hints_leaf_11.bin and /dev/null differ
diff --git a/prover/vk_setup_data_generator_server_fri/data/finalization_hints_leaf_12.bin b/prover/vk_setup_data_generator_server_fri/data/finalization_hints_leaf_12.bin
deleted file mode 100644
index 0cbd6e670c15..000000000000
Binary files a/prover/vk_setup_data_generator_server_fri/data/finalization_hints_leaf_12.bin and /dev/null differ
diff --git a/prover/vk_setup_data_generator_server_fri/data/finalization_hints_leaf_13.bin b/prover/vk_setup_data_generator_server_fri/data/finalization_hints_leaf_13.bin
deleted file mode 100644
index c674dafa7243..000000000000
Binary files a/prover/vk_setup_data_generator_server_fri/data/finalization_hints_leaf_13.bin and /dev/null differ
diff --git a/prover/vk_setup_data_generator_server_fri/data/finalization_hints_leaf_14.bin b/prover/vk_setup_data_generator_server_fri/data/finalization_hints_leaf_14.bin
deleted file mode 100644
index c674dafa7243..000000000000
Binary files a/prover/vk_setup_data_generator_server_fri/data/finalization_hints_leaf_14.bin and /dev/null differ
diff --git a/prover/vk_setup_data_generator_server_fri/data/finalization_hints_leaf_15.bin b/prover/vk_setup_data_generator_server_fri/data/finalization_hints_leaf_15.bin
deleted file mode 100644
index 3e449cec7cf0..000000000000
Binary files a/prover/vk_setup_data_generator_server_fri/data/finalization_hints_leaf_15.bin and /dev/null differ
diff --git a/prover/vk_setup_data_generator_server_fri/data/finalization_hints_leaf_3.bin b/prover/vk_setup_data_generator_server_fri/data/finalization_hints_leaf_3.bin
deleted file mode 100644
index 85792902bf69..000000000000
Binary files a/prover/vk_setup_data_generator_server_fri/data/finalization_hints_leaf_3.bin and /dev/null differ
diff --git a/prover/vk_setup_data_generator_server_fri/data/finalization_hints_leaf_4.bin b/prover/vk_setup_data_generator_server_fri/data/finalization_hints_leaf_4.bin
deleted file mode 100644
index 391b5cfb33cc..000000000000
Binary files a/prover/vk_setup_data_generator_server_fri/data/finalization_hints_leaf_4.bin and /dev/null differ
diff --git a/prover/vk_setup_data_generator_server_fri/data/finalization_hints_leaf_5.bin b/prover/vk_setup_data_generator_server_fri/data/finalization_hints_leaf_5.bin
deleted file mode 100644
index c72dee2934ee..000000000000
Binary files a/prover/vk_setup_data_generator_server_fri/data/finalization_hints_leaf_5.bin and /dev/null differ
diff --git a/prover/vk_setup_data_generator_server_fri/data/finalization_hints_leaf_6.bin b/prover/vk_setup_data_generator_server_fri/data/finalization_hints_leaf_6.bin
deleted file mode 100644
index 1c7b70f8aac1..000000000000
Binary files a/prover/vk_setup_data_generator_server_fri/data/finalization_hints_leaf_6.bin and /dev/null differ
diff --git a/prover/vk_setup_data_generator_server_fri/data/finalization_hints_leaf_7.bin b/prover/vk_setup_data_generator_server_fri/data/finalization_hints_leaf_7.bin
deleted file mode 100644
index dca15e362ce3..000000000000
Binary files a/prover/vk_setup_data_generator_server_fri/data/finalization_hints_leaf_7.bin and /dev/null differ
diff --git a/prover/vk_setup_data_generator_server_fri/data/finalization_hints_leaf_8.bin b/prover/vk_setup_data_generator_server_fri/data/finalization_hints_leaf_8.bin
deleted file mode 100644
index a40c24dd80b0..000000000000
Binary files a/prover/vk_setup_data_generator_server_fri/data/finalization_hints_leaf_8.bin and /dev/null differ
diff --git a/prover/vk_setup_data_generator_server_fri/data/finalization_hints_leaf_9.bin b/prover/vk_setup_data_generator_server_fri/data/finalization_hints_leaf_9.bin
deleted file mode 100644
index 082fcccf6d4c..000000000000
Binary files a/prover/vk_setup_data_generator_server_fri/data/finalization_hints_leaf_9.bin and /dev/null differ
diff --git a/prover/vk_setup_data_generator_server_fri/data/finalization_hints_node.bin b/prover/vk_setup_data_generator_server_fri/data/finalization_hints_node.bin
deleted file mode 100644
index 81d6735e9789..000000000000
Binary files a/prover/vk_setup_data_generator_server_fri/data/finalization_hints_node.bin and /dev/null differ
diff --git a/prover/vk_setup_data_generator_server_fri/data/finalization_hints_scheduler.bin b/prover/vk_setup_data_generator_server_fri/data/finalization_hints_scheduler.bin
deleted file mode 100644
index a8f3489ae673..000000000000
Binary files a/prover/vk_setup_data_generator_server_fri/data/finalization_hints_scheduler.bin and /dev/null differ
diff --git a/prover/vk_setup_data_generator_server_fri/data/verification_basic_10_key.json b/prover/vk_setup_data_generator_server_fri/data/verification_basic_10_key.json
deleted file mode 100644
index 8b980dde0932..000000000000
--- a/prover/vk_setup_data_generator_server_fri/data/verification_basic_10_key.json
+++ /dev/null
@@ -1,257 +0,0 @@
-{
-  "StorageApplication": {
-    "fixed_parameters": {
-      "parameters": {
-        "num_columns_under_copy_permutation": 60,
-        "num_witness_columns": 0,
-        "num_constant_columns": 4,
-        "max_allowed_constraint_degree": 8
-      },
-      "lookup_parameters": {
-        "UseSpecializedColumnsWithTableIdAsConstant": {
-          "width": 3,
-          "num_repetitions": 26,
-          "share_table_id": true
-        }
-      },
-      "domain_size": 1048576,
-      "total_tables_len": 132352,
-      "public_inputs_locations": [
-        [
-          0,
-          1027358
-        ],
-        [
-          1,
-          1027358
-        ],
-        [
-          2,
-          1027358
-        ],
-        [
-          3,
-          1027358
-        ]
-      ],
-      "extra_constant_polys_for_selectors": 2,
-      "table_ids_column_idxes": [
-        6
-      ],
-      "quotient_degree": 8,
-      "selectors_placement": {
-        "Fork": {
-          "left": {
-            "Fork": {
-              "left": {
-                "Fork": {
-                  "left": {
-                    "Fork": {
-                      "left": {
-                        "GateOnly": {
-                          "gate_idx": 2,
-                          "num_constants": 2,
-                          "degree": 3,
-                          "needs_selector": true,
-                          "is_lookup": false
-                        }
-                      },
-                      "right": {
-                        "Fork": {
-                          "left": {
-                            "Fork": {
-                              "left": {
-                                "GateOnly": {
-                                  "gate_idx": 4,
-                                  "num_constants": 0,
-                                  "degree": 2,
-                                  "needs_selector": true,
-                                  "is_lookup": false
-                                }
-                              },
-                              "right": {
-                                "GateOnly": {
-                                  "gate_idx": 6,
-                                  "num_constants": 0,
-                                  "degree": 2,
-                                  "needs_selector": true,
-                                  "is_lookup": false
-                                }
-                              }
-                            }
-                          },
-                          "right": {
-                            "Fork": {
-                              "left": {
-                                "GateOnly": {
-                                  "gate_idx": 5,
-                                  "num_constants": 0,
-                                  "degree": 2,
-                                  "needs_selector": true,
-                                  "is_lookup": false
-                                }
-                              },
-                              "right": {
-                                "GateOnly": {
-                                  "gate_idx": 7,
-                                  "num_constants": 0,
-                                  "degree": 0,
-                                  "needs_selector": true,
-                                  "is_lookup": false
-                                }
-                              }
-                            }
-                          }
-                        }
-                      }
-                    }
-                  },
-                  "right": {
-                    "GateOnly": {
-                      "gate_idx": 1,
-                      "num_constants": 0,
-                      "degree": 2,
-                      "needs_selector": true,
-                      "is_lookup": false
-                    }
-                  }
-                }
-              },
-              "right": {
-                "GateOnly": {
-                  "gate_idx": 3,
-                  "num_constants": 1,
-                  "degree": 2,
-                  "needs_selector": true,
-                  "is_lookup": false
-                }
-              }
-            }
-          },
-          "right": {
-            "Fork": {
-              "left": {
-                "GateOnly": {
-                  "gate_idx": 8,
-                  "num_constants": 4,
-                  "degree": 2,
-                  "needs_selector": true,
-                  "is_lookup": false
-                }
-              },
-              "right": {
-                "GateOnly": {
-                  "gate_idx": 0,
-                  "num_constants": 4,
-                  "degree": 1,
-                  "needs_selector": true,
-                  "is_lookup": false
-                }
-              }
-            }
-          }
-        }
-      },
-      "fri_lde_factor": 2,
-      "cap_size": 16
-    },
-    "setup_merkle_tree_cap": [
-      [
-        14828808970297586390,
-        10812916566872682190,
-        4814232139347019203,
-        9176100102005882856
-      ],
-      [
-        3967670424646093724,
-        15187149346332822036,
-        12510674113975494748,
-        4510474866283045065
-      ],
-      [
-        3090046568261325916,
-        2517005306301042120,
-        15367389528664824672,
-        4112249640174889690
-      ],
-      [
-        18105273888459951541,
-        5232822348364097609,
-        16713617721022374900,
-        190722882016699057
-      ],
-      [
-        3680596367242563456,
-        8277283738818682164,
-        770687293026604966,
-        964680746586707996
-      ],
-      [
-        14252438150460413337,
-        10138568641496080571,
-        10299531489109681582,
-        1029545029340913858
-      ],
-      [
-        15064118887360123896,
-        5094380307043679103,
-        14910118547805564561,
-        10715877189078928458
-      ],
-      [
-        15803708295742972434,
-        11361281300374199895,
-        17281542834964672336,
-        4609037794875108477
-      ],
-      [
-        17069406781160283989,
-        1486103635977441667,
-        5599688364977636665,
-        2606216552412168601
-      ],
-      [
-        11440625988157319556,
-        14165489000241104461,
-        12815938030387403166,
-        18358353209834817866
-      ],
-      [
-        17484081080457701823,
-        8488503007959107424,
-        15436257938093142847,
-        4434713360392963026
-      ],
-      [
-        11228941610173378380,
-        15586341149405816978,
-        6641174723323244420,
-        6502235669428985157
-      ],
-      [
-        1780813236656786088,
-        13705357356856822817,
-        13823081051755218384,
-        2628439960173921306
-      ],
-      [
-        5781733601274220376,
-        4396700195519547383,
-        4802209023715066280,
-        7053779784999063193
-      ],
-      [
-        11266624277386388719,
-        8947017045799184361,
-        15630186476936326904,
-        4970655490195943663
-      ],
-      [
-        13604491581251560181,
-        754251763827647964,
-        85019175871498033,
-        16264768579713941582
-      ]
-    ]
-  }
-}
\ No newline at end of file
diff --git a/prover/vk_setup_data_generator_server_fri/data/verification_basic_11_key.json b/prover/vk_setup_data_generator_server_fri/data/verification_basic_11_key.json
deleted file mode 100644
index bd030f4a3942..000000000000
--- a/prover/vk_setup_data_generator_server_fri/data/verification_basic_11_key.json
+++ /dev/null
@@ -1,257 +0,0 @@
-{
-  "EventsSorter": {
-    "fixed_parameters": {
-      "parameters": {
-        "num_columns_under_copy_permutation": 130,
-        "num_witness_columns": 0,
-        "num_constant_columns": 4,
-        "max_allowed_constraint_degree": 18
-      },
-      "lookup_parameters": {
-        "UseSpecializedColumnsWithTableIdAsConstant": {
-          "width": 1,
-          "num_repetitions": 8,
-          "share_table_id": true
-        }
-      },
-      "domain_size": 1048576,
-      "total_tables_len": 256,
-      "public_inputs_locations": [
-        [
-          0,
-          531517
-        ],
-        [
-          1,
-          531517
-        ],
-        [
-          2,
-          531517
-        ],
-        [
-          3,
-          531517
-        ]
-      ],
-      "extra_constant_polys_for_selectors": 3,
-      "table_ids_column_idxes": [
-        7
-      ],
-      "quotient_degree": 8,
-      "selectors_placement": {
-        "Fork": {
-          "left": {
-            "GateOnly": {
-              "gate_idx": 1,
-              "num_constants": 0,
-              "degree": 7,
-              "needs_selector": true,
-              "is_lookup": false
-            }
-          },
-          "right": {
-            "Fork": {
-              "left": {
-                "Fork": {
-                  "left": {
-                    "Fork": {
-                      "left": {
-                        "Fork": {
-                          "left": {
-                            "GateOnly": {
-                              "gate_idx": 3,
-                              "num_constants": 2,
-                              "degree": 3,
-                              "needs_selector": true,
-                              "is_lookup": false
-                            }
-                          },
-                          "right": {
-                            "Fork": {
-                              "left": {
-                                "GateOnly": {
-                                  "gate_idx": 5,
-                                  "num_constants": 0,
-                                  "degree": 2,
-                                  "needs_selector": true,
-                                  "is_lookup": false
-                                }
-                              },
-                              "right": {
-                                "GateOnly": {
-                                  "gate_idx": 6,
-                                  "num_constants": 0,
-                                  "degree": 2,
-                                  "needs_selector": true,
-                                  "is_lookup": false
-                                }
-                              }
-                            }
-                          }
-                        }
-                      },
-                      "right": {
-                        "Fork": {
-                          "left": {
-                            "GateOnly": {
-                              "gate_idx": 2,
-                              "num_constants": 0,
-                              "degree": 2,
-                              "needs_selector": true,
-                              "is_lookup": false
-                            }
-                          },
-                          "right": {
-                            "GateOnly": {
-                              "gate_idx": 7,
-                              "num_constants": 0,
-                              "degree": 0,
-                              "needs_selector": true,
-                              "is_lookup": false
-                            }
-                          }
-                        }
-                      }
-                    }
-                  },
-                  "right": {
-                    "GateOnly": {
-                      "gate_idx": 4,
-                      "num_constants": 1,
-                      "degree": 2,
-                      "needs_selector": true,
-                      "is_lookup": false
-                    }
-                  }
-                }
-              },
-              "right": {
-                "Fork": {
-                  "left": {
-                    "GateOnly": {
-                      "gate_idx": 8,
-                      "num_constants": 4,
-                      "degree": 2,
-                      "needs_selector": true,
-                      "is_lookup": false
-                    }
-                  },
-                  "right": {
-                    "GateOnly": {
-                      "gate_idx": 0,
-                      "num_constants": 4,
-                      "degree": 1,
-                      "needs_selector": true,
-                      "is_lookup": false
-                    }
-                  }
-                }
-              }
-            }
-          }
-        }
-      },
-      "fri_lde_factor": 2,
-      "cap_size": 16
-    },
-    "setup_merkle_tree_cap": [
-      [
-        769023300008107994,
-        15035929950782434877,
-        4767632476551610273,
-        6003255068455690448
-      ],
-      [
-        9026207300516234226,
-        12638320530307573615,
-        9548682324993884667,
-        1669798832247316225
-      ],
-      [
-        15771054686436993477,
-        14867268062778845716,
-        2755571000455103667,
-        17012958053718147653
-      ],
-      [
-        4796035851498319953,
-        15578398003463831188,
-        16487202842559859878,
-        12241980977059723891
-      ],
-      [
-        4905638728558119005,
-        7863530509045382726,
-        17089556944619165055,
-        6881822366736890373
-      ],
-      [
-        5605698221760842562,
-        15309408538060590842,
-        7774687445824112675,
-        1029523717262265273
-      ],
-      [
-        4602145677202369894,
-        10437641120626639391,
-        16191157018649573359,
-        2145181286557866215
-      ],
-      [
-        8347044010387916224,
-        7660057627892565262,
-        4087655568250966187,
-        4920987872151258558
-      ],
-      [
-        4652946618899021165,
-        10106017231231912813,
-        3800120974014235756,
-        6675575778477161887
-      ],
-      [
-        4980892440155162443,
-        6801648544364465294,
-        2944365492323162449,
-        6942743875951446975
-      ],
-      [
-        17666291786065358473,
-        11132525791177279380,
-        1090211641846788491,
-        18206157565187626653
-      ],
-      [
-        11955322036584323772,
-        9745237745974724322,
-        7620783083675382303,
-        6501674220304463161
-      ],
-      [
-        14154028621322325960,
-        12267966522963634693,
-        16381614744195346959,
-        10938579521199157178
-      ],
-      [
-        5661196656360295299,
-        16217006627182303897,
-        15559803411312667053,
-        14580126280029049348
-      ],
-      [
-        9186970898669061808,
-        692683705561232556,
-        14664202853793025315,
-        7113265307923171991
-      ],
-      [
-        256017097329808658,
-        1298676672131862834,
-        9342013003187223457,
-        172944159302847111
-      ]
-    ]
-  }
-}
\ No newline at end of file
diff --git a/prover/vk_setup_data_generator_server_fri/data/verification_basic_12_key.json b/prover/vk_setup_data_generator_server_fri/data/verification_basic_12_key.json
deleted file mode 100644
index 15680c68c303..000000000000
--- a/prover/vk_setup_data_generator_server_fri/data/verification_basic_12_key.json
+++ /dev/null
@@ -1,257 +0,0 @@
-{
-  "L1MessagesSorter": {
-    "fixed_parameters": {
-      "parameters": {
-        "num_columns_under_copy_permutation": 130,
-        "num_witness_columns": 0,
-        "num_constant_columns": 4,
-        "max_allowed_constraint_degree": 18
-      },
-      "lookup_parameters": {
-        "UseSpecializedColumnsWithTableIdAsConstant": {
-          "width": 1,
-          "num_repetitions": 8,
-          "share_table_id": true
-        }
-      },
-      "domain_size": 1048576,
-      "total_tables_len": 256,
-      "public_inputs_locations": [
-        [
-          0,
-          531517
-        ],
-        [
-          1,
-          531517
-        ],
-        [
-          2,
-          531517
-        ],
-        [
-          3,
-          531517
-        ]
-      ],
-      "extra_constant_polys_for_selectors": 3,
-      "table_ids_column_idxes": [
-        7
-      ],
-      "quotient_degree": 8,
-      "selectors_placement": {
-        "Fork": {
-          "left": {
-            "GateOnly": {
-              "gate_idx": 1,
-              "num_constants": 0,
-              "degree": 7,
-              "needs_selector": true,
-              "is_lookup": false
-            }
-          },
-          "right": {
-            "Fork": {
-              "left": {
-                "Fork": {
-                  "left": {
-                    "Fork": {
-                      "left": {
-                        "Fork": {
-                          "left": {
-                            "GateOnly": {
-                              "gate_idx": 3,
-                              "num_constants": 2,
-                              "degree": 3,
-                              "needs_selector": true,
-                              "is_lookup": false
-                            }
-                          },
-                          "right": {
-                            "Fork": {
-                              "left": {
-                                "GateOnly": {
-                                  "gate_idx": 5,
-                                  "num_constants": 0,
-                                  "degree": 2,
-                                  "needs_selector": true,
-                                  "is_lookup": false
-                                }
-                              },
-                              "right": {
-                                "GateOnly": {
-                                  "gate_idx": 6,
-                                  "num_constants": 0,
-                                  "degree": 2,
-                                  "needs_selector": true,
-                                  "is_lookup": false
-                                }
-                              }
-                            }
-                          }
-                        }
-                      },
-                      "right": {
-                        "Fork": {
-                          "left": {
-                            "GateOnly": {
-                              "gate_idx": 2,
-                              "num_constants": 0,
-                              "degree": 2,
-                              "needs_selector": true,
-                              "is_lookup": false
-                            }
-                          },
-                          "right": {
-                            "GateOnly": {
-                              "gate_idx": 7,
-                              "num_constants": 0,
-                              "degree": 0,
-                              "needs_selector": true,
-                              "is_lookup": false
-                            }
-                          }
-                        }
-                      }
-                    }
-                  },
-                  "right": {
-                    "GateOnly": {
-                      "gate_idx": 4,
-                      "num_constants": 1,
-                      "degree": 2,
-                      "needs_selector": true,
-                      "is_lookup": false
-                    }
-                  }
-                }
-              },
-              "right": {
-                "Fork": {
-                  "left": {
-                    "GateOnly": {
-                      "gate_idx": 8,
-                      "num_constants": 4,
-                      "degree": 2,
-                      "needs_selector": true,
-                      "is_lookup": false
-                    }
-                  },
-                  "right": {
-                    "GateOnly": {
-                      "gate_idx": 0,
-                      "num_constants": 4,
-                      "degree": 1,
-                      "needs_selector": true,
-                      "is_lookup": false
-                    }
-                  }
-                }
-              }
-            }
-          }
-        }
-      },
-      "fri_lde_factor": 2,
-      "cap_size": 16
-    },
-    "setup_merkle_tree_cap": [
-      [
-        769023300008107994,
-        15035929950782434877,
-        4767632476551610273,
-        6003255068455690448
-      ],
-      [
-        9026207300516234226,
-        12638320530307573615,
-        9548682324993884667,
-        1669798832247316225
-      ],
-      [
-        15771054686436993477,
-        14867268062778845716,
-        2755571000455103667,
-        17012958053718147653
-      ],
-      [
-        4796035851498319953,
-        15578398003463831188,
-        16487202842559859878,
-        12241980977059723891
-      ],
-      [
-        4905638728558119005,
-        7863530509045382726,
-        17089556944619165055,
-        6881822366736890373
-      ],
-      [
-        5605698221760842562,
-        15309408538060590842,
-        7774687445824112675,
-        1029523717262265273
-      ],
-      [
-        4602145677202369894,
-        10437641120626639391,
-        16191157018649573359,
-        2145181286557866215
-      ],
-      [
-        8347044010387916224,
-        7660057627892565262,
-        4087655568250966187,
-        4920987872151258558
-      ],
-      [
-        4652946618899021165,
-        10106017231231912813,
-        3800120974014235756,
-        6675575778477161887
-      ],
-      [
-        4980892440155162443,
-        6801648544364465294,
-        2944365492323162449,
-        6942743875951446975
-      ],
-      [
-        17666291786065358473,
-        11132525791177279380,
-        1090211641846788491,
-        18206157565187626653
-      ],
-      [
-        11955322036584323772,
-        9745237745974724322,
-        7620783083675382303,
-        6501674220304463161
-      ],
-      [
-        14154028621322325960,
-        12267966522963634693,
-        16381614744195346959,
-        10938579521199157178
-      ],
-      [
-        5661196656360295299,
-        16217006627182303897,
-        15559803411312667053,
-        14580126280029049348
-      ],
-      [
-        9186970898669061808,
-        692683705561232556,
-        14664202853793025315,
-        7113265307923171991
-      ],
-      [
-        256017097329808658,
-        1298676672131862834,
-        9342013003187223457,
-        172944159302847111
-      ]
-    ]
-  }
-}
\ No newline at end of file
diff --git a/prover/vk_setup_data_generator_server_fri/data/verification_basic_13_key.json b/prover/vk_setup_data_generator_server_fri/data/verification_basic_13_key.json
deleted file mode 100644
index fe32152c3110..000000000000
--- a/prover/vk_setup_data_generator_server_fri/data/verification_basic_13_key.json
+++ /dev/null
@@ -1,244 +0,0 @@
-{
-  "L1MessagesHasher": {
-    "fixed_parameters": {
-      "parameters": {
-        "num_columns_under_copy_permutation": 66,
-        "num_witness_columns": 0,
-        "num_constant_columns": 4,
-        "max_allowed_constraint_degree": 8
-      },
-      "lookup_parameters": {
-        "UseSpecializedColumnsWithTableIdAsConstant": {
-          "width": 3,
-          "num_repetitions": 26,
-          "share_table_id": true
-        }
-      },
-      "domain_size": 1048576,
-      "total_tables_len": 132096,
-      "public_inputs_locations": [
-        [
-          0,
-          1038149
-        ],
-        [
-          1,
-          1038149
-        ],
-        [
-          2,
-          1038149
-        ],
-        [
-          3,
-          1038149
-        ]
-      ],
-      "extra_constant_polys_for_selectors": 2,
-      "table_ids_column_idxes": [
-        6
-      ],
-      "quotient_degree": 8,
-      "selectors_placement": {
-        "Fork": {
-          "left": {
-            "Fork": {
-              "left": {
-                "Fork": {
-                  "left": {
-                    "Fork": {
-                      "left": {
-                        "GateOnly": {
-                          "gate_idx": 2,
-                          "num_constants": 2,
-                          "degree": 3,
-                          "needs_selector": true,
-                          "is_lookup": false
-                        }
-                      },
-                      "right": {
-                        "Fork": {
-                          "left": {
-                            "Fork": {
-                              "left": {
-                                "GateOnly": {
-                                  "gate_idx": 4,
-                                  "num_constants": 0,
-                                  "degree": 2,
-                                  "needs_selector": true,
-                                  "is_lookup": false
-                                }
-                              },
-                              "right": {
-                                "GateOnly": {
-                                  "gate_idx": 6,
-                                  "num_constants": 0,
-                                  "degree": 0,
-                                  "needs_selector": true,
-                                  "is_lookup": false
-                                }
-                              }
-                            }
-                          },
-                          "right": {
-                            "GateOnly": {
-                              "gate_idx": 5,
-                              "num_constants": 0,
-                              "degree": 2,
-                              "needs_selector": true,
-                              "is_lookup": false
-                            }
-                          }
-                        }
-                      }
-                    }
-                  },
-                  "right": {
-                    "GateOnly": {
-                      "gate_idx": 1,
-                      "num_constants": 0,
-                      "degree": 2,
-                      "needs_selector": true,
-                      "is_lookup": false
-                    }
-                  }
-                }
-              },
-              "right": {
-                "GateOnly": {
-                  "gate_idx": 3,
-                  "num_constants": 1,
-                  "degree": 2,
-                  "needs_selector": true,
-                  "is_lookup": false
-                }
-              }
-            }
-          },
-          "right": {
-            "Fork": {
-              "left": {
-                "GateOnly": {
-                  "gate_idx": 7,
-                  "num_constants": 4,
-                  "degree": 2,
-                  "needs_selector": true,
-                  "is_lookup": false
-                }
-              },
-              "right": {
-                "GateOnly": {
-                  "gate_idx": 0,
-                  "num_constants": 4,
-                  "degree": 1,
-                  "needs_selector": true,
-                  "is_lookup": false
-                }
-              }
-            }
-          }
-        }
-      },
-      "fri_lde_factor": 2,
-      "cap_size": 16
-    },
-    "setup_merkle_tree_cap": [
-      [
-        14777139935278588112,
-        4852642306346514505,
-        528870644537653013,
-        12766220607019407671
-      ],
-      [
-        4257836937173457180,
-        18105850810127810627,
-        12045855835945477909,
-        1337145016913030516
-      ],
-      [
-        13540294178921617935,
-        5675450379425866696,
-        8080330723590348862,
-        12416515377803888920
-      ],
-      [
-        3171578350856517770,
-        6539655571602714350,
-        17682924767985674977,
-        8074611540701237863
-      ],
-      [
-        14866967567212658098,
-        14985810164396930899,
-        14103564390721978582,
-        2713291878303732148
-      ],
-      [
-        7209698436584637628,
-        72403128177350562,
-        13748975409439240331,
-        17101408191037730854
-      ],
-      [
-        7094792714865445950,
-        14145350607330203478,
-        3322372571606796615,
-        7791275147072878055
-      ],
-      [
-        10260092656566629894,
-        6872708783997532427,
-        5457407604248314227,
-        366003053747525096
-      ],
-      [
-        6163187172733089710,
-        15116272236856095840,
-        8980783297696807334,
-        4318634308458673791
-      ],
-      [
-        22911656643808543,
-        4389862417760095893,
-        8180530007173246228,
-        15363392102238906744
-      ],
-      [
-        16724058906600359122,
-        9749245991791698283,
-        3733079220084897482,
-        35144727903715636
-      ],
-      [
-        1733024683910700810,
-        16815568708094698990,
-        9597261785243145371,
-        14191876845225710581
-      ],
-      [
-        3368783094877746336,
-        10313180424218970297,
-        7411576603144233838,
-        18155104604678927944
-      ],
-      [
-        15539244454544408034,
-        14071575935246766022,
-        3167686754143854069,
-        2580957889210849319
-      ],
-      [
-        11188593692389277627,
-        3317111011441128346,
-        18315606312625447776,
-        14080235054242793975
-      ],
-      [
-        11188480902959932408,
-        16241470651544083095,
-        17491552077640160913,
-        1747401256351375709
-      ]
-    ]
-  }
-}
\ No newline at end of file
diff --git a/prover/vk_setup_data_generator_server_fri/data/verification_basic_1_key.json b/prover/vk_setup_data_generator_server_fri/data/verification_basic_1_key.json
deleted file mode 100644
index 54cda61bfca1..000000000000
--- a/prover/vk_setup_data_generator_server_fri/data/verification_basic_1_key.json
+++ /dev/null
@@ -1,283 +0,0 @@
-{
-  "MainVM": {
-    "fixed_parameters": {
-      "parameters": {
-        "num_columns_under_copy_permutation": 130,
-        "num_witness_columns": 0,
-        "num_constant_columns": 4,
-        "max_allowed_constraint_degree": 8
-      },
-      "lookup_parameters": {
-        "UseSpecializedColumnsWithTableIdAsConstant": {
-          "width": 3,
-          "num_repetitions": 8,
-          "share_table_id": true
-        }
-      },
-      "domain_size": 1048576,
-      "total_tables_len": 68756,
-      "public_inputs_locations": [
-        [
-          0,
-          1041180
-        ],
-        [
-          1,
-          1041180
-        ],
-        [
-          2,
-          1041180
-        ],
-        [
-          3,
-          1041180
-        ]
-      ],
-      "extra_constant_polys_for_selectors": 3,
-      "table_ids_column_idxes": [
-        7
-      ],
-      "quotient_degree": 8,
-      "selectors_placement": {
-        "Fork": {
-          "left": {
-            "GateOnly": {
-              "gate_idx": 2,
-              "num_constants": 0,
-              "degree": 7,
-              "needs_selector": true,
-              "is_lookup": false
-            }
-          },
-          "right": {
-            "Fork": {
-              "left": {
-                "Fork": {
-                  "left": {
-                    "Fork": {
-                      "left": {
-                        "Fork": {
-                          "left": {
-                            "GateOnly": {
-                              "gate_idx": 5,
-                              "num_constants": 2,
-                              "degree": 3,
-                              "needs_selector": true,
-                              "is_lookup": false
-                            }
-                          },
-                          "right": {
-                            "Fork": {
-                              "left": {
-                                "GateOnly": {
-                                  "gate_idx": 3,
-                                  "num_constants": 0,
-                                  "degree": 2,
-                                  "needs_selector": true,
-                                  "is_lookup": false
-                                }
-                              },
-                              "right": {
-                                "GateOnly": {
-                                  "gate_idx": 4,
-                                  "num_constants": 0,
-                                  "degree": 2,
-                                  "needs_selector": true,
-                                  "is_lookup": false
-                                }
-                              }
-                            }
-                          }
-                        }
-                      },
-                      "right": {
-                        "Fork": {
-                          "left": {
-                            "Fork": {
-                              "left": {
-                                "GateOnly": {
-                                  "gate_idx": 1,
-                                  "num_constants": 0,
-                                  "degree": 2,
-                                  "needs_selector": true,
-                                  "is_lookup": false
-                                }
-                              },
-                              "right": {
-                                "GateOnly": {
-                                  "gate_idx": 8,
-                                  "num_constants": 0,
-                                  "degree": 2,
-                                  "needs_selector": true,
-                                  "is_lookup": false
-                                }
-                              }
-                            }
-                          },
-                          "right": {
-                            "Fork": {
-                              "left": {
-                                "GateOnly": {
-                                  "gate_idx": 7,
-                                  "num_constants": 0,
-                                  "degree": 2,
-                                  "needs_selector": true,
-                                  "is_lookup": false
-                                }
-                              },
-                              "right": {
-                                "GateOnly": {
-                                  "gate_idx": 9,
-                                  "num_constants": 0,
-                                  "degree": 0,
-                                  "needs_selector": true,
-                                  "is_lookup": false
-                                }
-                              }
-                            }
-                          }
-                        }
-                      }
-                    }
-                  },
-                  "right": {
-                    "GateOnly": {
-                      "gate_idx": 6,
-                      "num_constants": 1,
-                      "degree": 2,
-                      "needs_selector": true,
-                      "is_lookup": false
-                    }
-                  }
-                }
-              },
-              "right": {
-                "Fork": {
-                  "left": {
-                    "GateOnly": {
-                      "gate_idx": 10,
-                      "num_constants": 4,
-                      "degree": 2,
-                      "needs_selector": true,
-                      "is_lookup": false
-                    }
-                  },
-                  "right": {
-                    "GateOnly": {
-                      "gate_idx": 0,
-                      "num_constants": 4,
-                      "degree": 1,
-                      "needs_selector": true,
-                      "is_lookup": false
-                    }
-                  }
-                }
-              }
-            }
-          }
-        }
-      },
-      "fri_lde_factor": 2,
-      "cap_size": 16
-    },
-    "setup_merkle_tree_cap": [
-      [
-        11230239963091452912,
-        13026461504664266360,
-        16713169701215574185,
-        12615976815403328075
-      ],
-      [
-        3804170955286114995,
-        17070428581913287652,
-        16444458341617335831,
-        12310477573463289452
-      ],
-      [
-        15717060580753384291,
-        5009332941172699339,
-        5141249138356870627,
-        14525082357218066066
-      ],
-      [
-        5451473672302709994,
-        14405751484257675144,
-        6034423888032264287,
-        14528639950002943854
-      ],
-      [
-        11233253504932768792,
-        9984746197426258635,
-        4438596486612781127,
-        17198259095221505968
-      ],
-      [
-        5681291117413714556,
-        18436270377115663121,
-        11989211218541826903,
-        2671135999160204746
-      ],
-      [
-        963730224051018518,
-        1293300388921029500,
-        7261069736084660486,
-        12414181044622900231
-      ],
-      [
-        17155210460432560694,
-        920670927493907875,
-        6658462737460123613,
-        8253351903179999964
-      ],
-      [
-        3039615529982926935,
-        12254392109531368227,
-        12274357209453453775,
-        16608606384477787215
-      ],
-      [
-        11218496188813210888,
-        16107046895420213310,
-        16285761395335573298,
-        8624190103510841482
-      ],
-      [
-        14835727297511074005,
-        1164596723783439781,
-        11276497358832644724,
-        9219531475080512501
-      ],
-      [
-        3715985935119482043,
-        12185867206854340138,
-        7900628271499451412,
-        8891356055003024224
-      ],
-      [
-        17763963322580587554,
-        218146194744968367,
-        16033549148238902530,
-        1522529898878047239
-      ],
-      [
-        8120794419871565322,
-        18267867130143702317,
-        17178857528695612575,
-        14839022417830798252
-      ],
-      [
-        16480189677896973754,
-        18441483621256548692,
-        3982214183107947832,
-        5099760740801601882
-      ],
-      [
-        10335714458962187072,
-        8498294096277334786,
-        8574103413352512596,
-        9714850528124914412
-      ]
-    ]
-  }
-}
\ No newline at end of file
diff --git a/prover/vk_setup_data_generator_server_fri/data/verification_basic_2_key.json b/prover/vk_setup_data_generator_server_fri/data/verification_basic_2_key.json
deleted file mode 100644
index afbdd17f87d3..000000000000
--- a/prover/vk_setup_data_generator_server_fri/data/verification_basic_2_key.json
+++ /dev/null
@@ -1,257 +0,0 @@
-{
-  "CodeDecommittmentsSorter": {
-    "fixed_parameters": {
-      "parameters": {
-        "num_columns_under_copy_permutation": 130,
-        "num_witness_columns": 0,
-        "num_constant_columns": 4,
-        "max_allowed_constraint_degree": 8
-      },
-      "lookup_parameters": {
-        "UseSpecializedColumnsWithTableIdAsConstant": {
-          "width": 1,
-          "num_repetitions": 18,
-          "share_table_id": true
-        }
-      },
-      "domain_size": 1048576,
-      "total_tables_len": 256,
-      "public_inputs_locations": [
-        [
-          0,
-          1021854
-        ],
-        [
-          1,
-          1021854
-        ],
-        [
-          2,
-          1021854
-        ],
-        [
-          3,
-          1021854
-        ]
-      ],
-      "extra_constant_polys_for_selectors": 3,
-      "table_ids_column_idxes": [
-        7
-      ],
-      "quotient_degree": 8,
-      "selectors_placement": {
-        "Fork": {
-          "left": {
-            "GateOnly": {
-              "gate_idx": 1,
-              "num_constants": 0,
-              "degree": 7,
-              "needs_selector": true,
-              "is_lookup": false
-            }
-          },
-          "right": {
-            "Fork": {
-              "left": {
-                "Fork": {
-                  "left": {
-                    "Fork": {
-                      "left": {
-                        "Fork": {
-                          "left": {
-                            "GateOnly": {
-                              "gate_idx": 3,
-                              "num_constants": 2,
-                              "degree": 3,
-                              "needs_selector": true,
-                              "is_lookup": false
-                            }
-                          },
-                          "right": {
-                            "Fork": {
-                              "left": {
-                                "GateOnly": {
-                                  "gate_idx": 5,
-                                  "num_constants": 0,
-                                  "degree": 2,
-                                  "needs_selector": true,
-                                  "is_lookup": false
-                                }
-                              },
-                              "right": {
-                                "GateOnly": {
-                                  "gate_idx": 6,
-                                  "num_constants": 0,
-                                  "degree": 2,
-                                  "needs_selector": true,
-                                  "is_lookup": false
-                                }
-                              }
-                            }
-                          }
-                        }
-                      },
-                      "right": {
-                        "Fork": {
-                          "left": {
-                            "GateOnly": {
-                              "gate_idx": 2,
-                              "num_constants": 0,
-                              "degree": 2,
-                              "needs_selector": true,
-                              "is_lookup": false
-                            }
-                          },
-                          "right": {
-                            "GateOnly": {
-                              "gate_idx": 7,
-                              "num_constants": 0,
-                              "degree": 0,
-                              "needs_selector": true,
-                              "is_lookup": false
-                            }
-                          }
-                        }
-                      }
-                    }
-                  },
-                  "right": {
-                    "GateOnly": {
-                      "gate_idx": 4,
-                      "num_constants": 1,
-                      "degree": 2,
-                      "needs_selector": true,
-                      "is_lookup": false
-                    }
-                  }
-                }
-              },
-              "right": {
-                "Fork": {
-                  "left": {
-                    "GateOnly": {
-                      "gate_idx": 8,
-                      "num_constants": 4,
-                      "degree": 2,
-                      "needs_selector": true,
-                      "is_lookup": false
-                    }
-                  },
-                  "right": {
-                    "GateOnly": {
-                      "gate_idx": 0,
-                      "num_constants": 4,
-                      "degree": 1,
-                      "needs_selector": true,
-                      "is_lookup": false
-                    }
-                  }
-                }
-              }
-            }
-          }
-        }
-      },
-      "fri_lde_factor": 2,
-      "cap_size": 16
-    },
-    "setup_merkle_tree_cap": [
-      [
-        2638073007663622156,
-        8095790926675075575,
-        16070536450025430297,
-        11107879245782883310
-      ],
-      [
-        14146741033954484667,
-        6190536674348638720,
-        16225788979445059477,
-        14054620090462985529
-      ],
-      [
-        11640224008014629596,
-        641539748496027160,
-        13808722951176221096,
-        16170765986761751839
-      ],
-      [
-        3935980412801468150,
-        1369763633048581729,
-        15164038222707237449,
-        13549026317001505493
-      ],
-      [
-        7347140194150198874,
-        3761583621533582182,
-        1201042008705759557,
-        4518814071203771589
-      ],
-      [
-        800427219378311884,
-        9408589372717347086,
-        4254572946942417329,
-        5142794058426597251
-      ],
-      [
-        9025763675471789857,
-        9658241200006349915,
-        10843576536878471228,
-        4504613934156851017
-      ],
-      [
-        924391528635837029,
-        17275471398483292983,
-        7119295641875104852,
-        3574531397848859770
-      ],
-      [
-        9377840526717456169,
-        10735342053764638034,
-        2342156236435128394,
-        14166002014472046096
-      ],
-      [
-        2892383637971079443,
-        13418647945623595756,
-        10019182992393923816,
-        9844763621346094605
-      ],
-      [
-        10882982703274329811,
-        1514425380968646350,
-        13439208364741860903,
-        13990068349260696136
-      ],
-      [
-        15895812818511549818,
-        15738749976988188006,
-        13440084002922282596,
-        14578356625798184093
-      ],
-      [
-        3859406845557969736,
-        17314298659359090415,
-        16770924942850282883,
-        486597592063200525
-      ],
-      [
-        11378407834848513159,
-        4967859104549187166,
-        13937264085276400573,
-        7478354099484226349
-      ],
-      [
-        1449906124962973794,
-        5408228139111124399,
-        1658036384062801904,
-        7066463570538863033
-      ],
-      [
-        15186027246389802614,
-        9949859568958827686,
-        11971923963356626879,
-        15735564656222075589
-      ]
-    ]
-  }
-}
\ No newline at end of file
diff --git a/prover/vk_setup_data_generator_server_fri/data/verification_basic_3_key.json b/prover/vk_setup_data_generator_server_fri/data/verification_basic_3_key.json
deleted file mode 100644
index 0cfb70f82924..000000000000
--- a/prover/vk_setup_data_generator_server_fri/data/verification_basic_3_key.json
+++ /dev/null
@@ -1,244 +0,0 @@
-{
-  "CodeDecommitter": {
-    "fixed_parameters": {
-      "parameters": {
-        "num_columns_under_copy_permutation": 108,
-        "num_witness_columns": 0,
-        "num_constant_columns": 4,
-        "max_allowed_constraint_degree": 8
-      },
-      "lookup_parameters": {
-        "UseSpecializedColumnsWithTableIdAsConstant": {
-          "width": 4,
-          "num_repetitions": 11,
-          "share_table_id": true
-        }
-      },
-      "domain_size": 1048576,
-      "total_tables_len": 12320,
-      "public_inputs_locations": [
-        [
-          0,
-          1045893
-        ],
-        [
-          1,
-          1045893
-        ],
-        [
-          2,
-          1045893
-        ],
-        [
-          3,
-          1045893
-        ]
-      ],
-      "extra_constant_polys_for_selectors": 2,
-      "table_ids_column_idxes": [
-        6
-      ],
-      "quotient_degree": 8,
-      "selectors_placement": {
-        "Fork": {
-          "left": {
-            "Fork": {
-              "left": {
-                "Fork": {
-                  "left": {
-                    "Fork": {
-                      "left": {
-                        "GateOnly": {
-                          "gate_idx": 1,
-                          "num_constants": 2,
-                          "degree": 3,
-                          "needs_selector": true,
-                          "is_lookup": false
-                        }
-                      },
-                      "right": {
-                        "Fork": {
-                          "left": {
-                            "Fork": {
-                              "left": {
-                                "GateOnly": {
-                                  "gate_idx": 4,
-                                  "num_constants": 0,
-                                  "degree": 2,
-                                  "needs_selector": true,
-                                  "is_lookup": false
-                                }
-                              },
-                              "right": {
-                                "GateOnly": {
-                                  "gate_idx": 5,
-                                  "num_constants": 0,
-                                  "degree": 0,
-                                  "needs_selector": true,
-                                  "is_lookup": false
-                                }
-                              }
-                            }
-                          },
-                          "right": {
-                            "GateOnly": {
-                              "gate_idx": 7,
-                              "num_constants": 0,
-                              "degree": 2,
-                              "needs_selector": true,
-                              "is_lookup": false
-                            }
-                          }
-                        }
-                      }
-                    }
-                  },
-                  "right": {
-                    "GateOnly": {
-                      "gate_idx": 3,
-                      "num_constants": 0,
-                      "degree": 2,
-                      "needs_selector": true,
-                      "is_lookup": false
-                    }
-                  }
-                }
-              },
-              "right": {
-                "GateOnly": {
-                  "gate_idx": 6,
-                  "num_constants": 1,
-                  "degree": 2,
-                  "needs_selector": true,
-                  "is_lookup": false
-                }
-              }
-            }
-          },
-          "right": {
-            "Fork": {
-              "left": {
-                "GateOnly": {
-                  "gate_idx": 2,
-                  "num_constants": 4,
-                  "degree": 2,
-                  "needs_selector": true,
-                  "is_lookup": false
-                }
-              },
-              "right": {
-                "GateOnly": {
-                  "gate_idx": 0,
-                  "num_constants": 4,
-                  "degree": 1,
-                  "needs_selector": true,
-                  "is_lookup": false
-                }
-              }
-            }
-          }
-        }
-      },
-      "fri_lde_factor": 2,
-      "cap_size": 16
-    },
-    "setup_merkle_tree_cap": [
-      [
-        14477188964753033185,
-        8969677320239131616,
-        1511337688601558079,
-        6903237435877294238
-      ],
-      [
-        6879979662383013500,
-        9972710512945599417,
-        1141938191658961290,
-        7985281381511529082
-      ],
-      [
-        17209416762295781376,
-        598939655522077579,
-        6689912638469680235,
-        4921519662278829132
-      ],
-      [
-        2218810108211543567,
-        17367409571577782381,
-        4068453030111399481,
-        2894111853945751344
-      ],
-      [
-        9999042349572898395,
-        7429179575907305306,
-        10123408942776369379,
-        3022715221462077728
-      ],
-      [
-        10045842633239015513,
-        4244812848324665170,
-        12301343603596417356,
-        11332920712778059030
-      ],
-      [
-        15900139291770141663,
-        8192446346506891091,
-        10086891539583546802,
-        7343942987745068197
-      ],
-      [
-        6124221718954912549,
-        13486682166896696529,
-        15097291952143481844,
-        16653894364467704495
-      ],
-      [
-        12766623698334678967,
-        1729058559883227397,
-        1411108054906351423,
-        13278453333171202065
-      ],
-      [
-        12233418151438626108,
-        14016138745865492456,
-        13255147568691004416,
-        14998854132551828470
-      ],
-      [
-        10323923076292169703,
-        8158278707949376146,
-        12845614783152862914,
-        5914093648720582597
-      ],
-      [
-        13520835009196520971,
-        14417779140547238889,
-        6862603050786324034,
-        10245030009169430808
-      ],
-      [
-        1835499986105723876,
-        9973301486190772269,
-        3431085138170097359,
-        16617926458565371046
-      ],
-      [
-        6995430833584764582,
-        10186803315798237521,
-        13404931797112939412,
-        17530795913574984460
-      ],
-      [
-        10883424944588923206,
-        13314595728239865895,
-        3282096066350298749,
-        3956046981299225896
-      ],
-      [
-        12087054656445457911,
-        7314398367646261307,
-        7998118142061675046,
-        11673364943123337175
-      ]
-    ]
-  }
-}
\ No newline at end of file
diff --git a/prover/vk_setup_data_generator_server_fri/data/verification_basic_4_key.json b/prover/vk_setup_data_generator_server_fri/data/verification_basic_4_key.json
deleted file mode 100644
index a4a410d90a26..000000000000
--- a/prover/vk_setup_data_generator_server_fri/data/verification_basic_4_key.json
+++ /dev/null
@@ -1,257 +0,0 @@
-{
-  "LogDemuxer": {
-    "fixed_parameters": {
-      "parameters": {
-        "num_columns_under_copy_permutation": 136,
-        "num_witness_columns": 0,
-        "num_constant_columns": 4,
-        "max_allowed_constraint_degree": 8
-      },
-      "lookup_parameters": {
-        "UseSpecializedColumnsWithTableIdAsConstant": {
-          "width": 1,
-          "num_repetitions": 14,
-          "share_table_id": true
-        }
-      },
-      "domain_size": 1048576,
-      "total_tables_len": 256,
-      "public_inputs_locations": [
-        [
-          0,
-          770856
-        ],
-        [
-          1,
-          770856
-        ],
-        [
-          2,
-          770856
-        ],
-        [
-          3,
-          770856
-        ]
-      ],
-      "extra_constant_polys_for_selectors": 3,
-      "table_ids_column_idxes": [
-        7
-      ],
-      "quotient_degree": 8,
-      "selectors_placement": {
-        "Fork": {
-          "left": {
-            "GateOnly": {
-              "gate_idx": 1,
-              "num_constants": 0,
-              "degree": 7,
-              "needs_selector": true,
-              "is_lookup": false
-            }
-          },
-          "right": {
-            "Fork": {
-              "left": {
-                "Fork": {
-                  "left": {
-                    "Fork": {
-                      "left": {
-                        "Fork": {
-                          "left": {
-                            "GateOnly": {
-                              "gate_idx": 3,
-                              "num_constants": 2,
-                              "degree": 3,
-                              "needs_selector": true,
-                              "is_lookup": false
-                            }
-                          },
-                          "right": {
-                            "Fork": {
-                              "left": {
-                                "GateOnly": {
-                                  "gate_idx": 5,
-                                  "num_constants": 0,
-                                  "degree": 2,
-                                  "needs_selector": true,
-                                  "is_lookup": false
-                                }
-                              },
-                              "right": {
-                                "GateOnly": {
-                                  "gate_idx": 6,
-                                  "num_constants": 0,
-                                  "degree": 2,
-                                  "needs_selector": true,
-                                  "is_lookup": false
-                                }
-                              }
-                            }
-                          }
-                        }
-                      },
-                      "right": {
-                        "Fork": {
-                          "left": {
-                            "GateOnly": {
-                              "gate_idx": 2,
-                              "num_constants": 0,
-                              "degree": 2,
-                              "needs_selector": true,
-                              "is_lookup": false
-                            }
-                          },
-                          "right": {
-                            "GateOnly": {
-                              "gate_idx": 7,
-                              "num_constants": 0,
-                              "degree": 0,
-                              "needs_selector": true,
-                              "is_lookup": false
-                            }
-                          }
-                        }
-                      }
-                    }
-                  },
-                  "right": {
-                    "GateOnly": {
-                      "gate_idx": 4,
-                      "num_constants": 1,
-                      "degree": 2,
-                      "needs_selector": true,
-                      "is_lookup": false
-                    }
-                  }
-                }
-              },
-              "right": {
-                "Fork": {
-                  "left": {
-                    "GateOnly": {
-                      "gate_idx": 8,
-                      "num_constants": 4,
-                      "degree": 2,
-                      "needs_selector": true,
-                      "is_lookup": false
-                    }
-                  },
-                  "right": {
-                    "GateOnly": {
-                      "gate_idx": 0,
-                      "num_constants": 4,
-                      "degree": 1,
-                      "needs_selector": true,
-                      "is_lookup": false
-                    }
-                  }
-                }
-              }
-            }
-          }
-        }
-      },
-      "fri_lde_factor": 2,
-      "cap_size": 16
-    },
-    "setup_merkle_tree_cap": [
-      [
-        13241330279191725103,
-        13753032629530173038,
-        2076223530664948596,
-        3297807117114706044
-      ],
-      [
-        11713836288112670191,
-        1177996762465404370,
-        7559895083149599749,
-        3210974432904624409
-      ],
-      [
-        12556775438783409088,
-        12836668195118427958,
-        10659579382288992879,
-        14824820023358081641
-      ],
-      [
-        12129434367710731467,
-        13223863980858698592,
-        15076313205959171338,
-        8812832758598326992
-      ],
-      [
-        5619695298194316584,
-        1702543119292958822,
-        10286311332797928654,
-        5029271658667181176
-      ],
-      [
-        7415141098448981547,
-        15663039494509354932,
-        13208197120197557194,
-        11245742858683836013
-      ],
-      [
-        3002540241136310707,
-        11547797899694244403,
-        7124622061839424949,
-        10949013563713078494
-      ],
-      [
-        17142575575809782204,
-        13800993532867337554,
-        4423537342426483807,
-        12089179399318945120
-      ],
-      [
-        5543363940431137493,
-        14528536317911082899,
-        3928220692870214567,
-        7185369207264833028
-      ],
-      [
-        2815159846192152478,
-        16507211682718130921,
-        1793329775903937916,
-        6473686931817864950
-      ],
-      [
-        17815165628195346102,
-        9542948826192641186,
-        14973284068738873799,
-        13577641628730921985
-      ],
-      [
-        17938393397553240876,
-        15660715751237780491,
-        12630446844016399148,
-        11862059154139259048
-      ],
-      [
-        11953996319846633859,
-        12131238563851642562,
-        5803319004748576191,
-        10988868046472383675
-      ],
-      [
-        3859400868090135128,
-        15214844687221204138,
-        13973059553580269639,
-        7853383910131759805
-      ],
-      [
-        11592486898864810791,
-        4871056958970591747,
-        137946356858301988,
-        14529417267976359973
-      ],
-      [
-        11093343120608557204,
-        14684319039324015274,
-        5221221840195929029,
-        17478918223903237221
-      ]
-    ]
-  }
-}
\ No newline at end of file
diff --git a/prover/vk_setup_data_generator_server_fri/data/verification_basic_5_key.json b/prover/vk_setup_data_generator_server_fri/data/verification_basic_5_key.json
deleted file mode 100644
index 4537187b9b36..000000000000
--- a/prover/vk_setup_data_generator_server_fri/data/verification_basic_5_key.json
+++ /dev/null
@@ -1,244 +0,0 @@
-{
-  "KeccakRoundFunction": {
-    "fixed_parameters": {
-      "parameters": {
-        "num_columns_under_copy_permutation": 86,
-        "num_witness_columns": 0,
-        "num_constant_columns": 4,
-        "max_allowed_constraint_degree": 8
-      },
-      "lookup_parameters": {
-        "UseSpecializedColumnsWithTableIdAsConstant": {
-          "width": 3,
-          "num_repetitions": 14,
-          "share_table_id": true
-        }
-      },
-      "domain_size": 1048576,
-      "total_tables_len": 132096,
-      "public_inputs_locations": [
-        [
-          0,
-          1047292
-        ],
-        [
-          1,
-          1047292
-        ],
-        [
-          2,
-          1047292
-        ],
-        [
-          3,
-          1047292
-        ]
-      ],
-      "extra_constant_polys_for_selectors": 2,
-      "table_ids_column_idxes": [
-        6
-      ],
-      "quotient_degree": 8,
-      "selectors_placement": {
-        "Fork": {
-          "left": {
-            "Fork": {
-              "left": {
-                "Fork": {
-                  "left": {
-                    "Fork": {
-                      "left": {
-                        "GateOnly": {
-                          "gate_idx": 2,
-                          "num_constants": 2,
-                          "degree": 3,
-                          "needs_selector": true,
-                          "is_lookup": false
-                        }
-                      },
-                      "right": {
-                        "Fork": {
-                          "left": {
-                            "Fork": {
-                              "left": {
-                                "GateOnly": {
-                                  "gate_idx": 4,
-                                  "num_constants": 0,
-                                  "degree": 2,
-                                  "needs_selector": true,
-                                  "is_lookup": false
-                                }
-                              },
-                              "right": {
-                                "GateOnly": {
-                                  "gate_idx": 6,
-                                  "num_constants": 0,
-                                  "degree": 0,
-                                  "needs_selector": true,
-                                  "is_lookup": false
-                                }
-                              }
-                            }
-                          },
-                          "right": {
-                            "GateOnly": {
-                              "gate_idx": 5,
-                              "num_constants": 0,
-                              "degree": 2,
-                              "needs_selector": true,
-                              "is_lookup": false
-                            }
-                          }
-                        }
-                      }
-                    }
-                  },
-                  "right": {
-                    "GateOnly": {
-                      "gate_idx": 1,
-                      "num_constants": 0,
-                      "degree": 2,
-                      "needs_selector": true,
-                      "is_lookup": false
-                    }
-                  }
-                }
-              },
-              "right": {
-                "GateOnly": {
-                  "gate_idx": 3,
-                  "num_constants": 1,
-                  "degree": 2,
-                  "needs_selector": true,
-                  "is_lookup": false
-                }
-              }
-            }
-          },
-          "right": {
-            "Fork": {
-              "left": {
-                "GateOnly": {
-                  "gate_idx": 7,
-                  "num_constants": 4,
-                  "degree": 2,
-                  "needs_selector": true,
-                  "is_lookup": false
-                }
-              },
-              "right": {
-                "GateOnly": {
-                  "gate_idx": 0,
-                  "num_constants": 4,
-                  "degree": 1,
-                  "needs_selector": true,
-                  "is_lookup": false
-                }
-              }
-            }
-          }
-        }
-      },
-      "fri_lde_factor": 2,
-      "cap_size": 16
-    },
-    "setup_merkle_tree_cap": [
-      [
-        5926546619152935907,
-        11291861669768573654,
-        11100100891141895430,
-        1040099038134319144
-      ],
-      [
-        9405378490457870663,
-        11971348617109093172,
-        7779954465112100917,
-        8521139113892942903
-      ],
-      [
-        1041442145290466080,
-        2626937507866398782,
-        4297959424787982903,
-        7963254695121664304
-      ],
-      [
-        8679424872010178168,
-        928230210029079843,
-        17862919271344969949,
-        9085342720844642067
-      ],
-      [
-        2346566700143956389,
-        751827788815495159,
-        18018129704559687246,
-        6344673729449349673
-      ],
-      [
-        12798999539756004171,
-        2962217720855368908,
-        17815764746262544024,
-        6141433679632029898
-      ],
-      [
-        10612436896218340091,
-        5382517797965219051,
-        1440771605952502920,
-        6120504474919675320
-      ],
-      [
-        5639210895028949894,
-        17579589483393163114,
-        8531068549022389838,
-        9055992165271810945
-      ],
-      [
-        15625252378325581383,
-        11791782086341113568,
-        1976318982912441593,
-        16561636205817299485
-      ],
-      [
-        9291503982934971506,
-        5967409911022700010,
-        9096839168538146295,
-        3004596177933970509
-      ],
-      [
-        9243725287341188464,
-        6878316427230924845,
-        7270708110528992687,
-        15417458474646493002
-      ],
-      [
-        15577762808206668193,
-        10775213926343901301,
-        4900917235853777300,
-        8940673145641313937
-      ],
-      [
-        18157038451252266825,
-        13776543473230491269,
-        17449669960102455201,
-        1902286122568749061
-      ],
-      [
-        10247491007925641249,
-        5411016508841956578,
-        11766519965796614613,
-        1073824923129670847
-      ],
-      [
-        10691592838471536401,
-        16863854034452440410,
-        16989985027265774429,
-        10784858673090746367
-      ],
-      [
-        5688638173552292266,
-        2543022480770607266,
-        1257951713416281965,
-        6435312724052439304
-      ]
-    ]
-  }
-}
\ No newline at end of file
diff --git a/prover/vk_setup_data_generator_server_fri/data/verification_basic_6_key.json b/prover/vk_setup_data_generator_server_fri/data/verification_basic_6_key.json
deleted file mode 100644
index 48533211ab0c..000000000000
--- a/prover/vk_setup_data_generator_server_fri/data/verification_basic_6_key.json
+++ /dev/null
@@ -1,244 +0,0 @@
-{
-  "Sha256RoundFunction": {
-    "fixed_parameters": {
-      "parameters": {
-        "num_columns_under_copy_permutation": 116,
-        "num_witness_columns": 0,
-        "num_constant_columns": 4,
-        "max_allowed_constraint_degree": 8
-      },
-      "lookup_parameters": {
-        "UseSpecializedColumnsWithTableIdAsConstant": {
-          "width": 4,
-          "num_repetitions": 9,
-          "share_table_id": true
-        }
-      },
-      "domain_size": 1048576,
-      "total_tables_len": 12320,
-      "public_inputs_locations": [
-        [
-          0,
-          1039793
-        ],
-        [
-          1,
-          1039793
-        ],
-        [
-          2,
-          1039793
-        ],
-        [
-          3,
-          1039793
-        ]
-      ],
-      "extra_constant_polys_for_selectors": 2,
-      "table_ids_column_idxes": [
-        6
-      ],
-      "quotient_degree": 8,
-      "selectors_placement": {
-        "Fork": {
-          "left": {
-            "Fork": {
-              "left": {
-                "Fork": {
-                  "left": {
-                    "Fork": {
-                      "left": {
-                        "GateOnly": {
-                          "gate_idx": 1,
-                          "num_constants": 2,
-                          "degree": 3,
-                          "needs_selector": true,
-                          "is_lookup": false
-                        }
-                      },
-                      "right": {
-                        "Fork": {
-                          "left": {
-                            "Fork": {
-                              "left": {
-                                "GateOnly": {
-                                  "gate_idx": 4,
-                                  "num_constants": 0,
-                                  "degree": 2,
-                                  "needs_selector": true,
-                                  "is_lookup": false
-                                }
-                              },
-                              "right": {
-                                "GateOnly": {
-                                  "gate_idx": 5,
-                                  "num_constants": 0,
-                                  "degree": 0,
-                                  "needs_selector": true,
-                                  "is_lookup": false
-                                }
-                              }
-                            }
-                          },
-                          "right": {
-                            "GateOnly": {
-                              "gate_idx": 7,
-                              "num_constants": 0,
-                              "degree": 2,
-                              "needs_selector": true,
-                              "is_lookup": false
-                            }
-                          }
-                        }
-                      }
-                    }
-                  },
-                  "right": {
-                    "GateOnly": {
-                      "gate_idx": 3,
-                      "num_constants": 0,
-                      "degree": 2,
-                      "needs_selector": true,
-                      "is_lookup": false
-                    }
-                  }
-                }
-              },
-              "right": {
-                "GateOnly": {
-                  "gate_idx": 6,
-                  "num_constants": 1,
-                  "degree": 2,
-                  "needs_selector": true,
-                  "is_lookup": false
-                }
-              }
-            }
-          },
-          "right": {
-            "Fork": {
-              "left": {
-                "GateOnly": {
-                  "gate_idx": 2,
-                  "num_constants": 4,
-                  "degree": 2,
-                  "needs_selector": true,
-                  "is_lookup": false
-                }
-              },
-              "right": {
-                "GateOnly": {
-                  "gate_idx": 0,
-                  "num_constants": 4,
-                  "degree": 1,
-                  "needs_selector": true,
-                  "is_lookup": false
-                }
-              }
-            }
-          }
-        }
-      },
-      "fri_lde_factor": 2,
-      "cap_size": 16
-    },
-    "setup_merkle_tree_cap": [
-      [
-        7131095197302553268,
-        8153577698865827964,
-        4503618255465567901,
-        14277683095622422701
-      ],
-      [
-        17227565432950328258,
-        3812763700819798255,
-        11013754802988076876,
-        6868705666417715458
-      ],
-      [
-        6323710131523972374,
-        2634684603167736396,
-        18066615186100844391,
-        12905391948029250777
-      ],
-      [
-        3492005229273374536,
-        6055742838160324534,
-        1795486371688618704,
-        13052026771106363342
-      ],
-      [
-        10281812076992462791,
-        7165153365649379245,
-        13022274058059396511,
-        13989909544832134378
-      ],
-      [
-        12027415465257630320,
-        3276226892300848010,
-        8686471638009106913,
-        14892455799109213586
-      ],
-      [
-        2589896055307349461,
-        2860115159278340436,
-        16194627146103061118,
-        7076143423549975584
-      ],
-      [
-        13667404340259521763,
-        6297649363425018745,
-        16167424072873520384,
-        3830963799067739016
-      ],
-      [
-        16665883187665722508,
-        314738727176100190,
-        4253386482569091860,
-        1926299543937236525
-      ],
-      [
-        7820355437968047327,
-        6794680285466534678,
-        2978730525228113593,
-        3621380956903574094
-      ],
-      [
-        4838056840641790939,
-        16842388520310131551,
-        11612178730147038952,
-        2346195292789238934
-      ],
-      [
-        17810776396991797874,
-        12063662987004325494,
-        17932676844730723250,
-        14283996529720835225
-      ],
-      [
-        4982429352434514173,
-        14856186579270143608,
-        4051922516960412257,
-        8367898317160268319
-      ],
-      [
-        14584337208407353036,
-        15866593405986269360,
-        11704298830630250400,
-        14576621862375131798
-      ],
-      [
-        3101118738129024336,
-        4028118980088627608,
-        9223187088487468736,
-        3845581921289713376
-      ],
-      [
-        1013819453591993424,
-        13784105701097110976,
-        9114286772222497781,
-        10710488663310041007
-      ]
-    ]
-  }
-}
\ No newline at end of file
diff --git a/prover/vk_setup_data_generator_server_fri/data/verification_basic_7_key.json b/prover/vk_setup_data_generator_server_fri/data/verification_basic_7_key.json
deleted file mode 100644
index b905a476ea43..000000000000
--- a/prover/vk_setup_data_generator_server_fri/data/verification_basic_7_key.json
+++ /dev/null
@@ -1,257 +0,0 @@
-{
-  "ECRecover": {
-    "fixed_parameters": {
-      "parameters": {
-        "num_columns_under_copy_permutation": 80,
-        "num_witness_columns": 0,
-        "num_constant_columns": 4,
-        "max_allowed_constraint_degree": 8
-      },
-      "lookup_parameters": {
-        "UseSpecializedColumnsWithTableIdAsConstant": {
-          "width": 3,
-          "num_repetitions": 16,
-          "share_table_id": true
-        }
-      },
-      "domain_size": 1048576,
-      "total_tables_len": 132096,
-      "public_inputs_locations": [
-        [
-          0,
-          872841
-        ],
-        [
-          1,
-          872841
-        ],
-        [
-          2,
-          872841
-        ],
-        [
-          3,
-          872841
-        ]
-      ],
-      "extra_constant_polys_for_selectors": 2,
-      "table_ids_column_idxes": [
-        6
-      ],
-      "quotient_degree": 8,
-      "selectors_placement": {
-        "Fork": {
-          "left": {
-            "Fork": {
-              "left": {
-                "Fork": {
-                  "left": {
-                    "Fork": {
-                      "left": {
-                        "GateOnly": {
-                          "gate_idx": 2,
-                          "num_constants": 2,
-                          "degree": 3,
-                          "needs_selector": true,
-                          "is_lookup": false
-                        }
-                      },
-                      "right": {
-                        "Fork": {
-                          "left": {
-                            "Fork": {
-                              "left": {
-                                "GateOnly": {
-                                  "gate_idx": 4,
-                                  "num_constants": 0,
-                                  "degree": 2,
-                                  "needs_selector": true,
-                                  "is_lookup": false
-                                }
-                              },
-                              "right": {
-                                "GateOnly": {
-                                  "gate_idx": 6,
-                                  "num_constants": 0,
-                                  "degree": 2,
-                                  "needs_selector": true,
-                                  "is_lookup": false
-                                }
-                              }
-                            }
-                          },
-                          "right": {
-                            "Fork": {
-                              "left": {
-                                "GateOnly": {
-                                  "gate_idx": 5,
-                                  "num_constants": 0,
-                                  "degree": 2,
-                                  "needs_selector": true,
-                                  "is_lookup": false
-                                }
-                              },
-                              "right": {
-                                "GateOnly": {
-                                  "gate_idx": 7,
-                                  "num_constants": 0,
-                                  "degree": 0,
-                                  "needs_selector": true,
-                                  "is_lookup": false
-                                }
-                              }
-                            }
-                          }
-                        }
-                      }
-                    }
-                  },
-                  "right": {
-                    "GateOnly": {
-                      "gate_idx": 1,
-                      "num_constants": 0,
-                      "degree": 2,
-                      "needs_selector": true,
-                      "is_lookup": false
-                    }
-                  }
-                }
-              },
-              "right": {
-                "GateOnly": {
-                  "gate_idx": 3,
-                  "num_constants": 1,
-                  "degree": 2,
-                  "needs_selector": true,
-                  "is_lookup": false
-                }
-              }
-            }
-          },
-          "right": {
-            "Fork": {
-              "left": {
-                "GateOnly": {
-                  "gate_idx": 8,
-                  "num_constants": 4,
-                  "degree": 2,
-                  "needs_selector": true,
-                  "is_lookup": false
-                }
-              },
-              "right": {
-                "GateOnly": {
-                  "gate_idx": 0,
-                  "num_constants": 4,
-                  "degree": 1,
-                  "needs_selector": true,
-                  "is_lookup": false
-                }
-              }
-            }
-          }
-        }
-      },
-      "fri_lde_factor": 2,
-      "cap_size": 16
-    },
-    "setup_merkle_tree_cap": [
-      [
-        13818450912197620420,
-        5079205692118648775,
-        14615787041360044769,
-        2941606671776647183
-      ],
-      [
-        6715253104770723417,
-        3160280029457127352,
-        11108406980823166906,
-        15487865556610611893
-      ],
-      [
-        14039903923831613967,
-        15298198763143829103,
-        17031409250405123985,
-        10266023324667771113
-      ],
-      [
-        17366151300788544369,
-        13314676565834570017,
-        17521241757753748935,
-        13066688955830816807
-      ],
-      [
-        14445090483790969730,
-        15708367780098206326,
-        2336844413511710318,
-        3268235585540529265
-      ],
-      [
-        2882405134850480170,
-        14247534382965114291,
-        17531255653612736614,
-        11676635700695125188
-      ],
-      [
-        11530141675448575062,
-        8910365257612403024,
-        300072654586353643,
-        8472188536913229506
-      ],
-      [
-        1426612518547638168,
-        17806679375517512145,
-        14835333334022265221,
-        2007845272495904476
-      ],
-      [
-        6034343869761808836,
-        13937750910508416181,
-        16942548919853718543,
-        16086518391257789831
-      ],
-      [
-        15933462173546075175,
-        8612525819877657624,
-        4132383244121115701,
-        9288543398092863864
-      ],
-      [
-        8157130847726661070,
-        4231891352218163681,
-        14620351586778336684,
-        4186724240746204294
-      ],
-      [
-        7440132245224537493,
-        6666895991749911132,
-        8404993517441732468,
-        6556569653095950475
-      ],
-      [
-        1982595939619922877,
-        17561202624392859313,
-        14381497498171193805,
-        17908865555917026633
-      ],
-      [
-        7384278864004035589,
-        10191778068274570585,
-        6103937442735162958,
-        5142419559331404710
-      ],
-      [
-        3651117166359200686,
-        3827322296271305097,
-        14799462710376656576,
-        13600220646083181205
-      ],
-      [
-        1989104086172888026,
-        7796359126421144184,
-        16967575681666150511,
-        5993683835612332048
-      ]
-    ]
-  }
-}
\ No newline at end of file
diff --git a/prover/vk_setup_data_generator_server_fri/data/verification_basic_8_key.json b/prover/vk_setup_data_generator_server_fri/data/verification_basic_8_key.json
deleted file mode 100644
index 01b957e7a611..000000000000
--- a/prover/vk_setup_data_generator_server_fri/data/verification_basic_8_key.json
+++ /dev/null
@@ -1,257 +0,0 @@
-{
-  "RAMPermutation": {
-    "fixed_parameters": {
-      "parameters": {
-        "num_columns_under_copy_permutation": 133,
-        "num_witness_columns": 0,
-        "num_constant_columns": 4,
-        "max_allowed_constraint_degree": 8
-      },
-      "lookup_parameters": {
-        "UseSpecializedColumnsWithTableIdAsConstant": {
-          "width": 1,
-          "num_repetitions": 15,
-          "share_table_id": true
-        }
-      },
-      "domain_size": 1048576,
-      "total_tables_len": 256,
-      "public_inputs_locations": [
-        [
-          0,
-          1044095
-        ],
-        [
-          1,
-          1044095
-        ],
-        [
-          2,
-          1044095
-        ],
-        [
-          3,
-          1044095
-        ]
-      ],
-      "extra_constant_polys_for_selectors": 3,
-      "table_ids_column_idxes": [
-        7
-      ],
-      "quotient_degree": 8,
-      "selectors_placement": {
-        "Fork": {
-          "left": {
-            "GateOnly": {
-              "gate_idx": 1,
-              "num_constants": 0,
-              "degree": 7,
-              "needs_selector": true,
-              "is_lookup": false
-            }
-          },
-          "right": {
-            "Fork": {
-              "left": {
-                "Fork": {
-                  "left": {
-                    "Fork": {
-                      "left": {
-                        "Fork": {
-                          "left": {
-                            "GateOnly": {
-                              "gate_idx": 3,
-                              "num_constants": 2,
-                              "degree": 3,
-                              "needs_selector": true,
-                              "is_lookup": false
-                            }
-                          },
-                          "right": {
-                            "Fork": {
-                              "left": {
-                                "GateOnly": {
-                                  "gate_idx": 5,
-                                  "num_constants": 0,
-                                  "degree": 2,
-                                  "needs_selector": true,
-                                  "is_lookup": false
-                                }
-                              },
-                              "right": {
-                                "GateOnly": {
-                                  "gate_idx": 6,
-                                  "num_constants": 0,
-                                  "degree": 2,
-                                  "needs_selector": true,
-                                  "is_lookup": false
-                                }
-                              }
-                            }
-                          }
-                        }
-                      },
-                      "right": {
-                        "Fork": {
-                          "left": {
-                            "GateOnly": {
-                              "gate_idx": 2,
-                              "num_constants": 0,
-                              "degree": 2,
-                              "needs_selector": true,
-                              "is_lookup": false
-                            }
-                          },
-                          "right": {
-                            "GateOnly": {
-                              "gate_idx": 7,
-                              "num_constants": 0,
-                              "degree": 0,
-                              "needs_selector": true,
-                              "is_lookup": false
-                            }
-                          }
-                        }
-                      }
-                    }
-                  },
-                  "right": {
-                    "GateOnly": {
-                      "gate_idx": 4,
-                      "num_constants": 1,
-                      "degree": 2,
-                      "needs_selector": true,
-                      "is_lookup": false
-                    }
-                  }
-                }
-              },
-              "right": {
-                "Fork": {
-                  "left": {
-                    "GateOnly": {
-                      "gate_idx": 8,
-                      "num_constants": 4,
-                      "degree": 2,
-                      "needs_selector": true,
-                      "is_lookup": false
-                    }
-                  },
-                  "right": {
-                    "GateOnly": {
-                      "gate_idx": 0,
-                      "num_constants": 4,
-                      "degree": 1,
-                      "needs_selector": true,
-                      "is_lookup": false
-                    }
-                  }
-                }
-              }
-            }
-          }
-        }
-      },
-      "fri_lde_factor": 2,
-      "cap_size": 16
-    },
-    "setup_merkle_tree_cap": [
-      [
-        7748855058771730961,
-        18077946489631649497,
-        1126488644057748066,
-        14688059039599644438
-      ],
-      [
-        4480629341804348299,
-        10505662440791981234,
-        4568412032951786787,
-        12296506456394181969
-      ],
-      [
-        16177866372671364827,
-        6970256790084749443,
-        10619139891136255069,
-        1607793233799494191
-      ],
-      [
-        16984252104671889635,
-        13549428959009290270,
-        18134611582044419523,
-        13805480879905126881
-      ],
-      [
-        17770436976754840017,
-        7234588192906938750,
-        1676460085700470353,
-        17733573771328390126
-      ],
-      [
-        1322939182961086562,
-        5294941824911180446,
-        10983825026212251207,
-        4904636572110590284
-      ],
-      [
-        12784739321844360991,
-        12439305138735676805,
-        14983461304040938818,
-        17269069332772868104
-      ],
-      [
-        14780190734158735021,
-        13940544738219743565,
-        6645149114623433718,
-        13466406487834863255
-      ],
-      [
-        13329778603033226548,
-        10757456562158453823,
-        16599667503315631352,
-        7621238797658185159
-      ],
-      [
-        14547407989101566794,
-        13324264894451648565,
-        16566710504362716031,
-        4779331080355111127
-      ],
-      [
-        6132579229855214454,
-        17610416320024829323,
-        12304246579944377351,
-        9688211256511656964
-      ],
-      [
-        8981542755583161308,
-        5091565442848149167,
-        13934425064181076259,
-        9294930870454289441
-      ],
-      [
-        7427098481125065729,
-        13578369070049130481,
-        11513105383705002933,
-        9750527547580548099
-      ],
-      [
-        5745702296484372803,
-        17242736621178757499,
-        11421559995636138498,
-        12684122852092168791
-      ],
-      [
-        1002992144601037215,
-        16187923653560782188,
-        5293022176068028122,
-        9959247706453715838
-      ],
-      [
-        4182061746333368731,
-        5244109339200264013,
-        10015150430260308263,
-        11549298210681275420
-      ]
-    ]
-  }
-}
\ No newline at end of file
diff --git a/prover/vk_setup_data_generator_server_fri/data/verification_basic_9_key.json b/prover/vk_setup_data_generator_server_fri/data/verification_basic_9_key.json
deleted file mode 100644
index 2823ffec627f..000000000000
--- a/prover/vk_setup_data_generator_server_fri/data/verification_basic_9_key.json
+++ /dev/null
@@ -1,257 +0,0 @@
-{
-  "StorageSorter": {
-    "fixed_parameters": {
-      "parameters": {
-        "num_columns_under_copy_permutation": 132,
-        "num_witness_columns": 0,
-        "num_constant_columns": 4,
-        "max_allowed_constraint_degree": 8
-      },
-      "lookup_parameters": {
-        "UseSpecializedColumnsWithTableIdAsConstant": {
-          "width": 1,
-          "num_repetitions": 16,
-          "share_table_id": true
-        }
-      },
-      "domain_size": 1048576,
-      "total_tables_len": 256,
-      "public_inputs_locations": [
-        [
-          0,
-          1044628
-        ],
-        [
-          1,
-          1044628
-        ],
-        [
-          2,
-          1044628
-        ],
-        [
-          3,
-          1044628
-        ]
-      ],
-      "extra_constant_polys_for_selectors": 3,
-      "table_ids_column_idxes": [
-        7
-      ],
-      "quotient_degree": 8,
-      "selectors_placement": {
-        "Fork": {
-          "left": {
-            "GateOnly": {
-              "gate_idx": 1,
-              "num_constants": 0,
-              "degree": 7,
-              "needs_selector": true,
-              "is_lookup": false
-            }
-          },
-          "right": {
-            "Fork": {
-              "left": {
-                "Fork": {
-                  "left": {
-                    "Fork": {
-                      "left": {
-                        "Fork": {
-                          "left": {
-                            "GateOnly": {
-                              "gate_idx": 3,
-                              "num_constants": 2,
-                              "degree": 3,
-                              "needs_selector": true,
-                              "is_lookup": false
-                            }
-                          },
-                          "right": {
-                            "Fork": {
-                              "left": {
-                                "GateOnly": {
-                                  "gate_idx": 5,
-                                  "num_constants": 0,
-                                  "degree": 2,
-                                  "needs_selector": true,
-                                  "is_lookup": false
-                                }
-                              },
-                              "right": {
-                                "GateOnly": {
-                                  "gate_idx": 6,
-                                  "num_constants": 0,
-                                  "degree": 2,
-                                  "needs_selector": true,
-                                  "is_lookup": false
-                                }
-                              }
-                            }
-                          }
-                        }
-                      },
-                      "right": {
-                        "Fork": {
-                          "left": {
-                            "GateOnly": {
-                              "gate_idx": 2,
-                              "num_constants": 0,
-                              "degree": 2,
-                              "needs_selector": true,
-                              "is_lookup": false
-                            }
-                          },
-                          "right": {
-                            "GateOnly": {
-                              "gate_idx": 7,
-                              "num_constants": 0,
-                              "degree": 0,
-                              "needs_selector": true,
-                              "is_lookup": false
-                            }
-                          }
-                        }
-                      }
-                    }
-                  },
-                  "right": {
-                    "GateOnly": {
-                      "gate_idx": 4,
-                      "num_constants": 1,
-                      "degree": 2,
-                      "needs_selector": true,
-                      "is_lookup": false
-                    }
-                  }
-                }
-              },
-              "right": {
-                "Fork": {
-                  "left": {
-                    "GateOnly": {
-                      "gate_idx": 8,
-                      "num_constants": 4,
-                      "degree": 2,
-                      "needs_selector": true,
-                      "is_lookup": false
-                    }
-                  },
-                  "right": {
-                    "GateOnly": {
-                      "gate_idx": 0,
-                      "num_constants": 4,
-                      "degree": 1,
-                      "needs_selector": true,
-                      "is_lookup": false
-                    }
-                  }
-                }
-              }
-            }
-          }
-        }
-      },
-      "fri_lde_factor": 2,
-      "cap_size": 16
-    },
-    "setup_merkle_tree_cap": [
-      [
-        15152415627491818135,
-        7374237605577523933,
-        4465184016028924212,
-        2035234088595773309
-      ],
-      [
-        5061557444963845839,
-        12386849184623218277,
-        13052284409578998174,
-        2142376146067763313
-      ],
-      [
-        14276061640225729061,
-        3667833983304997823,
-        15567500985315483409,
-        10110252348727918570
-      ],
-      [
-        12534291856385391774,
-        4931691717277748218,
-        10385184271370113628,
-        10333556044049798387
-      ],
-      [
-        3902530530481162544,
-        11439177580828992768,
-        2956353447880097447,
-        2078779115341733037
-      ],
-      [
-        14361126694241130224,
-        4508476390465174580,
-        14814630315120762635,
-        17198376643024594512
-      ],
-      [
-        15399867818681370342,
-        17613339377988571860,
-        17463021656624906492,
-        18043402438787219822
-      ],
-      [
-        4721341021989730415,
-        941889554702533152,
-        4492052956383425703,
-        11785343591616806540
-      ],
-      [
-        14835583452718692456,
-        9747287794601877160,
-        13285319018669943605,
-        15566660322778346733
-      ],
-      [
-        634069327924902339,
-        7509671875950276664,
-        17149763085975395897,
-        17558106862399785122
-      ],
-      [
-        6504570481933973182,
-        9863954755773054818,
-        4192802816900646319,
-        11708054020605968244
-      ],
-      [
-        5368022000476684675,
-        11854447477637281190,
-        773008757856055958,
-        7428874382179860306
-      ],
-      [
-        820566450151427404,
-        14487105988932071384,
-        5168970873173217247,
-        16840718205559266321
-      ],
-      [
-        15018168499898445860,
-        15893129254829262789,
-        1267456796490088156,
-        14049704864991807107
-      ],
-      [
-        3678472314386256573,
-        4482269767107891177,
-        2891258367538769098,
-        10249141358181035242
-      ],
-      [
-        1175499750244297798,
-        7441679809319866074,
-        15706614384330332074,
-        12399917843582101807
-      ]
-    ]
-  }
-}
\ No newline at end of file
diff --git a/prover/vk_setup_data_generator_server_fri/data/verification_leaf_10_key.json b/prover/vk_setup_data_generator_server_fri/data/verification_leaf_10_key.json
deleted file mode 100644
index 82e2d2f2fb54..000000000000
--- a/prover/vk_setup_data_generator_server_fri/data/verification_leaf_10_key.json
+++ /dev/null
@@ -1,262 +0,0 @@
-{
-  "LeafLayerCircuitForRAMPermutation": {
-    "fixed_parameters": {
-      "parameters": {
-        "num_columns_under_copy_permutation": 140,
-        "num_witness_columns": 0,
-        "num_constant_columns": 4,
-        "max_allowed_constraint_degree": 8
-      },
-      "lookup_parameters": "NoLookup",
-      "domain_size": 1048576,
-      "total_tables_len": 0,
-      "public_inputs_locations": [
-        [
-          0,
-          0
-        ],
-        [
-          1,
-          0
-        ],
-        [
-          2,
-          0
-        ],
-        [
-          3,
-          0
-        ]
-      ],
-      "extra_constant_polys_for_selectors": 4,
-      "table_ids_column_idxes": [],
-      "quotient_degree": 8,
-      "selectors_placement": {
-        "Fork": {
-          "left": {
-            "GateOnly": {
-              "gate_idx": 1,
-              "num_constants": 0,
-              "degree": 7,
-              "needs_selector": true,
-              "is_lookup": false
-            }
-          },
-          "right": {
-            "Fork": {
-              "left": {
-                "Fork": {
-                  "left": {
-                    "Fork": {
-                      "left": {
-                        "GateOnly": {
-                          "gate_idx": 4,
-                          "num_constants": 4,
-                          "degree": 3,
-                          "needs_selector": true,
-                          "is_lookup": false
-                        }
-                      },
-                      "right": {
-                        "Fork": {
-                          "left": {
-                            "Fork": {
-                              "left": {
-                                "GateOnly": {
-                                  "gate_idx": 5,
-                                  "num_constants": 1,
-                                  "degree": 2,
-                                  "needs_selector": true,
-                                  "is_lookup": false
-                                }
-                              },
-                              "right": {
-                                "GateOnly": {
-                                  "gate_idx": 6,
-                                  "num_constants": 0,
-                                  "degree": 2,
-                                  "needs_selector": true,
-                                  "is_lookup": false
-                                }
-                              }
-                            }
-                          },
-                          "right": {
-                            "Fork": {
-                              "left": {
-                                "GateOnly": {
-                                  "gate_idx": 2,
-                                  "num_constants": 0,
-                                  "degree": 2,
-                                  "needs_selector": true,
-                                  "is_lookup": false
-                                }
-                              },
-                              "right": {
-                                "GateOnly": {
-                                  "gate_idx": 7,
-                                  "num_constants": 0,
-                                  "degree": 2,
-                                  "needs_selector": true,
-                                  "is_lookup": false
-                                }
-                              }
-                            }
-                          }
-                        }
-                      }
-                    }
-                  },
-                  "right": {
-                    "Fork": {
-                      "left": {
-                        "GateOnly": {
-                          "gate_idx": 9,
-                          "num_constants": 4,
-                          "degree": 2,
-                          "needs_selector": true,
-                          "is_lookup": false
-                        }
-                      },
-                      "right": {
-                        "GateOnly": {
-                          "gate_idx": 0,
-                          "num_constants": 4,
-                          "degree": 1,
-                          "needs_selector": true,
-                          "is_lookup": false
-                        }
-                      }
-                    }
-                  }
-                }
-              },
-              "right": {
-                "Fork": {
-                  "left": {
-                    "GateOnly": {
-                      "gate_idx": 3,
-                      "num_constants": 2,
-                      "degree": 3,
-                      "needs_selector": true,
-                      "is_lookup": false
-                    }
-                  },
-                  "right": {
-                    "GateOnly": {
-                      "gate_idx": 8,
-                      "num_constants": 0,
-                      "degree": 0,
-                      "needs_selector": true,
-                      "is_lookup": false
-                    }
-                  }
-                }
-              }
-            }
-          }
-        }
-      },
-      "fri_lde_factor": 2,
-      "cap_size": 16
-    },
-    "setup_merkle_tree_cap": [
-      [
-        1125289536020813216,
-        13893991227523403350,
-        18221032481002623145,
-        6999555513372134161
-      ],
-      [
-        14558032258404044879,
-        15896302942503207712,
-        4320679543001532335,
-        16312301655514654219
-      ],
-      [
-        7101986692613628904,
-        7577883870349313041,
-        7352728228661094923,
-        18332380179278822986
-      ],
-      [
-        4857477437658850102,
-        2600358150758031758,
-        11245333823831173537,
-        8338725066623873242
-      ],
-      [
-        7533080307752291488,
-        7286216489335488511,
-        18156637335160778785,
-        7462498443331890731
-      ],
-      [
-        606568432443359176,
-        8912183283992686330,
-        17421481837200753913,
-        17592999343458504164
-      ],
-      [
-        13072668834394870334,
-        11175441683787645540,
-        3718467031089360132,
-        6303569707785751909
-      ],
-      [
-        15139014418351999292,
-        13433960894156419831,
-        1081036147938149073,
-        5537900067858640688
-      ],
-      [
-        16144198516884069513,
-        11760722486204114604,
-        9080477633162807038,
-        14878319203527003921
-      ],
-      [
-        9887232148319546846,
-        11280977977331453386,
-        1634486104168251049,
-        1013174085024142997
-      ],
-      [
-        8774759106642276381,
-        17014116512461272516,
-        5017632137039687644,
-        2879573590247199312
-      ],
-      [
-        8532316813139433929,
-        10192336124962558528,
-        10208988044571331050,
-        7412443809890180963
-      ],
-      [
-        1940771445624788955,
-        15990599983917575017,
-        12383682653785412359,
-        7243892390926482974
-      ],
-      [
-        15783323653576062669,
-        7433660384180142428,
-        11341821314666985051,
-        13908042579613943595
-      ],
-      [
-        6784650697753378650,
-        2429262522610065724,
-        3770879433095160288,
-        6633370836632857456
-      ],
-      [
-        18435367235881428398,
-        13152985860267484403,
-        17561012172979073263,
-        15335033836397886699
-      ]
-    ]
-  }
-}
\ No newline at end of file
diff --git a/prover/vk_setup_data_generator_server_fri/data/verification_leaf_11_key.json b/prover/vk_setup_data_generator_server_fri/data/verification_leaf_11_key.json
deleted file mode 100644
index 14b20e4f718f..000000000000
--- a/prover/vk_setup_data_generator_server_fri/data/verification_leaf_11_key.json
+++ /dev/null
@@ -1,262 +0,0 @@
-{
-  "LeafLayerCircuitForStorageSorter": {
-    "fixed_parameters": {
-      "parameters": {
-        "num_columns_under_copy_permutation": 140,
-        "num_witness_columns": 0,
-        "num_constant_columns": 4,
-        "max_allowed_constraint_degree": 8
-      },
-      "lookup_parameters": "NoLookup",
-      "domain_size": 1048576,
-      "total_tables_len": 0,
-      "public_inputs_locations": [
-        [
-          0,
-          0
-        ],
-        [
-          1,
-          0
-        ],
-        [
-          2,
-          0
-        ],
-        [
-          3,
-          0
-        ]
-      ],
-      "extra_constant_polys_for_selectors": 4,
-      "table_ids_column_idxes": [],
-      "quotient_degree": 8,
-      "selectors_placement": {
-        "Fork": {
-          "left": {
-            "GateOnly": {
-              "gate_idx": 1,
-              "num_constants": 0,
-              "degree": 7,
-              "needs_selector": true,
-              "is_lookup": false
-            }
-          },
-          "right": {
-            "Fork": {
-              "left": {
-                "Fork": {
-                  "left": {
-                    "Fork": {
-                      "left": {
-                        "GateOnly": {
-                          "gate_idx": 4,
-                          "num_constants": 4,
-                          "degree": 3,
-                          "needs_selector": true,
-                          "is_lookup": false
-                        }
-                      },
-                      "right": {
-                        "Fork": {
-                          "left": {
-                            "Fork": {
-                              "left": {
-                                "GateOnly": {
-                                  "gate_idx": 5,
-                                  "num_constants": 1,
-                                  "degree": 2,
-                                  "needs_selector": true,
-                                  "is_lookup": false
-                                }
-                              },
-                              "right": {
-                                "GateOnly": {
-                                  "gate_idx": 6,
-                                  "num_constants": 0,
-                                  "degree": 2,
-                                  "needs_selector": true,
-                                  "is_lookup": false
-                                }
-                              }
-                            }
-                          },
-                          "right": {
-                            "Fork": {
-                              "left": {
-                                "GateOnly": {
-                                  "gate_idx": 2,
-                                  "num_constants": 0,
-                                  "degree": 2,
-                                  "needs_selector": true,
-                                  "is_lookup": false
-                                }
-                              },
-                              "right": {
-                                "GateOnly": {
-                                  "gate_idx": 7,
-                                  "num_constants": 0,
-                                  "degree": 2,
-                                  "needs_selector": true,
-                                  "is_lookup": false
-                                }
-                              }
-                            }
-                          }
-                        }
-                      }
-                    }
-                  },
-                  "right": {
-                    "Fork": {
-                      "left": {
-                        "GateOnly": {
-                          "gate_idx": 9,
-                          "num_constants": 4,
-                          "degree": 2,
-                          "needs_selector": true,
-                          "is_lookup": false
-                        }
-                      },
-                      "right": {
-                        "GateOnly": {
-                          "gate_idx": 0,
-                          "num_constants": 4,
-                          "degree": 1,
-                          "needs_selector": true,
-                          "is_lookup": false
-                        }
-                      }
-                    }
-                  }
-                }
-              },
-              "right": {
-                "Fork": {
-                  "left": {
-                    "GateOnly": {
-                      "gate_idx": 3,
-                      "num_constants": 2,
-                      "degree": 3,
-                      "needs_selector": true,
-                      "is_lookup": false
-                    }
-                  },
-                  "right": {
-                    "GateOnly": {
-                      "gate_idx": 8,
-                      "num_constants": 0,
-                      "degree": 0,
-                      "needs_selector": true,
-                      "is_lookup": false
-                    }
-                  }
-                }
-              }
-            }
-          }
-        }
-      },
-      "fri_lde_factor": 2,
-      "cap_size": 16
-    },
-    "setup_merkle_tree_cap": [
-      [
-        14038008090973880203,
-        7437991399998284269,
-        12502661164686015780,
-        6154468052477899229
-      ],
-      [
-        4890279821462461425,
-        12267605659025997985,
-        16220814561210675069,
-        14958418982789304352
-      ],
-      [
-        16239014851914932689,
-        11626285279514581577,
-        7827403995053907198,
-        3320808129263057989
-      ],
-      [
-        9987109148114223767,
-        16027730699082584407,
-        16226544327370131567,
-        10505655809748447851
-      ],
-      [
-        2426355028560688438,
-        13015409833156179441,
-        3357212938175132730,
-        9924499217906835800
-      ],
-      [
-        7264556678081366657,
-        11014021481903289086,
-        1185381295776166890,
-        11220095453847753366
-      ],
-      [
-        10738220050569983945,
-        2071033793611953608,
-        2836853848682426199,
-        18280211532291996343
-      ],
-      [
-        4622574899935206725,
-        10283505057353003539,
-        10924169390994336784,
-        9267200805799259741
-      ],
-      [
-        4991426063445236730,
-        292198960832094512,
-        6370230421874009175,
-        2987533577516974457
-      ],
-      [
-        15100014620403370288,
-        17064710328307274600,
-        13596338039199898149,
-        7844302147920229272
-      ],
-      [
-        6997319402399846472,
-        5312486909661565204,
-        8133503726683094273,
-        14376435888676319871
-      ],
-      [
-        16536431163453527335,
-        8329243612205528007,
-        10332326446350256878,
-        6187024786825219302
-      ],
-      [
-        15819705933365601754,
-        17218893784817004570,
-        7197154299986843671,
-        11662127518680895562
-      ],
-      [
-        12757050724806983838,
-        14916998582501427105,
-        2903621530266216761,
-        12948020673936426635
-      ],
-      [
-        14563493065638885359,
-        6770003101729110728,
-        11839394563403429402,
-        1065983546047670743
-      ],
-      [
-        2845847955135199124,
-        16066115065717446946,
-        4482870472147946913,
-        8664518745998140088
-      ]
-    ]
-  }
-}
\ No newline at end of file
diff --git a/prover/vk_setup_data_generator_server_fri/data/verification_leaf_12_key.json b/prover/vk_setup_data_generator_server_fri/data/verification_leaf_12_key.json
deleted file mode 100644
index 047a79433899..000000000000
--- a/prover/vk_setup_data_generator_server_fri/data/verification_leaf_12_key.json
+++ /dev/null
@@ -1,262 +0,0 @@
-{
-  "LeafLayerCircuitForStorageApplication": {
-    "fixed_parameters": {
-      "parameters": {
-        "num_columns_under_copy_permutation": 140,
-        "num_witness_columns": 0,
-        "num_constant_columns": 4,
-        "max_allowed_constraint_degree": 8
-      },
-      "lookup_parameters": "NoLookup",
-      "domain_size": 1048576,
-      "total_tables_len": 0,
-      "public_inputs_locations": [
-        [
-          0,
-          0
-        ],
-        [
-          1,
-          0
-        ],
-        [
-          2,
-          0
-        ],
-        [
-          3,
-          0
-        ]
-      ],
-      "extra_constant_polys_for_selectors": 4,
-      "table_ids_column_idxes": [],
-      "quotient_degree": 8,
-      "selectors_placement": {
-        "Fork": {
-          "left": {
-            "GateOnly": {
-              "gate_idx": 1,
-              "num_constants": 0,
-              "degree": 7,
-              "needs_selector": true,
-              "is_lookup": false
-            }
-          },
-          "right": {
-            "Fork": {
-              "left": {
-                "Fork": {
-                  "left": {
-                    "Fork": {
-                      "left": {
-                        "GateOnly": {
-                          "gate_idx": 4,
-                          "num_constants": 4,
-                          "degree": 3,
-                          "needs_selector": true,
-                          "is_lookup": false
-                        }
-                      },
-                      "right": {
-                        "Fork": {
-                          "left": {
-                            "Fork": {
-                              "left": {
-                                "GateOnly": {
-                                  "gate_idx": 5,
-                                  "num_constants": 1,
-                                  "degree": 2,
-                                  "needs_selector": true,
-                                  "is_lookup": false
-                                }
-                              },
-                              "right": {
-                                "GateOnly": {
-                                  "gate_idx": 6,
-                                  "num_constants": 0,
-                                  "degree": 2,
-                                  "needs_selector": true,
-                                  "is_lookup": false
-                                }
-                              }
-                            }
-                          },
-                          "right": {
-                            "Fork": {
-                              "left": {
-                                "GateOnly": {
-                                  "gate_idx": 2,
-                                  "num_constants": 0,
-                                  "degree": 2,
-                                  "needs_selector": true,
-                                  "is_lookup": false
-                                }
-                              },
-                              "right": {
-                                "GateOnly": {
-                                  "gate_idx": 7,
-                                  "num_constants": 0,
-                                  "degree": 2,
-                                  "needs_selector": true,
-                                  "is_lookup": false
-                                }
-                              }
-                            }
-                          }
-                        }
-                      }
-                    }
-                  },
-                  "right": {
-                    "Fork": {
-                      "left": {
-                        "GateOnly": {
-                          "gate_idx": 9,
-                          "num_constants": 4,
-                          "degree": 2,
-                          "needs_selector": true,
-                          "is_lookup": false
-                        }
-                      },
-                      "right": {
-                        "GateOnly": {
-                          "gate_idx": 0,
-                          "num_constants": 4,
-                          "degree": 1,
-                          "needs_selector": true,
-                          "is_lookup": false
-                        }
-                      }
-                    }
-                  }
-                }
-              },
-              "right": {
-                "Fork": {
-                  "left": {
-                    "GateOnly": {
-                      "gate_idx": 3,
-                      "num_constants": 2,
-                      "degree": 3,
-                      "needs_selector": true,
-                      "is_lookup": false
-                    }
-                  },
-                  "right": {
-                    "GateOnly": {
-                      "gate_idx": 8,
-                      "num_constants": 0,
-                      "degree": 0,
-                      "needs_selector": true,
-                      "is_lookup": false
-                    }
-                  }
-                }
-              }
-            }
-          }
-        }
-      },
-      "fri_lde_factor": 2,
-      "cap_size": 16
-    },
-    "setup_merkle_tree_cap": [
-      [
-        17762498852322133081,
-        12402705633936516386,
-        2303979245623416237,
-        15492962941180331409
-      ],
-      [
-        1368919680062481249,
-        8419725427681044227,
-        12407005054982229959,
-        9729546646519366060
-      ],
-      [
-        3694696222464991628,
-        10691747603876514511,
-        5648287760852638838,
-        15128008410193030270
-      ],
-      [
-        5647849659158863308,
-        16391316755630265342,
-        17483459471194878342,
-        2382689231083026500
-      ],
-      [
-        414523452897415096,
-        14712743039552404085,
-        14274376366377496980,
-        1540457029378813951
-      ],
-      [
-        6437956396547385520,
-        10457280544359552653,
-        210288303177892964,
-        7009065088863365256
-      ],
-      [
-        6189643588169700860,
-        2874522095144611328,
-        3459596951253545261,
-        14912093041250189548
-      ],
-      [
-        2954035721997683722,
-        2628438295425873126,
-        9361498414301919378,
-        7780135632218518403
-      ],
-      [
-        13376229283479650476,
-        13646160168852625209,
-        12342809006526169374,
-        16140909717103038788
-      ],
-      [
-        14544916717622160085,
-        2335857756498039096,
-        12834512355397127233,
-        8257858357688008275
-      ],
-      [
-        13637749549385428585,
-        1568326361689976373,
-        14573670474737748882,
-        8002611813857126901
-      ],
-      [
-        4981475697544147574,
-        7477162419770815721,
-        13420952345288491036,
-        6849943909220872064
-      ],
-      [
-        5645683284474222575,
-        10480504810673180938,
-        7038844793157124351,
-        10701205261596194736
-      ],
-      [
-        2992787956816905753,
-        10666728141278334493,
-        4748213040479579674,
-        13258093297981567423
-      ],
-      [
-        11477426903799919629,
-        24925561182649344,
-        11412223773538266154,
-        2852175545463505023
-      ],
-      [
-        1060175052523024730,
-        6610510112497451814,
-        15229121744185849414,
-        12773820515972201248
-      ]
-    ]
-  }
-}
\ No newline at end of file
diff --git a/prover/vk_setup_data_generator_server_fri/data/verification_leaf_13_key.json b/prover/vk_setup_data_generator_server_fri/data/verification_leaf_13_key.json
deleted file mode 100644
index 9b8c7bca3296..000000000000
--- a/prover/vk_setup_data_generator_server_fri/data/verification_leaf_13_key.json
+++ /dev/null
@@ -1,262 +0,0 @@
-{
-  "LeafLayerCircuitForEventsSorter": {
-    "fixed_parameters": {
-      "parameters": {
-        "num_columns_under_copy_permutation": 140,
-        "num_witness_columns": 0,
-        "num_constant_columns": 4,
-        "max_allowed_constraint_degree": 8
-      },
-      "lookup_parameters": "NoLookup",
-      "domain_size": 1048576,
-      "total_tables_len": 0,
-      "public_inputs_locations": [
-        [
-          0,
-          0
-        ],
-        [
-          1,
-          0
-        ],
-        [
-          2,
-          0
-        ],
-        [
-          3,
-          0
-        ]
-      ],
-      "extra_constant_polys_for_selectors": 4,
-      "table_ids_column_idxes": [],
-      "quotient_degree": 8,
-      "selectors_placement": {
-        "Fork": {
-          "left": {
-            "GateOnly": {
-              "gate_idx": 1,
-              "num_constants": 0,
-              "degree": 7,
-              "needs_selector": true,
-              "is_lookup": false
-            }
-          },
-          "right": {
-            "Fork": {
-              "left": {
-                "Fork": {
-                  "left": {
-                    "Fork": {
-                      "left": {
-                        "GateOnly": {
-                          "gate_idx": 4,
-                          "num_constants": 4,
-                          "degree": 3,
-                          "needs_selector": true,
-                          "is_lookup": false
-                        }
-                      },
-                      "right": {
-                        "Fork": {
-                          "left": {
-                            "Fork": {
-                              "left": {
-                                "GateOnly": {
-                                  "gate_idx": 5,
-                                  "num_constants": 1,
-                                  "degree": 2,
-                                  "needs_selector": true,
-                                  "is_lookup": false
-                                }
-                              },
-                              "right": {
-                                "GateOnly": {
-                                  "gate_idx": 6,
-                                  "num_constants": 0,
-                                  "degree": 2,
-                                  "needs_selector": true,
-                                  "is_lookup": false
-                                }
-                              }
-                            }
-                          },
-                          "right": {
-                            "Fork": {
-                              "left": {
-                                "GateOnly": {
-                                  "gate_idx": 2,
-                                  "num_constants": 0,
-                                  "degree": 2,
-                                  "needs_selector": true,
-                                  "is_lookup": false
-                                }
-                              },
-                              "right": {
-                                "GateOnly": {
-                                  "gate_idx": 7,
-                                  "num_constants": 0,
-                                  "degree": 2,
-                                  "needs_selector": true,
-                                  "is_lookup": false
-                                }
-                              }
-                            }
-                          }
-                        }
-                      }
-                    }
-                  },
-                  "right": {
-                    "Fork": {
-                      "left": {
-                        "GateOnly": {
-                          "gate_idx": 9,
-                          "num_constants": 4,
-                          "degree": 2,
-                          "needs_selector": true,
-                          "is_lookup": false
-                        }
-                      },
-                      "right": {
-                        "GateOnly": {
-                          "gate_idx": 0,
-                          "num_constants": 4,
-                          "degree": 1,
-                          "needs_selector": true,
-                          "is_lookup": false
-                        }
-                      }
-                    }
-                  }
-                }
-              },
-              "right": {
-                "Fork": {
-                  "left": {
-                    "GateOnly": {
-                      "gate_idx": 3,
-                      "num_constants": 2,
-                      "degree": 3,
-                      "needs_selector": true,
-                      "is_lookup": false
-                    }
-                  },
-                  "right": {
-                    "GateOnly": {
-                      "gate_idx": 8,
-                      "num_constants": 0,
-                      "degree": 0,
-                      "needs_selector": true,
-                      "is_lookup": false
-                    }
-                  }
-                }
-              }
-            }
-          }
-        }
-      },
-      "fri_lde_factor": 2,
-      "cap_size": 16
-    },
-    "setup_merkle_tree_cap": [
-      [
-        1107277819469948429,
-        7779138633457495557,
-        9933991506239962590,
-        13247997120867942045
-      ],
-      [
-        10020877950065961527,
-        6525352303263078852,
-        10601857031603992424,
-        6699333963081308583
-      ],
-      [
-        8019436446207312706,
-        17880026081547931046,
-        14023459613581442883,
-        12177363081042438182
-      ],
-      [
-        17643512238638359026,
-        2759065364120570462,
-        1113452962298378930,
-        9944550331137276877
-      ],
-      [
-        6208699382898547395,
-        9442366708032685349,
-        9362620233586526034,
-        6406469355002722194
-      ],
-      [
-        17265154700194893264,
-        11486849446382907011,
-        1331827641678752332,
-        13890193454573854721
-      ],
-      [
-        7338198937132638061,
-        9619578268260381257,
-        16966504852427653624,
-        5042032213830518832
-      ],
-      [
-        9998014800451912206,
-        2764915420573986646,
-        12638108373731502079,
-        13849566240043998295
-      ],
-      [
-        18402224478111895268,
-        10245397321907314013,
-        15810832121998678624,
-        16050833323870358750
-      ],
-      [
-        5754119484130347551,
-        1334330314055286585,
-        1196783225751134982,
-        13693638204576454858
-      ],
-      [
-        7476283313073466871,
-        3327838189135133206,
-        7576584001149251522,
-        4746763672176501097
-      ],
-      [
-        8341294580974175099,
-        6996214973372400649,
-        2825261487886819108,
-        17611476352036968111
-      ],
-      [
-        6481216673139681707,
-        12834349834818063790,
-        14423475559705119809,
-        15943814042360079510
-      ],
-      [
-        7771500178827314392,
-        5968639878444939173,
-        18006309838458312166,
-        368714734303788414
-      ],
-      [
-        2137428658614683231,
-        4604901863694850124,
-        3581156028309568037,
-        7485386108131533730
-      ],
-      [
-        1078544443818230878,
-        14117476483719501663,
-        17985826373971579789,
-        10600652728062682193
-      ]
-    ]
-  }
-}
\ No newline at end of file
diff --git a/prover/vk_setup_data_generator_server_fri/data/verification_leaf_14_key.json b/prover/vk_setup_data_generator_server_fri/data/verification_leaf_14_key.json
deleted file mode 100644
index e32be9870e7b..000000000000
--- a/prover/vk_setup_data_generator_server_fri/data/verification_leaf_14_key.json
+++ /dev/null
@@ -1,262 +0,0 @@
-{
-  "LeafLayerCircuitForL1MessagesSorter": {
-    "fixed_parameters": {
-      "parameters": {
-        "num_columns_under_copy_permutation": 140,
-        "num_witness_columns": 0,
-        "num_constant_columns": 4,
-        "max_allowed_constraint_degree": 8
-      },
-      "lookup_parameters": "NoLookup",
-      "domain_size": 1048576,
-      "total_tables_len": 0,
-      "public_inputs_locations": [
-        [
-          0,
-          0
-        ],
-        [
-          1,
-          0
-        ],
-        [
-          2,
-          0
-        ],
-        [
-          3,
-          0
-        ]
-      ],
-      "extra_constant_polys_for_selectors": 4,
-      "table_ids_column_idxes": [],
-      "quotient_degree": 8,
-      "selectors_placement": {
-        "Fork": {
-          "left": {
-            "GateOnly": {
-              "gate_idx": 1,
-              "num_constants": 0,
-              "degree": 7,
-              "needs_selector": true,
-              "is_lookup": false
-            }
-          },
-          "right": {
-            "Fork": {
-              "left": {
-                "Fork": {
-                  "left": {
-                    "Fork": {
-                      "left": {
-                        "GateOnly": {
-                          "gate_idx": 4,
-                          "num_constants": 4,
-                          "degree": 3,
-                          "needs_selector": true,
-                          "is_lookup": false
-                        }
-                      },
-                      "right": {
-                        "Fork": {
-                          "left": {
-                            "Fork": {
-                              "left": {
-                                "GateOnly": {
-                                  "gate_idx": 5,
-                                  "num_constants": 1,
-                                  "degree": 2,
-                                  "needs_selector": true,
-                                  "is_lookup": false
-                                }
-                              },
-                              "right": {
-                                "GateOnly": {
-                                  "gate_idx": 6,
-                                  "num_constants": 0,
-                                  "degree": 2,
-                                  "needs_selector": true,
-                                  "is_lookup": false
-                                }
-                              }
-                            }
-                          },
-                          "right": {
-                            "Fork": {
-                              "left": {
-                                "GateOnly": {
-                                  "gate_idx": 2,
-                                  "num_constants": 0,
-                                  "degree": 2,
-                                  "needs_selector": true,
-                                  "is_lookup": false
-                                }
-                              },
-                              "right": {
-                                "GateOnly": {
-                                  "gate_idx": 7,
-                                  "num_constants": 0,
-                                  "degree": 2,
-                                  "needs_selector": true,
-                                  "is_lookup": false
-                                }
-                              }
-                            }
-                          }
-                        }
-                      }
-                    }
-                  },
-                  "right": {
-                    "Fork": {
-                      "left": {
-                        "GateOnly": {
-                          "gate_idx": 9,
-                          "num_constants": 4,
-                          "degree": 2,
-                          "needs_selector": true,
-                          "is_lookup": false
-                        }
-                      },
-                      "right": {
-                        "GateOnly": {
-                          "gate_idx": 0,
-                          "num_constants": 4,
-                          "degree": 1,
-                          "needs_selector": true,
-                          "is_lookup": false
-                        }
-                      }
-                    }
-                  }
-                }
-              },
-              "right": {
-                "Fork": {
-                  "left": {
-                    "GateOnly": {
-                      "gate_idx": 3,
-                      "num_constants": 2,
-                      "degree": 3,
-                      "needs_selector": true,
-                      "is_lookup": false
-                    }
-                  },
-                  "right": {
-                    "GateOnly": {
-                      "gate_idx": 8,
-                      "num_constants": 0,
-                      "degree": 0,
-                      "needs_selector": true,
-                      "is_lookup": false
-                    }
-                  }
-                }
-              }
-            }
-          }
-        }
-      },
-      "fri_lde_factor": 2,
-      "cap_size": 16
-    },
-    "setup_merkle_tree_cap": [
-      [
-        1107277819469948429,
-        7779138633457495557,
-        9933991506239962590,
-        13247997120867942045
-      ],
-      [
-        10020877950065961527,
-        6525352303263078852,
-        10601857031603992424,
-        6699333963081308583
-      ],
-      [
-        8019436446207312706,
-        17880026081547931046,
-        14023459613581442883,
-        12177363081042438182
-      ],
-      [
-        17643512238638359026,
-        2759065364120570462,
-        1113452962298378930,
-        9944550331137276877
-      ],
-      [
-        6208699382898547395,
-        9442366708032685349,
-        9362620233586526034,
-        6406469355002722194
-      ],
-      [
-        17265154700194893264,
-        11486849446382907011,
-        1331827641678752332,
-        13890193454573854721
-      ],
-      [
-        7338198937132638061,
-        9619578268260381257,
-        16966504852427653624,
-        5042032213830518832
-      ],
-      [
-        9998014800451912206,
-        2764915420573986646,
-        12638108373731502079,
-        13849566240043998295
-      ],
-      [
-        18402224478111895268,
-        10245397321907314013,
-        15810832121998678624,
-        16050833323870358750
-      ],
-      [
-        5754119484130347551,
-        1334330314055286585,
-        1196783225751134982,
-        13693638204576454858
-      ],
-      [
-        7476283313073466871,
-        3327838189135133206,
-        7576584001149251522,
-        4746763672176501097
-      ],
-      [
-        8341294580974175099,
-        6996214973372400649,
-        2825261487886819108,
-        17611476352036968111
-      ],
-      [
-        6481216673139681707,
-        12834349834818063790,
-        14423475559705119809,
-        15943814042360079510
-      ],
-      [
-        7771500178827314392,
-        5968639878444939173,
-        18006309838458312166,
-        368714734303788414
-      ],
-      [
-        2137428658614683231,
-        4604901863694850124,
-        3581156028309568037,
-        7485386108131533730
-      ],
-      [
-        1078544443818230878,
-        14117476483719501663,
-        17985826373971579789,
-        10600652728062682193
-      ]
-    ]
-  }
-}
\ No newline at end of file
diff --git a/prover/vk_setup_data_generator_server_fri/data/verification_leaf_15_key.json b/prover/vk_setup_data_generator_server_fri/data/verification_leaf_15_key.json
deleted file mode 100644
index 9457eb00fb97..000000000000
--- a/prover/vk_setup_data_generator_server_fri/data/verification_leaf_15_key.json
+++ /dev/null
@@ -1,262 +0,0 @@
-{
-  "LeafLayerCircuitForL1MessagesHasher": {
-    "fixed_parameters": {
-      "parameters": {
-        "num_columns_under_copy_permutation": 140,
-        "num_witness_columns": 0,
-        "num_constant_columns": 4,
-        "max_allowed_constraint_degree": 8
-      },
-      "lookup_parameters": "NoLookup",
-      "domain_size": 1048576,
-      "total_tables_len": 0,
-      "public_inputs_locations": [
-        [
-          0,
-          0
-        ],
-        [
-          1,
-          0
-        ],
-        [
-          2,
-          0
-        ],
-        [
-          3,
-          0
-        ]
-      ],
-      "extra_constant_polys_for_selectors": 4,
-      "table_ids_column_idxes": [],
-      "quotient_degree": 8,
-      "selectors_placement": {
-        "Fork": {
-          "left": {
-            "GateOnly": {
-              "gate_idx": 1,
-              "num_constants": 0,
-              "degree": 7,
-              "needs_selector": true,
-              "is_lookup": false
-            }
-          },
-          "right": {
-            "Fork": {
-              "left": {
-                "Fork": {
-                  "left": {
-                    "Fork": {
-                      "left": {
-                        "GateOnly": {
-                          "gate_idx": 4,
-                          "num_constants": 4,
-                          "degree": 3,
-                          "needs_selector": true,
-                          "is_lookup": false
-                        }
-                      },
-                      "right": {
-                        "Fork": {
-                          "left": {
-                            "Fork": {
-                              "left": {
-                                "GateOnly": {
-                                  "gate_idx": 5,
-                                  "num_constants": 1,
-                                  "degree": 2,
-                                  "needs_selector": true,
-                                  "is_lookup": false
-                                }
-                              },
-                              "right": {
-                                "GateOnly": {
-                                  "gate_idx": 6,
-                                  "num_constants": 0,
-                                  "degree": 2,
-                                  "needs_selector": true,
-                                  "is_lookup": false
-                                }
-                              }
-                            }
-                          },
-                          "right": {
-                            "Fork": {
-                              "left": {
-                                "GateOnly": {
-                                  "gate_idx": 2,
-                                  "num_constants": 0,
-                                  "degree": 2,
-                                  "needs_selector": true,
-                                  "is_lookup": false
-                                }
-                              },
-                              "right": {
-                                "GateOnly": {
-                                  "gate_idx": 7,
-                                  "num_constants": 0,
-                                  "degree": 2,
-                                  "needs_selector": true,
-                                  "is_lookup": false
-                                }
-                              }
-                            }
-                          }
-                        }
-                      }
-                    }
-                  },
-                  "right": {
-                    "Fork": {
-                      "left": {
-                        "GateOnly": {
-                          "gate_idx": 9,
-                          "num_constants": 4,
-                          "degree": 2,
-                          "needs_selector": true,
-                          "is_lookup": false
-                        }
-                      },
-                      "right": {
-                        "GateOnly": {
-                          "gate_idx": 0,
-                          "num_constants": 4,
-                          "degree": 1,
-                          "needs_selector": true,
-                          "is_lookup": false
-                        }
-                      }
-                    }
-                  }
-                }
-              },
-              "right": {
-                "Fork": {
-                  "left": {
-                    "GateOnly": {
-                      "gate_idx": 3,
-                      "num_constants": 2,
-                      "degree": 3,
-                      "needs_selector": true,
-                      "is_lookup": false
-                    }
-                  },
-                  "right": {
-                    "GateOnly": {
-                      "gate_idx": 8,
-                      "num_constants": 0,
-                      "degree": 0,
-                      "needs_selector": true,
-                      "is_lookup": false
-                    }
-                  }
-                }
-              }
-            }
-          }
-        }
-      },
-      "fri_lde_factor": 2,
-      "cap_size": 16
-    },
-    "setup_merkle_tree_cap": [
-      [
-        18238935086181014750,
-        12673103801320172126,
-        1807450351340584945,
-        4080587540382410469
-      ],
-      [
-        3576906271507691924,
-        15842010882262104289,
-        1545568012269070598,
-        15019610257262428212
-      ],
-      [
-        16552529329663272195,
-        70143638148036568,
-        9441616425189858949,
-        12576239326961652577
-      ],
-      [
-        13378751877668829423,
-        8821335076667849619,
-        8787507195664458069,
-        8033428383364368883
-      ],
-      [
-        14859204728026468678,
-        67528639960702832,
-        12174200483518178527,
-        14324674266854914755
-      ],
-      [
-        9830165552717527013,
-        2321461270838214863,
-        9268724714979319202,
-        9904762657753448069
-      ],
-      [
-        14141058045407997705,
-        17031147612244105327,
-        12751542125666982456,
-        17817764425153554681
-      ],
-      [
-        14795807291665277125,
-        12320949525745092193,
-        5617160704961099,
-        16219204181913320518
-      ],
-      [
-        7773282231989156729,
-        13990108174498859083,
-        6307778800331536092,
-        5637115465294994933
-      ],
-      [
-        3720582507396745477,
-        12235229471532413465,
-        2832424082557414313,
-        1295093033129086530
-      ],
-      [
-        5238251184464937674,
-        2468597264523797445,
-        7200015202778095391,
-        6285172799678453354
-      ],
-      [
-        14592230848145258634,
-        14635944054407782259,
-        16328656124118469880,
-        5673837317773168465
-      ],
-      [
-        10220932976054066577,
-        587071736468910470,
-        18317195354162201630,
-        4442910666147223606
-      ],
-      [
-        6686416988414600368,
-        14769819815353713716,
-        7130058524252605584,
-        9117426323287817862
-      ],
-      [
-        9696785136959918927,
-        10735699192129851744,
-        4483660550392452518,
-        16920055661791281465
-      ],
-      [
-        6465118959707729559,
-        15053655525644243783,
-        11077790678846863387,
-        377514359817848250
-      ]
-    ]
-  }
-}
\ No newline at end of file
diff --git a/prover/vk_setup_data_generator_server_fri/data/verification_leaf_1_key.json b/prover/vk_setup_data_generator_server_fri/data/verification_leaf_1_key.json
deleted file mode 100644
index 228a0e9fe926..000000000000
--- a/prover/vk_setup_data_generator_server_fri/data/verification_leaf_1_key.json
+++ /dev/null
@@ -1,270 +0,0 @@
-{
-  "SchedulerCircuit": {
-    "fixed_parameters": {
-      "parameters": {
-        "num_columns_under_copy_permutation": 130,
-        "num_witness_columns": 0,
-        "num_constant_columns": 4,
-        "max_allowed_constraint_degree": 8
-      },
-      "lookup_parameters": {
-        "UseSpecializedColumnsWithTableIdAsConstant": {
-          "width": 3,
-          "num_repetitions": 4,
-          "share_table_id": true
-        }
-      },
-      "domain_size": 1048576,
-      "total_tables_len": 132096,
-      "public_inputs_locations": [
-        [
-          0,
-          993345
-        ],
-        [
-          1,
-          993345
-        ],
-        [
-          2,
-          993345
-        ],
-        [
-          3,
-          993345
-        ]
-      ],
-      "extra_constant_polys_for_selectors": 4,
-      "table_ids_column_idxes": [
-        8
-      ],
-      "quotient_degree": 8,
-      "selectors_placement": {
-        "Fork": {
-          "left": {
-            "GateOnly": {
-              "gate_idx": 1,
-              "num_constants": 0,
-              "degree": 7,
-              "needs_selector": true,
-              "is_lookup": false
-            }
-          },
-          "right": {
-            "Fork": {
-              "left": {
-                "Fork": {
-                  "left": {
-                    "Fork": {
-                      "left": {
-                        "GateOnly": {
-                          "gate_idx": 4,
-                          "num_constants": 4,
-                          "degree": 3,
-                          "needs_selector": true,
-                          "is_lookup": false
-                        }
-                      },
-                      "right": {
-                        "Fork": {
-                          "left": {
-                            "Fork": {
-                              "left": {
-                                "GateOnly": {
-                                  "gate_idx": 5,
-                                  "num_constants": 1,
-                                  "degree": 2,
-                                  "needs_selector": true,
-                                  "is_lookup": false
-                                }
-                              },
-                              "right": {
-                                "GateOnly": {
-                                  "gate_idx": 6,
-                                  "num_constants": 0,
-                                  "degree": 2,
-                                  "needs_selector": true,
-                                  "is_lookup": false
-                                }
-                              }
-                            }
-                          },
-                          "right": {
-                            "Fork": {
-                              "left": {
-                                "GateOnly": {
-                                  "gate_idx": 2,
-                                  "num_constants": 0,
-                                  "degree": 2,
-                                  "needs_selector": true,
-                                  "is_lookup": false
-                                }
-                              },
-                              "right": {
-                                "GateOnly": {
-                                  "gate_idx": 7,
-                                  "num_constants": 0,
-                                  "degree": 2,
-                                  "needs_selector": true,
-                                  "is_lookup": false
-                                }
-                              }
-                            }
-                          }
-                        }
-                      }
-                    }
-                  },
-                  "right": {
-                    "Fork": {
-                      "left": {
-                        "GateOnly": {
-                          "gate_idx": 9,
-                          "num_constants": 4,
-                          "degree": 2,
-                          "needs_selector": true,
-                          "is_lookup": false
-                        }
-                      },
-                      "right": {
-                        "GateOnly": {
-                          "gate_idx": 0,
-                          "num_constants": 4,
-                          "degree": 1,
-                          "needs_selector": true,
-                          "is_lookup": false
-                        }
-                      }
-                    }
-                  }
-                }
-              },
-              "right": {
-                "Fork": {
-                  "left": {
-                    "GateOnly": {
-                      "gate_idx": 3,
-                      "num_constants": 2,
-                      "degree": 3,
-                      "needs_selector": true,
-                      "is_lookup": false
-                    }
-                  },
-                  "right": {
-                    "GateOnly": {
-                      "gate_idx": 8,
-                      "num_constants": 0,
-                      "degree": 0,
-                      "needs_selector": true,
-                      "is_lookup": false
-                    }
-                  }
-                }
-              }
-            }
-          }
-        }
-      },
-      "fri_lde_factor": 2,
-      "cap_size": 16
-    },
-    "setup_merkle_tree_cap": [
-      [
-        5188923951567823784,
-        1839604164061896861,
-        3760614143058722712,
-        17614504340708244503
-      ],
-      [
-        7889899638667026800,
-        14244435798393850379,
-        15230145556400915502,
-        12762495992738055897
-      ],
-      [
-        1590798346328722678,
-        14143092007536417439,
-        10480901561038728792,
-        3201431705395147463
-      ],
-      [
-        2780378477031897976,
-        11901528146276690135,
-        1343277030558816196,
-        6658753207411088573
-      ],
-      [
-        11039463659901501365,
-        8235548863391687887,
-        1033553352576624721,
-        12882010447949399432
-      ],
-      [
-        18078277235848158043,
-        14794319235551634496,
-        13982848369540832169,
-        11146980369941489422
-      ],
-      [
-        5423143341883663864,
-        15258729611778297770,
-        7733187200367671156,
-        11434904591161598775
-      ],
-      [
-        10914070908442174902,
-        8055525792807466851,
-        14391942428843610452,
-        11749906933466154458
-      ],
-      [
-        14580351359387308464,
-        13254290427053014332,
-        7257863927775762043,
-        11078203905320069045
-      ],
-      [
-        6123238811378029441,
-        11756658038961859601,
-        760000874907607862,
-        678236515728235822
-      ],
-      [
-        15657816790157674514,
-        4104741954972330508,
-        4150394799973679527,
-        15124992265078810298
-      ],
-      [
-        13825567788010925982,
-        636544017935987097,
-        2260460249587621344,
-        10354042489703999934
-      ],
-      [
-        12710868603685796297,
-        91862114057079406,
-        5614554900380483346,
-        131393259919990755
-      ],
-      [
-        13185811107579017595,
-        1006028503100864020,
-        2087984259170414019,
-        6445764843889735797
-      ],
-      [
-        10414938568348349467,
-        15415934042755645234,
-        11692038010863343064,
-        2402843492027871760
-      ],
-      [
-        17752536940710015241,
-        14329244239886245722,
-        16349180633511906354,
-        2663305413222761702
-      ]
-    ]
-  }
-}
\ No newline at end of file
diff --git a/prover/vk_setup_data_generator_server_fri/data/verification_leaf_2_key.json b/prover/vk_setup_data_generator_server_fri/data/verification_leaf_2_key.json
deleted file mode 100644
index 7865e106454e..000000000000
--- a/prover/vk_setup_data_generator_server_fri/data/verification_leaf_2_key.json
+++ /dev/null
@@ -1,262 +0,0 @@
-{
-  "NodeLayerCircuit": {
-    "fixed_parameters": {
-      "parameters": {
-        "num_columns_under_copy_permutation": 140,
-        "num_witness_columns": 0,
-        "num_constant_columns": 4,
-        "max_allowed_constraint_degree": 8
-      },
-      "lookup_parameters": "NoLookup",
-      "domain_size": 1048576,
-      "total_tables_len": 0,
-      "public_inputs_locations": [
-        [
-          0,
-          0
-        ],
-        [
-          1,
-          0
-        ],
-        [
-          2,
-          0
-        ],
-        [
-          3,
-          0
-        ]
-      ],
-      "extra_constant_polys_for_selectors": 4,
-      "table_ids_column_idxes": [],
-      "quotient_degree": 8,
-      "selectors_placement": {
-        "Fork": {
-          "left": {
-            "GateOnly": {
-              "gate_idx": 1,
-              "num_constants": 0,
-              "degree": 7,
-              "needs_selector": true,
-              "is_lookup": false
-            }
-          },
-          "right": {
-            "Fork": {
-              "left": {
-                "Fork": {
-                  "left": {
-                    "Fork": {
-                      "left": {
-                        "GateOnly": {
-                          "gate_idx": 4,
-                          "num_constants": 4,
-                          "degree": 3,
-                          "needs_selector": true,
-                          "is_lookup": false
-                        }
-                      },
-                      "right": {
-                        "Fork": {
-                          "left": {
-                            "Fork": {
-                              "left": {
-                                "GateOnly": {
-                                  "gate_idx": 5,
-                                  "num_constants": 1,
-                                  "degree": 2,
-                                  "needs_selector": true,
-                                  "is_lookup": false
-                                }
-                              },
-                              "right": {
-                                "GateOnly": {
-                                  "gate_idx": 6,
-                                  "num_constants": 0,
-                                  "degree": 2,
-                                  "needs_selector": true,
-                                  "is_lookup": false
-                                }
-                              }
-                            }
-                          },
-                          "right": {
-                            "Fork": {
-                              "left": {
-                                "GateOnly": {
-                                  "gate_idx": 2,
-                                  "num_constants": 0,
-                                  "degree": 2,
-                                  "needs_selector": true,
-                                  "is_lookup": false
-                                }
-                              },
-                              "right": {
-                                "GateOnly": {
-                                  "gate_idx": 7,
-                                  "num_constants": 0,
-                                  "degree": 2,
-                                  "needs_selector": true,
-                                  "is_lookup": false
-                                }
-                              }
-                            }
-                          }
-                        }
-                      }
-                    }
-                  },
-                  "right": {
-                    "Fork": {
-                      "left": {
-                        "GateOnly": {
-                          "gate_idx": 9,
-                          "num_constants": 4,
-                          "degree": 2,
-                          "needs_selector": true,
-                          "is_lookup": false
-                        }
-                      },
-                      "right": {
-                        "GateOnly": {
-                          "gate_idx": 0,
-                          "num_constants": 4,
-                          "degree": 1,
-                          "needs_selector": true,
-                          "is_lookup": false
-                        }
-                      }
-                    }
-                  }
-                }
-              },
-              "right": {
-                "Fork": {
-                  "left": {
-                    "GateOnly": {
-                      "gate_idx": 3,
-                      "num_constants": 2,
-                      "degree": 3,
-                      "needs_selector": true,
-                      "is_lookup": false
-                    }
-                  },
-                  "right": {
-                    "GateOnly": {
-                      "gate_idx": 8,
-                      "num_constants": 0,
-                      "degree": 0,
-                      "needs_selector": true,
-                      "is_lookup": false
-                    }
-                  }
-                }
-              }
-            }
-          }
-        }
-      },
-      "fri_lde_factor": 2,
-      "cap_size": 16
-    },
-    "setup_merkle_tree_cap": [
-      [
-        16110944391299715992,
-        6257581196984129533,
-        3238325178821009741,
-        2344850491864189019
-      ],
-      [
-        9070724167014080545,
-        4270936005334206500,
-        14011092173278602876,
-        17233390044312666340
-      ],
-      [
-        15882294806312417165,
-        4574813182503183418,
-        15374759504522847393,
-        12609068726586761599
-      ],
-      [
-        5081359810005150600,
-        3073725930902770385,
-        12151383627606620216,
-        1678712612408922293
-      ],
-      [
-        13389075440637154488,
-        1394733244174774927,
-        15897027408886080730,
-        8756205416909346149
-      ],
-      [
-        9635595243774498130,
-        12944626865667316474,
-        11443383015868895087,
-        11271399114434241688
-      ],
-      [
-        15730316965377191644,
-        9302195093067483199,
-        13013113029527355010,
-        16107136888029757437
-      ],
-      [
-        4376996761649023946,
-        5151155327098069058,
-        5052643273518683586,
-        4214154406154441301
-      ],
-      [
-        14323780220991293990,
-        8193587898306996901,
-        5671887774622993207,
-        9546628649033002185
-      ],
-      [
-        16523271232278987128,
-        994857983084927437,
-        14501829109938165419,
-        9015660151307809950
-      ],
-      [
-        1530238726285436995,
-        6261885523422263637,
-        11940153058268689285,
-        15737357444014615384
-      ],
-      [
-        2670341602838046451,
-        10669331667080282584,
-        16656965855764533819,
-        13339778044433609883
-      ],
-      [
-        17128805815986618686,
-        18194734266790270296,
-        5735422502154213482,
-        10164141197176685232
-      ],
-      [
-        2629176720116777217,
-        6966722226648521547,
-        2937669813272776408,
-        2812827195714811672
-      ],
-      [
-        6178870790111010071,
-        10834984121929556338,
-        2836091052290008872,
-        1311164878771236983
-      ],
-      [
-        7411275786539821863,
-        3702190765468277039,
-        18130480549896087952,
-        5277641488054089382
-      ]
-    ]
-  }
-}
\ No newline at end of file
diff --git a/prover/vk_setup_data_generator_server_fri/data/verification_leaf_3_key.json b/prover/vk_setup_data_generator_server_fri/data/verification_leaf_3_key.json
deleted file mode 100644
index d117b3b0ade3..000000000000
--- a/prover/vk_setup_data_generator_server_fri/data/verification_leaf_3_key.json
+++ /dev/null
@@ -1,262 +0,0 @@
-{
-  "LeafLayerCircuitForMainVM": {
-    "fixed_parameters": {
-      "parameters": {
-        "num_columns_under_copy_permutation": 140,
-        "num_witness_columns": 0,
-        "num_constant_columns": 4,
-        "max_allowed_constraint_degree": 8
-      },
-      "lookup_parameters": "NoLookup",
-      "domain_size": 1048576,
-      "total_tables_len": 0,
-      "public_inputs_locations": [
-        [
-          0,
-          0
-        ],
-        [
-          1,
-          0
-        ],
-        [
-          2,
-          0
-        ],
-        [
-          3,
-          0
-        ]
-      ],
-      "extra_constant_polys_for_selectors": 4,
-      "table_ids_column_idxes": [],
-      "quotient_degree": 8,
-      "selectors_placement": {
-        "Fork": {
-          "left": {
-            "GateOnly": {
-              "gate_idx": 1,
-              "num_constants": 0,
-              "degree": 7,
-              "needs_selector": true,
-              "is_lookup": false
-            }
-          },
-          "right": {
-            "Fork": {
-              "left": {
-                "Fork": {
-                  "left": {
-                    "Fork": {
-                      "left": {
-                        "GateOnly": {
-                          "gate_idx": 4,
-                          "num_constants": 4,
-                          "degree": 3,
-                          "needs_selector": true,
-                          "is_lookup": false
-                        }
-                      },
-                      "right": {
-                        "Fork": {
-                          "left": {
-                            "Fork": {
-                              "left": {
-                                "GateOnly": {
-                                  "gate_idx": 5,
-                                  "num_constants": 1,
-                                  "degree": 2,
-                                  "needs_selector": true,
-                                  "is_lookup": false
-                                }
-                              },
-                              "right": {
-                                "GateOnly": {
-                                  "gate_idx": 6,
-                                  "num_constants": 0,
-                                  "degree": 2,
-                                  "needs_selector": true,
-                                  "is_lookup": false
-                                }
-                              }
-                            }
-                          },
-                          "right": {
-                            "Fork": {
-                              "left": {
-                                "GateOnly": {
-                                  "gate_idx": 2,
-                                  "num_constants": 0,
-                                  "degree": 2,
-                                  "needs_selector": true,
-                                  "is_lookup": false
-                                }
-                              },
-                              "right": {
-                                "GateOnly": {
-                                  "gate_idx": 7,
-                                  "num_constants": 0,
-                                  "degree": 2,
-                                  "needs_selector": true,
-                                  "is_lookup": false
-                                }
-                              }
-                            }
-                          }
-                        }
-                      }
-                    }
-                  },
-                  "right": {
-                    "Fork": {
-                      "left": {
-                        "GateOnly": {
-                          "gate_idx": 9,
-                          "num_constants": 4,
-                          "degree": 2,
-                          "needs_selector": true,
-                          "is_lookup": false
-                        }
-                      },
-                      "right": {
-                        "GateOnly": {
-                          "gate_idx": 0,
-                          "num_constants": 4,
-                          "degree": 1,
-                          "needs_selector": true,
-                          "is_lookup": false
-                        }
-                      }
-                    }
-                  }
-                }
-              },
-              "right": {
-                "Fork": {
-                  "left": {
-                    "GateOnly": {
-                      "gate_idx": 3,
-                      "num_constants": 2,
-                      "degree": 3,
-                      "needs_selector": true,
-                      "is_lookup": false
-                    }
-                  },
-                  "right": {
-                    "GateOnly": {
-                      "gate_idx": 8,
-                      "num_constants": 0,
-                      "degree": 0,
-                      "needs_selector": true,
-                      "is_lookup": false
-                    }
-                  }
-                }
-              }
-            }
-          }
-        }
-      },
-      "fri_lde_factor": 2,
-      "cap_size": 16
-    },
-    "setup_merkle_tree_cap": [
-      [
-        2692117301910616223,
-        11862373594405581684,
-        12092750955553531256,
-        5108545912057877223
-      ],
-      [
-        13191057082261271313,
-        13461898869001565340,
-        3144977546711926190,
-        12887787173850649640
-      ],
-      [
-        8723842528870621436,
-        9645915571392535116,
-        6025366220407814286,
-        4747467989456698429
-      ],
-      [
-        7405718287975487752,
-        15471426320802247554,
-        8018397484818843188,
-        1076292840128333912
-      ],
-      [
-        15567092204640112640,
-        13512378722158897717,
-        16839350703341635379,
-        6580006701757635256
-      ],
-      [
-        478392572686859273,
-        1879898158113218624,
-        7956515309033309445,
-        15667184770862761054
-      ],
-      [
-        4738701842169478640,
-        14432395387726327998,
-        14827473518830139511,
-        7026071202596813302
-      ],
-      [
-        1832914181581899534,
-        12309614119776336180,
-        1786307750405330285,
-        9394109377731731297
-      ],
-      [
-        11330017822804908986,
-        17965075245400465236,
-        178921019209832245,
-        9010774195056378656
-      ],
-      [
-        10066603459136751242,
-        16922354046552351580,
-        1488715132336554574,
-        2488902959064634539
-      ],
-      [
-        12764025501053651238,
-        10583029583148326399,
-        10919956138611547307,
-        193732647159610859
-      ],
-      [
-        10812330075474661907,
-        11023893070918609227,
-        14153054852108697346,
-        3310659191720741717
-      ],
-      [
-        12566885554555589997,
-        5264949142237538963,
-        10357889278039077105,
-        1693879812388879198
-      ],
-      [
-        5143074524340781416,
-        1340176837904332618,
-        12593249647365922721,
-        16619880365401544994
-      ],
-      [
-        8116207797925146203,
-        2436416957055038167,
-        1598938366845903588,
-        7153648406343743028
-      ],
-      [
-        14400322751382246405,
-        4576201222988375875,
-        10482138496908129257,
-        1696076921104575474
-      ]
-    ]
-  }
-}
\ No newline at end of file
diff --git a/prover/vk_setup_data_generator_server_fri/data/verification_leaf_4_key.json b/prover/vk_setup_data_generator_server_fri/data/verification_leaf_4_key.json
deleted file mode 100644
index e8b25fd5f245..000000000000
--- a/prover/vk_setup_data_generator_server_fri/data/verification_leaf_4_key.json
+++ /dev/null
@@ -1,262 +0,0 @@
-{
-  "LeafLayerCircuitForCodeDecommittmentsSorter": {
-    "fixed_parameters": {
-      "parameters": {
-        "num_columns_under_copy_permutation": 140,
-        "num_witness_columns": 0,
-        "num_constant_columns": 4,
-        "max_allowed_constraint_degree": 8
-      },
-      "lookup_parameters": "NoLookup",
-      "domain_size": 1048576,
-      "total_tables_len": 0,
-      "public_inputs_locations": [
-        [
-          0,
-          0
-        ],
-        [
-          1,
-          0
-        ],
-        [
-          2,
-          0
-        ],
-        [
-          3,
-          0
-        ]
-      ],
-      "extra_constant_polys_for_selectors": 4,
-      "table_ids_column_idxes": [],
-      "quotient_degree": 8,
-      "selectors_placement": {
-        "Fork": {
-          "left": {
-            "GateOnly": {
-              "gate_idx": 1,
-              "num_constants": 0,
-              "degree": 7,
-              "needs_selector": true,
-              "is_lookup": false
-            }
-          },
-          "right": {
-            "Fork": {
-              "left": {
-                "Fork": {
-                  "left": {
-                    "Fork": {
-                      "left": {
-                        "GateOnly": {
-                          "gate_idx": 4,
-                          "num_constants": 4,
-                          "degree": 3,
-                          "needs_selector": true,
-                          "is_lookup": false
-                        }
-                      },
-                      "right": {
-                        "Fork": {
-                          "left": {
-                            "Fork": {
-                              "left": {
-                                "GateOnly": {
-                                  "gate_idx": 5,
-                                  "num_constants": 1,
-                                  "degree": 2,
-                                  "needs_selector": true,
-                                  "is_lookup": false
-                                }
-                              },
-                              "right": {
-                                "GateOnly": {
-                                  "gate_idx": 6,
-                                  "num_constants": 0,
-                                  "degree": 2,
-                                  "needs_selector": true,
-                                  "is_lookup": false
-                                }
-                              }
-                            }
-                          },
-                          "right": {
-                            "Fork": {
-                              "left": {
-                                "GateOnly": {
-                                  "gate_idx": 2,
-                                  "num_constants": 0,
-                                  "degree": 2,
-                                  "needs_selector": true,
-                                  "is_lookup": false
-                                }
-                              },
-                              "right": {
-                                "GateOnly": {
-                                  "gate_idx": 7,
-                                  "num_constants": 0,
-                                  "degree": 2,
-                                  "needs_selector": true,
-                                  "is_lookup": false
-                                }
-                              }
-                            }
-                          }
-                        }
-                      }
-                    }
-                  },
-                  "right": {
-                    "Fork": {
-                      "left": {
-                        "GateOnly": {
-                          "gate_idx": 9,
-                          "num_constants": 4,
-                          "degree": 2,
-                          "needs_selector": true,
-                          "is_lookup": false
-                        }
-                      },
-                      "right": {
-                        "GateOnly": {
-                          "gate_idx": 0,
-                          "num_constants": 4,
-                          "degree": 1,
-                          "needs_selector": true,
-                          "is_lookup": false
-                        }
-                      }
-                    }
-                  }
-                }
-              },
-              "right": {
-                "Fork": {
-                  "left": {
-                    "GateOnly": {
-                      "gate_idx": 3,
-                      "num_constants": 2,
-                      "degree": 3,
-                      "needs_selector": true,
-                      "is_lookup": false
-                    }
-                  },
-                  "right": {
-                    "GateOnly": {
-                      "gate_idx": 8,
-                      "num_constants": 0,
-                      "degree": 0,
-                      "needs_selector": true,
-                      "is_lookup": false
-                    }
-                  }
-                }
-              }
-            }
-          }
-        }
-      },
-      "fri_lde_factor": 2,
-      "cap_size": 16
-    },
-    "setup_merkle_tree_cap": [
-      [
-        1866437491015022712,
-        11793636374252065717,
-        2771461065434523690,
-        14888818750197177871
-      ],
-      [
-        13530099303626962147,
-        15053516955824087922,
-        12339234049539021204,
-        9708862473063699060
-      ],
-      [
-        11432132052297230557,
-        6677170992284491097,
-        6366885341898621463,
-        8111143143511568092
-      ],
-      [
-        9907106152447520228,
-        6682147062594018467,
-        10264912494418416112,
-        15503628246857005809
-      ],
-      [
-        17195185271365515391,
-        13597952072744597251,
-        17744684609835730837,
-        2231158103010709548
-      ],
-      [
-        14293262369681823328,
-        13130511952565359928,
-        10899311746723421149,
-        13247944667340766269
-      ],
-      [
-        13892335977334728116,
-        8911034200951442707,
-        9940381085909975496,
-        2442123831058139778
-      ],
-      [
-        6225220793196790211,
-        4712637343981148404,
-        17195066106455293379,
-        8613492331172308471
-      ],
-      [
-        6909799331954538355,
-        10338179227896084459,
-        12127192147500716446,
-        17400998769923799388
-      ],
-      [
-        16539422822493187900,
-        14101588151214983695,
-        13891327598256492007,
-        6120137922715167439
-      ],
-      [
-        14993757510795074537,
-        2243361897978774751,
-        3014175478852553185,
-        1107614745766341650
-      ],
-      [
-        13868198230244075748,
-        14568344587632252919,
-        18167720887640456957,
-        892660889500481924
-      ],
-      [
-        17208474456800792292,
-        12638116024924785718,
-        17972572249167165358,
-        14432332670537563027
-      ],
-      [
-        16794312278798106244,
-        18025850455584262724,
-        9034611355178459632,
-        4812066730993316535
-      ],
-      [
-        9019282623207016172,
-        8465996543066345624,
-        11891692540217379621,
-        1309821012694343566
-      ],
-      [
-        1009066940610956673,
-        6090643896458703235,
-        16512441752812232072,
-        14910610346758346291
-      ]
-    ]
-  }
-}
\ No newline at end of file
diff --git a/prover/vk_setup_data_generator_server_fri/data/verification_leaf_5_key.json b/prover/vk_setup_data_generator_server_fri/data/verification_leaf_5_key.json
deleted file mode 100644
index eb327eed3dd1..000000000000
--- a/prover/vk_setup_data_generator_server_fri/data/verification_leaf_5_key.json
+++ /dev/null
@@ -1,262 +0,0 @@
-{
-  "LeafLayerCircuitForCodeDecommitter": {
-    "fixed_parameters": {
-      "parameters": {
-        "num_columns_under_copy_permutation": 140,
-        "num_witness_columns": 0,
-        "num_constant_columns": 4,
-        "max_allowed_constraint_degree": 8
-      },
-      "lookup_parameters": "NoLookup",
-      "domain_size": 1048576,
-      "total_tables_len": 0,
-      "public_inputs_locations": [
-        [
-          0,
-          0
-        ],
-        [
-          1,
-          0
-        ],
-        [
-          2,
-          0
-        ],
-        [
-          3,
-          0
-        ]
-      ],
-      "extra_constant_polys_for_selectors": 4,
-      "table_ids_column_idxes": [],
-      "quotient_degree": 8,
-      "selectors_placement": {
-        "Fork": {
-          "left": {
-            "GateOnly": {
-              "gate_idx": 1,
-              "num_constants": 0,
-              "degree": 7,
-              "needs_selector": true,
-              "is_lookup": false
-            }
-          },
-          "right": {
-            "Fork": {
-              "left": {
-                "Fork": {
-                  "left": {
-                    "Fork": {
-                      "left": {
-                        "GateOnly": {
-                          "gate_idx": 4,
-                          "num_constants": 4,
-                          "degree": 3,
-                          "needs_selector": true,
-                          "is_lookup": false
-                        }
-                      },
-                      "right": {
-                        "Fork": {
-                          "left": {
-                            "Fork": {
-                              "left": {
-                                "GateOnly": {
-                                  "gate_idx": 5,
-                                  "num_constants": 1,
-                                  "degree": 2,
-                                  "needs_selector": true,
-                                  "is_lookup": false
-                                }
-                              },
-                              "right": {
-                                "GateOnly": {
-                                  "gate_idx": 6,
-                                  "num_constants": 0,
-                                  "degree": 2,
-                                  "needs_selector": true,
-                                  "is_lookup": false
-                                }
-                              }
-                            }
-                          },
-                          "right": {
-                            "Fork": {
-                              "left": {
-                                "GateOnly": {
-                                  "gate_idx": 2,
-                                  "num_constants": 0,
-                                  "degree": 2,
-                                  "needs_selector": true,
-                                  "is_lookup": false
-                                }
-                              },
-                              "right": {
-                                "GateOnly": {
-                                  "gate_idx": 7,
-                                  "num_constants": 0,
-                                  "degree": 2,
-                                  "needs_selector": true,
-                                  "is_lookup": false
-                                }
-                              }
-                            }
-                          }
-                        }
-                      }
-                    }
-                  },
-                  "right": {
-                    "Fork": {
-                      "left": {
-                        "GateOnly": {
-                          "gate_idx": 9,
-                          "num_constants": 4,
-                          "degree": 2,
-                          "needs_selector": true,
-                          "is_lookup": false
-                        }
-                      },
-                      "right": {
-                        "GateOnly": {
-                          "gate_idx": 0,
-                          "num_constants": 4,
-                          "degree": 1,
-                          "needs_selector": true,
-                          "is_lookup": false
-                        }
-                      }
-                    }
-                  }
-                }
-              },
-              "right": {
-                "Fork": {
-                  "left": {
-                    "GateOnly": {
-                      "gate_idx": 3,
-                      "num_constants": 2,
-                      "degree": 3,
-                      "needs_selector": true,
-                      "is_lookup": false
-                    }
-                  },
-                  "right": {
-                    "GateOnly": {
-                      "gate_idx": 8,
-                      "num_constants": 0,
-                      "degree": 0,
-                      "needs_selector": true,
-                      "is_lookup": false
-                    }
-                  }
-                }
-              }
-            }
-          }
-        }
-      },
-      "fri_lde_factor": 2,
-      "cap_size": 16
-    },
-    "setup_merkle_tree_cap": [
-      [
-        232279302667736671,
-        6726532338542220941,
-        13706010138770265797,
-        519282525097925002
-      ],
-      [
-        1103871324670382881,
-        2908131767596043522,
-        1184743003960864148,
-        15387210180491180588
-      ],
-      [
-        1835139914361735684,
-        16415559350382398669,
-        5395927063819619365,
-        11718217787759145490
-      ],
-      [
-        16896753956696589678,
-        18311507677904418762,
-        3337753834358040142,
-        15261701009883534681
-      ],
-      [
-        5146023192165443108,
-        6435094416669057886,
-        12102399260358768173,
-        11345203084302025912
-      ],
-      [
-        12317726061088124860,
-        16542505080079874955,
-        14545249352878185130,
-        6198318878248226108
-      ],
-      [
-        11741052063217712776,
-        6746988457930817443,
-        17049940702304400525,
-        664483646520961959
-      ],
-      [
-        16848268934698055336,
-        15351522766275089309,
-        3303427044017225869,
-        8449387423137144953
-      ],
-      [
-        3539943683510232958,
-        9977830546935578537,
-        14361154867928067261,
-        18078907485257653963
-      ],
-      [
-        9615907517852235498,
-        4547984845394069068,
-        1881087510325623488,
-        8387507487023822878
-      ],
-      [
-        4914791735672339571,
-        2927646189877435594,
-        8101987065768319522,
-        11220909861720631116
-      ],
-      [
-        12470368453784044761,
-        11566657313839792570,
-        8916441472890022081,
-        2460153038592468216
-      ],
-      [
-        11111897832305454757,
-        16681613892385931738,
-        11167212997482997212,
-        12907774125001975406
-      ],
-      [
-        12356110082580425887,
-        2082693370541797346,
-        6346996203748293162,
-        13460912313801928
-      ],
-      [
-        17583700199336254135,
-        3213348565987316027,
-        6373106379194368913,
-        3269747122288195701
-      ],
-      [
-        6235590918094214281,
-        6461943464583505547,
-        16473683422501694355,
-        5297565830886346313
-      ]
-    ]
-  }
-}
\ No newline at end of file
diff --git a/prover/vk_setup_data_generator_server_fri/data/verification_leaf_6_key.json b/prover/vk_setup_data_generator_server_fri/data/verification_leaf_6_key.json
deleted file mode 100644
index fcfc585f123a..000000000000
--- a/prover/vk_setup_data_generator_server_fri/data/verification_leaf_6_key.json
+++ /dev/null
@@ -1,262 +0,0 @@
-{
-  "LeafLayerCircuitForLogDemuxer": {
-    "fixed_parameters": {
-      "parameters": {
-        "num_columns_under_copy_permutation": 140,
-        "num_witness_columns": 0,
-        "num_constant_columns": 4,
-        "max_allowed_constraint_degree": 8
-      },
-      "lookup_parameters": "NoLookup",
-      "domain_size": 1048576,
-      "total_tables_len": 0,
-      "public_inputs_locations": [
-        [
-          0,
-          0
-        ],
-        [
-          1,
-          0
-        ],
-        [
-          2,
-          0
-        ],
-        [
-          3,
-          0
-        ]
-      ],
-      "extra_constant_polys_for_selectors": 4,
-      "table_ids_column_idxes": [],
-      "quotient_degree": 8,
-      "selectors_placement": {
-        "Fork": {
-          "left": {
-            "GateOnly": {
-              "gate_idx": 1,
-              "num_constants": 0,
-              "degree": 7,
-              "needs_selector": true,
-              "is_lookup": false
-            }
-          },
-          "right": {
-            "Fork": {
-              "left": {
-                "Fork": {
-                  "left": {
-                    "Fork": {
-                      "left": {
-                        "GateOnly": {
-                          "gate_idx": 4,
-                          "num_constants": 4,
-                          "degree": 3,
-                          "needs_selector": true,
-                          "is_lookup": false
-                        }
-                      },
-                      "right": {
-                        "Fork": {
-                          "left": {
-                            "Fork": {
-                              "left": {
-                                "GateOnly": {
-                                  "gate_idx": 5,
-                                  "num_constants": 1,
-                                  "degree": 2,
-                                  "needs_selector": true,
-                                  "is_lookup": false
-                                }
-                              },
-                              "right": {
-                                "GateOnly": {
-                                  "gate_idx": 6,
-                                  "num_constants": 0,
-                                  "degree": 2,
-                                  "needs_selector": true,
-                                  "is_lookup": false
-                                }
-                              }
-                            }
-                          },
-                          "right": {
-                            "Fork": {
-                              "left": {
-                                "GateOnly": {
-                                  "gate_idx": 2,
-                                  "num_constants": 0,
-                                  "degree": 2,
-                                  "needs_selector": true,
-                                  "is_lookup": false
-                                }
-                              },
-                              "right": {
-                                "GateOnly": {
-                                  "gate_idx": 7,
-                                  "num_constants": 0,
-                                  "degree": 2,
-                                  "needs_selector": true,
-                                  "is_lookup": false
-                                }
-                              }
-                            }
-                          }
-                        }
-                      }
-                    }
-                  },
-                  "right": {
-                    "Fork": {
-                      "left": {
-                        "GateOnly": {
-                          "gate_idx": 9,
-                          "num_constants": 4,
-                          "degree": 2,
-                          "needs_selector": true,
-                          "is_lookup": false
-                        }
-                      },
-                      "right": {
-                        "GateOnly": {
-                          "gate_idx": 0,
-                          "num_constants": 4,
-                          "degree": 1,
-                          "needs_selector": true,
-                          "is_lookup": false
-                        }
-                      }
-                    }
-                  }
-                }
-              },
-              "right": {
-                "Fork": {
-                  "left": {
-                    "GateOnly": {
-                      "gate_idx": 3,
-                      "num_constants": 2,
-                      "degree": 3,
-                      "needs_selector": true,
-                      "is_lookup": false
-                    }
-                  },
-                  "right": {
-                    "GateOnly": {
-                      "gate_idx": 8,
-                      "num_constants": 0,
-                      "degree": 0,
-                      "needs_selector": true,
-                      "is_lookup": false
-                    }
-                  }
-                }
-              }
-            }
-          }
-        }
-      },
-      "fri_lde_factor": 2,
-      "cap_size": 16
-    },
-    "setup_merkle_tree_cap": [
-      [
-        1255474782692205032,
-        16087518293005221749,
-        16120433120690725791,
-        13557959444835590881
-      ],
-      [
-        16027822192018731390,
-        8319846902607826113,
-        11762447400221114192,
-        8443748859905122045
-      ],
-      [
-        14217444156040642299,
-        11667925428120549150,
-        8770581120601633705,
-        13711220870168951809
-      ],
-      [
-        7514565357525361228,
-        17561543150251615679,
-        3154909983341532730,
-        12214081580202496570
-      ],
-      [
-        12103863316007597160,
-        3323941154151772169,
-        3020605753288032659,
-        13719536383629040140
-      ],
-      [
-        5692457694309768505,
-        2819674835255412986,
-        762859630950656893,
-        8641902833919071345
-      ],
-      [
-        17873529730032253633,
-        7201386304292118615,
-        11501182428688354869,
-        484571398574807569
-      ],
-      [
-        14885817894337856307,
-        6275077850611154396,
-        11258872656630844770,
-        3539429443980133849
-      ],
-      [
-        15063387858351738900,
-        4885324227361507661,
-        11843813664335157415,
-        12108718617943024927
-      ],
-      [
-        5899829642851923448,
-        12815217964596374101,
-        5258792099613493578,
-        3492836714462054208
-      ],
-      [
-        9767772893712446038,
-        9516937526725710003,
-        533138889369363889,
-        1960629141548643757
-      ],
-      [
-        5192250756718034923,
-        6205844331296290914,
-        16547640844499692480,
-        13348222714661177711
-      ],
-      [
-        6744522815256114347,
-        9303892902465539007,
-        14440545534790765924,
-        7421221195917428336
-      ],
-      [
-        354635080958416363,
-        15720855927808633651,
-        885375182959288083,
-        10459197185009191208
-      ],
-      [
-        3742508711441291317,
-        7193882150736289342,
-        17760334643806787982,
-        8575009527221694930
-      ],
-      [
-        18274184058397159114,
-        5200115837479315537,
-        2808181877606937346,
-        17946239285125192080
-      ]
-    ]
-  }
-}
\ No newline at end of file
diff --git a/prover/vk_setup_data_generator_server_fri/data/verification_leaf_7_key.json b/prover/vk_setup_data_generator_server_fri/data/verification_leaf_7_key.json
deleted file mode 100644
index 1ab34e32a4f7..000000000000
--- a/prover/vk_setup_data_generator_server_fri/data/verification_leaf_7_key.json
+++ /dev/null
@@ -1,262 +0,0 @@
-{
-  "LeafLayerCircuitForKeccakRoundFunction": {
-    "fixed_parameters": {
-      "parameters": {
-        "num_columns_under_copy_permutation": 140,
-        "num_witness_columns": 0,
-        "num_constant_columns": 4,
-        "max_allowed_constraint_degree": 8
-      },
-      "lookup_parameters": "NoLookup",
-      "domain_size": 1048576,
-      "total_tables_len": 0,
-      "public_inputs_locations": [
-        [
-          0,
-          0
-        ],
-        [
-          1,
-          0
-        ],
-        [
-          2,
-          0
-        ],
-        [
-          3,
-          0
-        ]
-      ],
-      "extra_constant_polys_for_selectors": 4,
-      "table_ids_column_idxes": [],
-      "quotient_degree": 8,
-      "selectors_placement": {
-        "Fork": {
-          "left": {
-            "GateOnly": {
-              "gate_idx": 1,
-              "num_constants": 0,
-              "degree": 7,
-              "needs_selector": true,
-              "is_lookup": false
-            }
-          },
-          "right": {
-            "Fork": {
-              "left": {
-                "Fork": {
-                  "left": {
-                    "Fork": {
-                      "left": {
-                        "GateOnly": {
-                          "gate_idx": 4,
-                          "num_constants": 4,
-                          "degree": 3,
-                          "needs_selector": true,
-                          "is_lookup": false
-                        }
-                      },
-                      "right": {
-                        "Fork": {
-                          "left": {
-                            "Fork": {
-                              "left": {
-                                "GateOnly": {
-                                  "gate_idx": 5,
-                                  "num_constants": 1,
-                                  "degree": 2,
-                                  "needs_selector": true,
-                                  "is_lookup": false
-                                }
-                              },
-                              "right": {
-                                "GateOnly": {
-                                  "gate_idx": 6,
-                                  "num_constants": 0,
-                                  "degree": 2,
-                                  "needs_selector": true,
-                                  "is_lookup": false
-                                }
-                              }
-                            }
-                          },
-                          "right": {
-                            "Fork": {
-                              "left": {
-                                "GateOnly": {
-                                  "gate_idx": 2,
-                                  "num_constants": 0,
-                                  "degree": 2,
-                                  "needs_selector": true,
-                                  "is_lookup": false
-                                }
-                              },
-                              "right": {
-                                "GateOnly": {
-                                  "gate_idx": 7,
-                                  "num_constants": 0,
-                                  "degree": 2,
-                                  "needs_selector": true,
-                                  "is_lookup": false
-                                }
-                              }
-                            }
-                          }
-                        }
-                      }
-                    }
-                  },
-                  "right": {
-                    "Fork": {
-                      "left": {
-                        "GateOnly": {
-                          "gate_idx": 9,
-                          "num_constants": 4,
-                          "degree": 2,
-                          "needs_selector": true,
-                          "is_lookup": false
-                        }
-                      },
-                      "right": {
-                        "GateOnly": {
-                          "gate_idx": 0,
-                          "num_constants": 4,
-                          "degree": 1,
-                          "needs_selector": true,
-                          "is_lookup": false
-                        }
-                      }
-                    }
-                  }
-                }
-              },
-              "right": {
-                "Fork": {
-                  "left": {
-                    "GateOnly": {
-                      "gate_idx": 3,
-                      "num_constants": 2,
-                      "degree": 3,
-                      "needs_selector": true,
-                      "is_lookup": false
-                    }
-                  },
-                  "right": {
-                    "GateOnly": {
-                      "gate_idx": 8,
-                      "num_constants": 0,
-                      "degree": 0,
-                      "needs_selector": true,
-                      "is_lookup": false
-                    }
-                  }
-                }
-              }
-            }
-          }
-        }
-      },
-      "fri_lde_factor": 2,
-      "cap_size": 16
-    },
-    "setup_merkle_tree_cap": [
-      [
-        15278222994235313807,
-        4647505541828109982,
-        11601404244072907522,
-        7495301362149670205
-      ],
-      [
-        2294446454282967643,
-        10852196555067806436,
-        4676542110718751671,
-        3650676510146080911
-      ],
-      [
-        10036426682390389619,
-        15410534417517518379,
-        411748073143090898,
-        1725429274294449186
-      ],
-      [
-        10773139363930294963,
-        14784009814759595952,
-        4523828744129500622,
-        14635565308295099932
-      ],
-      [
-        11532260655451503527,
-        2889442075290561580,
-        7947536971337998641,
-        9006850837384135593
-      ],
-      [
-        18268520902352688907,
-        17460815273130161567,
-        5448683527846534560,
-        16860223759333541117
-      ],
-      [
-        8586752129609394016,
-        17056726335999361043,
-        13247832408825538184,
-        10865075704067323346
-      ],
-      [
-        4810539255563012829,
-        3494541358111189199,
-        7443746985302784339,
-        1488118652209005646
-      ],
-      [
-        13632843557374648899,
-        11530787504038845899,
-        8016420701220086345,
-        2100494706314940875
-      ],
-      [
-        12565007434827640436,
-        2122488373912552994,
-        7924677296826511433,
-        4337201927455963919
-      ],
-      [
-        9121346173552113908,
-        8257616625819727572,
-        1352571964050839537,
-        1245015447612032209
-      ],
-      [
-        5550331618999138407,
-        15197131088442812142,
-        17401528975137618793,
-        7876503578710888777
-      ],
-      [
-        10581471072917622415,
-        11057977535360446233,
-        4745650017347491925,
-        16374614618217057484
-      ],
-      [
-        15877663159259953297,
-        13196700387970223678,
-        987069829507588466,
-        1239752961099076877
-      ],
-      [
-        1564056242532596441,
-        8225585740585112689,
-        8013357208824893542,
-        8291061420556283364
-      ],
-      [
-        10408011788640723232,
-        11035192730597666502,
-        7808927156371652130,
-        8373070655798680509
-      ]
-    ]
-  }
-}
\ No newline at end of file
diff --git a/prover/vk_setup_data_generator_server_fri/data/verification_leaf_8_key.json b/prover/vk_setup_data_generator_server_fri/data/verification_leaf_8_key.json
deleted file mode 100644
index 53184d3b764a..000000000000
--- a/prover/vk_setup_data_generator_server_fri/data/verification_leaf_8_key.json
+++ /dev/null
@@ -1,262 +0,0 @@
-{
-  "LeafLayerCircuitForSha256RoundFunction": {
-    "fixed_parameters": {
-      "parameters": {
-        "num_columns_under_copy_permutation": 140,
-        "num_witness_columns": 0,
-        "num_constant_columns": 4,
-        "max_allowed_constraint_degree": 8
-      },
-      "lookup_parameters": "NoLookup",
-      "domain_size": 1048576,
-      "total_tables_len": 0,
-      "public_inputs_locations": [
-        [
-          0,
-          0
-        ],
-        [
-          1,
-          0
-        ],
-        [
-          2,
-          0
-        ],
-        [
-          3,
-          0
-        ]
-      ],
-      "extra_constant_polys_for_selectors": 4,
-      "table_ids_column_idxes": [],
-      "quotient_degree": 8,
-      "selectors_placement": {
-        "Fork": {
-          "left": {
-            "GateOnly": {
-              "gate_idx": 1,
-              "num_constants": 0,
-              "degree": 7,
-              "needs_selector": true,
-              "is_lookup": false
-            }
-          },
-          "right": {
-            "Fork": {
-              "left": {
-                "Fork": {
-                  "left": {
-                    "Fork": {
-                      "left": {
-                        "GateOnly": {
-                          "gate_idx": 4,
-                          "num_constants": 4,
-                          "degree": 3,
-                          "needs_selector": true,
-                          "is_lookup": false
-                        }
-                      },
-                      "right": {
-                        "Fork": {
-                          "left": {
-                            "Fork": {
-                              "left": {
-                                "GateOnly": {
-                                  "gate_idx": 5,
-                                  "num_constants": 1,
-                                  "degree": 2,
-                                  "needs_selector": true,
-                                  "is_lookup": false
-                                }
-                              },
-                              "right": {
-                                "GateOnly": {
-                                  "gate_idx": 6,
-                                  "num_constants": 0,
-                                  "degree": 2,
-                                  "needs_selector": true,
-                                  "is_lookup": false
-                                }
-                              }
-                            }
-                          },
-                          "right": {
-                            "Fork": {
-                              "left": {
-                                "GateOnly": {
-                                  "gate_idx": 2,
-                                  "num_constants": 0,
-                                  "degree": 2,
-                                  "needs_selector": true,
-                                  "is_lookup": false
-                                }
-                              },
-                              "right": {
-                                "GateOnly": {
-                                  "gate_idx": 7,
-                                  "num_constants": 0,
-                                  "degree": 2,
-                                  "needs_selector": true,
-                                  "is_lookup": false
-                                }
-                              }
-                            }
-                          }
-                        }
-                      }
-                    }
-                  },
-                  "right": {
-                    "Fork": {
-                      "left": {
-                        "GateOnly": {
-                          "gate_idx": 9,
-                          "num_constants": 4,
-                          "degree": 2,
-                          "needs_selector": true,
-                          "is_lookup": false
-                        }
-                      },
-                      "right": {
-                        "GateOnly": {
-                          "gate_idx": 0,
-                          "num_constants": 4,
-                          "degree": 1,
-                          "needs_selector": true,
-                          "is_lookup": false
-                        }
-                      }
-                    }
-                  }
-                }
-              },
-              "right": {
-                "Fork": {
-                  "left": {
-                    "GateOnly": {
-                      "gate_idx": 3,
-                      "num_constants": 2,
-                      "degree": 3,
-                      "needs_selector": true,
-                      "is_lookup": false
-                    }
-                  },
-                  "right": {
-                    "GateOnly": {
-                      "gate_idx": 8,
-                      "num_constants": 0,
-                      "degree": 0,
-                      "needs_selector": true,
-                      "is_lookup": false
-                    }
-                  }
-                }
-              }
-            }
-          }
-        }
-      },
-      "fri_lde_factor": 2,
-      "cap_size": 16
-    },
-    "setup_merkle_tree_cap": [
-      [
-        6606882135817124908,
-        870347107746733688,
-        12589677233751162485,
-        589161009871845644
-      ],
-      [
-        2653237880188520795,
-        5593713591941028430,
-        14924807074602279493,
-        7403178895756596709
-      ],
-      [
-        4770385125899202728,
-        16848765286027915692,
-        7130735721393145418,
-        13542558858028383026
-      ],
-      [
-        10198382868561538358,
-        11182212222601267089,
-        2158487448188796066,
-        7515784380092212678
-      ],
-      [
-        18043800703311929788,
-        12605295159363639520,
-        16963777812872271598,
-        13934310487890398001
-      ],
-      [
-        17306728193061605292,
-        6162556196186301425,
-        15123250614620584121,
-        7156136428077702076
-      ],
-      [
-        3239169487219227705,
-        4415189033224694015,
-        10092040104298268727,
-        3953865385297495928
-      ],
-      [
-        13842490303827572248,
-        8581552410557417158,
-        6306820342544224802,
-        1525290694317383658
-      ],
-      [
-        16571790197298227277,
-        273370441868121439,
-        7446891486292543124,
-        5407600836394474442
-      ],
-      [
-        11518012136298307119,
-        15035338047379067034,
-        11014561672957925556,
-        9225054298465248935
-      ],
-      [
-        11950255612043468638,
-        10166628395020495040,
-        5673010277307553197,
-        3641423295115612757
-      ],
-      [
-        1072894636907573868,
-        10523520096472094653,
-        4897453347544558657,
-        3772162500249343132
-      ],
-      [
-        17527297802619704973,
-        16260964196666506939,
-        7653109999731571152,
-        15253570761269944834
-      ],
-      [
-        16258769312952303884,
-        7720171109291562352,
-        11124452352545828178,
-        16830247676911180779
-      ],
-      [
-        5288712429506529884,
-        13145012711898589816,
-        11490757447230521395,
-        5486824582454772190
-      ],
-      [
-        16641639521175638360,
-        5677946044429642761,
-        12635856058275795326,
-        12340020456497165526
-      ]
-    ]
-  }
-}
\ No newline at end of file
diff --git a/prover/vk_setup_data_generator_server_fri/data/verification_leaf_9_key.json b/prover/vk_setup_data_generator_server_fri/data/verification_leaf_9_key.json
deleted file mode 100644
index 88a48a0bf911..000000000000
--- a/prover/vk_setup_data_generator_server_fri/data/verification_leaf_9_key.json
+++ /dev/null
@@ -1,262 +0,0 @@
-{
-  "LeafLayerCircuitForECRecover": {
-    "fixed_parameters": {
-      "parameters": {
-        "num_columns_under_copy_permutation": 140,
-        "num_witness_columns": 0,
-        "num_constant_columns": 4,
-        "max_allowed_constraint_degree": 8
-      },
-      "lookup_parameters": "NoLookup",
-      "domain_size": 1048576,
-      "total_tables_len": 0,
-      "public_inputs_locations": [
-        [
-          0,
-          0
-        ],
-        [
-          1,
-          0
-        ],
-        [
-          2,
-          0
-        ],
-        [
-          3,
-          0
-        ]
-      ],
-      "extra_constant_polys_for_selectors": 4,
-      "table_ids_column_idxes": [],
-      "quotient_degree": 8,
-      "selectors_placement": {
-        "Fork": {
-          "left": {
-            "GateOnly": {
-              "gate_idx": 1,
-              "num_constants": 0,
-              "degree": 7,
-              "needs_selector": true,
-              "is_lookup": false
-            }
-          },
-          "right": {
-            "Fork": {
-              "left": {
-                "Fork": {
-                  "left": {
-                    "Fork": {
-                      "left": {
-                        "GateOnly": {
-                          "gate_idx": 4,
-                          "num_constants": 4,
-                          "degree": 3,
-                          "needs_selector": true,
-                          "is_lookup": false
-                        }
-                      },
-                      "right": {
-                        "Fork": {
-                          "left": {
-                            "Fork": {
-                              "left": {
-                                "GateOnly": {
-                                  "gate_idx": 5,
-                                  "num_constants": 1,
-                                  "degree": 2,
-                                  "needs_selector": true,
-                                  "is_lookup": false
-                                }
-                              },
-                              "right": {
-                                "GateOnly": {
-                                  "gate_idx": 6,
-                                  "num_constants": 0,
-                                  "degree": 2,
-                                  "needs_selector": true,
-                                  "is_lookup": false
-                                }
-                              }
-                            }
-                          },
-                          "right": {
-                            "Fork": {
-                              "left": {
-                                "GateOnly": {
-                                  "gate_idx": 2,
-                                  "num_constants": 0,
-                                  "degree": 2,
-                                  "needs_selector": true,
-                                  "is_lookup": false
-                                }
-                              },
-                              "right": {
-                                "GateOnly": {
-                                  "gate_idx": 7,
-                                  "num_constants": 0,
-                                  "degree": 2,
-                                  "needs_selector": true,
-                                  "is_lookup": false
-                                }
-                              }
-                            }
-                          }
-                        }
-                      }
-                    }
-                  },
-                  "right": {
-                    "Fork": {
-                      "left": {
-                        "GateOnly": {
-                          "gate_idx": 9,
-                          "num_constants": 4,
-                          "degree": 2,
-                          "needs_selector": true,
-                          "is_lookup": false
-                        }
-                      },
-                      "right": {
-                        "GateOnly": {
-                          "gate_idx": 0,
-                          "num_constants": 4,
-                          "degree": 1,
-                          "needs_selector": true,
-                          "is_lookup": false
-                        }
-                      }
-                    }
-                  }
-                }
-              },
-              "right": {
-                "Fork": {
-                  "left": {
-                    "GateOnly": {
-                      "gate_idx": 3,
-                      "num_constants": 2,
-                      "degree": 3,
-                      "needs_selector": true,
-                      "is_lookup": false
-                    }
-                  },
-                  "right": {
-                    "GateOnly": {
-                      "gate_idx": 8,
-                      "num_constants": 0,
-                      "degree": 0,
-                      "needs_selector": true,
-                      "is_lookup": false
-                    }
-                  }
-                }
-              }
-            }
-          }
-        }
-      },
-      "fri_lde_factor": 2,
-      "cap_size": 16
-    },
-    "setup_merkle_tree_cap": [
-      [
-        1966688024276265163,
-        1600999376577297955,
-        9979283765343242481,
-        10853158383047279373
-      ],
-      [
-        9617115799973676416,
-        1436692352837490106,
-        16621229234254045212,
-        17649471158808930813
-      ],
-      [
-        10598997254576197179,
-        6191890180530301291,
-        485325547092687385,
-        17866822217569560015
-      ],
-      [
-        17529069959174406385,
-        1822730242748867421,
-        10607268541276403219,
-        10369730414641253572
-      ],
-      [
-        9559948904275293033,
-        271393452476373483,
-        10294727560225979037,
-        13356808215545342022
-      ],
-      [
-        3330505141292591439,
-        14604912162246460234,
-        13747490798131143365,
-        9686392462153294316
-      ],
-      [
-        1308334442155460802,
-        8411248012498029090,
-        1727122243552046217,
-        1891983150748887801
-      ],
-      [
-        13628794098518472387,
-        9775581327398472118,
-        10952798350389999267,
-        3791915693702783252
-      ],
-      [
-        5150729729317744106,
-        15268081752408833175,
-        11313693800895322733,
-        7645258866415024451
-      ],
-      [
-        4492405884498997751,
-        1462600329700613046,
-        4494587633368393420,
-        13835293745083269390
-      ],
-      [
-        16786735218378765255,
-        13489016634632055711,
-        780880140016370703,
-        1632417931049291348
-      ],
-      [
-        15419598237747857050,
-        17379853454459968259,
-        1377883698753277247,
-        17090368996477921986
-      ],
-      [
-        5453156352466670830,
-        7921752778252981104,
-        15901693682958424795,
-        7759079127470880643
-      ],
-      [
-        13945928657949258565,
-        10630556046992331796,
-        5947903586431352857,
-        13970701039664769056
-      ],
-      [
-        11402992940883704805,
-        14254801701412570920,
-        16823021910688666954,
-        16435058721419375579
-      ],
-      [
-        1434897606543124534,
-        7242596307416400095,
-        1722748060955112357,
-        1262887759339605102
-      ]
-    ]
-  }
-}
\ No newline at end of file
diff --git a/prover/vk_setup_data_generator_server_fri/data/verification_node_key.json b/prover/vk_setup_data_generator_server_fri/data/verification_node_key.json
deleted file mode 100644
index 7865e106454e..000000000000
--- a/prover/vk_setup_data_generator_server_fri/data/verification_node_key.json
+++ /dev/null
@@ -1,262 +0,0 @@
-{
-  "NodeLayerCircuit": {
-    "fixed_parameters": {
-      "parameters": {
-        "num_columns_under_copy_permutation": 140,
-        "num_witness_columns": 0,
-        "num_constant_columns": 4,
-        "max_allowed_constraint_degree": 8
-      },
-      "lookup_parameters": "NoLookup",
-      "domain_size": 1048576,
-      "total_tables_len": 0,
-      "public_inputs_locations": [
-        [
-          0,
-          0
-        ],
-        [
-          1,
-          0
-        ],
-        [
-          2,
-          0
-        ],
-        [
-          3,
-          0
-        ]
-      ],
-      "extra_constant_polys_for_selectors": 4,
-      "table_ids_column_idxes": [],
-      "quotient_degree": 8,
-      "selectors_placement": {
-        "Fork": {
-          "left": {
-            "GateOnly": {
-              "gate_idx": 1,
-              "num_constants": 0,
-              "degree": 7,
-              "needs_selector": true,
-              "is_lookup": false
-            }
-          },
-          "right": {
-            "Fork": {
-              "left": {
-                "Fork": {
-                  "left": {
-                    "Fork": {
-                      "left": {
-                        "GateOnly": {
-                          "gate_idx": 4,
-                          "num_constants": 4,
-                          "degree": 3,
-                          "needs_selector": true,
-                          "is_lookup": false
-                        }
-                      },
-                      "right": {
-                        "Fork": {
-                          "left": {
-                            "Fork": {
-                              "left": {
-                                "GateOnly": {
-                                  "gate_idx": 5,
-                                  "num_constants": 1,
-                                  "degree": 2,
-                                  "needs_selector": true,
-                                  "is_lookup": false
-                                }
-                              },
-                              "right": {
-                                "GateOnly": {
-                                  "gate_idx": 6,
-                                  "num_constants": 0,
-                                  "degree": 2,
-                                  "needs_selector": true,
-                                  "is_lookup": false
-                                }
-                              }
-                            }
-                          },
-                          "right": {
-                            "Fork": {
-                              "left": {
-                                "GateOnly": {
-                                  "gate_idx": 2,
-                                  "num_constants": 0,
-                                  "degree": 2,
-                                  "needs_selector": true,
-                                  "is_lookup": false
-                                }
-                              },
-                              "right": {
-                                "GateOnly": {
-                                  "gate_idx": 7,
-                                  "num_constants": 0,
-                                  "degree": 2,
-                                  "needs_selector": true,
-                                  "is_lookup": false
-                                }
-                              }
-                            }
-                          }
-                        }
-                      }
-                    }
-                  },
-                  "right": {
-                    "Fork": {
-                      "left": {
-                        "GateOnly": {
-                          "gate_idx": 9,
-                          "num_constants": 4,
-                          "degree": 2,
-                          "needs_selector": true,
-                          "is_lookup": false
-                        }
-                      },
-                      "right": {
-                        "GateOnly": {
-                          "gate_idx": 0,
-                          "num_constants": 4,
-                          "degree": 1,
-                          "needs_selector": true,
-                          "is_lookup": false
-                        }
-                      }
-                    }
-                  }
-                }
-              },
-              "right": {
-                "Fork": {
-                  "left": {
-                    "GateOnly": {
-                      "gate_idx": 3,
-                      "num_constants": 2,
-                      "degree": 3,
-                      "needs_selector": true,
-                      "is_lookup": false
-                    }
-                  },
-                  "right": {
-                    "GateOnly": {
-                      "gate_idx": 8,
-                      "num_constants": 0,
-                      "degree": 0,
-                      "needs_selector": true,
-                      "is_lookup": false
-                    }
-                  }
-                }
-              }
-            }
-          }
-        }
-      },
-      "fri_lde_factor": 2,
-      "cap_size": 16
-    },
-    "setup_merkle_tree_cap": [
-      [
-        16110944391299715992,
-        6257581196984129533,
-        3238325178821009741,
-        2344850491864189019
-      ],
-      [
-        9070724167014080545,
-        4270936005334206500,
-        14011092173278602876,
-        17233390044312666340
-      ],
-      [
-        15882294806312417165,
-        4574813182503183418,
-        15374759504522847393,
-        12609068726586761599
-      ],
-      [
-        5081359810005150600,
-        3073725930902770385,
-        12151383627606620216,
-        1678712612408922293
-      ],
-      [
-        13389075440637154488,
-        1394733244174774927,
-        15897027408886080730,
-        8756205416909346149
-      ],
-      [
-        9635595243774498130,
-        12944626865667316474,
-        11443383015868895087,
-        11271399114434241688
-      ],
-      [
-        15730316965377191644,
-        9302195093067483199,
-        13013113029527355010,
-        16107136888029757437
-      ],
-      [
-        4376996761649023946,
-        5151155327098069058,
-        5052643273518683586,
-        4214154406154441301
-      ],
-      [
-        14323780220991293990,
-        8193587898306996901,
-        5671887774622993207,
-        9546628649033002185
-      ],
-      [
-        16523271232278987128,
-        994857983084927437,
-        14501829109938165419,
-        9015660151307809950
-      ],
-      [
-        1530238726285436995,
-        6261885523422263637,
-        11940153058268689285,
-        15737357444014615384
-      ],
-      [
-        2670341602838046451,
-        10669331667080282584,
-        16656965855764533819,
-        13339778044433609883
-      ],
-      [
-        17128805815986618686,
-        18194734266790270296,
-        5735422502154213482,
-        10164141197176685232
-      ],
-      [
-        2629176720116777217,
-        6966722226648521547,
-        2937669813272776408,
-        2812827195714811672
-      ],
-      [
-        6178870790111010071,
-        10834984121929556338,
-        2836091052290008872,
-        1311164878771236983
-      ],
-      [
-        7411275786539821863,
-        3702190765468277039,
-        18130480549896087952,
-        5277641488054089382
-      ]
-    ]
-  }
-}
\ No newline at end of file
diff --git a/prover/vk_setup_data_generator_server_fri/data/verification_scheduler_key.json b/prover/vk_setup_data_generator_server_fri/data/verification_scheduler_key.json
deleted file mode 100644
index f73530a2ca1a..000000000000
--- a/prover/vk_setup_data_generator_server_fri/data/verification_scheduler_key.json
+++ /dev/null
@@ -1,270 +0,0 @@
-{
-  "SchedulerCircuit": {
-    "fixed_parameters": {
-      "parameters": {
-        "num_columns_under_copy_permutation": 130,
-        "num_witness_columns": 0,
-        "num_constant_columns": 4,
-        "max_allowed_constraint_degree": 8
-      },
-      "lookup_parameters": {
-        "UseSpecializedColumnsWithTableIdAsConstant": {
-          "width": 3,
-          "num_repetitions": 4,
-          "share_table_id": true
-        }
-      },
-      "domain_size": 1048576,
-      "total_tables_len": 132096,
-      "public_inputs_locations": [
-        [
-          0,
-          993345
-        ],
-        [
-          1,
-          993345
-        ],
-        [
-          2,
-          993345
-        ],
-        [
-          3,
-          993345
-        ]
-      ],
-      "extra_constant_polys_for_selectors": 4,
-      "table_ids_column_idxes": [
-        8
-      ],
-      "quotient_degree": 8,
-      "selectors_placement": {
-        "Fork": {
-          "left": {
-            "GateOnly": {
-              "gate_idx": 1,
-              "num_constants": 0,
-              "degree": 7,
-              "needs_selector": true,
-              "is_lookup": false
-            }
-          },
-          "right": {
-            "Fork": {
-              "left": {
-                "Fork": {
-                  "left": {
-                    "Fork": {
-                      "left": {
-                        "GateOnly": {
-                          "gate_idx": 4,
-                          "num_constants": 4,
-                          "degree": 3,
-                          "needs_selector": true,
-                          "is_lookup": false
-                        }
-                      },
-                      "right": {
-                        "Fork": {
-                          "left": {
-                            "Fork": {
-                              "left": {
-                                "GateOnly": {
-                                  "gate_idx": 5,
-                                  "num_constants": 1,
-                                  "degree": 2,
-                                  "needs_selector": true,
-                                  "is_lookup": false
-                                }
-                              },
-                              "right": {
-                                "GateOnly": {
-                                  "gate_idx": 6,
-                                  "num_constants": 0,
-                                  "degree": 2,
-                                  "needs_selector": true,
-                                  "is_lookup": false
-                                }
-                              }
-                            }
-                          },
-                          "right": {
-                            "Fork": {
-                              "left": {
-                                "GateOnly": {
-                                  "gate_idx": 2,
-                                  "num_constants": 0,
-                                  "degree": 2,
-                                  "needs_selector": true,
-                                  "is_lookup": false
-                                }
-                              },
-                              "right": {
-                                "GateOnly": {
-                                  "gate_idx": 7,
-                                  "num_constants": 0,
-                                  "degree": 2,
-                                  "needs_selector": true,
-                                  "is_lookup": false
-                                }
-                              }
-                            }
-                          }
-                        }
-                      }
-                    }
-                  },
-                  "right": {
-                    "Fork": {
-                      "left": {
-                        "GateOnly": {
-                          "gate_idx": 9,
-                          "num_constants": 4,
-                          "degree": 2,
-                          "needs_selector": true,
-                          "is_lookup": false
-                        }
-                      },
-                      "right": {
-                        "GateOnly": {
-                          "gate_idx": 0,
-                          "num_constants": 4,
-                          "degree": 1,
-                          "needs_selector": true,
-                          "is_lookup": false
-                        }
-                      }
-                    }
-                  }
-                }
-              },
-              "right": {
-                "Fork": {
-                  "left": {
-                    "GateOnly": {
-                      "gate_idx": 3,
-                      "num_constants": 2,
-                      "degree": 3,
-                      "needs_selector": true,
-                      "is_lookup": false
-                    }
-                  },
-                  "right": {
-                    "GateOnly": {
-                      "gate_idx": 8,
-                      "num_constants": 0,
-                      "degree": 0,
-                      "needs_selector": true,
-                      "is_lookup": false
-                    }
-                  }
-                }
-              }
-            }
-          }
-        }
-      },
-      "fri_lde_factor": 2,
-      "cap_size": 16
-    },
-    "setup_merkle_tree_cap": [
-      [
-        15230555879575926816,
-        8670948681878777794,
-        767116401361787080,
-        13808751382541908272
-      ],
-      [
-        1220486015450063297,
-        9567900108378427313,
-        18210974256257044632,
-        18338726330920132716
-      ],
-      [
-        7568154221767192295,
-        11691578057855133612,
-        9987210827513697170,
-        17019942866370544662
-      ],
-      [
-        14102673551475852761,
-        3839757807646647049,
-        8317169401280108378,
-        14477318175428765566
-      ],
-      [
-        10669246787368115713,
-        11986124114638697341,
-        373240888095551057,
-        10600874540100090281
-      ],
-      [
-        1967433817606548880,
-        1252531621216687635,
-        14092128528722989126,
-        15316007954882781751
-      ],
-      [
-        5731133612849813361,
-        9439573956187051534,
-        15220234372923263193,
-        9871593147214385018
-      ],
-      [
-        5432497552013782457,
-        6217935098775351854,
-        10788625265296640732,
-        7626134139872594266
-      ],
-      [
-        16209439837876908945,
-        16958705495955599782,
-        2620710932184338631,
-        13207816187542048405
-      ],
-      [
-        11540918781414391435,
-        13215620469361541671,
-        7261198944216226328,
-        14101141177393020403
-      ],
-      [
-        10951103916546600353,
-        16291916249083597787,
-        8020395928888095904,
-        14831509381332343931
-      ],
-      [
-        14614496581821229034,
-        570029684825245175,
-        11368483572681932607,
-        17857699424461379920
-      ],
-      [
-        10549396205597068517,
-        16251363364669954894,
-        5619914240250798106,
-        15384760685177493623
-      ],
-      [
-        6443594760777705854,
-        4350415958090847717,
-        7924647710631862693,
-        1595589969968983394
-      ],
-      [
-        1575322136978699734,
-        1714883637605030004,
-        1403876268493429570,
-        5816075577953274504
-      ],
-      [
-        1910730620955478970,
-        10199274156501303143,
-        8240588740333284151,
-        7977626984796160665
-      ]
-    ]
-  }
-}
\ No newline at end of file
diff --git a/prover/vk_setup_data_generator_server_fri/data/witness_artifacts.json b/prover/vk_setup_data_generator_server_fri/data/witness_artifacts.json
deleted file mode 100644
index 98857952935b..000000000000
--- a/prover/vk_setup_data_generator_server_fri/data/witness_artifacts.json
+++ /dev/null
@@ -1,22 +0,0 @@
-{
-  "entry_point_address": "0xc54E30ABB6a3eeD1b9DC0494D90c9C22D76FbA7e",
-  "entry_point_code": "0x0004000000000002000200000000000200000000030100190000006003300270000002b70430019700030000004103550002000000010355000002b70030019d000100000000001f00000080010000390000004004000039000000000014043500000001012001900000006f0000c13d0000000002000031000000040120008c0000007a0000413d0000000201000367000000000101043b000000e001100270000002b90310009c000000290000c13d0000000001000416000000000110004c000002d20000c13d000000040100008a0000000001100031000002cf02000041000000000310004c00000000030000190000000003024019000002cf01100197000000000410004c000000000200a019000002cf0110009c00000000010300190000000001026019000000000110004c000002d20000c13d0ad708e90000040f000000270000013d000200000004001d000002ba0310009c000000810000613d000002bb0310009c0000009c0000613d000002bc0310009c000000be0000613d000002bd0310009c000000d80000613d000002be0310009c000000f30000613d000002bf0310009c0000010d0000613d000002c00310009c000002200000613d000002c10310009c000001460000613d000002c20210009c0000023b0000613d000002c30210009c000001580000613d000002c40210009c000001720000613d000002c50210009c000002550000613d000002c60210009c0000018c0000613d000002c70210009c000002780000613d000002c80210009c000001a20000613d000002c90210009c0000028e0000613d000002ca0210009c000001ba0000613d000002cb0210009c000001d20000613d000002cc0210009c000001ec0000613d000002cd0210009c000002060000613d000002ce0110009c000002d20000c13d0000000001000416000000000110004c000002d20000c13d000000040100008a0000000001100031000002cf02000041000000000310004c00000000030000190000000003024019000002cf01100197000000000410004c000000000200a019000002cf0110009c00000000010300190000000001026019000000000110004c000002d20000c13d00000004010000390ad70ad50000040f00000002020000290000000003020433000002d00110019700000000001304350000002002000039000000000103001900000000030000190ad7039b0000040f0000000001000416000000000110004c000002d20000c13d000000200200003900000100010000390000000000210439000001200200003900000000000204390000004002000039000002b8030000410ad7039b0000040f000000000120004c000002d20000c13d0ad703ff0000040f0000000001000019000000000200001900000000030000190ad7039b0000040f0000000001000416000000000110004c000002d20000c13d000000040100008a0000000001100031000002cf02000041000000000310004c00000000030000190000000003024019000002cf01100197000000000410004c000000000200a019000002cf0110009c00000000010300190000000001026019000000000110004c000002d20000c13d00000000010000190ad70ad50000040f00000002020000290000000003020433000002d00110019700000000001304350000002002000039000000000103001900000000030000190ad7039b0000040f0000000001000416000000000110004c000002d20000c13d000000040100008a0000000001100031000002cf02000041000000200310008c00000000030000190000000003024019000002cf01100197000000000410004c000000000200a019000002cf0110009c00000000010300190000000001026019000000000110004c000002d20000c13d00000004010000390000000201100367000000000101043b0000000005010433000002b7010000410000000002000414000002b70320009c0000000001024019000000c001100210000002d4011001c70000800d020000390000000203000039000002d5040000410ad70ac90000040f0000000101200190000002d20000613d000002d50000013d0000000001000416000000000110004c000002d20000c13d000000040100008a0000000001100031000002cf02000041000000000310004c00000000030000190000000003024019000002cf01100197000000000410004c000000000200a019000002cf0110009c00000000010300190000000001026019000000000110004c000002d20000c13d00000003010000390ad70ad50000040f0000000202000029000000000302043300000000001304350000002002000039000000000103001900000000030000190ad7039b0000040f0000000001000416000000000110004c000002d20000c13d000000040100008a0000000001100031000002cf02000041000000000310004c00000000030000190000000003024019000002cf01100197000000000410004c000000000200a019000002cf0110009c00000000010300190000000001026019000000000110004c000002d20000c13d00000002010000390ad70ad50000040f00000002020000290000000003020433000000e00110021000000000001304350000002002000039000000000103001900000000030000190ad7039b0000040f0000000001000416000000000110004c000002d20000c13d000000040100008a0000000001100031000002cf02000041000000000310004c00000000030000190000000003024019000002cf01100197000000000410004c000000000200a019000002cf0110009c00000000010300190000000001026019000000000110004c000002d20000c13d00000006010000390ad70ad50000040f0000000202000029000000000302043300000000001304350000002002000039000000000103001900000000030000190ad7039b0000040f0000000001000416000000000110004c000002d20000c13d000000040100008a0000000001100031000002cf02000041000000800310008c00000000030000190000000003024019000002cf01100197000000000410004c000000000200a019000002cf0110009c00000000010300190000000001026019000000000110004c000002d20000c13d000000000100041400000002040003670000006402400370000000000602043b0000004402400370000000000502043b0000000402400370000000000302043b0000000002000410000000040720008c000002cd0000c13d0000001f0160018f0000000502600270000000000420004c000001360000613d0000000004000019000000050640021000000000076500190000000006630019000000000606043300000000006704350000000104400039000000000624004b0000012e0000413d000000000410004c000002d50000613d0000000502200210000000000323001900000000022500190000000301100210000000000402043300000000041401cf000000000414022f00000000030304330000010001100089000000000313022f00000000011301cf000000000141019f0000000000120435000002d50000013d000000040120008a000002cf02000041000000000310004c00000000030000190000000003024019000002cf01100197000000000410004c000000000200a019000002cf0110009c00000000010300190000000001026019000000000110004c000002d20000c13d0ad706e60000040f0000000001000019000000000200001900000000030000190ad7039b0000040f0000000001000416000000000110004c000002d20000c13d000000040100008a0000000001100031000002cf02000041000000000310004c00000000030000190000000003024019000002cf01100197000000000410004c000000000200a019000002cf0110009c00000000010300190000000001026019000000000110004c000002d20000c13d0000000a010000390ad70ad50000040f0000000202000029000000000302043300000000001304350000002002000039000000000103001900000000030000190ad7039b0000040f0000000001000416000000000110004c000002d20000c13d000000040100008a0000000001100031000002cf02000041000000000310004c00000000030000190000000003024019000002cf01100197000000000410004c000000000200a019000002cf0110009c00000000010300190000000001026019000000000110004c000002d20000c13d00000008010000390ad70ad50000040f0000000202000029000000000302043300000000001304350000002002000039000000000103001900000000030000190ad7039b0000040f0000000001000416000000000110004c000002d20000c13d000000040100008a0000000001100031000002cf02000041000000000310004c00000000030000190000000003024019000002cf01100197000000000410004c000000000200a019000002cf0110009c00000000010300190000000001026019000000000110004c000002d20000c13d0ad70a100000040f0000000001000019000000000200001900000000030000190ad7039b0000040f0000000001000416000000000110004c000002d20000c13d000000040100008a0000000001100031000002cf02000041000000000310004c00000000030000190000000003024019000002cf01100197000000000410004c000000000200a019000002cf0110009c00000000010300190000000001026019000000000110004c000002d20000c13d00000002010000290000000001010433000002d3020000410000000000210435000000200200003900000000030000190ad7039b0000040f0000000001000416000000000110004c000002d20000c13d000000040100008a0000000001100031000002cf02000041000000400310008c00000000030000190000000003024019000002cf01100197000000000410004c000000000200a019000002cf0110009c00000000010300190000000001026019000000000110004c000002d20000c13d00000002010003670000002402100370000000000202043b0000000401100370000000000101043b00000000030000190ad7039b0000040f0000000001000416000000000110004c000002d20000c13d000000040100008a0000000001100031000002cf02000041000000000310004c00000000030000190000000003024019000002cf01100197000000000410004c000000000200a019000002cf0110009c00000000010300190000000001026019000000000110004c000002d20000c13d00000001010000390ad70ad50000040f0000000202000029000000000302043300000000001304350000002002000039000000000103001900000000030000190ad7039b0000040f0000000001000416000000000110004c000002d20000c13d000000040100008a0000000001100031000002cf02000041000000000310004c00000000030000190000000003024019000002cf01100197000000000410004c000000000200a019000002cf0110009c00000000010300190000000001026019000000000110004c000002d20000c13d0000000b010000390ad70ad50000040f0000000202000029000000000302043300000000001304350000002002000039000000000103001900000000030000190ad7039b0000040f0000000001000416000000000110004c000002d20000c13d000000040100008a0000000001100031000002cf02000041000000000310004c00000000030000190000000003024019000002cf01100197000000000410004c000000000200a019000002cf0110009c00000000010300190000000001026019000000000110004c000002d20000c13d00000005010000390ad70ad50000040f0000000202000029000000000302043300000000001304350000002002000039000000000103001900000000030000190ad7039b0000040f0000000001000416000000000110004c000002d20000c13d000000040100008a0000000001100031000002cf02000041000000000310004c00000000030000190000000003024019000002cf01100197000000000410004c000000000200a019000002cf0110009c00000000010300190000000001026019000000000110004c000002d20000c13d00000009010000390ad70ad50000040f00000002020000290000000003020433000002d00110019700000000001304350000002002000039000000000103001900000000030000190ad7039b0000040f0000000001000416000000000110004c000002d20000c13d000000040100008a0000000001100031000002cf02000041000000000310004c00000000030000190000000003024019000002cf01100197000000000410004c000000000200a019000002cf0110009c00000000010300190000000001026019000000000110004c000002d20000c13d00000007010000390ad70ad50000040f0000000202000029000000000302043300000000001304350000002002000039000000000103001900000000030000190ad7039b0000040f0000000001000416000000000110004c000002d20000c13d000000040100008a0000000001100031000002cf02000041000000200310008c00000000030000190000000003024019000002cf01100197000000000410004c000000000200a019000002cf0110009c00000000010300190000000001026019000000000110004c000002d20000c13d00000002010003670000000402100370000000000202043b000000000121034f000000000501043b000002b7010000410000000002000414000002b70320009c0000000001024019000000c001100210000002d4011001c70000800d020000390000000203000039000002d5040000410ad70ac90000040f0000000101200190000002d50000c13d000002d20000013d0000000001000416000000000110004c000002d20000c13d000000040100008a0000000001100031000002cf02000041000000000310004c00000000030000190000000003024019000002cf01100197000000000410004c000000000200a019000002cf0110009c00000000010300190000000001026019000000000110004c000002d20000c13d0ad707770000040f0000000001000019000000000200001900000000030000190ad7039b0000040f0000000001000416000000000110004c000002d20000c13d000000040100008a0000000001100031000002cf02000041000000000310004c00000000030000190000000003024019000002cf01100197000000000410004c000000000200a019000002cf0110009c00000000010300190000000001026019000000000110004c000002d20000c13d00000002010000290000000003010433000002d1010000410000000000130435000000000100041400000002020000390000000e04000039000000200600003900000000050000190ad7031f0000040f000000000110004c000002d90000c13d000000030200036700000001040000310000001f0340018f000000020100002900000000010104330000000504400270000000000540004c000002bc0000613d000000000500001900000005065002100000000007610019000000000662034f000000000606043b00000000006704350000000105500039000000000645004b000002b40000413d000000000530004c000002cb0000613d0000000504400210000000000242034f00000000044100190000000303300210000000000504043300000000053501cf000000000535022f000000000202043b0000010003300089000000000232022f00000000023201cf000000000252019f000000000024043500000001020000310ad703a50000040f0000002404400370000000000404043b0ad702ea0000040f000000000110004c000002d50000c13d000000000100001900000000020000190ad703a50000040f0000000001000019000000000200001900000000030000190ad7039b0000040f0000000001000433000002d20410016700000002030000290000000001030433000100000001001d000000400210003900000000004204350000002004100039000002d202000041000000000024043500000000003104350ad703ae0000040f00000001010000290ad709ab0000040f000000000100001900000000020000190ad703a50000040f0002000000000002000200000006001d000100000005001d000002b705000041000002b70630009c00000000030580190000004003300210000002b70640009c00000000040580190000006004400210000000000334019f000002b70410009c0000000001058019000000c001100210000000000113019f0ad70ac90000040f000000010800002900000002040000290000001f0340018f0000000504400270000000000540004c000003090000613d000000000500001900000005065002100000000007680019000000000661034f000000000606043b00000000006704350000000105500039000000000645004b000003010000413d000000010220018f000000000530004c000003190000613d0000000504400210000000000541034f00000000044800190000000303300210000000000604043300000000063601cf000000000636022f000000000505043b0000010003300089000000000535022f00000000033501cf000000000363019f000000000034043500030000000103550000006001100270000102b70010019d00000000010200190000000200000005000000000001042d0002000000000002000200000006001d000100000005001d000002b705000041000002b70630009c00000000030580190000004003300210000002b70640009c00000000040580190000006004400210000000000334019f000002b70410009c0000000001058019000000c001100210000000000113019f0ad70ace0000040f000000010800002900000002040000290000001f0340018f0000000504400270000000000540004c0000033e0000613d000000000500001900000005065002100000000007680019000000000661034f000000000606043b00000000006704350000000105500039000000000645004b000003360000413d000000010220018f000000000530004c0000034e0000613d0000000504400210000000000541034f00000000044800190000000303300210000000000604043300000000063601cf000000000636022f000000000505043b0000010003300089000000000535022f00000000033501cf000000000363019f000000000034043500030000000103550000006001100270000102b70010019d00000000010200190000000200000005000000000001042d000002b703000041000002b70410009c00000000010380190000004001100210000002b70420009c00000000020380190000006002200210000000000112019f0000000002000414000002b70420009c0000000002038019000000c002200210000000000112019f000002d4011001c700008010020000390ad70ace0000040f0000000102200190000003680000613d000000000101043b000000000001042d000000000100001900000000020000190ad703a50000040f0000000003010019000002b7010000410000000004000414000002b70540009c0000000001044019000000c00110021000000060022002100000000001120019000002d60110004100000000020300190ad70ace0000040f00000001022001900000037a0000613d000000000101043b000000000001042d000000000100001900000000020000190ad703a50000040f0000004402100039000000000300041400000060040000390000000000420435000002d70200004100000000002104350000006402100039000000000002043500000004021000390000000000020435000002b702000041000002b70430009c0000000003028019000002b70410009c00000000010280190000004001100210000000c002300210000000000112019f000002d8011001c700008006020000390ad70ac90000040f0000000102200190000003960000613d000000000101043b0000039a0000013d00030000000103550000006001100270000102b70010019d0000000001000019000000000001042d000002b704000041000002b70510009c000000000104801900000040011002100000000001310019000002b70320009c00000000020480190000006002200210000000000121001900000ad80001042e000002b703000041000002b70420009c0000000002038019000002b70410009c000000000103801900000040011002100000006002200210000000000112019f00000ad900010430000002d90210009c000003b40000813d000000600110003900000040020000390000000000120435000000000001042d000002da010000410000000000100435000000410100003900000004020000390000000000120435000000240200003900000000010000190ad703a50000040f0000004002100039000002db030000410000000000320435000000200210003900000017030000390000000000320435000000200200003900000000002104350000006001100039000000000001042d0000006002100039000002dc0300004100000000003204350000004002100039000002dd030000410000000000320435000000200210003900000026030000390000000000320435000000200200003900000000002104350000008001100039000000000001042d0000004002100039000002de03000041000000000032043500000020021000390000002003000039000000000032043500000000003104350000006001100039000000000001042d0000006002100039000002df0300004100000000003204350000004002100039000002e0030000410000000000320435000000200210003900000022030000390000000000320435000000200200003900000000002104350000008001100039000000000001042d0000004002100039000002e103000041000000000032043500000020021000390000002003000039000000000032043500000000003104350000006001100039000000000001042d0000006002100039000002e20300004100000000003204350000004002100039000002e303000041000000000032043500000020021000390000002c030000390000000000320435000000200200003900000000002104350000008001100039000000000001042d00080000000000020000000001000412000002d0021001970000000001000410000800000002001d000000000112004b000005dc0000c13d0ad706e60000040f0ad707770000040f0000000c010000390ad70ad50000040f000500000001001d000000000110004c000005eb0000613d000002e60100004100000000001004390000000401000039000300000001001d00000008020000290000000000210439000080020100003900000024020000390ad7036b0000040f000000000110004c000005cb0000613d0000004001000039000700000001001d0000000002010433000002e701000041000600000002001d000000000012043500000000010004140000000802000029000000040320008c000005ce0000613d00000004040000390000000603000029000400000004001d000000000503001900000000060000190ad702ea0000040f000000000110004c000005ce0000c13d0000000c010000390ad70ad50000040f0000000502000029000000000121004b000005fa0000c13d000002e6010000410000000000100439000000080200002900000004010000290000000000210439000080020100003900000024020000390ad7036b0000040f000000000110004c000005cb0000613d00000007010000290000000003010433000002e9010000410000000000130435000000000100041400000004040000390000000802000029000600000004001d000500000003001d000000000503001900000000060000190ad702ea0000040f000000000110004c000006090000c13d0ad70a100000040f00000000010004140000000003000416000000000230004c0000045d0000613d000002b702000041000002b70410009c0000000001028019000000c001100210000002d4011001c70000800902000039000002eb0400004100000000050000190ad70ac90000040f000000000301034f000000010120018f000300000003035500000000020300190000006002200270000102b70020019d000002b702200197000004640000013d000002eb0200004100000000030000190000000004000019000000000500001900000000060000190ad702ea0000040f0000000102000031000000000320004c0000000809000029000004950000613d0000003f03200039000000200400008a000000000443016f000000070700002900000000030704330000000004430019000000000534004b00000000050000190000000105004039000002ea0640009c000006a30000213d0000000105500190000006a30000c13d000000000047043500000000002304350000002002300039000000030300036700000001050000310000001f0450018f0000000505500270000000000650004c000004860000613d000000000600001900000005076002100000000008720019000000000773034f000000000707043b00000000007804350000000106600039000000000756004b0000047e0000413d000000000640004c000004950000613d0000000505500210000000000353034f00000000025200190000000304400210000000000502043300000000054501cf000000000545022f000000000303043b0000010004400089000000000343022f00000000034301cf000000000353019f0000000000320435000000000110004c000006170000613d0000000001000414000500000001001d000002e601000041000000000010043900000006010000290000000000910439000080020100003900000024020000390ad7036b0000040f000000000110004c000005cb0000613d000000070100002900000000030104330000002401300039000002b7020000410000000000210435000002ec0100004100000000001304350000000401300039000200000001001d00000000000104350000000501000029000027102110011a00000044040000390000000802000029000400000003001d000000000503001900000000060000190ad702ea0000040f000000000110004c000006260000c13d0000000001000414000500000001001d000002e6010000410000000000100439000000060100002900000008020000290000000000210439000080020100003900000024020000390ad7036b0000040f000000000110004c000005cb0000613d000000070100002900000000030104330000002401300039000000010200008a000400000002001d0000000000210435000002ec0100004100000000001304350000000401300039000100000001001d00000000000104350000000501000029000027102110011a00000044040000390000000802000029000200000003001d000000000503001900000000060000190ad702ea0000040f000000000110004c000006350000c13d000002e6010000410000000000100439000000060100002900000008020000290000000000210439000080020100003900000024020000390ad7036b0000040f000000000110004c000005cb0000613d00000007010000290000000003010433000002ed01000041000000000013043500000004043000390000000001000414000002b702000041000200000004001d000000000024043500000024040000390000000802000029000500000003001d000000000503001900000000060000190ad702ea0000040f000000000110004c000006440000c13d000002e6010000410000000000100439000000060100002900000008020000290000000000210439000080020100003900000024020000390ad7036b0000040f000000000110004c000005cb0000613d00000007010000290000000003010433000002ed01000041000000000013043500000004043000390000000001000414000002ee02000041000200000004001d000000000024043500000024040000390000000802000029000500000003001d000000000503001900000000060000190ad702ea0000040f000000000110004c000006530000c13d0000000001000414000500000001001d000002e6010000410000000000100439000000060100002900000008020000290000000000210439000080020100003900000024020000390ad7036b0000040f000000000110004c000005cb0000613d00000007010000290000000003010433000002ef0100004100000000001304350000000402300039000002f001000041000100000002001d00000000001204350000000501000029000027102110011a00000024040000390000000802000029000200000003001d000000000503001900000000060000190ad702ea0000040f000000000110004c000006620000c13d0000000001000414000500000001001d000002e6010000410000000000100439000000060100002900000008020000290000000000210439000080020100003900000024020000390ad7036b0000040f000000000110004c000005cb0000613d00000007010000290000000003010433000002ef0100004100000000001304350000000402300039000002b701000041000100000002001d00000000001204350000000501000029000027102110011a00000024040000390000000802000029000200000003001d000000000503001900000000060000190ad702ea0000040f000000000110004c000006710000c13d0000000001000414000500000001001d000002e6010000410000000000100439000000060100002900000008020000290000000000210439000080020100003900000024020000390ad7036b0000040f000000000110004c000005cb0000613d00000007010000290000000003010433000002ef01000041000000000013043500000004023000390000000401000029000100000002001d00000000001204350000000501000029000027102110011a00000024040000390000000802000029000200000003001d000000000503001900000000060000190ad702ea0000040f000000000110004c000006800000c13d0000000001000414000500000001001d000002e6010000410000000000100439000000060100002900000008020000290000000000210439000080020100003900000024020000390ad7036b0000040f000000000110004c000005cb0000613d000000070100002900000000030104330000006401300039000002f102000041000000000021043500000044013000390000000000210435000002f2010000410000000000130435000000240130003900000000000104350000000401300039000200000001001d00000000000104350000000501000029000027102110011a00000084040000390000000802000029000400000003001d000000000503001900000000060000190ad702ea0000040f000000000110004c0000068f0000c13d0000000001000414000500000001001d000002e6010000410000000000100439000000060100002900000008020000290000000000210439000080020100003900000024020000390ad7036b0000040f000000000110004c000005cb0000613d00000007010000290000000003010433000002f20100004100000000001304350000002401300039000002f10200004100000000002104350000000401300039000400000001001d000000000021043500000064013000390000000000010435000000440130003900000000000104350000000501000029000027102110011a00000084040000390000000802000029000600000003001d000000000503001900000000060000190ad702ea0000040f000000000110004c0000069e0000c13d00000007010000290000000001010433000002f30210009c000006a30000213d0000002402100039000002f40300004100000000003204350ad7037d0000040f000000000210004c000006ab0000613d000002d005100197000000000150004c000006cd0000613d000002b7010000410000000002000414000002b70320009c0000000001024019000000c001100210000002d4011001c70000800d020000390000000303000039000002f50400004100000000060004110ad70ac90000040f0000000101200190000005cb0000613d0000000800000005000000000001042d000000000100001900000000020000190ad703a50000040f0000000601000029000002f80110009c0000000701000029000006a30000813d00000006020000290000000000210435000002e501000041000000000012043500000004012000390ad703bc0000040f0000000603000029000000000231004900000000010300190ad703a50000040f000000400100003900000000010104330000004402100039000002e4030000410000000000320435000000240210003900000010030000390000000000320435000002e502000041000000000021043500000004021000390000002003000039000000000032043500000064020000390ad703a50000040f000000400100003900000000010104330000004402100039000002f9030000410000000000320435000000240210003900000018030000390000000000320435000002e502000041000000000021043500000004021000390000002003000039000000000032043500000064020000390ad703a50000040f000000070100002900000000010104330000004402100039000002e803000041000000000032043500000024021000390000001b030000390000000000320435000002e502000041000000000021043500000004021000390000002003000039000000000032043500000064020000390ad703a50000040f0000000501000029000002ea0110009c0000000701000029000006a30000213d00000005020000290000000000210435000002e501000041000000000012043500000004012000390ad703c60000040f0000000503000029000000000231004900000000010300190ad703a50000040f000000070100002900000000010104330000004402100039000002f7030000410000000000320435000000240210003900000014030000390000000000320435000002e502000041000000000021043500000004021000390000002003000039000000000032043500000064020000390ad703a50000040f00000002020000290000000401000029000002ea0110009c0000000701000029000006a30000213d00000004030000290000000000310435000002e501000041000000000013043500000000010200190ad703d30000040f0000000403000029000000000231004900000000010300190ad703a50000040f00000001020000290000000201000029000002ea0110009c0000000701000029000006a30000213d00000002030000290000000000310435000002e501000041000000000013043500000000010200190ad703d30000040f0000000203000029000000000231004900000000010300190ad703a50000040f00000002020000290000000501000029000002ea0110009c0000000701000029000006a30000213d00000005030000290000000000310435000002e501000041000000000013043500000000010200190ad703dc0000040f0000000503000029000000000231004900000000010300190ad703a50000040f00000002020000290000000501000029000002ea0110009c0000000701000029000006a30000213d00000005030000290000000000310435000002e501000041000000000013043500000000010200190ad703dc0000040f0000000503000029000000000231004900000000010300190ad703a50000040f00000001020000290000000201000029000002ea0110009c0000000701000029000006a30000213d00000002030000290000000000310435000002e501000041000000000013043500000000010200190ad703e90000040f0000000203000029000000000231004900000000010300190ad703a50000040f00000001020000290000000201000029000002ea0110009c0000000701000029000006a30000213d00000002030000290000000000310435000002e501000041000000000013043500000000010200190ad703e90000040f0000000203000029000000000231004900000000010300190ad703a50000040f00000001020000290000000201000029000002ea0110009c0000000701000029000006a30000213d00000002030000290000000000310435000002e501000041000000000013043500000000010200190ad703e90000040f0000000203000029000000000231004900000000010300190ad703a50000040f00000002020000290000000401000029000002ea0110009c0000000701000029000006a30000213d00000004030000290000000000310435000002e501000041000000000013043500000000010200190ad703f20000040f0000000403000029000000000231004900000000010300190ad703a50000040f00000004020000290000000601000029000002ea0110009c0000000701000029000006dc0000a13d000002da010000410000000000100435000000410100003900000003020000290000000000120435000000240200003900000000010000190ad703a50000040f000000030200036700000001040000310000001f0340018f000000070100002900000000010104330000000504400270000000000540004c000006bc0000613d000000000500001900000005065002100000000007610019000000000662034f000000000606043b00000000006704350000000105500039000000000645004b000006b40000413d000000000530004c000006cb0000613d0000000504400210000000000242034f00000000044100190000000303300210000000000504043300000000053501cf000000000535022f000000000202043b0000010003300089000000000232022f00000000023201cf000000000252019f000000000024043500000001020000310ad703a50000040f000000070100002900000000010104330000004402100039000002f6030000410000000000320435000000240210003900000019030000390000000000320435000002e502000041000000000021043500000004021000390000002003000039000000000032043500000064020000390ad703a50000040f00000006030000290000000000310435000002e501000041000000000013043500000000010200190ad703f20000040f0000000603000029000000000231004900000000010300190ad703a50000040f0004000000000002000002fa0100004100000000001004390000800b0100003900000004020000390ad7036b0000040f0000000002000411000000000121004b000007740000c13d0000000001000032000007740000c13d000002fb0100004100000000001004390000800b0100003900000004020000390ad7036b0000040f000000000110004c000007120000613d000002fb0100004100000000001004390000800b010000390000000402000039000100000002001d0ad7036b0000040f000000000110004c0000076c0000613d000002fb01000041000400000001001d00000000001004390000800b01000039000300000001001d0000000402000039000200000002001d0ad7036b0000040f00000004020000290000000000200439000400000001001d000000030100002900000002020000290ad7036b0000040f000003e8011000390000000402000029000000000112004b0000076c0000213d000002fc0100004100000000001004390000800b01000039000300000001001d0000000402000039000400000002001d0ad7036b0000040f0000000a020000390ad70ad30000040f000002fd010000410000000000100439000000030100002900000004020000290ad7036b0000040f000100000001001d0000000901000039000200000001001d0ad70ad50000040f0000000102000029000002d002200197000002fe01100197000000000121019f00000002020000290ad70ad30000040f000002ff010000410000000000100439000000030100002900000004020000290ad7036b0000040f00000008020000390ad70ad30000040f00000300010000410000000000100439000000030100002900000004020000290ad7036b0000040f00000007020000390ad70ad30000040f00000301010000410000000000100439000000030100002900000004020000290ad7036b0000040f00000006020000390ad70ad30000040f00000302010000410000000000100439000000030100002900000004020000290ad7036b0000040f00000003020000390ad70ad30000040f000002fa010000410000000000100439000000030100002900000004020000290ad7036b0000040f000200000001001d00000004010000290ad70ad50000040f0000000202000029000002d002200197000002fe01100197000000000121019f00000004020000290ad70ad30000040f0000000201000367000000000101043b000100000001001d0000000201000039000200000001001d0ad70ad50000040f0000000102000029000000e0022002700000030301100197000000000121019f00000002020000290ad70ad30000040f000002fb010000410000000000100439000000030100002900000004020000290ad7036b0000040f00000005020000390ad70ad30000040f00000000010004160000000b020000390ad70ad30000040f0000000400000005000000000001042d000002da010000410000000000100435000000110100003900000001020000290000000000120435000000240200003900000000010000190ad703a50000040f000000000100001900000000020000190ad703a50000040f000a0000000000020000000001000414000100000001001d0000004001000039000400000001001d0000000003010433000003040130009c000008640000813d000000a001300039000000040200002900000000001204350000008001300039000003050200004100000000002104350000006001300039000003060200004100000000002104350000004001300039000003070200004100000000002104350000002001300039000003080200004100000000002104350000007a0100003900000000001304350000000002000019000000030120008c000a00000003001d0000082d0000213d000200000002001d000000000203043300000020013000390ad703540000040f0000000a0700002900000004020000290000000003020433000900000001001d000000000100041400000000040704330000000002000019000000000542004b000007a70000813d000000000532001900000020022000390000000006720019000000000606043300000000006504350000079f0000013d000000000234001900000000000204350000000202000039000000200600003900000000050000190ad7031f0000040f000000000110004c0000086c0000613d00000000020004330000000a0800002900000000010804330000000403000029000000000703043300000020037000390000000004000019000000000514004b000007be0000813d00000000053400190000002004400039000000000684001900000000060604330000000000650435000007b60000013d0000000904000029000000000442013f0000000002310019000500000004001d0000000000420435000000200210003900000000002704350000005f01100039000000200200008a000000000221016f000300000007001d0000000001720019000000000221004b00000000020000190000000102004039000002ea0310009c000008640000213d0000000102200190000008640000c13d000000040200002900000000001204350000000c01000039000a00000001001d0ad70ad50000040f0000000003010019000002ea0130009c000008640000213d00000001013000390000000a02000029000900000003001d0ad70ad30000040f0000000a01000029000000000010043500000009010000290000030c0210004100000005010000290ad70ad30000040f0000000a010000290ad70ad50000040f000000000210004c0000085c0000613d000000010110008a000000000210004c000008190000613d000a00000001001d0ad708b00000040f000800000002001d0ad70ad50000040f000600000001001d0000000a01000029000000010110008a0000000101100270000900000001001d0ad708b00000040f000700000002001d0ad70ad50000040f00000007020000290000000302200210000000000121022f000000ff0220008c000000000100201900000008020000290000000302200210000000ff0320008c0000000a03000029000008190000213d0000000604000029000000000224022f000000000112004b000008190000a13d00000009010000290ad708b00000040f000800000002001d0ad70ad50000040f000700000001001d0000000a010000290ad708b00000040f000000080300002900000003033002100000000704000029000000000434022f000000ff0330008c000000000304001900000000030020190ad708c60000040f00000009010000290ad708b00000040f00000005030000290ad708c60000040f0000000901000029000007e80000013d0000000c010000390ad70ad50000040f000000000210004c0000085c0000613d000000010210008a0000000001210170000008270000c13d0000000d010000390ad70ad50000040f000002ea01100197000002ea0210009c0000085c0000613d00000001011000390ad708dc0000040f00000003010000290ad709ab0000040f000000020200002900000001022000390000000303000029000007910000013d0ad708e90000040f0000000007000414000000040100002900000000010104330000000102000029000000000272004b0000088e0000a13d0000000a0600002900000000020604330000000003000019000000000423004b0000083f0000813d00000000041300190000002003300039000000000563001900000000050504330000000000540435000008370000013d00000000031200190000000000030435000a00000007001d0ad703540000040f00000001020000290000000a0300002900000000023200490000000403000029000000000303043300000000002304350000000005010019000002b7010000410000000002000414000002b70420009c0000000002018019000002b70430009c00000000010340190000004001100210000000c002200210000000000112019f0000030a011001c70000800d0200003900000002030000390000030b040000410ad70ac90000040f00000001012001900000089b0000613d0000000a00000005000000000001042d000002da010000410000000000100435000000110100003900000004020000390000000000120435000000240200003900000000010000190ad703a50000040f000002da010000410000000000100435000000410100003900000004020000390000000000120435000000240200003900000000010000190ad703a50000040f000000030200036700000001040000310000001f0340018f000000040100002900000000010104330000000504400270000000000540004c0000087d0000613d000000000500001900000005065002100000000007610019000000000662034f000000000606043b00000000006704350000000105500039000000000645004b000008750000413d000000000530004c0000088c0000613d0000000504400210000000000242034f00000000044100190000000303300210000000000504043300000000053501cf000000000535022f000000000202043b0000010003300089000000000232022f00000000023201cf000000000252019f000000000024043500000001020000310ad703a50000040f000000440210003900000309030000410000000000320435000000240210003900000012030000390000000000320435000002e502000041000000000021043500000004021000390000002003000039000000000032043500000064020000390ad703a50000040f000000000100001900000000020000190ad703a50000040f00010000000000020000000c01000039000100000001001d0ad70ad50000040f000000000110004c000008a80000613d000000010100002900000000001004350000000100000005000000000001042d000002da010000410000000000100435000000320100003900000004020000390000000000120435000000240200003900000000010000190ad703a50000040f0002000000000002000200000001001d0000000c01000039000100000001001d0ad70ad50000040f0000000202000029000000000121004b000008be0000a13d000000010100002900000000001004350000030c0120004100000000020000190000000200000005000000000001042d000002da010000410000000000100435000000320100003900000004020000390000000000120435000000240200003900000000010000190ad703a50000040f0003000000000002000200000003001d000100000002001d000300000001001d0ad70ad50000040f00000001020000290000000302200210000000010300008a00000000042301cf000000ff0520008c0000000004002019000000020500002900000000022501cf0000000002002019000000000242016f000000000334013f000000000131016f000000000121019f00000003020000290ad70ad30000040f0000000300000005000000000001042d0002000000000002000100000001001d0000000d01000039000200000001001d0ad70ad50000040f0000000102000029000002ea022001970000030d01100197000000000121019f00000002020000290ad70ad30000040f0000000200000005000000000001042d00080000000000020000000c010000390ad70ad50000040f000700000001001d000000000110004c000009940000613d0ad7089e0000040f0000030c01000041000800000001001d0ad70ad50000040f0000000701000029000000010110008a0ad708b00000040f0ad70ad50000040f000700000001001d0ad7089e0000040f00000008010000290ad70ad50000040f000000070100002900000008020000290ad70ad30000040f0000000c01000039000200000001001d0ad70ad50000040f000000000210004c000009a30000613d00000002020000290000000000200435000800000001001d0000030e0210004100000000010000190ad70ad30000040f0000000801000029000000010110008a00000002020000290ad70ad30000040f000000010100008a000100000001001d0000000003000019000700000003001d000002cf010000410000000102000029000000000223004b00000000020000190000000002012019000002cf03300197000002cf0430009c0000000001008019000002cf03300167000002cf0330009c000000000102c019000000000110004c0000098c0000613d00000002010000290ad70ad50000040f0000000704000029000000010240021000000001032001bf000800000003001d000000000313004b0000097b0000813d0000000202200039000000000112004b000009430000813d0000000801000029000600000002001d0ad708b00000040f000500000002001d0ad70ad50000040f000400000001001d00000006010000290ad708b00000040f000300000002001d0ad70ad50000040f000000050200002900000003022002100000000403000029000000000323022f000000ff0220008c0000000002030019000000000200201900000003030000290000000303300210000000ff0430008c0000000604000029000009430000213d000000000131022f000000000121004b000009430000a13d000800000004001d00000008010000290ad708b00000040f000600000002001d0ad70ad50000040f000400000001001d00000007010000290ad708b00000040f000500000002001d0ad70ad50000040f000000070400002900000005020000290000000302200210000000000121022f000000ff0220008c000000000100201900000006020000290000000302200210000000ff0320008c0000097b0000213d0000000403000029000000000223022f000000000112004b0000097b0000a13d00000000010400190ad708b00000040f000600000002001d0ad70ad50000040f000500000001001d0000000801000029000800000001001d0ad708b00000040f000400000002001d0ad70ad50000040f000300000001001d00000007010000290ad708b00000040f000000040300002900000003033002100000000304000029000000000434022f000000ff0330008c000000000304001900000000030020190ad708c60000040f00000008010000290ad708b00000040f000000060300002900000003033002100000000504000029000000000434022f000000ff0330008c000000000304001900000000030020190ad708c60000040f0000000803000029000009100000013d0000000c010000390ad70ad50000040f0000000102000029000000000221004b0000098c0000613d000000010210003900000000011201700000098a0000c13d0000000d010000390ad70ad50000040f000002ea01100197000000010110008a000002ea0210009c0000098c0000213d0ad708dc0000040f0000000800000005000000000001042d000002da010000410000000000100435000000110100003900000004020000390000000000120435000000240200003900000000010000190ad703a50000040f0000004001000039000000000101043300000044021000390000030f030000410000000000320435000000240210003900000001030000390000000000320435000002e502000041000000000021043500000004021000390000002003000039000000000032043500000064020000390ad703a50000040f000002da010000410000000000100435000000310100003900000004020000390000000000120435000000240200003900000000010000190ad703a50000040f00020000000000020000004002000039000200000002001d00000000030204330000031002000041000000000023043500000004023000390000002004000039000000000042043500000000020104330000002404300039000000000024043500000044073000390000000004000019000000000524004b000009c10000813d00000000057400190000002004400039000000000614001900000000060604330000000000650435000009b90000013d000000000172001900000000000104350000001f01200039000000200200008a000000000121016f00000044041000390000000001000414000080080200003900000020060000390000000005030019000100000003001d0ad702ea0000040f0000000104000031000000000110004c000009e40000613d000000200140008c000000200100003900000000010440190000001f01100039000000600210018f00000001010000290000000001120019000000000221004b00000000020000190000000102004039000002ea0310009c00000a050000213d000000010220019000000a050000c13d00000002020000290000000000120435000000200140008c00000a0d0000413d0000000200000005000000000001042d00000003030003670000001f0240018f000000020100002900000000010104330000000504400270000000000540004c000009f40000613d000000000500001900000005065002100000000007610019000000000663034f000000000606043b00000000006704350000000105500039000000000645004b000009ec0000413d000000000520004c00000a030000613d0000000504400210000000000343034f00000000044100190000000302200210000000000504043300000000052501cf000000000525022f000000000303043b0000010002200089000000000323022f00000000022301cf000000000252019f000000000024043500000001020000310ad703a50000040f000002da010000410000000000100435000000410100003900000004020000390000000000120435000000240200003900000000010000190ad703a50000040f000000000100001900000000020000190ad703a50000040f000300000000000200000040050000390000000001050433000002d90210009c00000a6e0000813d00000060021000390000000000250435000003110200004100000000002104350000000002050433000003120320009c00000a6e0000213d0000008003200039000000000035043500000060032000390000031304000041000000000043043500000040032000390000031404000041000000000043043500000020032000390000031504000041000000000043043500000041060000390000000000620435000000400310003900000316040000410000000000430435000000200310003900000000002304350000000007050433000003170270009c00000a6e0000213d00000060027000390000000000250435000003180200004100000000002704350000000002050433000003120320009c00000a6e0000213d0000008003200039000000000035043500000060032000390000031304000041000000000043043500000040032000390000031904000041000000000043043500000020032000390000031a040000410000000000430435000000000062043500000040037000390000031b04000041000000000043043500000020037000390000000000230435000300000005001d000200000006001d000100000007001d0ad70a760000040f00000001010000290ad70a760000040f000000020500002900000003040000290000000001040433000003170210009c00000a6e0000213d000000600210003900000000002404350000031c0200004100000000002104350000000002040433000003120320009c00000a6e0000213d0000008003200039000000000034043500000060032000390000031d04000041000000000043043500000040032000390000031e04000041000000000043043500000020032000390000031f040000410000000000430435000000000052043500000020031000390000000000230435000000400210003900000000000204350ad70a760000040f0000000300000005000000000001042d000002da010000410000000000100435000000410100003900000004020000390000000000120435000000240200003900000000010000190ad703a50000040f0002000000000002000000200210003900000000030204330000000002030433000000410220008c00000aa40000c13d00000041023000390000000002020433000000ff0220018f0000001b0420008a000000010440008c00000aa40000213d00000040041000390000000004040433000200000004001d000000000101043300000020043000390000000004040433000000400330003900000000050304330000004003000039000100000003001d000000000303043300000060063000390000000000560435000000400530003900000000004504350000002004300039000000000024043500000000001304350000000000000435000000000100041400000001020000390000008004000039000000200600003900000000050000190ad7031f0000040f000000000110004c00000aa70000613d00000000010004330000000202000029000000000121013f000002d00110019800000aa40000c13d0000000200000005000000000001042d000000000100001900000000020000190ad703a50000040f000000030200036700000001040000310000001f0340018f000000010100002900000000010104330000000504400270000000000540004c00000ab80000613d000000000500001900000005065002100000000007610019000000000662034f000000000606043b00000000006704350000000105500039000000000645004b00000ab00000413d000000000530004c00000ac70000613d0000000504400210000000000242034f00000000044100190000000303300210000000000504043300000000053501cf000000000535022f000000000202043b0000010003300089000000000232022f00000000023201cf000000000252019f000000000024043500000001020000310ad703a50000040f00000acc002104210000000102000039000000000001042d0000000002000019000000000001042d00000ad1002104230000000102000039000000000001042d0000000002000019000000000001042d000000000012041b000000000001042d000000000101041a000000000001042d00000ad70000043200000ad80001042e00000ad9000104300000000000000000000000000000000000000000000000000000000000000000000000000000000000000000ffffffff0000000200000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000006603c2f10000000000000000000000000000000000000000000000000000000002d05d3f000000000000000000000000000000000000000000000000000000000738693d0000000000000000000000000000000000000000000000000000000019d8ac610000000000000000000000000000000000000000000000000000000022844fbc000000000000000000000000000000000000000000000000000000002abbd748000000000000000000000000000000000000000000000000000000003b29037c000000000000000000000000000000000000000000000000000000004840a05100000000000000000000000000000000000000000000000000000000579ae3ec0000000000000000000000000000000000000000000000000000000059308f0f000000000000000000000000000000000000000000000000000000005efe4bb4000000000000000000000000000000000000000000000000000000007737dde7000000000000000000000000000000000000000000000000000000007b494b6e000000000000000000000000000000000000000000000000000000007fd5946100000000000000000000000000000000000000000000000000000000874e8f8f00000000000000000000000000000000000000000000000000000000993a04b700000000000000000000000000000000000000000000000000000000ab25690f00000000000000000000000000000000000000000000000000000000aea34ae800000000000000000000000000000000000000000000000000000000af640d0f00000000000000000000000000000000000000000000000000000000be8b112000000000000000000000000000000000000000000000000000000000c6f9688400000000000000000000000000000000000000000000000000000000fb38aa568000000000000000000000000000000000000000000000000000000000000000000000000000000000000000ffffffffffffffffffffffffffffffffffffffff54657374206d65737361676520320000000000000000000000000000000000003ea98af6e35141fbcacc1724e14f5d76b9b58e41f6c35d0e8ae2e204e66695eb993a04b70000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000449bf97d987c61f24f2a6bbac8f2e426eab123cdfadfc01364acfff36c658d902000002000000000000000000000000000000000000000000000000000000009c4d535bdea7cd8a978f128b93471df48c7dbab89d703809115bdc118c235bfd0200000000000000000000000000000000000084000000000000000000000000000000000000000000000000000000000000000000000000ffffffffffffffa04e487b71000000000000000000000000000000000000000000000000000000006865617020746573742073686f756c64206661696c65640000000000000000006661696c6564000000000000000000000000000000000000000000000000000073656e64696e67206c31206d6573736167657320746573742073686f756c642072657475726e206d656d6f727920746573742073686f756c64206661696c656465640000000000000000000000000000000000000000000000000000000000006163636573732063616c6c6461746120746573742073686f756c64206661696c616363657373206d656d6f727920746573742073686f756c64206661696c6564686f756c64206661696c656400000000000000000000000000000000000000007261772063616c6c2074657374207769746820626967206f7574207075742073696e2064656c65676174652063616c6c0000000000000000000000000000000008c379a0000000000000000000000000000000000000000000000000000000001806aa1896bbf26568e884a7374b41e002500962caba6a15023a8d90e8508b836603c2f100000000000000000000000000000000000000000000000000000000486561702073686f756c64206e6f74206265206d6f6469666965640000000000ab25690f00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000ffffffffffffffff000000000000000000000000eeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeaea34ae8000000000000000000000000000000000000000000000000000000007b494b6e0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001000000000738693d000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000ffffff00000000000000000000000000000000000000000000000000000000800000003b29037c00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000ffffffffffffff7b01000035cd4a1b3f84331419050d6ae2d93c44ec0563f2f82bd890769ed5abec2d49c67975aadd2d389580b368cfff5b49965b0bd5da33c144922ce01e7a4d7b4661696c656420746f206465706c6f7920636f6e7472616374000000000000006661696c6564207472616e736665722063616c6c0000000000000000000000000000000000000000000000000000000000000000000000010000000000000000486561702073686f756c64206e6f7420626520656d7074790000000000000000938b5f3299a1f3b18e458564efbb950733226014eece26fae19012d850b48d8342cbb15ccdc3cad6266b0e7a08c0454b23bf29dc2df74b6f3c209e9336465bd119cae4629a2dd7890036d0d1f6a82742845b778b7184e38d5bebfd4cce3b181ea6ae0aac158b2d5c9a9c9285743419d62a32f6727a640955e4ce8ee41503c784ffffffffffffffffffffffff00000000000000000000000000000000000000007877a797fe6dca4321f33fd95414da079ab78e698d761514c01ced9211af267efe173b97ed9aa263236c52fa3eb334d07741add95e972d17352d76816b4aaea39a8a0592ac89c5ad3bc6df8224c17b485976f597df104ee20d0df415241f670b796b89b91644bc98cd93958e4c9038275d622183e25ac5af08cc6b5d95539132ffffffffffffffffffffffffffffffffffffffffffffffffffffffff00000000000000000000000000000000000000000000000000000000ffffffffffffff6074686520696e6475737472792773207374616e646172642e2e2e00000000000020696e6475737472792e204c6f72656d20497073756d20686173206265656e20206f6620746865207072696e74696e6720616e64207479706573657474696e674c6f72656d20497073756d2069732073696d706c792064756d6d792074657874536f6d65206572726f72206d6573736167650000000000000000000000000000020000000000000000000000000000000000002000000000000000000000000085bd2d2aa0e5528cca3248dfb1e992d0113a553802d7924fdf049ae9ed1d5b30df6966c971051c3d54ec59162606531493a51404a002842f56009d7e5cf4a8c7ffffffffffffffffffffffffffffffffffffffffffffffff0000000000000000df6966c971051c3d54ec59162606531493a51404a002842f56009d7e5cf4a8c6770000000000000000000000000000000000000000000000000000000000000062f84b240000000000000000000000000000000000000000000000000000000014431339128bd25f2c7f93baa611e367472048757f4ad67f6d71a5ca0da550f5000000000000000000000000000000000000000000000000ffffffffffffff7f1c0000000000000000000000000000000000000000000000000000000000000046eabf35680328e26ef4579caf8aeb2cf9ece05dbf67a4f3d1f28c7b1d0e354651e4dbbbcebade695a3f0fdf10beb8b5f83fda161e1a3105a14c41168bf3dce00000000000000000000000007f8b3b04bf34618f4a1723fba96b5db211279a2b000000000000000000000000000000000000000000000000ffffffffffffff9fe0682fd4a26032afff3b18053a0c33d2a6c465c0e19cb1e4c10eb0a949f2827c0bdb5f0ac79d1a7efdc255f399a045038c1b433e9d06c1b1abd58a5fcaab33f1c46cdc50a66f4d07c6e9a127a7277e882fb21bcfb5b068f2b58c7f7283993b790000000000000000000000000865a77d4d68c7e3cdd219d431cfee9271905074dd69e9950f52dddcbc6751fdbb6949787cc1b84ac4020ab0617ec8ad950e554a1b000000000000000000000000000000000000000000000000000000000000004068f5b5e6c4b442e83fcb7b6290520ebb5e077cd10d3bd86cf431ca4b640162b00986d8bb52ee7acb06cabfa6c2c099d8904c7c8d56707a267ddbafd7aed0700000000000000000000000000000000000000000000000000000000000000000",
-  "default_account_code": "0x0004000000000002000700000000000200000000030100190000006003300270000003540430019700030000004103550002000000010355000003540030019d000100000000001f00000080010000390000004007000039000000000017043500000001012001900000005b0000c13d0000000001000031000000040210008c000000660000413d0000000202000367000000000302043b000000e003300270000003560430009c000000000a00041100000000090004120000000008000410000000740000613d000003570430009c0000008c0000613d000003580430009c000000b30000613d000003590430009c000000c50000613d0000035a0330009c0000006c0000c13d000000040310008a0000035b04000041000000200530008c000000000500001900000000050440190000035b03300197000000000630004c000000000400a0190000035b0330009c00000000030500190000000003046019000000000330004c000000cb0000c13d0000000402200370000000000602043b0000035c0260009c000000cb0000213d000000040560003900000000015100490000035b02000041000002600310008c000000000300001900000000030240190000035b01100197000000000410004c000000000200a0190000035b0110009c00000000010300190000000001026019000000000110004c000000cb0000c13d0000800101a0008c000000680000c13d0000035d09900197000000000189004b000000680000c13d0000000001000414000000000207043300000020032000390000035e04000041000000000043043500000104036000390000000203300367000000000303043b00000024042000390000000000340435000000240300003900000000003204350000035f0320009c000000f60000a13d00000363010000410000000000100435000000410100003900000004020000390000000000120435000000240200003900000000010000190d4902a00000040f0000000001000416000000000110004c000000cb0000c13d00000020020000390000010001000039000000000021043900000120020000390000000000020439000000400200003900000355030000410d4902960000040f000000000110004c0000006c0000c13d0000000001000019000000000200001900000000030000190d4902960000040f0000000001000416000000000110004c000000cb0000c13d0d4905bf0000040f0000000001000019000000000200001900000000030000190d4902960000040f000500000009001d000600000008001d000400000007001d00070000000a001d0d4902a90000040f0000000701000029000080010110008c000000680000c13d00000005010000290000035d011001970000000604000029000000000141004b000000680000c13d000000000102001900000000020300190d49042e0000040f00000004020000290000000003020433000003640110019700000000001304350000002002000039000000000103001900000000030000190d4902960000040f000500000009001d000600000008001d000400000007001d00070000000a001d0d4902a90000040f0000000701000029000080010110008c000000680000c13d00000005010000290000035d021001970000000601000029000000000112004b000000680000c13d000600000002001d00000220023000390000000001030019000700000002001d000300000003001d0d4903300000040f000000030120008c000000c60000213d0000000401000029000000000101043300000064021000390000036f03000041000000000032043500000044021000390000037003000041000000000032043500000024021000390000003a0300003900000000003204350000036702000041000000000021043500000004021000390000002003000039000000000032043500000084020000390d4902a00000040f000500000009001d000600000008001d00070000000a001d0d4902a90000040f0000000701000029000080010110008c000000680000c13d00000005010000290000035d011001970000000602000029000000000121004b000000680000c13d00000000010300190d49049f0000040f0000000001000019000000000200001900000000030000190d4902960000040f0d4902d10000040f000000030100002900000007020000290d4903300000040f000000040220008c000000ce0000813d000000000100001900000000020000190d4902a00000040f0000000201100367000000000101043b0000036401100197000003650210009c000000e90000c13d000000030100002900000007020000290d4903300000040f000000430120008c000001390000213d0000000404000029000000000104043300000064021000390000036d03000041000000000032043500000044021000390000036e030000410000000000320435000000240210003900000000004204350000036702000041000000000021043500000004021000390000002003000039000000000032043500000084020000390d4902a00000040f000003660110009c000000680000613d00000004010000290000000002010433000700000002001d0000036701000041000000000012043500000004012000390d490c390000040f0000000703000029000000000231004900000000010300190d4902a00000040f000500000009001d000000600320003900000000003704350000035401100197000700000005001d000600000006001d0d4905cb0000040f00000007010000290d49061b0000040f000400000001001d000000060100002900000044011000390000000201100367000000000101043b000080060110008c0000010e0000c13d0000000601000029000001c40210003900000007010000290d4903300000040f000000030120008c000000000100001900000001010020390d49035d0000040f00000007010000290d490c430000040f0000036002000041000000000020043900000004030000390000000502000029000300000003001d0000000000230439000500000001001d0000800a0100003900000024020000390d4902840000040f0000000502000029000000000112004b0000000001000019000000010100a0390d49036e0000040f0000000601000029000001e402100039000600000002001d00000007010000290d4903300000040f00000000030000310d4903830000040f000000070100002900000006020000290d4903300000040f000000000120004c0000018d0000c13d000000060100002900000007010000290d4903c40000040f0000000002010433000000410220008c000001860000213d00000363010000410000000000100435000000320100003900000003020000290000000000120435000000240200003900000000010000190d4902a00000040f000000030100002900000007020000290d4903300000040f000000440220008c000000cb0000413d00000004031000390000000202000367000000000332034f000000000603043b0000035d0360009c000000cb0000213d0000000303000029000000e003300039000000000332034f0000002401100039000000000112034f000000000101043b000500000001001d000000000203043b000000040500002900000000030504330000036801000041000000000013043500000004073000390000000001000414000000060400002900000000004704350000035d042001970000002402300039000300000004001d0000000000420435000000040260008c0000019b0000613d000000440400003900000000020600190000000005030019000700000006001d000200000003001d0d49024a0000040f000000020300002900000007060000290000000405000029000000000110004c0000019b0000c13d000000030200036700000001040000310000001f0340018f00000000010504330000000504400270000000000540004c000001750000613d000000000500001900000005065002100000000007610019000000000662034f000000000606043b00000000006704350000000105500039000000000645004b0000016d0000413d000000000530004c000001840000613d0000000504400210000000000242034f00000000044100190000000303300210000000000504043300000000053501cf000000000535022f000000000202043b0000010003300089000000000232022f00000000023201cf000000000252019f000000000024043500000001020000310d4902a00000040f00000061011000390000000002010433000003610220019700000362022001c7000000000021043500000007010000290000000601000029000000070100002900000006020000290d4903300000040f00000000030000310d4903830000040f000000000201001900000004010000290d4905410000040f00000007010000290d49049f0000040f0000000001000019000000000200001900000000030000190d4902960000040f0000000101000031000000200210008c000000200200003900000000020140190000001f02200039000000600420018f00000000070300190000000002340019000000000342004b000000000300001900000001030040390000035c0420009c000000530000213d0000000103300190000000530000c13d0000000000250435000000200110008c000000cb0000413d000700000006001d00000000010704330000000503000029000000000131004b000000680000813d0000002001200039000003690300004100000000003104350000002401200039000000030300002900000000003104350000004401000039000100000001001d0000000000120435000000440120003900000000000104350000036a0120009c00000004030000290000000701000029000000530000213d000000800420003900000000004304350d490c7d0000040f000000070200002900000004050000290000000006050433000003680100004100000000001604350000002403600039000000000100041400000003040000290000000000430435000200000006001d000000040460003900000006030000290000000000340435000000040320008c000001da0000613d0000004404000039000000020300002900000000050300190d49024a0000040f0000000405000029000000000110004c000001650000613d0000000101000031000000200210008c000000200200003900000000020140190000001f02200039000000600220018f00000002030000290000000003320019000000000223004b000000000200001900000001020040390000035c0430009c000000530000213d0000000102200190000000530000c13d0000000000350435000000200110008c000000cb0000413d00000002010000290000000001010433000000000110004c000002040000c13d000000200130003900000369020000410000000000210435000000440130003900000005020000290000000000210435000000240130003900000003020000290000000000210435000000010100002900000000001304350000036a0130009c00000004020000290000000701000029000000530000213d0000008004300039000000000042043500000000020300190d490c7d0000040f000000680000013d00000064013000390000036b02000041000000000021043500000044013000390000036c02000041000000000021043500000024013000390000003602000039000000000021043500000367010000410000000000130435000000040130003900000020020000390000000000210435000000840200003900000000010300190d4902a00000040f0002000000000002000200000006001d000100000005001d0000035405000041000003540630009c00000000030580190000004003300210000003540640009c00000000040580190000006004400210000000000334019f000003540410009c0000000001058019000000c001100210000000000113019f0d490d3f0000040f000000010800002900000002040000290000001f0340018f0000000504400270000000000540004c000002340000613d000000000500001900000005065002100000000007680019000000000661034f000000000606043b00000000006704350000000105500039000000000645004b0000022c0000413d000000010220018f000000000530004c000002440000613d0000000504400210000000000541034f00000000044800190000000303300210000000000604043300000000063601cf000000000636022f000000000505043b0000010003300089000000000535022f00000000033501cf000000000363019f000000000034043500030000000103550000006001100270000103540010019d00000000010200190000000200000005000000000001042d0001000000000002000100000005001d0000035405000041000003540630009c00000000030580190000004003300210000003540640009c00000000040580190000006004400210000000000334019f000003540410009c0000000001058019000000c001100210000000000113019f0d490d440000040f0000000106000029000000010220018f000000000300001900000005043002100000000005460019000000000441034f000000000404043b00000000004504350000000103300039000000000430004c0000000004000019000000010400603900000001044001900000025c0000c13d00030000000103550000006001100270000103540010019d00000000010200190000000100000005000000000001042d0000035403000041000003540410009c00000000010380190000004001100210000003540420009c00000000020380190000006002200210000000000112019f0000000002000414000003540420009c0000000002038019000000c002200210000000000112019f00000371011001c700008010020000390d490d440000040f0000000102200190000002810000613d000000000101043b000000000001042d000000000100001900000000020000190d4902a00000040f000000000301001900000354010000410000000004000414000003540540009c0000000001044019000000c00110021000000060022002100000000001120019000003720110004100000000020300190d490d440000040f0000000102200190000002930000613d000000000101043b000000000001042d000000000100001900000000020000190d4902a00000040f0000035404000041000003540510009c000000000104801900000040011002100000000001310019000003540320009c00000000020480190000006002200210000000000121001900000d4a0001042e0000035403000041000003540420009c0000000002038019000003540410009c000000000103801900000040011002100000006002200210000000000112019f00000d4b00010430000000040210008a0000035b030000410000005f0420008c000000000400001900000000040320190000035b02200197000000000520004c00000000030080190000035b0220009c00000000020400190000000002036019000000000220004c000002ce0000613d00000002020003670000004403200370000000000303043b0000035c0430009c000002ce0000213d000000040330003900000000013100490000035b04000041000002600510008c000000000500001900000000050440190000035b01100197000000000610004c000000000400a0190000035b0110009c00000000010500190000000001046019000000000110004c000002ce0000c13d0000000401200370000000000101043b0000002402200370000000000202043b000000000001042d000000000100001900000000020000190d4902a00000040f000300000000000200000000010000310d4902a90000040f0000000001000411000080010110008c000003080000c13d00000000010004120000035d011001970000000002000410000000000121004b000003080000c13d000000a00230003900000000010004140000000204000367000000000524034f0000006002300039000000000224034f000000000202043b000000000405043b000000000340004c0000030c0000c13d0000000004000415000000030440008a00000020044000c9000300000000001d000100000004001d000080010200003900000000030000190000000004000019000000000500001900000000060000190d4902150000040f0000000103000029000000200230011a000000000201001f000000000110004c000003080000c13d000000400100003900000000010104330000006402100039000003730300004100000000003204350000004402100039000003740300004100000000003204350000002402100039000000250300003900000000003204350000036702000041000000000021043500000004021000390000002003000039000000000032043500000084020000390d4902a00000040f0000000001000019000000000200001900000000030000190d4902960000040f00000000534200a900000000544300d9000000000224004b000003280000c13d0000000004000415000000020440008a00000020044000c9000200000000001d000000000230004c000002ea0000613d0000035402000041000003540410009c0000000001028019000000c00110021000000371011001c70000800902000039000080010400003900000000050000190d490d3f0000040f00000000030100190000006003300270000103540030019d0000000003000415000000020330008a00000020033000c90003000000010355000000010120018f000002f20000013d00000363010000410000000000100435000000110100003900000004020000390000000000120435000000240200003900000000010000190d4902a00000040f000000000300003100000000041300490000001f0540008a0000000204000367000000000224034f000000000202043b0000035b06000041000000000752004b000000000700001900000000070640190000035b055001970000035b08200197000000000958004b000000000600a019000000000558013f0000035b0550009c00000000050700190000000005066019000000000550004c0000035a0000613d0000000001120019000000000214034f000000000202043b0000035c0420009c0000035a0000213d000000000323004900000020011000390000035b04000041000000000531004b000000000500001900000000050420190000035b033001970000035b06100197000000000736004b0000000004008019000000000336013f0000035b0330009c00000000030500190000000003046019000000000330004c0000035a0000c13d000000000001042d000000000100001900000000020000190d4902a00000040f000000000110004c000003600000613d000000000001042d00000040010000390000000001010433000000440210003900000375030000410000000000320435000003670200004100000000002104350000002402100039000000200300003900000000003204350000000402100039000000000032043500000064020000390d4902a00000040f000000000110004c000003710000613d000000000001042d000000400100003900000000010104330000006402100039000003760300004100000000003204350000004402100039000003770300004100000000003204350000002402100039000000220300003900000000003204350000036702000041000000000021043500000004021000390000002003000039000000000032043500000084020000390d4902a00000040f0000000004010019000003780120009c000003b90000813d0000003f01200039000000200500008a000000000651016f000000400500003900000000010504330000000006610019000000000716004b000000000700001900000001070040390000035c0860009c000003b90000213d0000000107700190000003b90000c13d000000000065043500000000002104350000000005420019000000000335004b000003c10000213d0000001f0520018f000000020440036700000020031000390000000506200270000000000760004c000003a70000613d000000000700001900000005087002100000000009830019000000000884034f000000000808043b00000000008904350000000107700039000000000867004b0000039f0000413d000000000750004c000003b60000613d0000000506600210000000000464034f00000000066300190000000305500210000000000706043300000000075701cf000000000757022f000000000404043b0000010005500089000000000454022f00000000045401cf000000000474019f000000000046043500000000022300190000000000020435000000000001042d00000363010000410000000000100435000000410100003900000004020000390000000000120435000000240200003900000000010000190d4902a00000040f000000000100001900000000020000190d4902a00000040f00000040020000390000000001020433000003790310009c000003d90000813d0000008003100039000000000032043500000041020000390000000000210435000000200210003900000000030000310000000203300367000000000400001900000005054002100000000006520019000000000553034f000000000505043b00000000005604350000000104400039000000030540008c000003d00000413d000000000001042d00000363010000410000000000100435000000410100003900000004020000390000000000120435000000240200003900000000010000190d4902a00000040f000000400200003900000000010204330000037a0310009c000003f90000813d0000004003100039000000000032043500000001020000390000000000210435000000200210003900000000030000310000000203300367000000000400001900000005054002100000000006520019000000000553034f000000000505043b00000000005604350000000104400039000000000540004c000000000500001900000001050060390000000105500190000003ed0000c13d000000000001042d00000363010000410000000000100435000000410100003900000004020000390000000000120435000000240200003900000000010000190d4902a00000040f0000000002010019000003780120009c000004260000813d0000003f01200039000000200300008a000000000431016f000000400300003900000000010304330000000004410019000000000514004b000000000500001900000001050040390000035c0640009c000004260000213d0000000105500190000004260000c13d000000000043043500000000002104350000001f022000390000000502200270000000000320004c000004230000613d000000200310003900000000040000310000000204400367000000000500001900000005065002100000000007630019000000000664034f000000000606043b00000000006704350000000105500039000000000625004b0000041b0000413d000000000200004c000004250000613d000000000001042d00000363010000410000000000100435000000410100003900000004020000390000000000120435000000240200003900000000010000190d4902a00000040f00040000000000020000000006020019000300000001001d00000000010004140000004003000039000000000203043300000020042000390000035e050000410000000000540435000400000006001d00000100046000390000000204400367000000000404043b00000024052000390000000000450435000000240400003900000000004204350000037b0420009c0000048f0000813d0000006004200039000000000043043500000354011001970d4905cb0000040f0000000302000029000000000120004c00000000010200190000044b0000c13d00000004010000290d49061b0000040f000300000001001d000000040100002900000040021000390000000202200367000000000202043b000080060220008c000004590000c13d000001c0021000390d4903300000040f000000030120008c000000000100001900000001010020390d49035d0000040f00000004010000290d490c430000040f0000036002000041000000000020043900000000020004100000000403000039000100000003001d0000000000230439000200000001001d0000800a0100003900000024020000390d4902840000040f0000000202000029000000000112004b0000000001000019000000010100a0390d49036e0000040f0000000401000029000001e002100039000200000002001d0d4903300000040f00000000030000310d4903830000040f000000040100002900000002020000290d4903300000040f000000000120004c0000000401000029000004820000c13d000000020100002900000001010000290d4903c40000040f0000000002010433000000410220008c000004970000a13d00000061011000390000000002010433000003610220019700000362022001c700000000002104350000000401000029000000020200002900000002020000290d4903300000040f00000000030000310d4903830000040f000000000201001900000003010000290d4905410000040f0000037c02000041000000000110004c000000000102001900000000010060190000000400000005000000000001042d00000363010000410000000000100435000000410100003900000004020000390000000000120435000000240200003900000000010000190d4902a00000040f00000363010000410000000000100435000000320100003900000001020000290000000000120435000000240200003900000000010000190d4902a00000040f0004000000000002000200000001001d00000120031000390000000202000367000000000432034f0000004003100039000000000232034f000000000202043b000400000002001d000000000104043b000300000001001d0000037d0110009c000000000100001900000001010040390d490c6b0000040f0000000201000029000001c0021000390d4903300000040f00000000030000310d4903830000040f00000003020000290000037e062001970000000002010019000000000700041400000004010000290000035d04100197000080060140008c000004e00000c13d0000037f0170009c00000000010000190000000101004039000300000006001d000100000007001d000400000002001d0d490c6b0000040f00000004010000290000000001010433000200000001001d0000037f0110009c000000000100001900000001010040390d490c6b0000040f00000003030000290000000101000029000000c00110021000000380011001970000000402000029000000400220021000000381022000410000038202200197000000000112019f000000020200002900000060022002100000038302200197000000000121019f00000384011001c7000000000230004c000004ff0000613d00008009020000390000800604000039000000010500003900000000060000190d490d3f0000040f000300000002001d000005060000013d000000040140008c0000053c0000613d00000000050204330000002003200039000000000160004c000005340000613d0000035401000041000003540230009c000000000201001900000000020340190000004002200210000003540350009c000000000301001900000000030540190000006003300210000000000223019f000003540370009c0000000001074019000000c001100210000000000112019f00000371011001c70000800902000039000000000306001900000000050000190d490d3f0000040f00000000030100190000006003300270000103540030019d0003000000010355000000010120018f0000053a0000013d000080060200003900000000030000190000000004000019000000000500001900000000060000190d490d3f0000040f000300000002001d00030000000103550000006001100270000103540010019d0000035401100197000400000001001d0d4904010000040f00000004050000290000000102000031000000000225004b0000053e0000213d000000200310003900000003040003670000001f0250018f0000000505500270000000000650004c0000051f0000613d000000000600001900000005076002100000000008730019000000000774034f000000000707043b00000000007804350000000106600039000000000756004b000005170000413d000000000620004c0000052e0000613d0000000505500210000000000454034f00000000055300190000000302200210000000000605043300000000062601cf000000000626022f000000000404043b0000010002200089000000000424022f00000000022401cf000000000262019f0000000000250435000000030200002900000001022001900000053c0000c13d000000000201043300000000010300190d4902a00000040f000000000107001900000000020400190000000004050019000000000500001900000000060000190d4902150000040f000000000110004c0000053e0000613d0000000400000005000000000001042d000000000100001900000000020000190d4902a00000040f00010000000000020000000003020433000000410330008c000005710000c13d00000041032000390000000003030433000000ff0430018f0000001d0340008a000000030500008a000000000353004b000005800000a13d00000040032000390000000005030433000000200220003900000000020204330000004003000039000100000003001d0000000003030433000003860650009c0000058f0000813d0000006006300039000000000056043500000040053000390000000000250435000000200230003900000000004204350000000000130435000000000000043500000000010004140000000102000039000000800400003900000000050000190d49024a0000040f000000000110004c0000059d0000613d00000000010004330000035d011001970000000002000410000000000221004b00000000020000190000000102006039000000000110004c0000000001000019000000010100c039000000000112016f000000010110018f0000000100000005000000000001042d0000004001000039000000000101043300000044021000390000038503000041000000000032043500000024021000390000001d0300003900000000003204350000036702000041000000000021043500000004021000390000002003000039000000000032043500000064020000390d4902a00000040f000000400100003900000000010104330000004402100039000003880300004100000000003204350000002402100039000000160300003900000000003204350000036702000041000000000021043500000004021000390000002003000039000000000032043500000064020000390d4902a00000040f00000044013000390000038702000041000000000021043500000024013000390000000902000039000000000021043500000367010000410000000000130435000000040130003900000020020000390000000000210435000000640200003900000000010300190d4902a00000040f000000030200036700000001040000310000001f0340018f000000010100002900000000010104330000000504400270000000000540004c000005ae0000613d000000000500001900000005065002100000000007610019000000000662034f000000000606043b00000000006704350000000105500039000000000645004b000005a60000413d000000000530004c000005bd0000613d0000000504400210000000000242034f00000000044100190000000303300210000000000504043300000000053501cf000000000535022f000000000202043b0000010003300089000000000232022f00000000023201cf000000000252019f000000000024043500000001020000310d4902a00000040f0000000001000411000080010110008c000005c30000613d000000000001042d00000363010000410000000000100435000000010100003900000004020000390000000000120435000000240200003900000000010000190d4902a00000040f0003000000000002000200000002001d000100000001001d0000000001020433000300000001001d0000037f0110009c000000000100001900000001010040390d490c6b0000040f0000000101000029000000c00110021000000380011001970000000202000029000000400220021000000381022000410000038202200197000000000121019f000000030200002900000060022002100000038302200197000000000121019f00000384011001c7000080030200003900000000030000190000000004000019000000000500001900000000060000190d490d3f0000040f000200000002001d00030000000103550000006001100270000103540010019d0000035401100197000300000001001d0d4904010000040f00000003050000290000000102000031000000000225004b000006150000213d000000200310003900000003040003670000001f0250018f0000000505500270000000000650004c000006010000613d000000000600001900000005076002100000000008730019000000000774034f000000000707043b00000000007804350000000106600039000000000756004b000005f90000413d000000000620004c000006100000613d0000000505500210000000000454034f00000000055300190000000302200210000000000605043300000000062601cf000000000626022f000000000404043b0000010002200089000000000424022f00000000022401cf000000000262019f000000000025043500000002020000290000000102200190000006180000613d0000000300000005000000000001042d000000000100001900000000020000190d4902a00000040f000000000201043300000000010300190d4902a00000040f000f0000000000020000000207000367000000000217034f000000000302043b000000000230004c0000010004100039000000a00610003900000060051000390000004002100039000a00000002001d0000012002100039000b00000002001d000001c002100039000f00000001001d000e00000002001d000d00000005001d000c00000006001d0000070b0000613d000900000004001d000000710430008c000000c004100039000007780000c13d000800000004001d0d4903300000040f00000000030000310d4903830000040f000000000201043300000020011000390d49026d0000040f0000000f020000290000020003200039000000000400003100000000022400490000001f0520008a0000000202000367000000000332034f000000000303043b0000035b06000041000000000753004b000000000700001900000000070640190000035b055001970000035b08300197000000000958004b000000000600a019000000000558013f0000035b0550009c00000000050700190000000005066019000000000a010019000000000150004c00000b200000613d0000000f010000290000000001130019000000000312034f000000000503043b0000035c0350009c00000b200000213d0000000503500210000000000434004900000020061000390000035b01000041000000000746004b000000000700001900000000070120190000035b044001970000035b08600197000000000948004b0000000001008019000000000448013f0000035b0440009c000000000107c019000000000110004c00000b200000c13d0000004001000039000e00000001001d000000000401043300000020014000390000038c05500197000000000750004c000006760000613d000000000262034f000000000600001900000005076002100000000008710019000000000772034f000000000707043b00000000007804350000000106600039000000000756004b0000066e0000413d000000000200004c000006780000613d00070000000a001d00000000003404350000003f02300039000000200300008a000000000232016f0000000002240019000000000342004b000000000300001900000001030040390000035c0520009c00000b180000213d000000010330019000000b180000c13d0000000e03000029000000000023043500000000020404330d49026d0000040f000600000001001d0000000f0100002900000220021000390d4903300000040f00000000030000310d4903830000040f000000000201043300000020011000390d49026d0000040f00000002020003670000000d03000029000000000632034f0000000a03000029000000000532034f0000000f0c0000290000002003c00039000000000432034f0000000b03000029000000000732034f0000000903000029000000000832034f000000e003c00039000000000932034f0000000803000029000000000a32034f0000000c03000029000000000b32034f0000008003c00039000000000d0c0019000000000c32034f0000000002d2034f000000000302043b000000000404043b000000000505043b000000000606043b000000000c0c043b000000000b0b043b000000000a0a043b000000000909043b000000000808043b000000000707043b0000000e020000290000000002020433000001c00d20003900000000001d0435000001a001200039000000060d0000290000000000d104350000018001200039000000070d0000290000000000d1043500000160012000390000000000710435000001400120003900000000008104350000012001200039000000000091043500000100012000390000000000a10435000000e0012000390000000000b10435000000c0012000390000000000c10435000000a0012000390000000000610435000000800120003900000000005104350000006001200039000000000041043500000040012000390000000000310435000001c00100003900000000001204350000038d03000041000000200120003900000000003104350000038e0320009c00000b180000213d000001e0032000390000000e04000029000000000034043500000000020204330d49026d0000040f0000000e020000290000000002020433000f00000002001d0000038a020000410000000000200439000d00000001001d0000800b0100003900000004020000390d4902840000040f0000038f020000410000000f040000290000006003400039000000000023043500000390020000410000004003400039000000000023043500000000030400190000008002300039000000000012043500000391020000410000002001300039000000000021043500000080020000390000000000230435000003920230009c00000b180000213d000000a0023000390000000e04000029000000000024043500000000020304330d49026d0000040f0000000e02000029000000000402043300000042024000390000000d03000029000000000032043500000393020000410000002003400039000000000023043500000022024000390000000000120435000000420100003900000000001404350000036a0140009c00000b180000213d000000800140003900000b110000013d000000000147034f000000000101043b00090000000703530d490b720000040f000000090200035f0000000c03000029000000000232034f000000000202043b000c00000001001d00000000010200190d490b720000040f0000000d02000029000000090300035f000000000223034f000000000202043b000d00000001001d00000000010200190d490b720000040f0000000d0700002900000000020704330000004009000039000000000809043300000020038000390000000004000019000000000524004b0000072b0000813d00000000053400190000002004400039000000000674001900000000060604330000000000650435000007230000013d0000000003320019000000000003043500000000040104330000000005000019000000000645004b000007370000813d000000000635001900000020055000390000000007150019000000000707043300000000007604350000072f0000013d00000000013400190000000000010435000000000124001900000000001804350000003f01100039000000200200008a000700000002001d000000000221016f000d00000008001d0000000001820019000000000221004b000000000200001900000001020040390000035c0310009c00000b180000213d000000010220019000000b180000c13d000900000009001d00000000001904350000000a010000290000000201100367000000000101043b0000035d011001970d490b5a0000040f0000000b020000290000000202200367000000000202043b000a00000001001d00000000010200190d490b720000040f000b00000001001d0000000f010000290000000e020000290d4903300000040f0000035c01200197000000010210008c000007ba0000c13d0000000f010000290000000e020000290d4903300000040f000000000220004c00000b230000613d0000000205000367000000000115034f000000000101043b000000010200008a0000035b03000041000000000221004b000000000200001900000000020320190000035b011001970000035b0410009c00000000030080190000035b011001670000035b0110009c000000000102001900000000010360190000006006000039000000000110004c000007bd0000c13d00080000000503530d490b460000040f000000080500035f0000000006010019000007bd0000013d000000020230008c000008ad0000c13d0000038a0100004100000000001004390000800b010000390000000402000039000800000004001d0d4902840000040f0d490b720000040f000000020300036700070000000303530000000902000029000000000223034f000000000202043b000500000001001d00000000010200190d490b720000040f000000070200035f0000000803000029000000000232034f000000000202043b000600000001001d00000000010200190d490b720000040f000000070200035f0000000c03000029000000000232034f000000000202043b000800000001001d00000000010200190d490b720000040f0000000d02000029000000070300035f000000000223034f000000000202043b000900000001001d00000000010200190d490b720000040f0000000a02000029000000070300035f000000000223034f000000000202043b0000035d02200197000c00000001001d00000000010200190d490b5a0000040f0000000b020000290000000202200367000000000202043b000d00000001001d00000000010200190d490b720000040f000000050700002900000000020704330000004009000039000000000809043300000020038000390000000004000019000000000524004b000008e70000813d00000000053400190000002004400039000000000674001900000000060604330000000000650435000007b20000013d0d490ba70000040f000000020500036700000000060100190000000f010000290000014002100039000000000225034f0000006007000039000000000202043b000000000220004c0000000d020000290000000c030000290000000b040000290000000a050000290000000908000029000600000006001d000007f40000613d0000038a0100004100000000001004390000800b0100003900000004020000390d4902840000040f0d490b720000040f00000009080000290000000007080433000000200370003900000000020104330000000004000019000000000524004b000007dd0000813d00000000053400190000002004400039000000000614001900000000060604330000000000650435000007d50000013d0000000001320019000003940300004100000000003104350000000201200039000000000017043500000041012000390000000702000029000000000221016f0000000001720019000000000221004b000000000200001900000001020040390000035c0310009c00000b180000213d000000010220019000000b180000c13d00000000001804350000000f010000290000000d020000290000000c030000290000000b040000290000000a050000290000000606000029000800000007001d0000000006060433000500000006001d0000000004040433000400000004001d0000000004050433000300000004001d0000000002020433000200000002001d0000000002030433000100000002001d0000000e020000290d4903300000040f00000002010000290000000103000029000000000131001900000003030000290000000001310019000000040300002900000000013100190000000503000029000000000131001900000000012100190000000802000029000000000202043300000000012100190000035c011001970d490be70000040f000500000001001d0000000f010000290000000e020000290d4903300000040f000000050900002900000000050904330000000903000029000000000403043300000020034000390000000006000019000000000756004b000008220000813d000000000736001900000020066000390000000008960019000000000808043300000000008704350000081a0000013d00000000063500190000000000060435000000000545001900000020075000390000000c0c00002900000000060c043300000000080000190000000d0b000029000000000968004b000008320000813d00000000097800190000002008800039000000000ac80019000000000a0a04330000000000a904350000082a0000013d000000000776001900000000000704350000000005560019000000200750003900000000060b043300000000080000190000000a0c000029000000000968004b000008410000813d00000000097800190000002008800039000000000ab80019000000000a0a04330000000000a90435000008390000013d000000000776001900000000000704350000000005560019000000200750003900000000060c043300000000080000190000000b0b000029000000000968004b000008500000813d00000000097800190000002008800039000000000ac80019000000000a0a04330000000000a90435000008480000013d000000000776001900000000000704350000000005560019000000200750003900000000060b04330000000008000019000000000968004b0000085e0000813d00000000097800190000002008800039000000000ab80019000000000a0a04330000000000a90435000008560000013d0000000007760019000000000007043500000000055600190000002007500039000000060b00002900000000060b04330000000008000019000000000968004b0000086d0000813d00000000097800190000002008800039000000000ab80019000000000a0a04330000000000a90435000008650000013d0000000007760019000000000007043500000000055600190000001f0620018f000000200750003900000002011003670000000508200270000000000980004c0000087f0000613d0000000009000019000000050a900210000000000ba70019000000000aa1034f000000000a0a043b0000000000ab04350000000109900039000000000a89004b000008770000413d000000000960004c0000088e0000613d0000000508800210000000000181034f00000000078700190000000306600210000000000807043300000000086801cf000000000868022f000000000101043b0000010006600089000000000161022f00000000016101cf000000000181019f0000000000170435000000000125001900000020051000390000000000050435000000080900002900000000020904330000000006000019000000000726004b0000089c0000813d00000000075600190000002006600039000000000896001900000000080804330000000000870435000008940000013d000000000552001900000000000504350000000001410049000000000112001900000000001404350000003f011000390000000702000029000000000221016f0000000001420019000000000221004b000000000200001900000001020040390000035c0510009c00000b180000213d000000010220019000000b110000613d00000b180000013d000000010130008c00000b2b0000c13d0000038a0100004100000000001004390000800b0100003900000004020000390d4902840000040f0d490b720000040f000000020300036700080000000303530000000902000029000000000223034f000000000202043b000600000001001d00000000010200190d490b720000040f0000000c02000029000000080300035f000000000223034f000000000202043b000700000001001d00000000010200190d490b720000040f0000000d02000029000000080300035f000000000223034f000000000202043b000900000001001d00000000010200190d490b720000040f0000000a02000029000000080300035f000000000223034f000000000202043b0000035d02200197000c00000001001d00000000010200190d490b5a0000040f0000000b020000290000000202200367000000000202043b000d00000001001d00000000010200190d490b720000040f000000060700002900000000020704330000004009000039000000000809043300000020038000390000000004000019000000000524004b000009710000813d00000000053400190000002004400039000000000674001900000000060604330000000000650435000008df0000013d0000000003320019000000000003043500000000028200190000002004200039000000060e00002900000000030e043300000000050000190000000d0a0000290000000c0b000029000000090c000029000000080d000029000000000635004b000008fa0000813d000000000645001900000020055000390000000007e5001900000000070704330000000000760435000008f20000013d000000000443001900000000000404350000000002230019000000200420003900000000030d04330000000005000019000000000635004b000009080000813d000000000645001900000020055000390000000007d5001900000000070704330000000000760435000009000000013d000000000443001900000000000404350000000002230019000000200420003900000000030c04330000000005000019000000000635004b000009160000813d000000000645001900000020055000390000000007c50019000000000707043300000000007604350000090e0000013d000000000443001900000000000404350000000002230019000000200420003900000000030b04330000000005000019000000000635004b000009240000813d000000000645001900000020055000390000000007b50019000000000707043300000000007604350000091c0000013d000000000443001900000000000404350000000002230019000000200420003900000000030a04330000000005000019000000000635004b000009320000813d000000000645001900000020055000390000000007a50019000000000707043300000000007604350000092a0000013d000000000443001900000000000404350000000002230019000000200420003900000000030104330000000005000019000000000635004b000009400000813d00000000064500190000002005500039000000000715001900000000070704330000000000760435000009380000013d000000000143001900000000000104350000000001820049000000000113001900000000001804350000003f01100039000000200200008a000a00000002001d000000000221016f000d00000008001d0000000001820019000000000221004b000000000200001900000001020040390000035c0310009c00000b180000213d000000010220019000000b180000c13d000900000009001d00000000001904350000000f010000290000000e020000290d4903300000040f0000035c01200197000000010210008c000009ec0000c13d0000000f010000290000000e020000290d4903300000040f000000000220004c00000b230000613d0000000201100367000000000101043b000000010200008a0000035b03000041000000000221004b000000000200001900000000020320190000035b011001970000035b0410009c00000000030080190000035b011001670000035b0110009c00000000020360190000006001000039000000000220004c000009ed0000c13d0d490b460000040f000009ed0000013d0000000003320019000000000003043500000000028200190000002004200039000000070d00002900000000030d043300000000050000190000000d0a0000290000000c0b000029000000090c000029000000000635004b000009830000813d000000000645001900000020055000390000000007d50019000000000707043300000000007604350000097b0000013d000000000443001900000000000404350000000002230019000000200420003900000000030c04330000000005000019000000000635004b000009910000813d000000000645001900000020055000390000000007c5001900000000070704330000000000760435000009890000013d000000000443001900000000000404350000000002230019000000200420003900000000030b04330000000005000019000000000635004b0000099f0000813d000000000645001900000020055000390000000007b5001900000000070704330000000000760435000009970000013d000000000443001900000000000404350000000002230019000000200420003900000000030a04330000000005000019000000000635004b000009ad0000813d000000000645001900000020055000390000000007a5001900000000070704330000000000760435000009a50000013d000000000443001900000000000404350000000002230019000000200420003900000000030104330000000005000019000000000635004b000009bb0000813d00000000064500190000002005500039000000000715001900000000070704330000000000760435000009b30000013d000000000143001900000000000104350000000001820049000000000113001900000000001804350000003f01100039000000200200008a000a00000002001d000000000221016f000d00000008001d0000000001820019000000000221004b000000000200001900000001020040390000035c0310009c00000b180000213d000000010220019000000b180000c13d000900000009001d00000000001904350000000f010000290000000e020000290d4903300000040f0000035c01200197000000010210008c00000a7f0000c13d0000000f010000290000000e020000290d4903300000040f000000000220004c00000b230000613d0000000201100367000000000101043b000000010200008a0000035b03000041000000000221004b000000000200001900000000020320190000035b011001970000035b0410009c00000000030080190000035b011001670000035b0110009c00000000020360190000006001000039000000000220004c00000a800000c13d0d490b460000040f00000a800000013d0d490ba70000040f000c00000001001d0d4903e10000040f00000000030100190000000001030433000000000110004c00000b230000613d0000002001300039000000000201043300000361022001970000038b022001c700000000002104350000000c010000290000000001010433000800000001001d0000000d010000290000000001010433000700000001001d0000000f010000290000000e02000029000b00000003001d0d4903300000040f00000008010000290000000703000029000000000131001900000000012100190000000b02000029000000000202043300000000012100190000035c011001970d490be70000040f000800000001001d0000000f010000290000000e020000290d4903300000040f000000080a00002900000009030000290000000004030433000003710500004100000020034000390000000000530435000000210640003900000000050a04330000000007000019000000000857004b00000a200000813d000000000867001900000020077000390000000009a700190000000009090433000000000098043500000a180000013d00000000066500190000000000060435000000000545001900000021075000390000000d0b00002900000000060b04330000000008000019000000000968004b00000a2f0000813d00000000097800190000002008800039000000000ab80019000000000a0a04330000000000a9043500000a270000013d00000000077600190000000000070435000000000556001900000021075000390000000c0b00002900000000060b04330000000008000019000000000968004b00000a3e0000813d00000000097800190000002008800039000000000ab80019000000000a0a04330000000000a9043500000a360000013d0000000007760019000000000007043500000000055600190000001f0620018f000000210750003900000002011003670000000508200270000000000980004c00000a500000613d0000000009000019000000050a900210000000000ba70019000000000aa1034f000000000a0a043b0000000000ab04350000000109900039000000000a89004b00000a480000413d000000000960004c00000a5f0000613d0000000508800210000000000181034f00000000078700190000000306600210000000000807043300000000086801cf000000000868022f000000000101043b0000010006600089000000000161022f00000000016101cf000000000181019f00000000001704350000000001250019000000210510003900000000000504350000000b0900002900000000020904330000000006000019000000000726004b00000a6d0000813d0000000007560019000000200660003900000000089600190000000008080433000000000087043500000a650000013d00000000055200190000000000050435000000000141004900000000011200190000000102100039000000000024043500000040011000390000000a02000029000000000221016f0000000001420019000000000221004b000000000200001900000001020040390000035c0510009c00000b180000213d000000010220019000000b110000613d00000b180000013d0d490ba70000040f000c00000001001d0d4903e10000040f00000000030100190000000001030433000000000110004c00000b230000613d0000002001300039000000000201043300000361022001970000038b022001c700000000002104350000000c010000290000000001010433000800000001001d0000000d010000290000000001010433000700000001001d0000000f010000290000000e02000029000b00000003001d0d4903300000040f00000008010000290000000703000029000000000131001900000000012100190000000b02000029000000000202043300000000012100190000035c011001970d490be70000040f000800000001001d0000000f010000290000000e020000290d4903300000040f000000080a00002900000009030000290000000004030433000003840500004100000020034000390000000000530435000000210640003900000000050a04330000000007000019000000000857004b00000ab30000813d000000000867001900000020077000390000000009a700190000000009090433000000000098043500000aab0000013d00000000066500190000000000060435000000000545001900000021075000390000000d0b00002900000000060b04330000000008000019000000000968004b00000ac20000813d00000000097800190000002008800039000000000ab80019000000000a0a04330000000000a9043500000aba0000013d00000000077600190000000000070435000000000556001900000021075000390000000c0b00002900000000060b04330000000008000019000000000968004b00000ad10000813d00000000097800190000002008800039000000000ab80019000000000a0a04330000000000a9043500000ac90000013d0000000007760019000000000007043500000000055600190000001f0620018f000000210750003900000002011003670000000508200270000000000980004c00000ae30000613d0000000009000019000000050a900210000000000ba70019000000000aa1034f000000000a0a043b0000000000ab04350000000109900039000000000a89004b00000adb0000413d000000000960004c00000af20000613d0000000508800210000000000181034f00000000078700190000000306600210000000000807043300000000086801cf000000000868022f000000000101043b0000010006600089000000000161022f00000000016101cf000000000181019f00000000001704350000000001250019000000210510003900000000000504350000000b0900002900000000020904330000000006000019000000000726004b00000b000000813d0000000007560019000000200660003900000000089600190000000008080433000000000087043500000af80000013d00000000055200190000000000050435000000000141004900000000011200190000000102100039000000000024043500000040011000390000000a02000029000000000221016f0000000001420019000000000221004b000000000200001900000001020040390000035c0510009c00000b180000213d000000010220019000000b180000c13d00000040020000390000000000120435000000000204043300000000010300190d49026d0000040f0000000f00000005000000000001042d00000363010000410000000000100435000000410100003900000004020000390000000000120435000000240200003900000000010000190d4902a00000040f000000000100001900000000020000190d4902a00000040f00000363010000410000000000100435000000320100003900000004020000390000000000120435000000240200003900000000010000190d4902a00000040f000000400100003900000000010104330000004402100039000003890300004100000000003204350000002402100039000000170300003900000000003204350000036702000041000000000021043500000004021000390000002003000039000000000032043500000064020000390d4902a00000040f0000000004000019000000000534004b00000b430000813d0000000005240019000000000614001900000000060604330000000000650435000000200440003900000b3b0000013d00000000012300190000000000010435000000000001042d000000400200003900000000010204330000037a0310009c00000b520000813d0000004003100039000000000032043500000020021000390000039503000041000000000032043500000001020000390000000000210435000000000001042d00000363010000410000000000100435000000410100003900000004020000390000000000120435000000240200003900000000010000190d4902a00000040f0000000002010019000000400300003900000000010304330000037a0410009c00000b6a0000813d0000004004100039000000000043043500000020031000390000039604000041000000000043043500000060022002100000002103100039000000000023043500000015020000390000000000210435000000000001042d00000363010000410000000000100435000000410100003900000004020000390000000000120435000000240200003900000000010000190d4902a00000040f00020000000000020000007f0210008c000200000001001d00000b8f0000a13d0d490c1d0000040f000100000001001d00000002011000390d4904010000040f0000000002010433000000000220004c00000b9f0000613d0000002002100039000000000302043300000361033001970000000105000029000000f804500210000000000334019f000003950330004100000000003204350000000302500210000000f802200089000000020300002900000000032301cf000000ff0220008c000000000203001900000000020020190000002103100039000000000023043500000b9d0000013d0d4903e10000040f0000000002010433000000000220004c00000b9f0000613d0000000204000029000000f8024002100000035b03000041000000000440004c0000000002036019000000200310003900000000040304330000036104400197000000000224019f00000000002304350000000200000005000000000001042d00000363010000410000000000100435000000320100003900000004020000390000000000120435000000240200003900000000010000190d4902a00000040f000200000000000200000000030100190000035c01300197000000010210008c00000bd70000613d000000370210008c00000bc80000a13d000200000001001d0d490c1d0000040f000100000001001d00000002011000390d4904010000040f0000000002010433000000000220004c00000bdf0000613d0000002002100039000000000302043300000361033001970000000105000029000000f804500210000000000334019f000003970330004100000000003204350000000302500210000000f802200089000000020300002900000000032301cf000000ff0220008c000000000203001900000000020020190000002103100039000000000023043500000bd50000013d000200000003001d0d4903e10000040f0000000002010433000000000220004c00000bdf0000613d0000000202000029000000f802200210000000200310003900000000040304330000036104400197000000000224019f0000035b0220016700000000002304350000000200000005000000000001042d00000363010000410000000000100435000000010100003900000004020000390000000000120435000000240200003900000000010000190d4902a00000040f00000363010000410000000000100435000000320100003900000004020000390000000000120435000000240200003900000000010000190d4902a00000040f000200000000000200000000030100190000035c01300197000000370210008c00000c060000a13d000200000001001d0d490c1d0000040f000100000001001d00000002011000390d4904010000040f0000000002010433000000000220004c00000c150000613d0000002002100039000000000302043300000361033001970000000105000029000000f804500210000000000334019f000003980330004100000000003204350000000302500210000000f802200089000000020300002900000000032301cf000000ff0220008c000000000203001900000000020020190000002103100039000000000023043500000c130000013d000200000003001d0d4903e10000040f0000000002010433000000000220004c00000c150000613d0000000202000029000000f802200210000000200310003900000000040304330000036104400197000000000242019f0000038b0220004100000000002304350000000200000005000000000001042d00000363010000410000000000100435000000320100003900000004020000390000000000120435000000240200003900000000010000190d4902a00000040f00000080021002700000037e0310009c000000000201a0190000037e0110009c0000000001000019000000100100203900000008031001bf0000035c0420009c000000000103201900000040032002700000035c0420009c000000000203201900000004031001bf000003540420009c00000000010320190000002003200270000003540420009c000000000203201900000002031001bf0000ffff0420008c000000000103201900000010032002700000000002032019000000ff0220008c000000000200001900000001020020390000000001210019000000000001042d00000040021000390000039903000041000000000032043500000020021000390000001a030000390000000000320435000000200200003900000000002104350000006001100039000000000001042d000000e0031000390000000202000367000000000332034f000000000303043b0000035d0330019800000c4d0000613d0000012001100039000000000112034f000000000101043b00000c620000013d000000a003100039000000000332034f0000006004100039000000000442034f000000000404043b000000000503043b00000000635400a9000000000650004c00000c590000613d00000000655300d9000000000445004b00000c630000c13d0000012001100039000000000112034f000000000201043b0000000001320019000000000221004b00000000020000190000000102004039000000010220019000000c630000c13d000000000001042d00000363010000410000000000100435000000110100003900000004020000390000000000120435000000240200003900000000010000190d4902a00000040f000000000110004c00000c6e0000613d000000000001042d0000004001000039000000000101043300000044021000390000039a0300004100000000003204350000002402100039000000080300003900000000003204350000036702000041000000000021043500000004021000390000002003000039000000000032043500000064020000390d4902a00000040f00050000000000020000035d0a1001970000004009000039000000000b0904330000037a01b0009c00000cfb0000813d0000004001b0003900000000001904350000002001000039000400000001001d00000000001b04350000002003b000390000039b01000041000300000003001d0000000000130435000000010100003900000000050004140000000403a0008c00000c9d0000613d00000000040204330000002003200039000000000105001900000000020a001900000000050000190000000006000019000500000009001d00020000000a001d00010000000b001d0d4902150000040f000000010b000029000000020a0000290000000509000029000000600c0000390000000102000031000000000320004c00000cd00000613d0000035c0320009c00000cfb0000213d0000003f03200039000000200400008a000000000343016f000000000c09043300000000033c00190000000004c3004b000000000400001900000001040040390000035c0530009c00000cfb0000213d000000010440019000000cfb0000c13d000000000039043500000000002c04350000002002c00039000000030300036700000001050000310000001f0450018f0000000505500270000000000650004c00000cc10000613d000000000600001900000005076002100000000008720019000000000773034f000000000707043b00000000007804350000000106600039000000000756004b00000cb90000413d000000000640004c00000cd00000613d0000000505500210000000000353034f00000000025200190000000304400210000000000502043300000000054501cf000000000545022f000000000303043b0000010004400089000000000343022f00000000034301cf000000000353019f000000000032043500000000020c0433000000000110004c00000d060000613d000000000120004c00000ce50000c13d00030000000c001d000500000009001d0000039c01000041000000000010043900000004010000390000000000a10439000080020100003900000024020000390d4902840000040f000000000110004c00000d300000613d000000030c00002900000000020c0433000000000120004c000000050900002900000cf90000613d0000035b01000041000000200320008c000000000300001900000000030140190000035b02200197000000000420004c000000000100a0190000035b0220009c000000000103c019000000000110004c00000d030000c13d0000002001c000390000000001010433000000000210004c0000000002000019000000010200c039000000000221004b00000d030000c13d000000000110004c00000d1d0000613d0000000500000005000000000001042d00000363010000410000000000100435000000410100003900000004020000390000000000120435000000240200003900000000010000190d4902a00000040f000000000100001900000000020000190d4902a00000040f000000000120004c00000d2e0000c13d0000000004090433000500000004001d0000036701000041000000000014043500000004014000390000000402000029000000000021043500000000030b0433000400000003001d00000024014000390000000000310435000000440240003900000003010000290d490b3a0000040f00000004010000290000001f01100039000000200200008a000000000121016f000000440210003900000005010000290d4902a00000040f000000000109043300000064021000390000039d03000041000000000032043500000044021000390000039e03000041000000000032043500000024021000390000002a0300003900000000003204350000036702000041000000000021043500000004021000390000000403000029000000000032043500000084020000390d4902a00000040f0000002001c000390d4902a00000040f0000000501000029000000000101043300000044021000390000039f03000041000000000032043500000024021000390000001d0300003900000000003204350000036702000041000000000021043500000004021000390000000403000029000000000032043500000064020000390d4902a00000040f00000d42002104210000000102000039000000000001042d0000000002000019000000000001042d00000d47002104230000000102000039000000000001042d0000000002000019000000000001042d00000d490000043200000d4a0001042e00000d4b00010430000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000ffffffff000000020000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000202bcce700000000000000000000000000000000000000000000000000000000a28c1aee00000000000000000000000000000000000000000000000000000000df9c158900000000000000000000000000000000000000000000000000000000e2f318e300000000000000000000000000000000000000000000000000000000eeb8cb098000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000ffffffffffffffff000000000000000000000000ffffffffffffffffffffffffffffffffffffffffe1239cd800000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000ffffffffffffff9f9cc7f708afc65944829bd487b90b72536b1951864fbfc14e125fc972a6507f3900ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff1b000000000000000000000000000000000000000000000000000000000000004e487b7100000000000000000000000000000000000000000000000000000000ffffffff00000000000000000000000000000000000000000000000000000000949431dc000000000000000000000000000000000000000000000000000000008c5a34450000000000000000000000000000000000000000000000000000000008c379a000000000000000000000000000000000000000000000000000000000dd62ed3e00000000000000000000000000000000000000000000000000000000095ea7b300000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000ffffffffffffff7f20746f206e6f6e2d7a65726f20616c6c6f77616e6365000000000000000000005361666545524332303a20617070726f76652066726f6d206e6f6e2d7a65726f74206d757374206265206174206c65617374203638206279746573206c6f6e6754686520617070726f76616c4261736564207061796d617374657220696e707574206265206174206c656173742034206279746573206c6f6e67000000000000546865207374616e64617264207061796d617374657220696e707574206d7573020000000000000000000000000000000000000000000000000000000000000002000002000000000000000000000000000000000000000000000000000000007261746f720000000000000000000000000000000000000000000000000000004661696c656420746f20706179207468652066656520746f20746865206f7065496e76616c69642063616c6c20746f20436f6e74726163744465706c6f79657275650000000000000000000000000000000000000000000000000000000000004e6f7420656e6f7567682062616c616e636520666f7220666565202b2076616c0000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000000ffffffffffffff80000000000000000000000000000000000000000000000000ffffffffffffffc0000000000000000000000000000000000000000000000000ffffffffffffffa0202bcce700000000000000000000000000000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000000ffffffffffffffffffffffffffffffff000000000000000000000000000000000000000000000000000000010000000000000000ffffffff00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000ffffffff000000000000000000000000000000000000000000000000ffffffff00000000000000000000000001000000000000000000000000000000000000000000000000000000000000005369676e6174757265206c656e67746820697320696e636f72726563740000007fffffffffffffffffffffffffffffff5d576e7357a4501ddfe92f46681b20a1496e76616c69642073000000000000000000000000000000000000000000000076206973206e656974686572203237206e6f7220323800000000000000000000456e636f64696e6720756e737570706f727465642074780000000000000000009a8a0592ac89c5ad3bc6df8224c17b485976f597df104ee20d0df415241f670bc00000000000000000000000000000000000000000000000000000000000000007ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff848e1bfa1ac4e3576b728bda6721b215c70a7799a5b4866282a71bab954baac8000000000000000000000000000000000000000000000000fffffffffffffe1fad7c5bef027816a800da1736444fb58a807ef4c9603b7848673f7e3a68eb14a519b453ce45aaaaf3a300f5a9ec95869b4f28ab10430b572ee218c3a6a5e07d6fc2f8787176b8ac6bf7215b4adcc1e069bf4ab82d9ab1df05a57a91d425935b6e000000000000000000000000000000000000000000000000ffffffffffffff5f1901000000000000000000000000000000000000000000000000000000000000808000000000000000000000000000000000000000000000000000000000000081000000000000000000000000000000000000000000000000000000000000009400000000000000000000000000000000000000000000000000000000000000b800000000000000000000000000000000000000000000000000000000000000f800000000000000000000000000000000000000000000000000000000000000556e737570706f72746564207061796d617374657220666c6f770000000000004f766572666c6f770000000000000000000000000000000000000000000000005361666545524332303a206c6f772d6c6576656c2063616c6c206661696c65641806aa1896bbf26568e884a7374b41e002500962caba6a15023a8d90e8508b836f742073756363656564000000000000000000000000000000000000000000005361666545524332303a204552433230206f7065726174696f6e20646964206e416464726573733a2063616c6c20746f206e6f6e2d636f6e74726163740000000000000000000000000000000000000000000000000000000000000000000000",
-  "predeployed_contracts": {
-    "0xdeadbeafdeadbeafdeadbeafdeadbeafdeadbeaf": "0x00020000000000020001000000000002000000000301001900000060033002700000002b033001970001000000310355000000000000001f0000008001000039000000400a00003900000000001a04350000000102200190000000190000c13d000000300200004100000000002104350000002002000039000000840300003900000000002304350000001d02000039000000a40300003900000000002304350000003202000041000000c4030000390000000000230435000000640200003900a6009a0000040f0000000001000416000000000110004c000000390000c13d000000010100003900000000030004140000000002000410000000040420008c000000250000613d000000000103001900010000000a001d00a6008d0000040f000000010a00002900000060020000390000000003000031000000000430004c0000003c0000c13d000000000110004c000000760000c13d00000000010a043300000044021000390000003103000041000000000032043500000024021000390000001303000039000000000032043500000030020000410000000000210435000000040210003900000020030000390000000000320435000000640200003900a6009a0000040f0000000001000019000000000200001900a6009a0000040f0000002c0230009c0000006e0000813d0000001f02300039000000200400008a000000000242016f0000003f02200039000000000442016f00000000020a04330000000004420019000000000524004b000000000500001900000001050040390000002d0640009c0000006e0000213d00000001055001900000006e0000c13d00000000004a043500000000003204350000002003200039000000010400036700000000060000310000001f0560018f0000000506600270000000000760004c0000005e0000613d000000000700001900000005087002100000000009830019000000000884034f000000000808043b00000000008904350000000107700039000000000867004b000000560000413d000000000750004c000000290000613d0000000506600210000000000464034f00000000036300190000000305500210000000000603043300000000065601cf000000000656022f000000000404043b0000010005500089000000000454022f00000000045401cf000000000464019f0000000000430435000000290000013d0000002e0100004100000000001004350000004101000039000000040200003900000000001204350000002402000039000000000100001900a6009a0000040f0000000001020433000000000110004c0000007f0000c13d0000002001000039000001000200003900000000001204390000012001000039000000000001043900a600980000040f00000000010a043300000044021000390000002f03000041000000000032043500000024021000390000001403000039000000000032043500000030020000410000000000210435000000040210003900000020030000390000000000320435000000640200003900a6009a0000040f0000002b030000410000002b0410009c0000000001038019000000c00110021000a600a10000040f000000000301001900000060033002700000002b0030019d0001000000010355000000010120018f000000000001042d0000003301000041000000a70001042e0000002b030000410000002b0410009c000000000103801900000040011002100000006002200210000000000121019f000000a800010430000000a4002104210000000102000039000000000001042d0000000002000019000000000001042d000000a600000432000000a70001042e000000a80001043000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000ffffffff0000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000000ffffffffffffffff4e487b7100000000000000000000000000000000000000000000000000000000646174612073686f756c6420626520656d70747900000000000000000000000008c379a00000000000000000000000000000000000000000000000000000000063616c6c2073686f756c6420737563636565640000000000000000000000000066616c6c6261636b2073686f756c64206e6f742062652063616c6c656400000000000002000000000000000000000000000000400000010000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-    "0x0000000000000000000000000000000000008002": "0x0004000000000002000400000000000200000000030100190000006003300270000000630430019700030000004103550002000000010355000000630030019d000100000000001f0000008006000039000000400500003900000000006504350000000101200190000000460000c13d0000000001000031000000040110008c000001150000413d0000000201000367000000000101043b000000e001100270000000650210009c000000510000613d000000660210009c0000009e0000613d000000670210009c000000ba0000613d000000680210009c000000dd0000613d000000690110009c000001150000c13d0000000001000416000000000110004c000001150000c13d000000040100008a00000000011000310000006a02000041000000200310008c000000000300001900000000030240190000006a01100197000000000410004c000000000200a0190000006a0110009c00000000010300190000000001026019000000000110004c000001150000c13d00000004010000390000000201100367000000000101043b0000006b01100197000400000006001d018701850000040f0000006f02100197000000700220009c00000000020000190000000102006039000000000310004c0000000003000019000000010300603900000000022301a0000000db0110027000000073011001970000000002010019000000000200c0190000000401000029000000000021043500000020020000390000000003000019018701620000040f0000000001000416000000000110004c000001150000c13d0000002002000039000001000100003900000000002104390000012002000039000000000002043900000040020000390000006403000041018701620000040f0000000001000416000000000110004c000001150000c13d000000040100008a00000000011000310000006a02000041000000200310008c000000000300001900000000030240190000006a01100197000000000410004c000000000200a0190000006a0110009c00000000010300190000000001026019000000000110004c000001150000c13d0000000401000039000200000001001d0000000201100367000000000101043b0000006b01100197000300000001001d000400000005001d018701850000040f000000040200002900000000020204330000000003010019000000000130004c000001260000c13d000100000003001d0000006c010000410000000000120435000000040120003900000003030000290000000000310435000000000100041400000020040000390000000003020019000300000002001d0187012f0000040f000000000110004c000001020000c13d000000030200036700000001040000310000001f0340018f000000040100002900000000010104330000000504400270000000000540004c0000008d0000613d000000000500001900000005065002100000000007610019000000000662034f000000000606043b00000000006704350000000105500039000000000645004b000000850000413d000000000530004c0000009c0000613d0000000504400210000000000242034f00000000044100190000000303300210000000000504043300000000053501cf000000000535022f000000000202043b0000010003300089000000000232022f00000000023201cf000000000252019f000000000024043500000001020000310187016c0000040f0000000001000416000000000110004c000001150000c13d000000040100008a00000000011000310000006a02000041000000200310008c000000000300001900000000030240190000006a01100197000000000410004c000000000200a0190000006a0110009c00000000010300190000000001026019000000000110004c000001150000c13d000400000005001d018701750000040f0000006b01100197018701850000040f000000040200002900000000030204330000000000130435000000200200003900000000010300190000000003000019018701620000040f0000000001000416000000000110004c000001150000c13d000000040100008a00000000011000310000006a02000041000000400310008c000000000300001900000000030240190000006a01100197000000000410004c000000000200a0190000006a0110009c00000000010300190000000001026019000000000110004c000001150000c13d00000002010003670000000402100370000000000202043b0000006b0320009c000001150000213d0000002401100370000000000101043b0000006f031001970000000004000411000080060440008c000001150000c13d000000700330009c000001150000c13d018701830000040f000000000100001900000000020000190000000003000019018701620000040f0000000001000416000000000110004c000001150000c13d000000040100008a00000000011000310000006a02000041000000200310008c000000000300001900000000030240190000006a01100197000000000410004c000000000200a0190000006a0110009c00000000010300190000000001026019000000000110004c000001150000c13d00000004010000390000000201100367000000000101043b0000006b0210009c000001150000213d0000000002000411000080060220008c000001150000c13d000400000001001d018701850000040f0000006f02100197000000700220009c0000000402000029000001150000c13d0000007201100197018701830000040f000000000100001900000000020000190000000003000019018701620000040f0000000102000031000000200120008c000000200100003900000000010240190000001f01100039000000600310018f00000003050000290000000001530019000000000331004b000000000300001900000001030040390000006d0410009c0000000404000029000001180000213d0000000103300190000001180000c13d0000000000140435000000200220008c000001200000813d000000000100001900000000020000190187016c0000040f00000071010000410000000000100435000000410100003900000002020000290000000000120435000000240200003900000000010000190187016c0000040f0000006e040000410000000003050433000000000330004c000000000201001900000001030000290000012b0000c13d0000006f013001970000006e04000041000000700110009c000000000403c0190000000001020019000000000041043500000020020000390000000003000019018701620000040f0002000000000002000200000004001d000100000003001d0000006303000041000000630420009c0000000002038019000000630410009c0000000001038019000000c0011002100000004002200210000000000112019f00000074011001c700008003020000390187017e0000040f000000010800002900000002040000290000001f0340018f0000000504400270000000000540004c0000014c0000613d000000000500001900000005065002100000000007680019000000000661034f000000000606043b00000000006704350000000105500039000000000645004b000001440000413d000000010220018f000000000530004c0000015c0000613d0000000504400210000000000541034f00000000044800190000000303300210000000000604043300000000063601cf000000000636022f000000000505043b0000010003300089000000000535022f00000000033501cf000000000363019f000000000034043500030000000103550000006001100270000100630010019d00000000010200190000000200000005000000000001042d0000006304000041000000630510009c000000000104801900000040011002100000000001310019000000630320009c000000000204801900000060022002100000000001210019000001880001042e0000006303000041000000630420009c0000000002038019000000630410009c000000000103801900000040011002100000006002200210000000000112019f000001890001043000000004010000390000000201100367000000000101043b000000750210009c0000017b0000813d000000000001042d000000000100001900000000020000190187016c0000040f00000181002104230000000102000039000000000001042d0000000002000019000000000001042d000000000012041b000000000001042d000000000101041a000000000001042d0000018700000432000001880001042e00000189000104300000000000000000000000000000000000000000000000000000000000000000000000000000000000000000ffffffff000000020000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000e03fe177000000000000000000000000000000000000000000000000000000004de2e468000000000000000000000000000000000000000000000000000000004f1e1be000000000000000000000000000000000000000000000000000000000c2e4ff97000000000000000000000000000000000000000000000000000000001806aa188000000000000000000000000000000000000000000000000000000000000000000000000000000000000000ffffffffffffffffffffffffffffffffffffffff5aa9b6b500000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000ffffffffffffffffc5d2460186f7233c927e7db2dcc703c0e500b653ca82273b7bfad8045d85a47000ff00000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000004e487b7100000000000000000000000000000000000000000000000000000000ff00ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff00000000000000000000000000000000000000000000000000000000001fffe0000000000000000000000000000000000000002400000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-    "0x000000000000000000000000000000000000800b": "0x0002000000000002000300000000000200010000000103550000006001100270000000cd0010019d00000080010000390000004005000039000000000015043500000001012001900000004d0000c13d0000000001000031000000040110008c000002610000413d0000000101000367000000000101043b000000e001100270000000d20210009c0000009a0000613d000000d30210009c000000650000613d000000d40210009c000000b50000613d000000d50210009c0000007f0000613d000000d60210009c000000e50000613d000000d70210009c000001000000613d000000d80210009c000001190000613d000000d90210009c0000014b0000613d000000da0210009c0000016f0000613d000000db0210009c0000018b0000613d000000dc0210009c000001a60000613d000000dd0210009c000001d60000613d000000de0210009c000001f10000613d000000df0210009c0000020d0000613d000000e00210009c000002330000613d000000e10210009c000002500000613d000000e20110009c000002610000c13d0000000001000416000000000110004c000002610000c13d000000040100008a0000000001100031000000e302000041000000000310004c00000000030000190000000003024019000000e301100197000000000410004c000000000200a019000000e30110009c00000000010300190000000001026019000000000110004c000002610000c13d0000000501000039000300000005001d032f032d0000040f000000030200002900000000030204330000000000130435000000200200003900000000010300190000000003000019032f02c30000040f0000000001000416000000000110004c000002610000c13d000000ce010000410000000302000039032f032b0000040f0000000401000039000300000001001d032f032d0000040f000000cf0110019700008001011001bf0000000302000029032f032b0000040f000000d0010000410000000502000039032f032b0000040f000000200200003900000100010000390000000000210439000001200200003900000000000204390000004002000039000000d103000041032f02c30000040f0000000001000416000000000110004c000002610000c13d000000040100008a0000000001100031000000e302000041000000000310004c00000000030000190000000003024019000000e301100197000000000410004c000000000200a019000000e30110009c00000000010300190000000001026019000000000110004c000002610000c13d000300000005001d032f02df0000040f000000030200002900000000030204330000000000130435000000200200003900000000010300190000000003000019032f02c30000040f0000000001000416000000000110004c000002610000c13d000000040100008a0000000001100031000000e302000041000000000310004c00000000030000190000000003024019000000e301100197000000000410004c000000000200a019000000e30110009c00000000010300190000000001026019000000000110004c000002610000c13d0000000601000039000300000005001d032f032d0000040f000000030200002900000000030204330000000000130435000000200200003900000000010300190000000003000019032f02c30000040f0000000001000416000000000110004c000002610000c13d000000040100008a0000000001100031000000e302000041000000000310004c00000000030000190000000003024019000000e301100197000000000410004c000000000200a019000000e30110009c00000000010300190000000001026019000000000110004c000002610000c13d0000000201000039000300000005001d032f032d0000040f000000030200002900000000030204330000000000130435000000200200003900000000010300190000000003000019032f02c30000040f0000000001000416000000000110004c000002610000c13d000000040100008a0000000001100031000000e302000041000000600310008c00000000030000190000000003024019000000e301100197000000000410004c000000000200a019000000e30110009c00000000010300190000000001026019000000000110004c000002610000c13d00000001010003670000002402100370000000000302043b0000000002000411000080010220008c000002610000c13d0000008002300210000000000430004c000000d20000613d00000000433200d9000000e90330009c000001430000c13d0000000401100370000000000301043b0000000001230019000000000231004b000000000200001900000001020040390000000102200190000001430000c13d0000000702000039032f032b0000040f00000044010000390000000101100367000000000101043b0000000602000039032f032b0000040f000000000100001900000000020000190000000003000019032f02c30000040f0000000001000416000000000110004c000002610000c13d000000040100008a0000000001100031000000e302000041000000000310004c00000000030000190000000003024019000000e301100197000000000410004c000000000200a019000000e30110009c00000000010300190000000001026019000000000110004c000002610000c13d0000000301000039000300000005001d032f032d0000040f000000030200002900000000030204330000000000130435000000200200003900000000010300190000000003000019032f02c30000040f0000000001000416000000000110004c000002610000c13d000000040100008a0000000001100031000000e302000041000000000310004c00000000030000190000000003024019000000e301100197000000000410004c000000000200a019000000e30110009c00000000010300190000000001026019000000000110004c000002610000c13d000300000005001d032f02df0000040f00000003010000290000000001010433000000000021043500000020020000390000000003000019032f02c30000040f0000000001000416000000000110004c000002610000c13d000000040100008a0000000001100031000000e302000041000000200310008c00000000030000190000000003024019000000e301100197000000000410004c000000000200a019000000e30110009c00000000010300190000000001026019000000000110004c000002610000c13d000300000005001d00000004010000390000000101100367000000000101043b000200000001001d000000e8010000410000000000100439032f02b40000040f0000000202000029000000000121004b00000000010000190000027a0000413d000000e801000041000100000001001d0000000000100439032f02b40000040f0000000102000029000000000020043900000002020000290000000001210049000100000001001d032f02b40000040f0000000102000029000000000112004b0000026f0000a13d000000ea01000041000000000010043500000011010000390000000402000039000000000012043500000024020000390000000001000019032f02cb0000040f0000000001000416000000000110004c000002610000c13d000000040100008a0000000001100031000000e302000041000000200310008c00000000030000190000000003024019000000e301100197000000000410004c000000000200a019000000e30110009c00000000010300190000000001026019000000000110004c000002610000c13d00000004010000390000000101100367000000000101043b000000000010043500000008010000390000002002000039000200000002001d00000000001204350000000001000019000300000005001d032f02a10000040f032f032d0000040f000000030200002900000000020204330000000000120435000000000102001900000002020000290000000003000019032f02c30000040f0000000001000416000000000110004c000002610000c13d000000040100008a0000000001100031000000e302000041000000000310004c00000000030000190000000003024019000000e301100197000000000410004c000000000200a019000000e30110009c00000000010300190000000001026019000000000110004c000002610000c13d0000000101000039000300000005001d032f032d0000040f00000003020000290000000003020433000000e4011001970000000000130435000000200200003900000000010300190000000003000019032f02c30000040f0000000001000416000000000110004c000002610000c13d000000040100008a0000000001100031000000e302000041000000000310004c00000000030000190000000003024019000000e301100197000000000410004c000000000200a019000000e30110009c00000000010300190000000001026019000000000110004c000002610000c13d0000000001000019000300000005001d032f032d0000040f000000030200002900000000030204330000000000130435000000200200003900000000010300190000000003000019032f02c30000040f0000000001000416000000000110004c000002610000c13d000000040100008a0000000001100031000000e302000041000000800310008c00000000030000190000000003024019000000e301100197000000000410004c000000000200a019000000e30110009c00000000010300190000000001026019000000000110004c000002610000c13d00000001010003670000002402100370000000000202043b0000000401100370000000000301043b0000000001000411000080010110008c000002610000c13d000100000003001d000300000005001d0000000701000039000200000002001d032f032d0000040f0000000203000029000000e502100197000000000223004b000002810000813d000000030100002900000000010104330000004402100039000000e6030000410000000000320435000000e7020000410000000000210435000000240210003900000020030000390000000000320435000000040210003900000000003204350000006402000039032f02cb0000040f0000000001000416000000000110004c000002610000c13d000000040100008a0000000001100031000000e302000041000000000310004c00000000030000190000000003024019000000e301100197000000000410004c000000000200a019000000e30110009c00000000010300190000000001026019000000000110004c000002610000c13d0000000701000039000300000005001d032f032d0000040f000000030200002900000000030204330000000000130435000000200200003900000000010300190000000003000019032f02c30000040f0000000001000416000000000110004c000002610000c13d000000040100008a0000000001100031000000e302000041000000000310004c00000000030000190000000003024019000000e301100197000000000410004c000000000200a019000000e30110009c00000000010300190000000001026019000000000110004c000002610000c13d0000000401000039000300000005001d032f032d0000040f00000003020000290000000003020433000000e4011001970000000000130435000000200200003900000000010300190000000003000019032f02c30000040f0000000001000416000000000110004c000002610000c13d000000040100008a0000000001100031000000e302000041000000200310008c00000000030000190000000003024019000000e301100197000000000410004c000000000200a019000000e30110009c00000000010300190000000001026019000000000110004c000002610000c13d00000004010000390000000101100367000000000201043b000000e40120009c000002610000213d0000000001000411000080010110008c000002610000c13d0000000101000039000300000001001d000200000002001d032f032d0000040f000000cf011001970000000202000029000000000121019f0000000302000029032f032b0000040f000000000100001900000000020000190000000003000019032f02c30000040f0000000001000416000000000110004c000002610000c13d000000040100008a0000000001100031000000e302000041000000200310008c00000000030000190000000003024019000000e301100197000000000410004c000000000200a019000000e30110009c00000000010300190000000001026019000000000110004c000002610000c13d0000000001000411000080010110008c000002610000c13d00000004010000390000000101100367000000000101043b0000000202000039032f032b0000040f000000000100001900000000020000190000000003000019032f02c30000040f0000000001000416000000000110004c000002610000c13d000000040100008a0000000001100031000000e302000041000000000310004c00000000030000190000000003024019000000e301100197000000000410004c000000000200a019000000e30110009c00000000010300190000000001026019000000000110004c000002640000613d00000000010000190000000002000019032f02cb0000040f000300000005001d032f02df0000040f00000003050000290000000003050433000000200430003900000000002404350000000000130435000000000103001900000000020500190000000003000019032f02c30000040f000001010120008c000000000100001900000002020000290000027a0000813d00000000002004350000000801000039000000200200003900000000001204350000000001000019032f02a10000040f032f032d0000040f000000030200002900000000030204330000000000130435000000200200003900000000010300190000000003000019032f02c30000040f00000044020000390000000102200367000000000202043b0000008001100270000300000001001d0000000101100039000000000121004b00000000010000190000000101006039032f03010000040f0000000301000029032f02d20000040f00000000020100190000000101000029032f032b0000040f0000000301000029032f02e50000040f032f03160000040f0000000202000029032f02f20000040f032f02d90000040f00000064010000390000000101100367000000000101043b032f02dc0000040f00000002010000290000000102000029000000000021041c000000000100001900000000020000190000000003000019032f02c30000040f000000cd020000410000000003000414000000cd0430009c0000000003028019000000cd0410009c00000000010280190000004001100210000000c002300210000000000112019f000000eb011001c70000801002000039032f03260000040f0000000102200190000002b10000613d000000000101043b000000000001042d00000000010000190000000002000019032f02cb0000040f000000cd010000410000000002000414000000cd0320009c0000000001024019000000c001100210000000ec011001c70000800b02000039032f03260000040f0000000102200190000002c00000613d000000000101043b000000000001042d00000000010000190000000002000019032f02cb0000040f000000cd04000041000000cd0510009c000000000104801900000040011002100000006002200210000000000121019f0000000001310019000003300001042e000000cd03000041000000cd0410009c000000000103801900000040011002100000006002200210000000000121019f000003310001043000000000001004350000000801000039000000200200003900000000001204350000000001000019032f02a10000040f000000000001042d0000000702000039032f032b0000040f000000000001042d0000000602000039032f032b0000040f000000000001042d0000000701000039032f032d0000040f0000008003100270000000e5021001970000000001030019000000000001042d000000010200008a000000000221004b000002ea0000613d0000000101100039000000000001042d000000ea01000041000000000010043500000011010000390000000402000039000000000012043500000024020000390000000001000019032f02cb0000040f0000000001120019000000000221004b000000000200001900000001020040390000000102200190000002f90000c13d000000000001042d000000ea01000041000000000010043500000011010000390000000402000039000000000012043500000024020000390000000001000019032f02cb0000040f000000000110004c000003040000613d000000000001042d000000400100003900000000010104330000006402100039000000ed0300004100000000003204350000004402100039000000ee030000410000000000320435000000240210003900000028030000390000000000320435000000e70200004100000000002104350000000402100039000000200300003900000000003204350000008402000039032f02cb0000040f00000000020100190000008001200210000000000320004c0000031d0000613d00000000322100d9000000e90220009c0000031e0000c13d000000000001042d000000ea01000041000000000010043500000011010000390000000402000039000000000012043500000024020000390000000001000019032f02cb0000040f00000329002104230000000102000039000000000001042d0000000002000019000000000001042d000000000012041b000000000001042d000000000101041a000000000001042d0000032f00000432000003300001042e00000331000104300000000000000000000000000000000000000000000000000000000000000000000000000000000000000000ffffffff0000000000000000000000000000000000000000000000000000000040000000ffffffffffffffffffffffff00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008e1bc9bf04000000000020000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000fe173b970000000000000000000000000000000000000000000000000000000042cbb15c000000000000000000000000000000000000000000000000000000004d59979f000000000000000000000000000000000000000000000000000000006ef25c3a000000000000000000000000000000000000000000000000000000007877a79700000000000000000000000000000000000000000000000000000000796b89b90000000000000000000000000000000000000000000000000000000080b412460000000000000000000000000000000000000000000000000000000085df51fd00000000000000000000000000000000000000000000000000000000938b5f32000000000000000000000000000000000000000000000000000000009a8a0592000000000000000000000000000000000000000000000000000000009e830ad300000000000000000000000000000000000000000000000000000000a0803ef700000000000000000000000000000000000000000000000000000000a6ae0aac00000000000000000000000000000000000000000000000000000000a851ae7800000000000000000000000000000000000000000000000000000000bf1fe42000000000000000000000000000000000000000000000000000000000d4a4ca0d0000000000000000000000000000000000000000000000000000000019cae4628000000000000000000000000000000000000000000000000000000000000000000000000000000000000000ffffffffffffffffffffffffffffffffffffffff00000000000000000000000000000000ffffffffffffffffffffffffffffffff54696d657374616d70732073686f756c6420626520696e6372656d656e74616c08c379a00000000000000000000000000000000000000000000000000000000042cbb15ccdc3cad6266b0e7a08c0454b23bf29dc2df74b6f3c209e9336465bd100000000000000000000000000000001000000000000000000000000000000004e487b71000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000040000000000000000000000000020000020000000000000000000000000000000400000000000000000000000020636f72726563740000000000000000000000000000000000000000000000005468652070726f766964656420626c6f636b206e756d626572206973206e6f74",
-    "0x0000000000000000000000000000000000008006": "0x0005000000000002000900000000000200000000030100190000006003300270000003050430019700040000004103550003000000010355000003050030019d000200000002001f000100000000001f0000008001000039000000400800003900000000001804350000000102200190000000550000c13d0000000002000031000000040320008c000003990000413d0000000303000367000000000403043b000000e006400270000003070460009c000000040520008a0000000404300370000000000a000411000001f40000613d000003080760009c000400000008001d000000600000613d000003090760009c000002540000613d0000030a0760009c000002810000613d0000030b0760009c000000a30000613d0000030c0760009c000002c50000613d0000030d0760009c000000ef0000613d0000030e0760009c000002f60000613d0000030f0760009c000001310000613d000003100160009c000001700000613d000003110160009c000001b10000613d000003120160009c000003990000c13d0000000001000416000000000110004c000003990000c13d000000040100008a00000000011000310000031302000041000000400310008c000000000300001900000000030240190000031301100197000000000410004c000000000200a019000003130110009c00000000010300190000000001026019000000000110004c000003990000c13d000000030100036700080000000103530000000401100370000000000101043b000900000001001d0c0f059b0000040f000000080100035f0000002401100370000000000201043b00000009010000290c0f079e0000040f00000004020000290000000003020433000003150110019700000000001304350000002002000039000000000103001900000000030000190c0f05880000040f0000000001000416000000000110004c000003990000c13d00000020020000390000010001000039000000000021043900000120020000390000000000020439000000400200003900000306030000410c0f05880000040f00090000000a001d00000000010200190c0f05bd0000040f000300000001001d000500000002001d000700000003001d000600000004001d000000020100003900000002021001870000000101200270000000000220004c000000700000c13d0000000901000029000003180110009c000000000100001900000001010040390c0f06c20000040f00000004010000290000000003010433000003190100004100000000001304350000000401300039000000090200002900000000002104350000000001000414000080030200003900000024040000390000002006000039000800000003001d00000000050300190c0f050a0000040f0000000104000031000000000110004c000003190000c13d00000004030003670000001f0240018f000000040100002900000000010104330000000504400270000000000540004c000000920000613d000000000500001900000005065002100000000007610019000000000663034f000000000606043b00000000006704350000000105500039000000000645004b0000008a0000413d000000000520004c000000a10000613d0000000504400210000000000343034f00000000044100190000000302200210000000000504043300000000052501cf000000000525022f000000000303043b0000010002200089000000000323022f00000000022301cf000000000252019f000000000024043500000001020000310c0f05920000040f0000000001000416000000000110004c000003990000c13d000000040100008a00000000011000310000031302000041000000200310008c000000000300001900000000030240190000031301100197000000000410004c000000000200a019000003130110009c00000000010300190000000001026019000000000110004c000003990000c13d00000004010000390000000301100367000000000101043b000900000001001d0c0f059b0000040f0c0f06250000040f00000009010000290000031501100197000000000010043500000020010000390000000000010435000000000100001900000004020000290c0f05620000040f000800000001001d00000004010000290000000001010433000900000001001d0c0f06170000040f00000008010000290c0f0c0d0000040f000800000001001d000000ff0110018f000700000001001d0c0f060c0000040f00000009010000290000000702000029000000000021043500000008010000290000000801100270000000ff0110018f000700000001001d0c0f060c0000040f00000009010000290000002002100039000800000002001d000000070300002900000000003204350000000002010433000700000002001d00000004010000290000000001010433000900000001001d00000000010200190c0f060c0000040f00000009010000290000000702000029000000000021043500000008010000290000000001010433000800000001001d0c0f060c0000040f0000000901000029000000200210003900000008030000290000000000320435000000040200002900000000030000190c0f05880000040f00090000000a001d00000000010200190c0f05bd0000040f000500000002001d000700000003001d000600000004001d000000020100003900000002021001870000000101200270000000000220004c000000fe0000c13d0000000901000029000003180110009c000000000100001900000001010040390c0f06c20000040f00000004010000290000000003010433000003190100004100000000001304350000000401300039000000090200002900000000002104350000000001000414000080030200003900000024040000390000002006000039000800000003001d00000000050300190c0f050a0000040f0000000104000031000000000110004c0000033f0000c13d00000004030003670000001f0240018f000000040100002900000000010104330000000504400270000000000540004c000001200000613d000000000500001900000005065002100000000007610019000000000663034f000000000606043b00000000006704350000000105500039000000000645004b000001180000413d000000000520004c0000012f0000613d0000000504400210000000000343034f00000000044100190000000302200210000000000504043300000000052501cf000000000525022f000000000303043b0000010002200089000000000323022f00000000022301cf000000000252019f000000000024043500000001020000310c0f05920000040f0000031306000041000000200750008c000000000700001900000000070640190000031305500197000000000850004c000000000600a019000003130550009c00000000050700190000000005066019000000000550004c000003990000c13d000000000404043b000003140540009c000003990000213d00000023054000390000031306000041000000000725004b0000000007000019000000000706801900000313082001970000031305500197000000000985004b0000000006008019000000000585013f000003130550009c00000000050700190000000005066019000000000550004c000003990000c13d0000000405400039000000000353034f000000000b03043b0000031403b0009c000003990000213d00000024044000390000000503b00210000600000004001d0000000003430019000000000223004b000003990000213d0000800702a0008c000003b00000c13d0000000002000019000000000300001900070000000b001d0000000001b3004b000003bf0000813d0000000601000029000800000002001d00000000020b0019000900000003001d00000009030000290c0f07ba0000040f00000009030000290000000802000029000000070b00002900000060011000390000000301100367000000000101043b000000000221001900000001033000390000015f0000013d0000000001000416000000000110004c000003990000c13d000000040100008a00000000011000310000031302000041000000200310008c000000000300001900000000030240190000031301100197000000000410004c000000000200a019000003130110009c00000000010300190000000001026019000000000110004c000003990000c13d00000004030000390000000301300367000000000201043b000000010120008c000003990000213d000800000003001d000700000002001d0000000101000039000000020200003900000002022001880000018f0000c13d0000031801a0009c0000000001000019000000010100403900090000000a001d0c0f06c20000040f0000000901000029000000000010043500000020010000390000000000010435000000000100001900000004020000290c0f05620000040f000000040300002900000000040304330000031a0240009c000004870000213d00000040024000390000000000230435000600000004001d0c0f0c0d0000040f0000000604000029000000ff0210018f000000020320008c000001a90000813d00000000002404350000000801100270000000ff0110018f000000010210008c0000048f0000a13d0000031b010000410000000000100435000000210100003900000008020000290000000000120435000000240200003900000000010000190c0f05920000040f00090000000a001d00000000010200190c0f05e20000040f000500000002001d000700000003001d000600000004001d000300000005001d000000020100003900000002021001870000000101200270000000000220004c000001c10000c13d0000000901000029000003180110009c000000000100001900000001010040390c0f06c20000040f00000004010000290000000003010433000003190100004100000000001304350000000401300039000000090200002900000000002104350000000001000414000080030200003900000024040000390000002006000039000800000003001d00000000050300190c0f050a0000040f0000000104000031000000000110004c000003620000c13d00000004030003670000001f0240018f000000040100002900000000010104330000000504400270000000000540004c000001e30000613d000000000500001900000005065002100000000007610019000000000663034f000000000606043b00000000006704350000000105500039000000000645004b000001db0000413d000000000520004c000001f20000613d0000000504400210000000000343034f00000000044100190000000302200210000000000504043300000000052501cf000000000525022f000000000303043b0000010002200089000000000323022f00000000022301cf000000000252019f000000000024043500000001020000310c0f05920000040f0000031301000041000000400250008c000000000200001900000000020140190000031306500197000000000760004c000000000100a019000003130660009c000000000102c019000000000110004c000003990000c13d000000000604043b000003140160009c000003990000213d00000000016500490000031302000041000000a00410008c000000000400001900000000040240190000031301100197000000000510004c000000000200a019000003130110009c00000000010400190000000001026019000000000110004c000003990000c13d0000002401300370000000000201043b000003150120009c000003990000213d000000000100041000000000011a004b000003990000c13d0000000401600039000500000001001d000000000113034f000000000101043b000800000001001d000700000002001d000900000006001d0c0f09980000040f000000090100002900000024031000390000000301300367000000000101043b000003150210009c000003990000213d0000000802000029000400000003001d000600000001001d0c0f09fa0000040f0c0f06250000040f000000000201001900000020012000390000000000010435000000000002043500000006010000290c0f07050000040f000000090700002900000006020000290000000404000029000000070500002900000044037000390000000301000367000000000331034f000000000603043b000000000360004c0000000003000019000000010300c039000000000336004b000003990000c13d0000000803000029000000000360004c000004b70000c13d000000000141034f000000000701043b000003150170009c0000000806000029000003990000213d00000305010000410000000002000414000003050320009c0000000001024019000000c00110021000000316011001c70000800d02000039000000040300003900000317040000410c0f0bfb0000040f0000000101200190000003990000613d0000000001000019000000000200001900000000030000190c0f05880000040f0000000001000416000000000110004c000003990000c13d000000040100008a00000000011000310000031302000041000000200310008c000000000300001900000000030240190000031301100197000000000410004c000000000200a019000003130110009c00000000010300190000000001026019000000000110004c000003990000c13d00000004010000390000000301100367000000000201043b000000010120008c000003990000213d000800000002001d000000010100003900000002020000390000000202200188000002720000c13d0000031801a0009c0000000001000019000000010100403900090000000a001d0c0f06c20000040f0000000901000029000000000010043500000020010000390000000000010435000000400200003900000000010000190c0f05620000040f00000008020000290c0f06d70000040f0000000001000019000000000200001900000000030000190c0f05880000040f00090000000a001d00000000010200190c0f05e20000040f000200000001001d000500000002001d000700000003001d000600000004001d000300000005001d000000020100003900000002021001870000000101200270000000000220004c000002920000c13d0000000901000029000003180110009c000000000100001900000001010040390c0f06c20000040f00000004010000290000000003010433000003190100004100000000001304350000000401300039000000090200002900000000002104350000000001000414000080030200003900000024040000390000002006000039000800000003001d00000000050300190c0f050a0000040f0000000104000031000000000110004c000003860000c13d00000004030003670000001f0240018f000000040100002900000000010104330000000504400270000000000540004c000002b40000613d000000000500001900000005065002100000000007610019000000000663034f000000000606043b00000000006704350000000105500039000000000645004b000002ac0000413d000000000520004c000002c30000613d0000000504400210000000000343034f00000000044100190000000302200210000000000504043300000000052501cf000000000525022f000000000303043b0000010002200089000000000323022f00000000022301cf000000000252019f000000000024043500000001020000310c0f05920000040f0000000001000416000000000110004c000003990000c13d0000000002000031000000040120008a0000031303000041000000800410008c000000000400001900000000040340190000031301100197000000000510004c000000000300a019000003130110009c00000000010400190000000001036019000000000110004c000003990000c13d00000003010003670000000403100370000000000403043b000003150340009c000003990000213d0000006401100370000000000101043b000003140310009c000003990000213d0000000401100039000900000004001d0c0f05a10000040f00000003030003670000002404300370000000000404043b0000004403300370000000000303043b0000000005010019000000000602001900000009010000290000000002040019000000000405001900000000050600190c0f076f0000040f00000004020000290000000003020433000003150110019700000000001304350000002002000039000000000103001900000000030000190c0f05880000040f0000000001000416000000000110004c000003990000c13d000000040100008a00000000011000310000031302000041000000200310008c000000000300001900000000030240190000031301100197000000000410004c000000000200a019000003130110009c00000000010300190000000001026019000000000110004c000003990000c13d00000004010000390000000301100367000000000101043b000900000001001d0c0f059b0000040f00000009010000290c0f06430000040f00000004020000290000000002020433000900000002001d000800000001001d0c0f060c0000040f000000090100002900000008020000290000000000210435000000200200003900000000030000190c0f05880000040f000000200140008c000000200100003900000000010440190000001f01100039000000600210018f00000008010000290000000001120019000000000221004b00000000020000190000000102004039000003140310009c0000000406000029000004870000213d0000000102200190000004870000c13d0000000000160435000000200140008c0000000901000029000003990000413d00000005020000290000000303000029000000070400002900000006050000290c0f076f0000040f0000000002010019000900000002001d0000000501000029000000070300002900000006040000290c0f08280000040f00000009010000290000031502100197000000040100002900000000010104330000000000210435000000200200003900000000030000190c0f05880000040f000000200140008c000000200100003900000000010440190000001f01100039000000600210018f00000008050000290000000001520019000000000221004b00000000020000190000000102004039000003140310009c0000000403000029000004870000213d0000000102200190000004870000c13d0000000000130435000000200140008c0000000901000029000003990000413d00000000020504330c0f079e0000040f0000000002010019000900000002001d0000000501000029000000070300002900000006040000290c0f08280000040f00000009010000290000031502100197000000040100002900000000010104330000000000210435000000200200003900000000030000190c0f05880000040f000000200140008c000000200100003900000000010440190000001f01100039000000600210018f00000008050000290000000001520019000000000221004b00000000020000190000000102004039000003140310009c0000000403000029000004870000213d0000000102200190000004870000c13d0000000000130435000000200140008c0000000901000029000003990000413d00000000020504330c0f079e0000040f0000000002010019000900000002001d00000005010000290000000303000029000000070400002900000006050000290c0f08da0000040f00000009010000290000031502100197000000040100002900000000010104330000000000210435000000200200003900000000030000190c0f05880000040f000000200140008c000000200100003900000000010440190000001f01100039000000600210018f00000008010000290000000001120019000000000221004b00000000020000190000000102004039000003140310009c0000000406000029000004870000213d0000000102200190000004870000c13d0000000000160435000000200140008c00000009010000290000039c0000813d000000000100001900000000020000190c0f05920000040f00000005020000290000000203000029000000070400002900000006050000290c0f076f0000040f0000000002010019000900000002001d00000005010000290000000303000029000000070400002900000006050000290c0f08da0000040f00000009010000290000031502100197000000040100002900000000010104330000000000210435000000200200003900000000030000190c0f05880000040f0000031c0200004100000000002104350000002003000039000000840200003900000000003204350000002d03000039000000a40400003900000000003404350000031d03000041000000c40400003900000000003404350000031e03000041000000e40400003900000000003404350c0f05920000040f0000000001000416000000000121004b000004a20000c13d0000000001000410000800000001001d0000000401000039000200000001001d0000000001000019000900000001001d0000000001b1004b000002500000813d000000060100002900000000020b001900000009030000290c0f07ba0000040f00000060011000390000000301100367000000000101043b000300000001001d0000000601000029000000070200002900000009030000290c0f07ba0000040f00000322020000410000000000200439000000080200002900000002030000290000000000230439000500000001001d0c0f05790000040f000000050d000029000000070b000029000000040a000029000000000110004c000003990000613d000000000c0a0433000003230100004100000000001c04350000000402c0003900000000010004140000000000a204350000000302d00367000000000202043b0000004403c0003900000000002304350000002002d000390000000302200367000000000202043b000003150320009c000003990000213d0000006403c0003900000000002304350000004002d000390000000302200367000000000202043b000000000320004c0000000003000019000000010300c039000000000332004b000003990000c13d0000008403c0003900000000002304350000006002d000390000000302200367000000000202043b000000a403c00039000000000023043500000000030000310000000002d300490000008004d000390000001f0520008a0000000302000367000000000442034f000000000404043b0000031306000041000000000754004b0000000007000019000000000706801900000313055001970000031308400197000000000958004b0000000006008019000000000558013f000003130550009c00000000050700190000000005066019000000000550004c000003990000c13d0000000004d40019000000000242034f000000000202043b000003140520009c000003990000213d000000200440003900000000032300490000031305000041000000000634004b0000000006000019000000000605201900000313033001970000031307400197000000000837004b0000000005008019000000000337013f000003130330009c00000000030600190000000003056019000000000330004c000003990000c13d000000c403c00039000000a0050000390000000000530435000000e403c0003900000000002304350000010403c0003900000003044003670000000505200270000000000650004c0000043f0000613d000000000600001900000005076002100000000008730019000000000774034f000000000707043b00000000007804350000000106600039000000000756004b000004370000413d0000001f0620018f000000000760004c0000044f0000613d0000000505500210000000000454034f00000000055300190000000306600210000000000705043300000000076701cf000000000767022f000000000404043b0000010006600089000000000464022f00000000046401cf000000000474019f0000000000450435000000000332001900000000000304350000002403c00039000080070400003900000000004304350000000803000029000000040330008c000004810000613d0000001f02200039000000200300008a000000000232016f00000104042000390000000303000029000000000230004c00010000000c001d000004770000613d00000305020000410000030505c0009c000000000502001900000000050c40190000004006500210000003050540009c00000000040280190000006004400210000000000564019f000003050410009c0000000001028019000000c001100210000000000115019f00000316011001c70000800902000039000000080400002900000000050000190c0f0bfb0000040f00000000030100190000006003300270000103050030019d0004000000010355000000010120018f0000047c0000013d000000080200002900000000030c001900000000050c001900000000060000190c0f050a0000040f000000000110004c000000040a000029000000070b000029000000010c000029000004e90000613d0000031401c0009c000004870000213d0000000000ca043500000009010000290000000101100039000003c70000013d0000031b010000410000000000100435000000410100003900000004020000390000000000120435000000240200003900000000010000190c0f05920000040f0000002002400039000800000002001d00000000001204350000000702000029000000010220015f00000000011201a0000000000100001900000001010060390c0f06ed0000040f000000080100002900000007020000290c0f06370000040f000000090100002900000006020000290c0f07050000040f0000000001000019000000000200001900000000030000190c0f05880000040f0000000401000029000000000101043300000084021000390000031f0300004100000000003204350000006402100039000003200300004100000000003204350000004402100039000003210300004100000000003204350000002402100039000000450300003900000000003204350000031c020000410000000000210435000000040210003900000020030000390000000000320435000000a4020000390c0f05920000040f0000008403700039000000000331034f000000000a00003100000000047a0049000000230440008a000000000303043b0000031309000041000000000643004b0000000006000019000000000609801900000313044001970000031307300197000000000847004b00000000080000190000000008094019000000000447013f000003130440009c00000000040600190000000004086019000000000440004c000003990000c13d00000005040000290000000003430019000000000131034f000000000401043b000003140140009c000003990000213d00000000014a004900000020033000390000031309000041000000000613004b0000000008000019000000000809201900000313011001970000031306300197000000000716004b00000000070000190000000007094019000000000116013f000003130110009c00000000010800190000000001076019000000000110004c000003990000c13d00000000010500190c0f0a510000040f0000000404000029000000070500002900000003010003670000023f0000013d000000040200036700000001040000310000001f0340018f00000000010a04330000000504400270000000000540004c000004f90000613d000000000500001900000005065002100000000007610019000000000662034f000000000606043b00000000006704350000000105500039000000000645004b000004f10000413d000000000530004c000005080000613d0000000504400210000000000242034f00000000044100190000000303300210000000000504043300000000053501cf000000000535022f000000000202043b0000010003300089000000000232022f00000000023201cf000000000252019f000000000024043500000001020000310c0f05920000040f0002000000000002000200000006001d000100000005001d0000030505000041000003050630009c00000000030580190000004003300210000003050640009c00000000040580190000006004400210000000000334019f000003050410009c0000000001058019000000c001100210000000000113019f0c0f0bfb0000040f000000010800002900000002040000290000001f0340018f0000000504400270000000000540004c000005290000613d000000000500001900000005065002100000000007680019000000000661034f000000000606043b00000000006704350000000105500039000000000645004b000005210000413d000000010220018f000000000530004c000005390000613d0000000504400210000000000541034f00000000044800190000000303300210000000000604043300000000063601cf000000000636022f000000000505043b0000010003300089000000000535022f00000000033501cf000000000363019f000000000034043500040000000103550000006001100270000103050010019d00000000010200190000000200000005000000000001042d0001000000000002000100000005001d0000030505000041000003050630009c00000000030580190000004003300210000003050640009c00000000040580190000006004400210000000000334019f000003050410009c0000000001058019000000c001100210000000000113019f0c0f0c000000040f0000000106000029000000010220018f000000000300001900000005043002100000000005460019000000000441034f000000000404043b00000000004504350000000103300039000000000430004c000000000400001900000001040060390000000104400190000005510000c13d00040000000103550000006001100270000103050010019d00000000010200190000000100000005000000000001042d0000030503000041000003050410009c00000000010380190000004001100210000003050420009c00000000020380190000006002200210000000000112019f0000000002000414000003050420009c0000000002038019000000c002200210000000000112019f00000316011001c700008010020000390c0f0c000000040f0000000102200190000005760000613d000000000101043b000000000001042d000000000100001900000000020000190c0f05920000040f00000305010000410000000002000414000003050320009c0000000001024019000000c00110021000000324011001c700008002020000390c0f0c000000040f0000000102200190000005850000613d000000000101043b000000000001042d000000000100001900000000020000190c0f05920000040f0000030504000041000003050510009c000000000104801900000040011002100000000001310019000003050320009c00000000020480190000006002200210000000000121001900000c100001042e0000030503000041000003050420009c0000000002038019000003050410009c000000000103801900000040011002100000006002200210000000000112019f00000c1100010430000003250110009c0000059e0000813d000000000001042d000000000100001900000000020000190c0f05920000040f0000001f031000390000031304000041000000000523004b0000000005000019000000000504401900000313062001970000031303300197000000000763004b000000000400a019000000000363013f000003130330009c00000000030500190000000003046019000000000330004c000005ba0000613d0000000303100367000000000303043b000003140430009c000005ba0000213d00000020011000390000000004310019000000000224004b000005ba0000213d0000000002030019000000000001042d000000000100001900000000020000190c0f05920000040f00020000000000020000000002010019000000040120008a00000313030000410000005f0410008c000000000400001900000000040320190000031301100197000000000510004c0000000003008019000003130110009c00000000010400190000000001036019000000000110004c000005df0000613d00000003030003670000004401300370000000000101043b000003140410009c000005df0000213d0000000404300370000000000404043b000200000004001d0000002403300370000000000303043b000100000003001d00000004011000390c0f05a10000040f00000000030100190000000004020019000000020100002900000001020000290000000200000005000000000001042d000000000100001900000000020000190c0f05920000040f00020000000000020000000002010019000000040120008a00000313030000410000007f0410008c000000000400001900000000040320190000031301100197000000000510004c0000000003008019000003130110009c00000000010400190000000001036019000000000110004c000006090000613d00000003010003670000002403100370000000000303043b000200000003001d0000000403100370000000000303043b000100000003001d0000004401100370000000000101043b000003140310009c000006090000213d00000004011000390c0f05a10000040f0000000003010019000000000402001900000064010000390000000301100367000000000501043b000000010150008c000006090000213d000000010100002900000002020000290000000200000005000000000001042d000000000100001900000000020000190c0f05920000040f000000020110008c0000060f0000813d000000000001042d0000031b010000410000000000100435000000210100003900000004020000390000000000120435000000240200003900000000010000190c0f05920000040f000003260210009c0000061d0000813d000000400110003900000040020000390000000000120435000000000001042d0000031b010000410000000000100435000000410100003900000004020000390000000000120435000000240200003900000000010000190c0f05920000040f00000040020000390000000001020433000003260310009c0000062f0000813d00000040031000390000000000320435000000200210003900000000000204350000000000010435000000000001042d0000031b010000410000000000100435000000410100003900000004020000390000000000120435000000240200003900000000010000190c0f05920000040f000000020320008c0000063b0000813d0000000000210435000000000001042d0000031b010000410000000000100435000000210100003900000004020000390000000000120435000000240200003900000000010000190c0f05920000040f00030000000000020000031501100197000100000001001d0000000000100435000000200100003900000000000104350000004002000039000300000002001d00000000010000190c0f05620000040f00000003030000290000000004030433000003260240009c000006960000813d00000040024000390000000000230435000200000004001d0c0f0c0d0000040f0000000204000029000000ff0210018f000000020320008c0000068e0000813d00000000002404350000000801100270000000ff0110018f000000010210008c0000068e0000213d000000200240003900000000001204350000000002040433000000010120008c0000068e0000213d0000000101000039000000000220004c0000068c0000c13d00000003010000290000000005010433000003270100004100000000001504350000000402500039000000000100041400000001030000290000000000320435000080020200003900000024040000390000000003050019000200000005001d0c0f053f0000040f0000000104000031000000000110004c0000069e0000613d000000200140008c000000200100003900000000010440190000001f01100039000000600210018f00000002050000290000000001520019000000000221004b00000000020000190000000102004039000003140310009c0000000303000029000006960000213d0000000102200190000006960000c13d00000000001304350000001f0140008c000006bf0000a13d0000000001050433000000000110004c000000000100001900000001010060390000000300000005000000000001042d0000031b010000410000000000100435000000210100003900000004020000390000000000120435000000240200003900000000010000190c0f05920000040f0000031b010000410000000000100435000000410100003900000004020000390000000000120435000000240200003900000000010000190c0f05920000040f00000004030003670000001f0240018f000000030100002900000000010104330000000504400270000000000540004c000006ae0000613d000000000500001900000005065002100000000007610019000000000663034f000000000606043b00000000006704350000000105500039000000000645004b000006a60000413d000000000520004c000006bd0000613d0000000504400210000000000343034f00000000044100190000000302200210000000000504043300000000052501cf000000000525022f000000000303043b0000010002200089000000000323022f00000000022301cf000000000252019f000000000024043500000001020000310c0f05920000040f000000000100001900000000020000190c0f05920000040f000000000110004c000006c50000613d000000000001042d000000400100003900000000010104330000006402100039000003280300004100000000003204350000004402100039000003290300004100000000003204350000002402100039000000240300003900000000003204350000031c02000041000000000021043500000004021000390000002003000039000000000032043500000084020000390c0f05920000040f0002000000000002000200000002001d000000020220008c000006e50000813d000100000001001d0c0f0c0d0000040f000001000200008a000000000121016f0000000202000029000000000121019f00000001020000290c0f0c0b0000040f0000000200000005000000000001042d0000031b010000410000000000100435000000210100003900000004020000390000000000120435000000240200003900000000010000190c0f05920000040f000000000110004c000006f00000613d000000000001042d0000004001000039000000000101043300000084021000390000032a03000041000000000032043500000064021000390000032b03000041000000000032043500000044021000390000032c0300004100000000003204350000002402100039000000430300003900000000003204350000031c020000410000000000210435000000040210003900000020030000390000000000320435000000a4020000390c0f05920000040f0002000000000002000200000002001d0000031501100197000000000010043500000020010000390000000000010435000000400200003900000000010000190c0f05620000040f00000002020000290000000002020433000000020320008c000007260000813d000100000001001d0c0f06d70000040f0000000101000029000000020200002900000020022000390000000002020433000200000002001d000000010220008c000007260000213d0c0f0c0d0000040f0000032d02000041000000000121016f000000020200002900000008022002100000ff000220018f000000000121019f00000001020000290c0f0c0b0000040f0000000200000005000000000001042d0000031b010000410000000000100435000000210100003900000004020000390000000000120435000000240200003900000000010000190c0f05920000040f00000000040100190000032e0120009c000007640000813d0000003f01200039000000200500008a000000000651016f000000400500003900000000010504330000000006610019000000000716004b00000000070000190000000107004039000003140860009c000007640000213d0000000107700190000007640000c13d000000000065043500000000002104350000000005420019000000000335004b0000076c0000213d0000001f0520018f000000030440036700000020031000390000000506200270000000000760004c000007520000613d000000000700001900000005087002100000000009830019000000000884034f000000000808043b00000000008904350000000107700039000000000867004b0000074a0000413d000000000750004c000007610000613d0000000506600210000000000464034f00000000066300190000000305500210000000000706043300000000075701cf000000000757022f000000000404043b0000010005500089000000000454022f00000000045401cf000000000474019f000000000046043500000000022300190000000000020435000000000001042d0000031b010000410000000000100435000000410100003900000004020000390000000000120435000000240200003900000000010000190c0f05920000040f000000000100001900000000020000190c0f05920000040f0003000000000002000200000003001d000300000002001d000100000001001d0000000003000031000000000104001900000000020500190c0f072e0000040f000000000201043300000020011000390c0f05620000040f000000010200002900000315042001970000004003000039000000000203043300000040052000390000000000450435000000600420003900000002050000290000000000540435000000800420003900000003050000290000000000540435000000a0042000390000000000140435000000a00100003900000000001204350000032f0400004100000020012000390000000000410435000003300420009c000007960000813d000000c004200039000000000043043500000000020204330c0f05620000040f00000315011001970000000300000005000000000001042d0000031b010000410000000000100435000000410100003900000004020000390000000000120435000000240200003900000000010000190c0f05920000040f000000400400003900000000030404330000006005300039000000000025043500000315011001970000004002300039000000000012043500000060010000390000000000130435000000200130003900000331020000410000000000210435000003320230009c000007b20000813d0000008002300039000000000024043500000000020304330c0f05620000040f0000031501100197000000000001042d0000031b010000410000000000100435000000410100003900000004020000390000000000120435000000240200003900000000010000190c0f05920000040f000000000223004b000007d20000813d000000050230021000000000021200190000000302200367000000000202043b00000000031000790000009f0330008a0000031304000041000000000532004b0000000005000019000000000504401900000313033001970000031306200197000000000736004b000000000400a019000000000336013f000003130330009c00000000030500190000000003046019000000000330004c000007da0000613d0000000001120019000000000001042d0000031b010000410000000000100435000000320100003900000004020000390000000000120435000000240200003900000000010000190c0f05920000040f000000000100001900000000020000190c0f05920000040f000000000110004c000007e00000613d000000000001042d0000004001000039000000000101043300000044021000390000033303000041000000000032043500000024021000390000001c0300003900000000003204350000031c02000041000000000021043500000004021000390000002003000039000000000032043500000064020000390c0f05920000040f000000000110004c000007f20000613d000000000001042d000000400100003900000000010104330000006402100039000003340300004100000000003204350000004402100039000003350300004100000000003204350000002402100039000000280300003900000000003204350000031c02000041000000000021043500000004021000390000002003000039000000000032043500000084020000390c0f05920000040f000000000110004c000008070000613d000000000001042d000000400100003900000000010104330000004402100039000003360300004100000000003204350000002402100039000000150300003900000000003204350000031c02000041000000000021043500000004021000390000002003000039000000000032043500000064020000390c0f05920000040f000000000110004c000008190000613d000000000001042d000000400100003900000000010104330000004402100039000003370300004100000000003204350000002402100039000000130300003900000000003204350000031c02000041000000000021043500000004021000390000002003000039000000000032043500000064020000390c0f05920000040f0007000000000002000200000004001d000100000003001d000700000002001d000400000001001d000000000110004c0000000001000019000000010100c0390c0f07dd0000040f00000007010000290000031501100197000500000001001d0000ffff0110008c000000000100001900000001010020390c0f07ef0000040f0000004001000039000600000001001d000000000301043300000338010000410000000000130435000000040230003900000000010004140000000504000029000000000042043500008002020000390000002404000039000300000003001d00000000050300190c0f053f0000040f000000000110004c000008b00000613d0000000101000031000000200210008c000000200200003900000000020140190000001f02200039000000600320018f00000003050000290000000002530019000000000332004b00000000030000190000000103004039000003140420009c0000000004050019000008d20000213d0000000103300190000008d20000c13d000000060300002900000000002304350000001f0110008c000008ad0000a13d0000000001040433000000000110004c000000000100001900000001010060390c0f08040000040f00000006010000290000000005010433000003390100004100000000001504350000000402500039000000000100041400000005030000290000000000320435000080030200003900000024040000390000000003050019000300000005001d0c0f053f0000040f000000000110004c000008b00000613d0000000101000031000000200210008c000000200200003900000000020140190000001f02200039000000600320018f00000003050000290000000002530019000000000332004b00000000030000190000000103004039000003140420009c0000000004050019000008d20000213d0000000103300190000008d20000c13d00000006030000290000000000230435000000200110008c000008ad0000413d0000000001040433000000000110004c000000000100001900000001010060390c0f08160000040f00000004010000290c0f09980000040f000000070100002900000004020000290c0f09fa0000040f0c0f06250000040f000000000201001900000020012000390000000000010435000000000002043500000007010000290c0f07050000040f0000000001000411000600000001001d0000000702000029000000010300002900000002040000290c0f0a510000040f00000305010000410000000002000414000003050320009c000000000102401900000006020000290000031505200197000000c00110021000000316011001c70000800d0200003900000004030000390000031704000041000000040600002900000005070000290c0f0bfb0000040f0000000101200190000008ad0000613d0000000700000005000000000001042d000000000100001900000000020000190c0f05920000040f000000040200036700000001040000310000001f0340018f000000060100002900000000010104330000000504400270000000000540004c000008c10000613d000000000500001900000005065002100000000007610019000000000662034f000000000606043b00000000006704350000000105500039000000000645004b000008b90000413d000000000530004c000008d00000613d0000000504400210000000000242034f00000000044100190000000303300210000000000504043300000000053501cf000000000535022f000000000202043b0000010003300089000000000232022f00000000023201cf000000000252019f000000000024043500000001020000310c0f05920000040f0000031b010000410000000000100435000000410100003900000004020000390000000000120435000000240200003900000000010000190c0f05920000040f0008000000000002000200000005001d000100000004001d000300000003001d000800000002001d000500000001001d000000000110004c0000000001000019000000010100c0390c0f07dd0000040f00000008010000290000031501100197000600000001001d0000ffff0110008c000000000100001900000001010020390c0f07ef0000040f0000004001000039000700000001001d000000000301043300000338010000410000000000130435000000040230003900000000010004140000000604000029000000000042043500008002020000390000002404000039000400000003001d00000000050300190c0f053f0000040f000000000110004c000009660000613d0000000101000031000000200210008c000000200200003900000000020140190000001f02200039000000600320018f00000004050000290000000002530019000000000332004b00000000030000190000000103004039000003140420009c0000000004050019000009880000213d0000000103300190000009880000c13d000000070300002900000000002304350000001f0110008c000009630000a13d0000000001040433000000000110004c000000000100001900000001010060390c0f08040000040f00000007010000290000000005010433000003390100004100000000001504350000000402500039000000000100041400000006030000290000000000320435000080030200003900000024040000390000000003050019000400000005001d0c0f053f0000040f000000000110004c000009660000613d0000000101000031000000200210008c000000200200003900000000020140190000001f02200039000000600320018f00000004050000290000000002530019000000000332004b00000000030000190000000103004039000003140420009c0000000004050019000009880000213d0000000103300190000009880000c13d00000007030000290000000000230435000000200110008c000009630000413d0000000001040433000000000110004c000000000100001900000001010060390c0f08160000040f00000005010000290c0f09980000040f000000080100002900000005020000290c0f09fa0000040f0c0f06250000040f00000000020100190000000303000029000000020130008c000009900000813d00000000003204350000002001200039000000000001043500000008010000290c0f07050000040f0000000001000411000700000001001d0000000802000029000000010300002900000002040000290c0f0a510000040f00000305010000410000000002000414000003050320009c000000000102401900000007020000290000031505200197000000c00110021000000316011001c70000800d0200003900000004030000390000031704000041000000050600002900000006070000290c0f0bfb0000040f0000000101200190000009630000613d0000000800000005000000000001042d000000000100001900000000020000190c0f05920000040f000000040200036700000001040000310000001f0340018f000000070100002900000000010104330000000504400270000000000540004c000009770000613d000000000500001900000005065002100000000007610019000000000662034f000000000606043b00000000006704350000000105500039000000000645004b0000096f0000413d000000000530004c000009860000613d0000000504400210000000000242034f00000000044100190000000303300210000000000504043300000000053501cf000000000535022f000000000202043b0000010003300089000000000232022f00000000023201cf000000000252019f000000000024043500000001020000310c0f05920000040f0000031b010000410000000000100435000000410100003900000004020000390000000000120435000000240200003900000000010000190c0f05920000040f0000031b010000410000000000100435000000210100003900000004020000390000000000120435000000240200003900000000010000190c0f05920000040f00020000000000020000004002000039000200000002001d00000000030204330000033a02000041000000000023043500000004023000390000000000120435000000000100041400008004020000390000002404000039000100000003001d00000000050300190c0f053f0000040f0000000104000031000000000110004c000009c10000613d000000200140008c000000200100003900000000010440190000001f01100039000000600210018f00000001050000290000000001520019000000000221004b00000000020000190000000102004039000003140310009c0000000003050019000009e20000213d0000000102200190000009e20000c13d000000020200002900000000001204350000001f0240008c000009ea0000a13d0000000002030433000000000220004c000009ed0000613d0000000200000005000000000001042d00000004030003670000001f0240018f000000020100002900000000010104330000000504400270000000000540004c000009d10000613d000000000500001900000005065002100000000007610019000000000663034f000000000606043b00000000006704350000000105500039000000000645004b000009c90000413d000000000520004c000009e00000613d0000000504400210000000000343034f00000000044100190000000302200210000000000504043300000000052501cf000000000525022f000000000303043b0000010002200089000000000323022f00000000022301cf000000000252019f000000000024043500000001020000310c0f05920000040f0000031b010000410000000000100435000000410100003900000004020000390000000000120435000000240200003900000000010000190c0f05920000040f000000000100001900000000020000190c0f05920000040f00000044021000390000033b03000041000000000032043500000024021000390000001a0300003900000000003204350000031c02000041000000000021043500000004021000390000002003000039000000000032043500000064020000390c0f05920000040f0003000000000002000200000002001d000300000001001d0000032201000041000000000010043900008002010000390000000402000039000100000002001d00000000001204390c0f05790000040f000000000110004c00000a240000613d00000002010000290000033c011001970000033d011001c70000004002000039000200000002001d0000000003020433000000240230003900000000001204350000033e0100004100000000001304350000000301000029000003150110019700000004023000390000000000120435000000000100041400008002020000390000004404000039000300000003001d000000000503001900000000060000190c0f050a0000040f000000000110004c00000a270000613d00000003020000290000032e0120009c00000a490000813d000000020100002900000000002104350000000300000005000000000001042d000000000100001900000000020000190c0f05920000040f000000040200036700000001040000310000001f0340018f000000020100002900000000010104330000000504400270000000000540004c00000a380000613d000000000500001900000005065002100000000007610019000000000662034f000000000606043b00000000006704350000000105500039000000000645004b00000a300000413d000000000530004c00000a470000613d0000000504400210000000000242034f00000000044100190000000303300210000000000504043300000000053501cf000000000535022f000000000202043b0000010003300089000000000232022f00000000023201cf000000000252019f000000000024043500000001020000310c0f05920000040f0000031b010000410000000000100435000000410100003900000001020000290000000000120435000000240200003900000000010000190c0f05920000040f00060000000000020000000005030019000500000002001d000600000001001d0000000001000416000000000110004c00000a850000613d000300000005001d000400000004001d000003220100004100000000001004390000800a01000039000000040200003900000000001204390c0f05790000040f000000000110004c00000ba20000613d0000004001000039000100000001001d00000000050104330000033f0100004100000000001504350000004402500039000000000100041400000000030004160000000000320435000000050200002900000315022001970000002403500039000000000023043500000000020004100000031502200197000000040350003900000000002304350000800a0200003900000064040000390000000003050019000200000005001d00000000060000190c0f050a0000040f000000000110004c00000bad0000613d0000000202000029000003140120009c0000000404000029000000030500002900000ba50000213d000000010100002900000000002104350000000001000416000003400110019700000000000104170000000003000031000000000105001900000000020400190c0f072e0000040f000400000001001d00000000010104330c0f0be90000040f000300000001001d00000000010004140c0f0be90000040f0000000402000029000000400220021000000341022000410000034202200197000000030300002900000060033002100000034303300197000000000232019f000000c0011002100000034401100197000000000112019f0000000602000029000003150d2001970000033d011001c700000005020000290c0f0c050000040f000000000302001900000000020100190000006002200270000103050020019d0000030502200197000400000001035500000001033001900000001f0320018f000000050420027000000bcf0000613d0000003f012000390000034506100197000000400c00003900000000050c04330000000001650019000000000751004b00000000070000190000000107004039000003140810009c00000ba50000213d000000010770019000000ba50000c13d00000000001c043500000000002504350000002001500039000000200860008a0000001f0680018f000000000700003100000003077003670000000508800270000000000980004c00000ac80000613d0000000009000019000000050a900210000000000ba10019000000000aa7034f000000000a0a043b0000000000ab04350000000109900039000000000a89004b00000ac00000413d000000000960004c00000ad70000613d0000000508800210000000000787034f00000000088100190000000306600210000000000908043300000000096901cf000000000969022f000000000707043b0000010006600089000000000767022f00000000066701cf000000000696019f000000000068043500000000002504350000000106000031000000000262004b00000ba20000213d0000000402000367000000000640004c00000ae70000613d000000000600001900000005076002100000000008710019000000000772034f000000000707043b00000000007804350000000106600039000000000746004b00000adf0000413d000000000630004c00000af60000613d0000000504400210000000000242034f00000000044100190000000303300210000000000604043300000000063601cf000000000636022f000000000202043b0000010003300089000000000232022f00000000023201cf000000000262019f000000000024043500000000020504330000031303000041000000200420008c000000000400001900000000040340190000031305200197000000000650004c000000000300a019000003130550009c000000000304c019000000000330004c00000ba20000c13d0000000003010433000003140430009c00000ba20000213d000000000221001900000000011300190000001f031000390000031304000041000000000523004b0000000005000019000000000504801900000313033001970000031306200197000000000763004b0000000004008019000000000363013f000003130330009c00000000030500190000000003046019000000000330004c00000ba20000c13d0000000003010433000003140430009c00000ba50000213d00000005043002100000003f04400039000000200500008a000000000454016f00000000090c04330000000004490019000000000594004b00000000050000190000000105004039000003140640009c00000ba50000213d000000010550019000000ba50000c13d00000000004c04350000000000390435000000200110003900000006033002100000000003130019000000000423004b00000ba20000213d0000000004090019000000000531004b00000b4c0000813d00000000051200490000031306000041000000400750008c000000000700001900000000070640190000031305500197000000000850004c000000000600a019000003130550009c00000000050700190000000005066019000000000550004c00000ba20000c13d00000000050c04330000031a0650009c00000ba50000213d0000002004400039000000400650003900000000006c04350000000006010433000000000065043500000020061000390000000006060433000000200750003900000000006704350000000000540435000000400110003900000b2e0000013d0000032201000041000000000010043900008005010000390000000402000039000300000002001d000000000012043900060000000c001d000400000009001d0c0f05790000040f00000004070000290000000604000029000000000110004c00000ba20000613d000000000304043300000346010000410000000000130435000000240230003900000000010004140000000000420435000000050200002900000315042001970000000402300039000200000004001d000000000042043500000000020704330000004404300039000000000024043500000064083000390000000004000019000000000524004b00000b760000813d000000200770003900000000050704330000000006050433000000000068043500000020055000390000000005050433000000200680003900000000005604350000000104400039000000400880003900000b690000013d0000000004380049000080050200003900000000050300190000000006000019000500000003001d0c0f050a0000040f000000000110004c00000bad0000613d0000000502000029000003140120009c000000060100002900000ba50000213d0000000000210435000003220100004100000000001004390000800201000039000000030200002900000000001204390c0f05790000040f0000000602000029000000000110004c00000ba20000613d0000000005020433000003470100004100000000001504350000000402500039000000000100041400000002030000290000000000320435000080020200003900000024040000390000000003050019000500000005001d00000000060000190c0f050a0000040f000000000110004c00000bad0000613d0000000502000029000003140120009c000000060100002900000ba50000213d00000000002104350000000600000005000000000001042d000000000100001900000000020000190c0f05920000040f0000031b010000410000000000100435000000410100003900000004020000390000000000120435000000240200003900000000010000190c0f05920000040f000000040200036700000001040000310000001f0340018f000000400100003900000000010104330000000504400270000000000540004c00000bbe0000613d000000000500001900000005065002100000000007610019000000000662034f000000000606043b00000000006704350000000105500039000000000645004b00000bb60000413d000000000530004c00000bcd0000613d0000000504400210000000000242034f00000000044100190000000303300210000000000504043300000000053501cf000000000535022f000000000202043b0000010003300089000000000232022f00000000023201cf000000000252019f000000000024043500000001020000310c0f05920000040f000000000540004c00000bd90000613d00000000050000190000000506500210000000000761034f000000000707043b00000000007604350000000105500039000000000645004b00000bd20000413d000000000530004c00000be70000613d00000003033002100000000504400210000000000504043300000000053501cf000000000535022f000000000141034f000000000101043b0000010003300089000000000131022f00000000013101cf000000000151019f000000000014043500000000010000190c0f05920000040f000003480210009c00000bec0000813d000000000001042d000000400100003900000000010104330000004402100039000003490300004100000000003204350000002402100039000000080300003900000000003204350000031c02000041000000000021043500000004021000390000002003000039000000000032043500000064020000390c0f05920000040f00000bfe002104210000000102000039000000000001042d0000000002000019000000000001042d00000c03002104230000000102000039000000000001042d0000000002000019000000000001042d000000000f0d001900000c09002104290000000102000039000000000001042d0000000002000019000000000001042d000000000012041b000000000001042d000000000101041a000000000001042d00000c0f0000043200000c100001042e00000c11000104300000000000000000000000000000000000000000000000000000000000000000000000000000000000000000ffffffff000000020000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000f3385fb6000000000000000000000000000000000000000000000000000000003cda33510000000000000000000000000000000000000000000000000000000057180981000000000000000000000000000000000000000000000000000000005d382700000000000000000000000000000000000000000000000000000000007b510fe80000000000000000000000000000000000000000000000000000000084da1fb4000000000000000000000000000000000000000000000000000000009c4d535b00000000000000000000000000000000000000000000000000000000bb0fd61000000000000000000000000000000000000000000000000000000000e9f18c1700000000000000000000000000000000000000000000000000000000ec8067c700000000000000000000000000000000000000000000000000000000ecf95b8a00000000000000000000000000000000000000000000000000000000187598a58000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000ffffffffffffffff000000000000000000000000ffffffffffffffffffffffffffffffffffffffff0200000000000000000000000000000000000000000000000000000000000000290afdae231a3fc0bbae8b1af63698b0a1d79b21ad17df0342dfb952fe74f8e50000000000000000000000000000000000000000000000000000000000010000306395c600000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000ffffffffffffffbf4e487b710000000000000000000000000000000000000000000000000000000008c379a00000000000000000000000000000000000000000000000000000000043616e206f6e6c792062652063616c6c656420627920464f5243455f4445504c4f5945525f434f4e5452414354000000000000000000000000000000000000006d656e74730000000000000000000000000000000000000000000000000000002074686520636f6d62696e6564206076616c75656073206f66206465706c6f796076616c7565602070726f7669646564206973206e6f7420657175616c20746f1806aa1896bbf26568e884a7374b41e002500962caba6a15023a8d90e8508b83f3385fb60000000000000000000000000000000000000000000000000000000002000002000000000000000000000000000000240000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000ffffffffffffffc04de2e46800000000000000000000000000000000000000000000000000000000666c61670000000000000000000000000000000000000000000000000000000054686973206d6574686f6420726571756972652073797374656d2063616c6c20696e6700000000000000000000000000000000000000000000000000000000006f6d2073657175656e7469616c20746f20617262697472617279206f726465724974206973206f6e6c7920706f737369626c6520746f206368616e6765206672ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff00ff00000000000000000000000000000000000000000000000100000000000000002020dba91b30cc0006188af794c2fb30dd8520db7e2c088b7fc7c103c00ca494000000000000000000000000000000000000000000000000ffffffffffffff4063bae3a9951d38e8a3fbb7b70909afc1200610fc5bc55ade242f815974674f23000000000000000000000000000000000000000000000000ffffffffffffff8042797465636f6465486173682063616e206e6f74206265207a65726f00000000656c20737061636500000000000000000000000000000000000000000000000043616e206e6f74206465706c6f7920636f6e74726163747320696e206b65726e436f64652068617368206973206e6f6e2d7a65726f00000000000000000000004163636f756e74206973206f6363757069656400000000000000000000000000e03fe177000000000000000000000000000000000000000000000000000000005aa9b6b5000000000000000000000000000000000000000000000000000000004c6314f00000000000000000000000000000000000000000000000000000000054686520636f64652068617368206973206e6f74206b6e6f776e000000000000ff00ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff00010000000000000000000000000000000000000000000000000000000000004f1e1be000000000000000000000000000000000000000000000000000000000579952fc0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000ffffffffffffffffffffffffffffffff00000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000ffffffff000000000000000000000000000000000000000000000000ffffffff00000000000000000000000000000000ffffffff00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001ffffffe0ad7e232e00000000000000000000000000000000000000000000000000000000c2e4ff970000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001000000004f766572666c6f770000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-    "0x0000000000000000000000000000000000000001": "0x00010000000000020000000000010355000000800300003900000040010000390000000000310435000000000300041600000001022001900000003b0000c13d000000000230004c000000450000c13d00000000020004120000001a022001970000000003000410000000000232004b000000450000c13d00000000040003670000006002400370000000000302043b0000001b063000410000002002400370000000000202043b0000004005400370000000000505043b0000001b075000410000001c0770009c000000470000413d0000001d0720008a000000020800008a000000000787004b000000470000413d0000001b0660009c000000470000a13d000000000404043b000000000101043300000060061000390000000000360435000000400310003900000000005304350000001b0220008a000000200310003900000000002304350000000000410435000000800110008c0000004b0000c13d0000000001000414000004580110008c000000450000413d00000458010000390000001e020000410000000001120420000000000110004c000000450000613d0000000001000433000000010110008c000000470000c13d000000200100003900000000020100190000000003000019005e00520000040f000000000130004c000000450000c13d0000002002000039000001000100003900000000002104390000012002000039000000000002043900000040020000390000001903000041005e00520000040f0000000001000019005e005c0000040f000000000100001900000000020000190000000003000019005e00520000040f0000001d0100004100000000001004350000000101000039000000040200003900000000001204350000002401000039005e005c0000040f0000001f040000410000001f0510009c0000000001048019000000400110021000000000013100190000001f0320009c0000000002048019000000600220021000000000012100190000005f0001042e000000600110021000000060000104300000005e000004320000005f0001042e00000060000104300000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000000000000000000000ffffffffffffffffffffffffffffffffffffffff000000000000000000000000000000014551231950b75fc4402da1732fc9bebf000000000000000000000000000000014551231950b75fc4402da1732fc9bec04e487b7100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000100000000000000040000000400000000000000000000000000000000000000000000000000000000ffffffff0000000000000000000000000000000000000000000000000000000000000000",
-    "0x0000000000000000000000000000000000008005": "0x00020000000000020007000000000002000100000001035500000060011002700000003a0010019d00000080050000390000004001000039000000000051043500000001012001900000003d0000c13d0000000001000031000000040110008c000000a50000413d0000000101000367000000000101043b000000e0011002700000003c0210009c000000480000613d0000003d0110009c000000a50000c13d0000000001000416000000000110004c000000a50000c13d000000040100008a00000000011000310000003e02000041000000400310008c000000000300001900000000030240190000003e01100197000000000410004c000000000200a0190000003e0110009c00000000010300190000000001026019000000000110004c000000a50000c13d000600000005001d00e400d20000040f0000003f0110019700000000001004350000002001000039000700000001001d0000000000010435000000000100001900e400ac0000040f00000024020000390000000102200367000000000202043b000000000020043500000007020000290000000000120435000000000100001900e400ac0000040f00e400e20000040f0000000602000029000000000012043500000000010200190000000702000029000000000300001900e400bf0000040f0000000001000416000000000110004c000000a50000c13d0000002002000039000001000100003900000000002104390000012002000039000000000002043900000040020000390000003b0300004100e400bf0000040f0000000001000416000000000110004c000000a50000c13d0000000001000031000000040210008a0000003e03000041000000400420008c000000000400001900000000040340190000003e02200197000000000520004c000000000300a0190000003e0220009c00000000020400190000000002036019000000000220004c000000a50000c13d00000001020003670000000403200370000000000303043b000300000003001d0000003f0330009c000000a50000213d0000002403200370000000000303043b000000400430009c000000a50000213d00000023043000390000003e05000041000000000614004b000000000600001900000000060580190000003e071001970000003e04400197000000000874004b0000000005008019000000000474013f0000003e0440009c00000000040600190000000004056019000000000440004c000000a50000c13d0000000404300039000000000242034f000000000402043b000000400240009c000000a50000213d00000024033000390000000602400210000200000003001d0000000002320019000000000112004b000000a50000213d0000000001000411000080060110008c000000a50000c13d0000002001000039000700000001001d0000000002000019000100000004001d000000000142004b000000a80000813d0000000601200210000600000002001d000000020200002900000000012100190000000102000367000000000312034f0000002001100039000000000112034f000000000101043b000500000001001d000000000103043b000400000001001d0000000301000029000000000010043500000007010000290000000000010435000000000100001900e400ac0000040f0000000402000029000000000020043500000007020000290000000000120435000000000100001900e400ac0000040f0000000002010019000000050100002900e400e00000040f000000060200002900000001040000290000000102200039000000840000013d0000000001000019000000000200001900e400c90000040f00000000010000190000000002000019000000000300001900e400bf0000040f0000003a0200004100000000030004140000003a0430009c00000000030280190000003a0410009c00000000010280190000004001100210000000c002300210000000000112019f00000041011001c7000080100200003900e400db0000040f0000000102200190000000bc0000613d000000000101043b000000000001042d0000000001000019000000000200001900e400c90000040f0000003a040000410000003a0510009c0000000001048019000000400110021000000000013100190000003a0320009c000000000204801900000060022002100000000001210019000000e50001042e0000003a030000410000003a0420009c00000000020380190000003a0410009c000000000103801900000040011002100000006002200210000000000112019f000000e60001043000000004010000390000000101100367000000000101043b000000420210009c000000d80000813d000000000001042d0000000001000019000000000200001900e400c90000040f000000de002104230000000102000039000000000001042d0000000002000019000000000001042d000000000012041b000000000001042d000000000101041a000000000001042d000000e400000432000000e50001042e000000e600010430000000000000000000000000000000000000000000000000000000000000000000000000ffffffff000000020000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000ad7e232e00000000000000000000000000000000000000000000000000000000310ab0898000000000000000000000000000000000000000000000000000000000000000000000000000000000000000ffffffffffffffffffffffffffffffffffffffff000000000000000000000000000000000000000000000000ffffffffffffffff02000000000000000000000000000000000000400000000000000000000000000000000000000000000000010000000000000000000000000000000000000000",
-    "0x0000000000000000000000000000000000008010": "0x0002000000000002000200000000000200010000000103550000006001100270000000280010019d00000080010000390000004004000039000000000014043500000000030004160000000102200190000000550000c13d000000000230004c0000005f0000c13d00000000020004120000002a022001970000000003000410000000000232004b0000005f0000c13d000000010500036700000000030000310000001f0630018f0000000004040433000000882730011a0000000507300270000000000870004c000000230000613d00000000080000190000000509800210000000000a940019000000000995034f000000000909043b00000000009a04350000000108800039000000000978004b0000001b0000413d000000000860004c000000320000613d0000000507700210000000000575034f00000000077400190000000306600210000000000807043300000000086801cf000000000868022f000000000505043b0000010006600089000000000565022f00000000056501cf000000000585019f0000000000570435000000800440008c000000620000c13d000000000323004900000088043000390000002c030000410000000001100031000000870220008c0000003e0000613d0000002d0200004100000000002104350000002e030000410000007f014000390000000000310435000000881240011a000100000002001d00000028212000c9000200000004001d009a00880000040f0000000102000029000000c00220021000000002030000290000001b033002100000002f033000410000003003300197000000000223019f00000031022001c7000000000301001900000000010200190000000002030019009a007f0000040f009a00790000040f000000200200003900000000010000190000000003000019009a006a0000040f000000000130004c0000005f0000c13d0000002002000039000001000100003900000000002104390000012002000039000000000002043900000040020000390000002903000041009a006a0000040f00000000010000190000000002000019009a00720000040f0000002b01000041000000000010043500000001010000390000000402000039000000000012043500000024020000390000000001000019009a00720000040f0000002804000041000000280510009c000000000104801900000040011002100000006002200210000000000121019f00000000013100190000009b0001042e0000002803000041000000280410009c000000000103801900000040011002100000006002200210000000000121019f0000009c00010430000000000110004c0000007c0000613d000000000001042d00000000010000190000000002000019009a00720000040f00000028022001970000000003000414000000000323004b000000850000413d0000000001210420000000000001042d00000000010000190000000002000019009a00720000040f000000320210009c0000008b0000813d000000000001042d00000040010000390000000001010433000000440210003900000033030000410000000000320435000000240210003900000008030000390000000000320435000000340200004100000000002104350000000402100039000000200300003900000000003204350000006402000039009a00720000040f0000009a000004320000009b0001042e0000009c0001043000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000ffffffff0000000200000000000000000000000000000000000000000000000000000000000000000000000000000000ffffffffffffffffffffffffffffffffffffffff4e487b710000000000000000000000000000000000000000000000000000000081000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000800000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000f8000000000000000000000000000000000000000000000000000000ffffffff00000000000000000000000000000000000000000000000100000000000000000000000400000000000000000000000000000000000000000000000000000001000000004f766572666c6f7700000000000000000000000000000000000000000000000008c379a000000000000000000000000000000000000000000000000000000000",
-    "0x0000000000000000000000000000000000008004": "0x0002000000000002000100000000000200010000000103550000006001100270000000520010019d0000008005000039000000400100003900000000005104350000000101200190000000300000c13d0000000001000031000000040110008c000000710000413d0000000101000367000000000101043b000000e001100270000000540210009c0000003b0000613d000000550110009c000000710000c13d0000000001000416000000000110004c000000710000c13d000000040100008a00000000011000310000005602000041000000200310008c000000000300001900000000030240190000005601100197000000000410004c000000000200a019000000560110009c00000000010300190000000001026019000000000110004c000000710000c13d00000004010000390000000101100367000000000101043b000100000005001d014201400000040f00000001030000290000000000130435000000200200003900000000010300190000000003000019014200790000040f0000000001000416000000000110004c000000710000c13d0000002002000039000001000100003900000000002104390000012002000039000000000002043900000040020000390000005303000041014200790000040f0000000001000416000000000110004c000000710000c13d0000000004000031000000040140008a0000005602000041000000400310008c000000000300001900000000030240190000005601100197000000000510004c000000000200a019000000560110009c00000000010300190000000001026019000000000110004c000000710000c13d00000001020003670000000401200370000000000101043b000000000310004c0000000003000019000000010300c039000000000331004b000000710000c13d0000002403200370000000000503043b000000570350009c000000710000213d00000023035000390000005606000041000000000743004b0000000007000019000000000706801900000056084001970000005603300197000000000983004b0000000006008019000000000383013f000000560330009c00000000030700190000000003066019000000000330004c000000710000c13d0000000403500039000000000232034f000000000302043b000000570230009c000000710000213d000000240250003900000005053002100000000005250019000000000445004b000000740000a13d00000000010000190000000002000019014200830000040f0142008c0000040f000000000100001900000000020000190000000003000019014200790000040f0000005204000041000000520510009c000000000104801900000040011002100000000001310019000000520320009c000000000204801900000060022002100000000001210019000001430001042e0000005203000041000000520420009c0000000002038019000000520410009c000000000103801900000040011002100000006002200210000000000112019f0000014400010430000a000000000002000700000003001d000600000002001d00000000030100190000000001000411000080010110008c0000012a0000c13d000000000130004c0000000001000019000000010100c039000500000001001d0000000101000039000400000001001d0000800d01000039000300000001001d0000000301000039000200000001001d0000000001000413000100000001001d0000000002000019000800000003001d0000000701000029000000000112004b000000df0000813d000a00000002001d0000000501200210000000060200002900000000012100190000000101100367000000000101043b000900000001001d014201400000040f0000000803000029000000000110004c000000dc0000c13d00000009020000290000005a012001970000005b0110009c000000e40000c13d0000005e01200198000000f60000613d000000000130004c000000cb0000613d00000001010000290000005205100197000000db012002700000005f01100197000000640310003900000000413500a900000000433100d9000000000335004b000001040000c13d0000000003020019000000610210009c0000010c0000813d0000000002000414000000000212004b000000e10000413d0000000001100420000000000110004c0000011b0000613d0000000002030019000000000002041d00000004010000290142013e0000040f00000052010000410000000002000414000000520320009c0000000001024019000000c00110021000000064011001c700000065040000410000000302000029000000020300002900000009050000290000000506000029014201390000040f00000008030000290000000101200190000000e10000613d0000000a020000290000000102200039000000a10000013d0000000a00000005000000000001042d00000000010000190000000002000019014200830000040f0000004001000039000000000101043300000064021000390000005c03000041000000000032043500000044021000390000005d030000410000000000320435000000240210003900000022030000390000000000320435000000590200004100000000002104350000000402100039000000200300003900000000003204350000008402000039014200830000040f0000004001000039000000000101043300000044021000390000006603000041000000000032043500000059020000410000000000210435000000240210003900000020030000390000000000320435000000040210003900000000003204350000006402000039014200830000040f0000006001000041000000000010043500000011010000390000000402000039000000000012043500000024020000390000000001000019014200830000040f00000040010000390000000001010433000000440210003900000063030000410000000000320435000000240210003900000008030000390000000000320435000000590200004100000000002104350000000402100039000000200300003900000000003204350000006402000039014200830000040f00000040010000390000000001010433000000440210003900000062030000410000000000320435000000240210003900000014030000390000000000320435000000590200004100000000002104350000000402100039000000200300003900000000003204350000006402000039014200830000040f0000004001000039000000000101043300000044021000390000005803000041000000000032043500000024021000390000001f030000390000000000320435000000590200004100000000002104350000000402100039000000200300003900000000003204350000006402000039014200830000040f0000013c002104210000000102000039000000000001042d0000000002000019000000000001042d000000000012041b000000000001042d000000000101041a000000000001042d0000014200000432000001430001042e000001440001043000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000ffffffff000000020000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000e516761e000000000000000000000000000000000000000000000000000000004c6314f08000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000ffffffffffffffff43616c6c61626c65206f6e6c792062792074686520626f6f746c6f616465720008c379a000000000000000000000000000000000000000000000000000000000ffff00000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000007368000000000000000000000000000000000000000000000000000000000000496e636f72726563746c7920666f726d61747465642062797465636f64654861000000010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001fffe04e487b710000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001000000004661696c656420746f20636861726765206761730000000000000000000000004f766572666c6f770000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000c94722ff13eacf53547c4741dab5228353a05938ffcdd5d4a2d533ae0e618287436f6465206c656e67746820696e20776f726473206d757374206265206f6464",
-    "0x0000000000000000000000000000000000008008": "0x00020000000000020001000000000002000100000001035500000060011002700000004c0010019d00000080010000390000004008000039000000000018043500000001012001900000007a0000c13d0000000001000031000000040110008c000000850000413d0000000101000367000000000101043b0000004e011001970000004f0110009c000000850000c13d0000000001000416000000000110004c000000850000c13d0000000001000031000000040210008a0000005003000041000000200420008c000000000400001900000000040340190000005002200197000000000520004c000000000300a019000000500220009c00000000020400190000000002036019000000000220004c000000850000c13d00000001020003670000000403200370000000000303043b000000510430009c000000850000213d00000023043000390000005005000041000000000614004b0000000006000019000000000605801900000050011001970000005004400197000000000714004b0000000005008019000000000114013f000000500110009c00000000010600190000000001056019000000000110004c000000850000c13d0000000401300039000000000112034f000000000201043b000000520120009c000000880000813d0000001f01200039000000200400008a000000000141016f0000003f01100039000000000441016f00000000010804330000000004410019000000000514004b00000000050000190000000105004039000000510640009c000000880000213d0000000105500190000000880000c13d00000000004804350000000000210435000000240330003900000000043200190000000005000031000000000454004b000000850000213d000100000008001d0000001f0420018f000000010530036700000020031000390000000506200270000000000760004c000000610000613d000000000700001900000005087002100000000009830019000000000885034f000000000808043b00000000008904350000000107700039000000000867004b000000590000413d000000000740004c000000700000613d0000000506600210000000000565034f00000000066300190000000304400210000000000706043300000000074701cf000000000747022f000000000505043b0000010004400089000000000545022f00000000044501cf000000000474019f000000000046043500000000022300190000000000020435012a00ba0000040f000000010200002900000000030204330000000000130435000000200200003900000000010300190000000003000019012a00a70000040f0000000001000416000000000110004c000000850000c13d0000002002000039000001000100003900000000002104390000012002000039000000000002043900000040020000390000004d03000041012a00a70000040f00000000010000190000000002000019012a00b10000040f0000005301000041000000000010043500000041010000390000000402000039000000000012043500000024020000390000000001000019012a00b10000040f0000004c030000410000004c0410009c000000000103801900000040011002100000004c0420009c00000000020380190000006002200210000000000112019f00000000020004140000004c0420009c0000000002038019000000c002200210000000000112019f00000054011001c70000801002000039012a01250000040f0000000102200190000000a40000613d000000000101043b000000000001042d00000000010000190000000002000019012a00b10000040f0000004c040000410000004c0510009c0000000001048019000000400110021000000000013100190000004c0320009c0000000002048019000000600220021000000000012100190000012b0001042e0000004c030000410000004c0420009c00000000020380190000004c0410009c000000000103801900000040011002100000006002200210000000000112019f0000012c000104300001000000000002000100000001001d00000000020104330000002001100039012a00900000040f000000010a00002900000000020a04330000005f03200039000000200200008a000000000323016f000000000901001900000000010004130000004c0410019700000000514300a9000000000530004c000000cf0000613d00000000533100d9000000000334004b000001090000c13d000000550310009c000001110000813d00000058011001970000000003000414000000000313004b000001060000413d0000000001100420000000000110004c000001060000613d0000000005000411000000000095041d000000400100003900000000010104330000002003000039000000000031043500000000030a04330000002004100039000000000034043500000040041000390000000006000019000000000736004b000000e90000813d000000000746001900000020066000390000000008a6001900000000080804330000000000870435000000e10000013d000000000443001900000000000404350000005f03300039000000000223016f0000004c030000410000004c0410009c000000000103801900000040011002100000004c0420009c00000000020380190000006002200210000000000112019f00000000020004140000004c0420009c0000000002038019000000c002200210000000000112019f00000054011001c70000800d02000039000000030300003900000059040000410000000006090019000100000009001d012a01200000040f00000001010000290000000102200190000001060000613d0000000100000005000000000001042d00000000010000190000000002000019012a00b10000040f0000005301000041000000000010043500000011010000390000000402000039000000000012043500000024020000390000000001000019012a00b10000040f00000040010000390000000001010433000000440210003900000056030000410000000000320435000000240210003900000008030000390000000000320435000000570200004100000000002104350000000402100039000000200300003900000000003204350000006402000039012a00b10000040f00000123002104210000000102000039000000000001042d0000000002000019000000000001042d00000128002104230000000102000039000000000001042d0000000002000019000000000001042d0000012a000004320000012b0001042e0000012c0001043000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000ffffffff0000000200000000000000000000000000000000000000000000000000000000ffffffff0000000000000000000000000000000000000000000000000000000062f84b24000000000000000000000000000000000000000000000000000000008000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000ffffffffffffffff00000000000000000000000000000000000000000000000100000000000000004e487b7100000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001000000004f766572666c6f7700000000000000000000000000000000000000000000000008c379a00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000ffffffe03a36e47291f4201faf137fab081d92295bce2d53be2c6ca68ba82c7faa9ce2410000000000000000000000000000000000000000000000000000000000000000",
-    "0x000000000000000000000000000000000000800a": "0x0004000000000002000600000000000200000000030100190000006003300270000000b60430019700030000004103550002000000010355000000b60030019d000100000000001f0000008001000039000000400600003900000000001604350000000101200190000000440000c13d0000000003000031000000040130008c000002410000413d0000000201000367000000000201043b000000e002200270000000b90420009c000000e90000613d000000ba0420009c0000010c0000613d000000bb0420009c000001270000613d000000bc0420009c0000013e0000613d000000bd0420009c000000550000613d000000be0120009c0000018f0000613d000000bf0120009c000000c10000613d000000c00120009c000002410000c13d0000000001000416000000000110004c000002410000c13d000000040100008a0000000001100031000000c102000041000000000310004c00000000030000190000000003024019000000c101100197000000000410004c000000000200a019000000c10110009c00000000010300190000000001026019000000000110004c000002410000c13d000600000006001d02d102b20000040f00000000020100190000002001200039000000d103000041000000000031043500000006010000290000000001010433000600000001001d02d1029d0000040f000000060300002900000000023100490000000001030019000000000300001902d102770000040f0000000001000416000000000110004c000002410000c13d0000000201000039000600000001001d02d102cf0000040f000000b701100197000000060200002902d102cd0000040f000000200200003900000100010000390000000000210439000001200200003900000000000204390000004002000039000000b80300004102d102770000040f000000040230008a000000c103000041000000200420008c00000000040000190000000004034019000000c102200197000000000520004c000000000300a019000000c10220009c00000000020400190000000002036019000000000220004c000002410000c13d0000000401100370000000000201043b000000c20120009c000002410000213d0000000001000410000000c20110019700000000001004350000002001000039000300000001001d0000000000010435000600000006001d000500000002001d02d102680000040f000400000001001d02d102cf0000040f00000000020004160000000001210049000000040200002902d102cd0000040f0000000101000039000400000001001d02d102cf0000040f00000000020004160000000001210049000000040200002902d102cd0000040f000000060500002900000000020004160000000001050433000000c9030000410000002004100039000000000034043500000005030000290000006003300210000000240410003900000000003404350000003803100039000000000023043500000038020000390000000000210435000000ca0210009c000001ce0000813d0000006003100039000400000003001d0000000000350435000000cb02000041000000000023043500000064021000390000000003000414000200000003001d00000003030000290000000000320435000000840210003902d1028a0000040f000000040200002900000000032100490000000201000029000000000402001902d102440000040f0000000104000031000000000110004c000001c30000c13d00000003030003670000001f0240018f000000060100002900000000010104330000000504400270000000000540004c000000b00000613d000000000500001900000005065002100000000007610019000000000663034f000000000606043b00000000006704350000000105500039000000000645004b000000a80000413d000000000520004c000000bf0000613d0000000504400210000000000343034f00000000044100190000000302200210000000000504043300000000052501cf000000000525022f000000000303043b0000010002200089000000000323022f00000000022301cf000000000252019f0000000000240435000000010200003102d102810000040f0000000001000416000000000110004c000002410000c13d000000040100008a0000000001100031000000c102000041000000000310004c00000000030000190000000003024019000000c101100197000000000410004c000000000200a019000000c10110009c00000000010300190000000001026019000000000110004c000002410000c13d0000000001060433000500000001001d000600000006001d02d102a40000040f00000005030000290000002001300039000000c302000041000000000021043500000003010000390000000000130435000000000103001900000006020000290000000003020433000600000003001d00000020020000390000000000230435000000200230003902d1028a0000040f000000060300002900000000023100490000000001030019000000000300001902d102770000040f0000000001000416000000000110004c000002410000c13d000000040100008a0000000001100031000000c102000041000000200310008c00000000030000190000000003024019000000c101100197000000000410004c000000000200a019000000c10110009c00000000010300190000000001026019000000000110004c000002410000c13d00000004010000390000000201100367000000000101043b000000c20110019700000000001004350000002001000039000500000001001d0000000000010435000600000006001d02d102680000040f02d102cf0000040f00000006020000290000000002020433000000000012043500000000010200190000000502000029000000000300001902d102770000040f0000000001000416000000000110004c000002410000c13d000000040100008a0000000001100031000000c102000041000000000310004c00000000030000190000000003024019000000c101100197000000000410004c000000000200a019000000c10110009c00000000010300190000000001026019000000000110004c000002410000c13d0000000101000039000600000006001d02d102cf0000040f00000006020000290000000003020433000000000013043500000020020000390000000001030019000000000300001902d102770000040f0000000001000416000000000110004c000002410000c13d000000040100008a0000000001100031000000c102000041000000000310004c00000000030000190000000003024019000000c101100197000000000410004c000000000200a019000000c10110009c00000000010300190000000001026019000000000110004c000002410000c13d0000000001060433000000120200003900000000002104350000002002000039000000000300001902d102770000040f0000000001000416000000000110004c000002410000c13d000000040100008a0000000001100031000000c102000041000000400310008c00000000030000190000000003024019000000c101100197000000000410004c000000000200a019000000c10110009c00000000010300190000000001026019000000000110004c000002410000c13d00000002010003670000000402100370000000000302043b000000c20230009c000002410000213d0000002401100370000000000201043b0000000001000411000080010110008c000001d60000c13d000400000003001d000600000006001d0000000101000039000500000002001d02d102cf0000040f000000000201001900000005010000290000000001120019000000000221004b000000000200001900000001020040390000000102200190000002210000c13d000000010200003902d102cd0000040f000000040100002900000000001004350000002001000039000000000001043502d102680000040f000300000001001d02d102cf0000040f000000050300002900000000020100190000000001320019000000000221004b000000000200001900000001020040390000000102200190000002210000c13d000000030200002902d102cd0000040f0000000601000029000000000101043300000005020000290000000000210435000000b6020000410000000003000414000000b60430009c0000000003028019000000b60410009c00000000010280190000004001100210000000c002300210000000000112019f000000c4011001c70000800d020000390000000203000039000000d004000041000000040500002902d102c30000040f0000000101200190000002410000613d000001fd0000013d0000000001000416000000000110004c000002410000c13d000000040100008a0000000001100031000000c102000041000000600310008c00000000030000190000000003024019000000c101100197000000000410004c000000000200a019000000c10110009c00000000010300190000000001026019000000000110004c000002410000c13d00000002010003670000000402100370000000000302043b000000c20230009c000002410000213d0000002402100370000000000402043b000000c20240009c000002410000213d00000000020004110000004401100370000000000501043b000080060120008c000002010000613d000000090100008a000000000112016f000080010110008c000002010000613d00000000010604330000006402100039000000c60300004100000000003204350000004402100039000000c703000041000000000032043500000024021000390000003e030000390000000000320435000000c8020000410000000000210435000000040210003900000020030000390000000000320435000000840200003902d102810000040f000000200140008c000000200100003900000000010440190000001f01100039000000600110018f00000004020000290000000001210019000000cc0210009c00000006020000290000000506000029000001e40000a13d000000ce0100004100000000001004350000004101000039000000040200003900000000001204350000002402000039000000000100001902d102810000040f00000000010604330000004402100039000000cf03000041000000000032043500000024021000390000001f030000390000000000320435000000c8020000410000000000210435000000040210003900000020030000390000000000320435000000640200003902d102810000040f0000000000120435000000200140008c000002410000413d0000000001000416000000000016041d000000000102043300000000020004160000000000210435000000b6020000410000000003000414000000b60430009c0000000003028019000000b60410009c00000000010280190000004001100210000000c002300210000000000112019f000000c4011001c70000800d020000390000000303000039000000cd04000041000000000500041102d102c30000040f0000000101200190000002410000613d00000000010000190000000002000019000000000300001902d102770000040f000400000004001d000600000006001d000100000003001d00000000003004350000002001000039000300000001001d0000000000010435000500000005001d02d102680000040f000200000001001d02d102cf0000040f0000000503000029000000000231004b000002210000413d0000000001310049000000020200002902d102cd0000040f000000040100002900000000001004350000000301000029000000000001043502d102680000040f000300000001001d02d102cf0000040f000000050300002900000000020100190000000001320019000000000221004b000000000200001900000001020040390000000102200190000002290000613d000000ce0100004100000000001004350000001101000039000000040200003900000000001204350000002402000039000000000100001902d102810000040f000000030200002902d102cd0000040f0000000601000029000000000101043300000005020000290000000000210435000000b6020000410000000003000414000000b60430009c0000000003028019000000b60410009c00000000010280190000004001100210000000c002300210000000000112019f000000c4011001c70000800d020000390000000303000039000000c5040000410000000105000029000000040600002902d102c30000040f0000000101200190000001fd0000c13d0000000001000019000000000200001902d102810000040f0001000000000002000100000004001d000000b604000041000000b60520009c00000000020480190000004002200210000000b60530009c00000000030480190000006003300210000000000223019f000000b60310009c0000000001048019000000c001100210000000000112019f000080080200003902d102c30000040f0000000106000029000000010220018f000000000300001900000005043002100000000005460019000000000441034f000000000404043b00000000004504350000000103300039000000000430004c000000000400001900000001040060390000000104400190000002570000c13d00030000000103550000006001100270000100b60010019d00000000010200190000000100000005000000000001042d000000b6010000410000000002000414000000b60320009c0000000001024019000000c001100210000000d2011001c7000080100200003902d102c80000040f0000000102200190000002740000613d000000000101043b000000000001042d0000000001000019000000000200001902d102810000040f000000b604000041000000b60510009c000000000104801900000040011002100000000001310019000000b60320009c000000000204801900000060022002100000000001210019000002d20001042e000000b603000041000000b60420009c0000000002038019000000b60410009c000000000103801900000040011002100000006002200210000000000112019f000002d3000104300000000003010433000000000032043500000020022000390000000004000019000000000534004b000002960000813d000000000542001900000020044000390000000006140019000000000606043300000000006504350000028e0000013d000000000132001900000000000104350000001f01300039000000200300008a000000000131016f0000000001120019000000000001042d0000000003020019000000200200003900000000002104350000002002100039000000000103001902d1028a0000040f000000000001042d000000d30210009c000002aa0000813d000000400110003900000040020000390000000000120435000000000001042d000000ce0100004100000000001004350000004101000039000000040200003900000000001204350000002402000039000000000100001902d102810000040f00000040020000390000000001020433000000d30310009c000002bb0000813d0000004003100039000000000032043500000005020000390000000000210435000000000001042d000000ce0100004100000000001004350000004101000039000000040200003900000000001204350000002402000039000000000100001902d102810000040f000002c6002104210000000102000039000000000001042d0000000002000019000000000001042d000002cb002104230000000102000039000000000001042d0000000002000019000000000001042d000000000012041b000000000001042d000000000101041a000000000001042d000002d100000432000002d20001042e000002d300010430000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000ffffffffffffffffffffffffffffffff00000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000009cc7f7080000000000000000000000000000000000000000000000000000000018160ddd00000000000000000000000000000000000000000000000000000000313ce5670000000000000000000000000000000000000000000000000000000040c10f190000000000000000000000000000000000000000000000000000000051cff8d900000000000000000000000000000000000000000000000000000000579952fc0000000000000000000000000000000000000000000000000000000095d89b410000000000000000000000000000000000000000000000000000000006fdde038000000000000000000000000000000000000000000000000000000000000000000000000000000000000000ffffffffffffffffffffffffffffffffffffffff45544800000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000020000000000000000000000000ddf252ad1be2c89b69c2b068fc378daa952ba7f163c4a11628f55a4df523b3ef616c206163636573732063616e2063616c6c2074686973206d6574686f6400004f6e6c792073797374656d20636f6e747261637473207769746820737065636908c379a0000000000000000000000000000000000000000000000000000000006c0960f900000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000ffffffffffffffa062f84b2400000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000ffffffffffffffff2717ead6b9200dd235aad468c9809ea400fe33ac69b5bfaa6d3e90fc922b63984e487b710000000000000000000000000000000000000000000000000000000043616c6c61626c65206f6e6c792062792074686520626f6f746c6f61646572000f6798a560793a54c3bcfe86a93cde1e73087d944c0ea20544137d412139688545746865720000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000040000000000000000000000000000000000000000000000000000000000000000000000000ffffffffffffffc00000000000000000000000000000000000000000000000000000000000000000",
-    "0x0000000000000000000000000000000000008009": "0x0008000000000002000400000000000200000000060100190000006006600270000000740760019700070000007103550006000000010355000300000003001f000400000004001f000500000005001f000000740060019d000200000002001f000100000000001f00000080010000390000004007000039000000000017043500000001022001900000002c0000c13d000000020200003900000002032001870000000102300270000000000330004c00000000030004110000001b0000c13d000000760230009c00000000020000190000000102004039000000000220004c000000370000c13d0000007d0200004100000000002104350000002003000039000000840200003900000000003204350000002403000039000000a40400003900000000003404350000007e03000041000000c40400003900000000003404350000007f03000041000000e404000039000000000034043501cc00c90000040f0000000001000416000000000110004c000000660000c13d000000200200003900000100010000390000000000210439000001200200003900000000000204390000004002000039000000750300004101cc00bf0000040f0000000504000031000000770200004100000004052001870000000306000031000000000260004c000400000004001d000300000005001d0000004d0000c13d00000000000604170000000001000031000000000201001901cc00d20000040f00000000030100190000000401000029000000010410018f0000000002000411000000030100002901cc01120000040f00000000020104330000002001100039000000000300001901cc00bf0000040f0000007804000041000000a00200003900000000004204350000007703300197000000a4040000390000000000340435000000c4030000390000000000530435000000e403000039000100000006001d0000000000630435000000640300003900000000003104350000012003000039000200000007001d000000000037043500000000040004140000000003010433000000000104001901cc00ab0000040f0000000102000031000000000320004c000000690000c13d000000000110004c000000a20000c13d0000000001000019000000000200001901cc00c90000040f000000790320009c00000002070000290000009a0000813d0000003f03200039000000200400008a000000000443016f00000000030704330000000004430019000000000534004b000000000500001900000001050040390000007a0640009c0000009a0000213d00000001055001900000009a0000c13d000000000047043500000000002304350000002002300039000000070300036700000001050000310000001f0450018f0000000505500270000000000650004c0000008a0000613d000000000600001900000005076002100000000008720019000000000773034f000000000707043b00000000007804350000000106600039000000000756004b000000820000413d000000000640004c000000640000613d0000000505500210000000000353034f00000000025200190000000304400210000000000502043300000000054501cf000000000545022f000000000303043b0000010004400089000000000343022f00000000034301cf000000000353019f0000000000320435000000640000013d0000007b0100004100000000001004350000004101000039000000040200003900000000001204350000002402000039000000000100001901cc00c90000040f00000001060000290000007c0160009c000000040400002900000003050000290000003f0000413d00000000010000190000000002000019000000000300001901cc00bf0000040f0000007404000041000000740520009c00000000020480190000004002200210000000740530009c00000000030480190000006003300210000000000223019f000000740310009c0000000001048019000000c001100210000000000112019f0000800a0200003901cc01c10000040f00000000030100190000006003300270000100740030019d0007000000010355000000010120018f000000000001042d0000007404000041000000740510009c000000000104801900000040011002100000000001310019000000740320009c000000000204801900000060022002100000000001210019000001cd0001042e0000007403000041000000740420009c0000000002038019000000740410009c000000000103801900000040011002100000006002200210000000000112019f000001ce00010430000000790310009c000001070000813d0000003f03100039000000200400008a000000000543016f000000400400003900000000030404330000000005530019000000000635004b000000000600001900000001060040390000007a0750009c000001070000213d0000000106600190000001070000c13d00000000005404350000000000130435000000000221004b0000010f0000213d00000006050003670000001f0410018f00000020023000390000000506100270000000000760004c000000f40000613d000000000700001900000005087002100000000009820019000000000885034f000000000808043b00000000008904350000000107700039000000000867004b000000ec0000413d000000000740004c000001030000613d0000000506600210000000000565034f00000000066200190000000304400210000000000706043300000000074701cf000000000747022f000000000505043b0000010004400089000000000545022f00000000044501cf000000000474019f0000000000460435000000000112001900000000000104350000000001030019000000000001042d0000007b0100004100000000001004350000004101000039000000040200003900000000001204350000002402000039000000000100001901cc00c90000040f0000000001000019000000000200001901cc00c90000040f0005000000000002000300000004001d000200000003001d000400000002001d000500000001001d000000000103043301cc01af0000040f000100000001001d000000000100041401cc01af0000040f0000000202000029000000400220021000000080022000410000008102200197000000010300002900000060033002100000008203300197000000000223019f000000c0011002100000008301100197000000000112019f00000084021001c70000000303000029000000000330004c000000000102c0190000000402000029000000770d200197000000050200002901cc01c60000040f000000000302001900000000020100190000006002200270000100740020019d000000740220019700070000000103550000000103300190000001880000613d0000003f012000390000008504100197000000400300003900000000010304330000000005410019000000000615004b000000000600001900000001060040390000007a0750009c000001a40000213d0000000106600190000001a40000c13d000000000053043500000000002104350000002003100039000000200640008a0000001f0460018f000000000500003100000006055003670000000506600270000000000760004c000001560000613d000000000700001900000005087002100000000009830019000000000885034f000000000808043b00000000008904350000000107700039000000000867004b0000014e0000413d000000000740004c000001650000613d0000000506600210000000000565034f00000000066300190000000304400210000000000706043300000000074701cf000000000747022f000000000505043b0000010004400089000000000545022f00000000044501cf000000000474019f000000000046043500000000002104350000000104000031000000000442004b000001ac0000213d00000007050003670000001f0420018f0000000502200270000000000620004c000001770000613d000000000600001900000005076002100000000008730019000000000775034f000000000707043b00000000007804350000000106600039000000000726004b0000016f0000413d000000000640004c000001860000613d0000000502200210000000000525034f00000000022300190000000303400210000000000402043300000000043401cf000000000434022f000000000505043b0000010003300089000000000535022f00000000033501cf000000000343019f00000000003204350000000500000005000000000001042d0000001f0420018f0000000503200270000000000530004c000001940000613d00000000050000190000000506500210000000000761034f000000000707043b00000000007604350000000105500039000000000635004b0000018d0000413d000000000540004c000001a20000613d00000003044002100000000503300210000000000503043300000000054501cf000000000545022f000000000131034f000000000101043b0000010004400089000000000141022f00000000014101cf000000000151019f0000000000130435000000000100001901cc00c90000040f0000007b0100004100000000001004350000004101000039000000040200003900000000001204350000002402000039000000000100001901cc00c90000040f0000000001000019000000000200001901cc00c90000040f000000860210009c000001b20000813d000000000001042d000000400100003900000000010104330000004402100039000000870300004100000000003204350000002402100039000000080300003900000000003204350000007d020000410000000000210435000000040210003900000020030000390000000000320435000000640200003901cc00c90000040f000001c4002104210000000102000039000000000001042d0000000002000019000000000001042d000000000f0d0019000001ca002104290000000102000039000000000001042d0000000002000019000000000001042d000001cc00000432000001cd0001042e000001ce00010430000000000000000000000000000000000000000000000000000000000000000000000000ffffffff00000002000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000ffffffffffffffffffffffffffffffffffffffff579952fc000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000000ffffffffffffffff4e487b7100000000000000000000000000000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000008c379a00000000000000000000000000000000000000000000000000000000054686973206d6574686f6420726571756972652073797374656d2063616c6c20666c61670000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000ffffffff000000000000000000000000000000000000000000000000ffffffff00000000000000000000000000000000ffffffff000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001ffffffe000000000000000000000000000000000000000000000000000000001000000004f766572666c6f770000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-    "0x0000000000000000000000000000000000008003": "0x0005000000000002000500000000000200000000030100190000006003300270000000dc0430019700040000004103550003000000010355000000dc0030019d000200000002001f000100000000001f00000080010000390000004005000039000000000015043500000001012001900000007d0000c13d0000000001000031000000040110008c000002800000413d0000000301000367000000000101043b000000e001100270000000de0210009c000001630000613d000000df0210009c000000880000613d000000e00210009c000001860000613d000000e10210009c000000c30000613d000000e20210009c000001ba0000613d000000e30210009c000001dc0000613d000000e40210009c000000ed0000613d000000e50210009c000001080000613d000000e60210009c000001290000613d000000e70110009c000002800000c13d0000000001000416000000000110004c000002800000c13d000000040100008a0000000001100031000000e802000041000000400310008c00000000030000190000000003024019000000e801100197000000000410004c000000000200a019000000e80110009c00000000010300190000000001026019000000000110004c000002800000c13d000500000005001d000000010100003900000003020003670000002403200370000000000303043b000200000003001d0000000402200370000000000202043b000100000002001d0000000202000039000000020220018800000000020004110000004a0000c13d000000ea0120009c00000000010000190000000101004039000400000002001d036c03260000040f00000005010000290000000004010433000000f30100004100000000001404350000000401000029000000e90210019700000004034000390000000001000414000000000023043500000024030000390000000002040019000300000004001d036c02ba0000040f0000000104000031000000000110004c000002120000c13d00000004030003670000001f0240018f000000050100002900000000010104330000000504400270000000000540004c0000006c0000613d000000000500001900000005065002100000000007610019000000000663034f000000000606043b00000000006704350000000105500039000000000645004b000000640000413d000000000520004c0000007b0000613d0000000504400210000000000343034f00000000044100190000000302200210000000000504043300000000052501cf000000000525022f000000000303043b0000010002200089000000000323022f00000000022301cf000000000252019f00000000002404350000000102000031036c02f80000040f0000000001000416000000000110004c000002800000c13d000000200200003900000100010000390000000000210439000001200200003900000000000204390000004002000039000000dd03000041036c02ee0000040f0000000001000416000000000110004c000002800000c13d000000040100008a0000000001100031000000e802000041000000200310008c00000000030000190000000003024019000000e801100197000000000410004c000000000200a019000000e80110009c00000000010300190000000001026019000000000110004c000002800000c13d00000004010000390000000301100367000000000201043b000000e90120009c000002800000213d000400000002001d000500000005001d000000010100003900000002020000390000000202200188000000a80000c13d0000000001000411000000ea0110009c00000000010000190000000101004039036c03260000040f0000000001000411000080060110008c000002580000c13d000000040100002900000000001004350000002001000039000200000001001d00000000000104350000000001000019036c02db0000040f036c036a0000040f000300000001001d0000000401000029036c03110000040f00000000020100190000000301000029000000f201100041036c03680000040f0000000301000029000000800210027000000005010000290000000001010433000000000021043500000002020000290000000003000019036c02ee0000040f0000000001000416000000000110004c000002800000c13d000000040100008a0000000001100031000000e802000041000000200310008c00000000030000190000000003024019000000e801100197000000000410004c000000000200a019000000e80110009c00000000010300190000000001026019000000000110004c000002800000c13d0000000001000411000000000010043500000001010000390000002002000039000400000002001d00000000001204350000000001000019000500000005001d036c02db0000040f00000004020000390000000302200367000000000202043b0000000000200435000000040200002900000000001204350000000001000019036c02db0000040f036c036a0000040f000000050200002900000000020204330000000000120435000000000102001900000004020000290000000003000019036c02ee0000040f0000000001000416000000000110004c000002800000c13d000000040100008a0000000001100031000000e802000041000000200310008c00000000030000190000000003024019000000e801100197000000000410004c000000000200a019000000e80110009c00000000010300190000000001026019000000000110004c000002800000c13d000500000005001d036c03010000040f036c031d0000040f000000050200002900000000030204330000000000130435000000200200003900000000010300190000000003000019036c02ee0000040f0000000001000416000000000110004c000002800000c13d000000040100008a0000000001100031000000e802000041000000400310008c00000000030000190000000003024019000000e801100197000000000410004c000000000200a019000000e80110009c00000000010300190000000001026019000000000110004c000002800000c13d000500000005001d036c03010000040f00000024020000390000000302200367000000000202043b036c033b0000040f00000005020000290000000003020433000000000110004c0000000001000019000000010100c0390000000000130435000000200200003900000000010300190000000003000019036c02ee0000040f0000000001000416000000000110004c000002800000c13d000000040100008a0000000001100031000000e802000041000000200310008c00000000030000190000000003024019000000e801100197000000000410004c000000000200a019000000e80110009c00000000010300190000000001026019000000000110004c000002800000c13d000500000005001d000000010100003900000002020000390000000202200188000001430000c13d0000000001000411000000ea0110009c00000000010000190000000101004039036c03260000040f0000000001000411000300000001001d00000000001004350000002001000039000400000001001d00000000000104350000000001000019036c02db0000040f036c036a0000040f00000004020000390000000302200367000000000202043b0000000003010019000000eb01300197000000000121004b0000022e0000c13d00000003010000290000000000100435000000040100002900000000000104350000000001000019000500000003001d036c02db0000040f000000000201001900000005010000290000000101100039036c03680000040f000000000100001900000000020000190000000003000019036c02ee0000040f0000000001000416000000000110004c000002800000c13d000000040100008a0000000001100031000000e802000041000000200310008c00000000030000190000000003024019000000e801100197000000000410004c000000000200a019000000e80110009c00000000010300190000000001026019000000000110004c000002800000c13d000500000005001d036c03010000040f000000e90110019700000000001004350000002001000039000400000001001d00000000000104350000000001000019036c02db0000040f036c036a0000040f0000000502000029000000000202043300000080011002700000000000120435000000000102001900000004020000290000000003000019036c02ee0000040f0000000001000416000000000110004c000002800000c13d000000040100008a0000000001100031000000e802000041000000200310008c00000000030000190000000003024019000000e801100197000000000410004c000000000200a019000000e80110009c00000000010300190000000001026019000000000110004c000002800000c13d000500000005001d000000010100003900000004020000390000000302200367000000000202043b000400000002001d00000002020000390000000202200188000001a40000c13d0000000001000411000000ea0110009c00000000010000190000000101004039036c03260000040f0000000402000029000000ef0120009c0000023d0000413d000000050100002900000000010104330000006402100039000000f00300004100000000003204350000004402100039000000f1030000410000000000320435000000240210003900000030030000390000000000320435000000ed0200004100000000002104350000000402100039000000200300003900000000003204350000008402000039036c02f80000040f0000000001000416000000000110004c000002800000c13d000000040100008a0000000001100031000000e802000041000000200310008c00000000030000190000000003024019000000e801100197000000000410004c000000000200a019000000e80110009c00000000010300190000000001026019000000000110004c000002800000c13d000500000005001d036c03010000040f000000e90110019700000000001004350000002001000039000400000001001d00000000000104350000000001000019036c02db0000040f036c036a0000040f000000050200002900000000020204330000000000120435000000000102001900000004020000290000000003000019036c02ee0000040f0000000001000416000000000110004c000002800000c13d000000040100008a0000000001100031000000e802000041000000600310008c00000000030000190000000003024019000000e801100197000000000410004c000000000200a019000000e80110009c00000000010300190000000001026019000000000110004c000002800000c13d00000003020003670000000401200370000000000101043b000000e90310009c000002800000213d0000004403200370000000000403043b000000000340004c0000000003000019000000010300c039000000000334004b000002800000c13d000400000004001d000500000005001d0000002402200370000000000202043b036c033b0000040f000000000110004c000002630000c13d0000000401000029000000000110004c0000000501000029000002710000613d00000000010104330000004402100039000000ee03000041000000000032043500000024021000390000001d030000390000000000320435000000ed0200004100000000002104350000000402100039000000200300003900000000003204350000006402000039036c02f80000040f000000400140008c000000400100003900000000010440190000001f01100039000000e00210018f00000003050000290000000001520019000000000221004b00000000020000190000000102004039000000f40310009c000002260000213d0000000102200190000002260000c13d00000005020000290000000000120435000000400240008c000002800000413d000000f50210009c000002750000a13d000000f801000041000000000010043500000041010000390000000402000039000000000012043500000024020000390000000001000019036c02f80000040f000000050100002900000000010104330000004402100039000000ec03000041000000000032043500000024021000390000000f030000390000000000320435000000ed0200004100000000002104350000000402100039000000040300002900000000003204350000006402000039036c02f80000040f0000000001000411000100000001001d00000000001004350000002001000039000200000001001d00000000000104350000000001000019036c02db0000040f036c036a0000040f000300000001001d0000000101000029036c03110000040f000000040200002900000003030000290000000002230019000000000301001900000000010200190000000002030019036c03680000040f0000000301000029000000eb0210019700000005010000290000000001010433000000000021043500000002020000290000000003000019036c02ee0000040f00000005010000290000000001010433000000ed020000410000000000210435000000040210003900000020030000390000000000320435000000240210003900000000000204350000004402000039036c02f80000040f0000000401000029000000000110004c0000000501000029000002710000c13d0000000002010433000500000002001d000000ed0100004100000000001204350000000401200039036c03590000040f000000050300002900000000023100490000000001030019036c02f80000040f000000000100001900000000020000190000000003000019036c02ee0000040f0000004002100039000000050400002900000000002404350000000002050433000000010320008c000002800000213d000000000021043500000020025000390000000002020433000000010320008c000002830000a13d00000000010000190000000002000019036c02f80000040f000000200110003900000000002104350000000201000029000000000110004c000002960000c13d00000000010404330000004402100039000000f703000041000000000032043500000024021000390000001f030000390000000000320435000000ed0200004100000000002104350000000402100039000000200300003900000000003204350000006402000039036c02f80000040f000000000120004c000002af0000c13d0000000101000029000000000110004c000002af0000613d0000000101000029000000010210008a0000000401000029036c033b0000040f000000000110004c000002af0000c13d000000050100002900000000010104330000004402100039000000f6030000410000000000320435000000ed020000410000000000210435000000240210003900000020030000390000000000320435000000040210003900000000003204350000006402000039036c02f80000040f0000000401000029036c030a0000040f0000000102000029036c03170000040f00000000020100190000000201000029036c03680000040f000000000100001900000000020000190000000003000019036c02ee0000040f0001000000000002000100000004001d000000dc04000041000000dc0520009c00000000020480190000004002200210000000dc0530009c00000000030480190000006003300210000000000223019f000000dc0310009c0000000001048019000000c001100210000000000112019f0000800602000039036c03630000040f0000000106000029000000010220018f000000000300001900000005043002100000000005460019000000000441034f000000000404043b00000000004504350000000103300039000000020430008c000002cd0000413d00040000000103550000006001100270000100dc0010019d00000000010200190000000100000005000000000001042d000000dc020000410000000003000414000000dc0430009c0000000003028019000000dc0410009c00000000010280190000004001100210000000c002300210000000000112019f000000f9011001c70000801002000039036c03630000040f0000000102200190000002eb0000613d000000000101043b000000000001042d00000000010000190000000002000019036c02f80000040f000000dc04000041000000dc0510009c000000000104801900000040011002100000000001310019000000dc0320009c0000000002048019000000600220021000000000012100190000036d0001042e000000dc03000041000000dc0420009c0000000002038019000000dc0410009c000000000103801900000040011002100000006002200210000000000112019f0000036e0001043000000004010000390000000301100367000000000101043b000000fa0210009c000003070000813d000000000001042d00000000010000190000000002000019036c02f80000040f00000000001004350000000101000039000000200200003900000000001204350000000001000019036c02db0000040f000000000001042d0000000000100435000000200100003900000000000104350000000001000019036c02db0000040f000000000001042d0000000000200435000000200200003900000000001204350000000001000019036c02db0000040f000000000001042d000000e9011001970000000000100435000000200100003900000000000104350000000001000019036c02db0000040f036c036a0000040f000000eb01100197000000000001042d000000000110004c000003290000613d000000000001042d000000400100003900000000010104330000006402100039000000fb0300004100000000003204350000004402100039000000fc030000410000000000320435000000240210003900000024030000390000000000320435000000ed0200004100000000002104350000000402100039000000200300003900000000003204350000008402000039036c02f80000040f0002000000000002000200000002001d000100000001001d036c031d0000040f00000001020000390000000203000029000000000131004b000003560000213d0000000101000029000000e901100197000000000010043500000001010000390000002002000039000100000002001d00000000001204350000000001000019036c02db0000040f00000002020000290000000000200435000000010200002900000000001204350000000001000019036c02db0000040f036c036a0000040f000000000110004c0000000002000019000000010200c039000000010120018f0000000200000005000000000001042d0000004002100039000000fd03000041000000000032043500000020021000390000001c030000390000000000320435000000200200003900000000002104350000006001100039000000000001042d00000366002104230000000102000039000000000001042d0000000002000019000000000001042d000000000012041b000000000001042d000000000101041a000000000001042d0000036c000004320000036d0001042e0000036e00010430000000000000000000000000000000000000000000000000000000000000000000000000ffffffff000000020000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000fb1a9a5700000000000000000000000000000000000000000000000000000000306395c60000000000000000000000000000000000000000000000000000000038a780920000000000000000000000000000000000000000000000000000000055d35d18000000000000000000000000000000000000000000000000000000005aa9b6b5000000000000000000000000000000000000000000000000000000006ee1dc2000000000000000000000000000000000000000000000000000000000896909dc00000000000000000000000000000000000000000000000000000000cab7e8eb00000000000000000000000000000000000000000000000000000000e1239cd800000000000000000000000000000000000000000000000000000000155fd27a8000000000000000000000000000000000000000000000000000000000000000000000000000000000000000ffffffffffffffffffffffffffffffffffffffff000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000ffffffffffffffffffffffffffffffff496e636f7272656374206e6f6e6365000000000000000000000000000000000008c379a000000000000000000000000000000000000000000000000000000000546865206e6f6e636520776173206e6f7420736574206173207573656400000000000000000000000000000000000000000000000000000000000001000000016f6e636520697320746f6f2068696768000000000000000000000000000000005468652076616c756520666f7220696e6372656d656e74696e6720746865206e00000000000000000000000000000001000000000000000000000000000000007b510fe800000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000ffffffffffffffff000000000000000000000000000000000000000000000000ffffffffffffffbf50726576696f7573206e6f6e636520686173206e6f74206265656e20757365644e6f6e63652076616c75652063616e206e6f742062652073657420746f2030004e487b710000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000400000000000000000000000000000000000000000000000010000000000000000000000000000000000000000666c61670000000000000000000000000000000000000000000000000000000054686973206d6574686f6420726571756972652073797374656d2063616c6c2052657573696e67207468652073616d65206e6f6e6365207477696365000000000000000000000000000000000000000000000000000000000000000000000000",
-    "0x0000000000000000000000000000000000000002": "0x00020000000000020002000000000002000100000001035500000060011002700000002b0010019d000000800300003900000040010000390000000000310435000000000300041600000001022001900000005e0000c13d000000000230004c000000680000c13d00000000020004120000002d022001970000000003000410000000000232004b000000680000c13d000000400200008a0000000004000031000000000224016f000000400320003900000080022000390000003f0540018f000000370550008c000000000a030019000000000a02201900000006053002700000000006000019000000010600203900000001030003670000001f0240018f00000000010104330000000504400270000000000740004c0000002d0000613d000000000700001900000005087002100000000009810019000000000883034f000000000808043b00000000008904350000000107700039000000000847004b000000250000413d0000000005650019000200000005001d000000000520004c0000003e0000613d0000000504400210000000000343034f00000000044100190000000302200210000000000504043300000000052501cf000000000525022f000000000303043b0000010002200089000000000323022f00000000022301cf000000000252019f000000000024043500000000021000310000002e0300004100000000003204350000000002a10019000000080220008a000000c30300003900000000033001ff0000000000320435000000800110008c0000000001000019000000010100603900010000000a001d00a600800000040f000000020100002900000007211000c900a600940000040f0000000202000029000000c00220021000000001030000290000001b033002100000002f03300197000000000223019f00000030022001c700000000030100190000000001020019000000000203001900a6008b0000040f00a6007a0000040f00000020020000390000000001000019000000000300001900a6006b0000040f000000000130004c000000680000c13d0000002002000039000001000100003900000000002104390000012002000039000000000002043900000040020000390000002c0300004100a6006b0000040f0000000001000019000000000200001900a600730000040f0000002b040000410000002b0510009c000000000104801900000040011002100000006002200210000000000121019f0000000001310019000000a70001042e0000002b030000410000002b0410009c000000000103801900000040011002100000006002200210000000000121019f000000a800010430000000000110004c0000007d0000613d000000000001042d0000000001000019000000000200001900a600730000040f000000000110004c000000830000613d000000000001042d000000310100004100000000001004350000000101000039000000040200003900000000001204350000002402000039000000000100001900a600730000040f0000002b022001970000000003000414000000000323004b000000910000413d0000000001210420000000000001042d0000000001000019000000000200001900a600730000040f000000320210009c000000970000813d000000000001042d0000004001000039000000000101043300000044021000390000003303000041000000000032043500000024021000390000000803000039000000000032043500000034020000410000000000210435000000040210003900000020030000390000000000320435000000640200003900a600730000040f000000a600000432000000a70001042e000000a80001043000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000ffffffff0000000200000000000000000000000000000000000000000000000000000000000000000000000000000000ffffffffffffffffffffffffffffffffffffffff8000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000ffffffff0000000000000000000000000000000000000000000000010000000000000000000000044e487b710000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001000000004f766572666c6f7700000000000000000000000000000000000000000000000008c379a000000000000000000000000000000000000000000000000000000000",
-    "0x000000000000000000000000000000000000800c": "0x00020000000000020016000000000002000100000001035500000060011002700000026a0010019d000000800c00003900000040060000390000000000c604350000000101200190000000830000c13d0000000001000031000000040110008c000006380000413d0000000101000367000000000101043b0000026c011001970000026d0110009c000006380000c13d0000000001000416000000000110004c000006380000c13d000000040100008a00000000011000310000026e02000041000000200310008c000000000300001900000000030240190000026e04100197000000000540004c000000000200a0190000026e0440009c000000000203c019000000000220004c000006380000c13d000000010d0003670000000402d00370000000000502043b0000026f0250009c000006380000213d00000000015100490000026e02000041000002600310008c000000000300001900000000030240190000026e01100197000000000410004c000000000200a0190000026e0110009c00000000010300190000000001026019000000000110004c000006380000c13d000000040350003900000000013d034f000000000101043b000000000210004c000001040b500039000000a40a500039000000640950003900000044085000390000012407500039000001c402500039000000c404500039000b00000004001d0000014404500039000d00000004001d001400000006001d001600000003001d001500000002001d000e00000005001d001200000007001d001100000008001d001000000009001d000f0000000a001d000c0000000b001d0000008e0000c13d0000000001bd034f000000000101043b00130000000d035309a108b10000040f0000000f03000029000000130200035f000000000232034f000000000202043b000a00000001001d000000000102001909a108b10000040f0000001003000029000000130200035f000000000232034f000000000202043b000900000001001d000000000102001909a108b10000040f0000000002010019000000090100002909a1078d0000040f0000001102000029000000130300035f000000000223034f000000000202043b0000027302200197000900000001001d000000000102001909a108990000040f00000012020000290000000102200367000000000202043b000700000001001d000000000102001909a108b10000040f000800000001001d0000001601000029000000150200002909a107120000040f0000026f01200197000000010210008c0000016a0000c13d0000001601000029000000150200002909a107120000040f000000000220004c000001c80000c13d000002810100004100000000001004350000003201000039000000040200003900000000001204350000002402000039000000000100001909a106ff0000040f0000000001000416000000000110004c000006380000c13d0000002002000039000001000100003900000000002104390000012002000039000000000002043900000040020000390000026b0300004109a106f50000040f000000710410008c0000016e0000c13d000000000103001900130000000c001d09a107120000040f000000000300003109a1073f0000040f0000000002010433000000200110003909a106cf0000040f0000000e02000029000000140a000029000002040320003900000000040000310000000002240049000000230520008a0000000102000367000000000332034f000000000303043b0000026e06000041000000000753004b000000000700001900000000070680190000026e055001970000026e08300197000000000958004b0000000006008019000000000558013f0000026e0550009c00000000050700190000000005066019000000000b010019000000000150004c000006380000c13d00000016010000290000000001130019000000000312034f000000000503043b0000026f0350009c000006380000213d0000000503500210000000000434004900000020061000390000026e01000041000000000746004b000000000700001900000000070120190000026e044001970000026e08600197000000000948004b0000000001008019000000000448013f0000026e0440009c000000000107c019000000000110004c000006380000c13d00000000040a043300000020014000390000027605500197000000000750004c000000d50000613d000000000262034f000000000600001900000005076002100000000008710019000000000772034f000000000707043b00000000007804350000000106600039000000000756004b000000cd0000413d000000000200004c000000d70000613d00000000003404350000003f02300039000000200300008a000000000232016f0000000002240019000000000342004b000000000300001900000001030040390000026f0520009c000003b10000213d0000000103300190000003b10000c13d000000140300002900000000002304350000000002040433000a0000000b001d09a106cf0000040f000900000001001d0000000e010000290000022402100039000000160100002909a107120000040f000000000300003109a1073f0000040f0000000002010433000000200110003909a106cf0000040f0000000e04000029000000e4024000390000002403400039000000840440003900000001050003670000001006000029000000000665034f0000001107000029000000000775034f000000000835034f0000001203000029000000000935034f0000000c03000029000000000a35034f000000000225034f0000000b03000029000000000b35034f0000000f03000029000000000c35034f000000000d45034f0000001603000029000000000335034f000000000303043b000000000408043b000000000507043b000000000606043b00000000070d043b00000000080c043b000000000b0b043b000000000c02043b000000000a0a043b000000000909043b00000014020000290000000002020433000001c00d20003900000000001d0435000001a001200039000000090d0000290000000000d1043500000180012000390000000a0d0000290000000000d104350000016001200039000000000091043500000140012000390000000000a1043500000120012000390000000000c1043500000100012000390000000000b10435000000e0012000390000000000810435000000c0012000390000000000710435000000a0012000390000000000610435000000800120003900000000005104350000006001200039000000000041043500000040012000390000000000310435000001c0010000390000000000120435000002770300004100000020012000390000000000310435000002780320009c000003b10000213d000001e00320003900000014040000290000000000340435000000000202043309a106cf0000040f00000014020000290000000002020433000a00000002001d00000272020000410000000000200439000900000001001d09a106e60000040f00000279020000410000000a04000029000000600340003900000000002304350000027a0200004100000040034000390000000000230435000000800240003900000000001204350000027b02000041000000200140003900000000002104350000001302000029000000000024043500000000030400190000027c0240009c000003b10000213d000000a00230003900000014040000290000000000240435000000000203043309a106cf0000040f000000140200002900000000040204330000004202400039000000090300002900000000003204350000027d020000410000002003400039000400000003001d000000000023043500000022024000390000000000120435000000420100003900000000001404350000027e0140009c000003b10000213d0000008001400039000003910000013d09a108e60000040f00000001050003670000000002010019000001de0000013d000000020410008c000002720000c13d0000027201000041000000000010043909a106e60000040f09a108b10000040f000000010200036700130000000203530000000c03000029000000000232034f000000000202043b000a00000001001d000000000102001909a108b10000040f0000000b02000029000000130300035f000000000223034f000000000202043b000900000001001d000000000102001909a108b10000040f0000000f03000029000000130200035f000000000232034f000000000202043b000800000001001d000000000102001909a108b10000040f0000001002000029000000130300035f000000000223034f000000000202043b000700000001001d000000000102001909a108b10000040f0000001102000029000000130300035f000000000223034f000000000202043b0000027302200197001300000001001d000000000102001909a108990000040f00000012020000290000000102200367000000000202043b000600000001001d000000000102001909a108b10000040f00000000070100190000000a010000290000000902000029000000080300002900000007040000290000001305000029000000060600002909a108110000040f000a00000001001d0000001601000029000000150200002909a107120000040f0000026f01200197000000010210008c000002c40000c13d0000001601000029000000150200002909a107120000040f000000000220004c0000007b0000613d0000000101100367000000000101043b000000010200008a0000026e03000041000000000221004b000000000200001900000000020320190000026e011001970000026e0410009c00000000030080190000026e011001670000026e0110009c000000000102001900000000010360190000006002000039001300000002001d000000000110004c000002c60000c13d09a107b40000040f001300000001001d000002c60000013d0000000105000367000000000115034f000000000101043b000000010200008a0000026e03000041000000000221004b000000000200001900000000020320190000026e011001970000026e0410009c00000000030080190000026e011001670000026e0110009c000000000102001900000000010360190000006002000039000000000110004c000001de0000c13d001300000005035309a107b40000040f000000130500035f00000000020100190000000d01000029000000000115034f0000006004000039000000000101043b000000000110004c000500000002001d000002020000613d0000027201000041000000000010043909a106e60000040f09a108b10000040f00000014020000290000000002020433001300000002001d000000200220003909a107800000040f00000013040000290000027f02000041000000000021043500000000014100490000001e0210008a00000000002404350000002101100039000000200200008a000000000221016f0000000001420019000000000221004b000000000200001900000001020040390000026f0310009c000003b10000213d0000000102200190000003b10000c13d000000140200002900000000001204350000000502000029001300000004001d0000000001020433000600000001001d00000008010000290000000001010433000400000001001d00000007010000290000000001010433000300000001001d00000009010000290000000001010433000200000001001d0000000a010000290000000001010433000100000001001d0000001601000029000000150200002909a107120000040f00000002010000290000000103000029000000000131001900000003030000290000000001310019000000040300002900000000013100190000000603000029000000000131001900000000012100190000001302000029000000000202043300000000012100190000026f0110019709a1094a0000040f000400000001001d0000001601000029000000150200002909a107120000040f00000014030000290000000003030433000300000001001d000200000002001d000600000003001d00000020023000390000000401000029000400000002001d09a107800000040f00000000020100190000000a0100002909a107800000040f0000000002010019000000090100002909a107800000040f0000000002010019000000070100002909a107800000040f0000000002010019000000080100002909a107800000040f0000000002010019000000050100002909a107800000040f00000002080000290000001f0280018f000000030300002900000001033003670000000504800270000000000540004c0000024f0000613d000000000500001900000005065002100000000007610019000000000663034f000000000606043b00000000006704350000000105500039000000000645004b000002470000413d000000000520004c0000025e0000613d0000000504400210000000000343034f00000000044100190000000302200210000000000504043300000000052501cf000000000525022f000000000303043b0000010002200089000000000323022f00000000022301cf000000000252019f000000000024043500000000028100190000000000020435000000130100002909a107800000040f00000006040000290000000001410049000000200210008a00000000002404350000001f01100039000000200200008a000000000221016f0000000001420019000000000221004b000000000200001900000001020040390000026f0310009c000003b10000213d0000000102200190000003910000613d000003b10000013d000000010110008c000003240000c13d0000027201000041000000000010043909a106e60000040f09a108b10000040f000000010200036700130000000203530000000c03000029000000000232034f000000000202043b000a00000001001d000000000102001909a108b10000040f0000000f03000029000000130200035f000000000232034f000000000202043b000900000001001d000000000102001909a108b10000040f0000001002000029000000130300035f000000000223034f000000000202043b000800000001001d000000000102001909a108b10000040f0000001102000029000000130300035f000000000223034f000000000202043b0000027302200197001300000001001d000000000102001909a108990000040f00000012020000290000000102200367000000000202043b000700000001001d000000000102001909a108b10000040f00000000060100190000000a01000029000000090200002900000008030000290000001304000029000000070500002909a107da0000040f000a00000001001d0000001601000029000000150200002909a107120000040f0000026f01200197000000010210008c000003320000c13d0000001601000029000000150200002909a107120000040f000000000220004c0000007b0000613d0000000101100367000000000101043b000000010200008a0000026e03000041000000000221004b000000000200001900000000020320190000026e011001970000026e0410009c00000000030080190000026e011001670000026e0110009c000000000102001900000000010360190000006002000039001300000002001d000000000110004c000003340000c13d09a107b40000040f001300000001001d000003340000013d09a108e60000040f001300000001001d09a109380000040f000900000001001d0000000a010000290000000001010433000800000001001d0000001301000029001300000001001d0000000001010433000700000001001d0000001601000029000000150200002909a107120000040f00000008010000290000000703000029000000000113001900000000012100190000000902000029000000000202043300000000012100190000026f0110019709a1094a0000040f000500000001001d0000001601000029000000150200002909a107120000040f0000001403000029000000000403043300000275030000410000002005400039000400000005001d0000000000350435000800000001001d000700000002001d000600000004001d0000002102400039000000050100002909a107800000040f00000000020100190000000a0100002909a107800000040f0000000002010019000000130100002909a107800000040f00000007080000290000001f0280018f000000080300002900000001033003670000000504800270000000000540004c000003010000613d000000000500001900000005065002100000000007610019000000000663034f000000000606043b00000000006704350000000105500039000000000645004b000002f90000413d000000000520004c000003100000613d0000000504400210000000000343034f00000000044100190000000302200210000000000504043300000000052501cf000000000525022f000000000303043b0000010002200089000000000323022f00000000022301cf000000000252019f000000000024043500000000028100190000000000020435000000090100002909a107800000040f00000006040000290000000001410049000000200210008a00000000002404350000001f01100039000000200200008a000000000221016f0000000001420019000000000221004b000000000200001900000001020040390000026f0310009c000003b10000213d0000000102200190000003910000613d000003b10000013d000000000106043300000044021000390000027003000041000000000032043500000024021000390000001703000039000000000032043500000271020000410000000000210435000000040210003900000020030000390000000000320435000000640200003909a106ff0000040f09a108e60000040f001300000001001d09a109260000040f000900000001001d0000000a010000290000000001010433000800000001001d0000001301000029001300000001001d0000000001010433000700000001001d0000001601000029000000150200002909a107120000040f00000008010000290000000703000029000000000113001900000000012100190000000902000029000000000202043300000000012100190000026f0110019709a1094a0000040f000500000001001d0000001601000029000000150200002909a107120000040f0000001403000029000000000403043300000274030000410000002005400039000400000005001d0000000000350435000800000001001d000700000002001d000600000004001d0000002102400039000000050100002909a107800000040f00000000020100190000000a0100002909a107800000040f0000000002010019000000130100002909a107800000040f00000007080000290000001f0280018f000000080300002900000001033003670000000504800270000000000540004c0000036f0000613d000000000500001900000005065002100000000007610019000000000663034f000000000606043b00000000006704350000000105500039000000000645004b000003670000413d000000000520004c0000037e0000613d0000000504400210000000000343034f00000000044100190000000302200210000000000504043300000000052501cf000000000525022f000000000303043b0000010002200089000000000323022f00000000022301cf000000000252019f000000000024043500000000028100190000000000020435000000090100002909a107800000040f00000006040000290000000001410049000000200210008a00000000002404350000001f01100039000000200200008a000000000221016f0000000001420019000000000221004b000000000200001900000001020040390000026f0310009c000003b10000213d0000000102200190000003b10000c13d000000140200002900000000001204350000000002040433000000040100002909a106cf0000040f00000001050003670000001603000029000000000235034f0000000004010019000000000102043b000000710210008c001300000004001d000003b90000c13d0000000e01000029000001e402100039000000000103001909a107120000040f000000000300003109a1073f0000040f0000000002010433000000200110003909a106cf0000040f00000013030000290000001405000029000000000405043300000040024000390000000000120435000000000054043500000020014000390000000000310435000002820240009c000004000000a13d000002810100004100000000001004350000004101000039000000040200003900000000001204350000002402000039000000000100001909a106ff0000040f000000000210004c0000040e0000c13d0000000c01000029000000000115034f000000000101043b000c00000005035309a108b10000040f0000000f020000290000000c0300035f000000000223034f000000000202043b000f00000001001d000000000102001909a108b10000040f00000010020000290000000c0300035f000000000223034f000000000202043b001000000001001d000000000102001909a108b10000040f0000000002010019000000100100002909a1078d0000040f00000011020000290000000c0300035f000000000223034f000000000202043b0000027302200197001100000001001d000000000102001909a108990000040f00000012020000290000000102200367000000000202043b000c00000001001d000000000102001909a108b10000040f001000000001001d0000001601000029000000150200002909a107120000040f0000026f01200197000000010210008c000004680000c13d0000001601000029000000150200002909a107120000040f000000000220004c0000007b0000613d0000000101100367000000000101043b000000010200008a0000026e03000041000000000221004b000000000200001900000000020320190000026e011001970000026e0410009c00000000030080190000026e011001670000026e0110009c000000000102001900000000010360190000006002000039000b00000002001d000000000110004c0000046a0000c13d09a107b40000040f000b00000001001d0000046a0000013d000000600540003900000014020000290000000000520435000000000204043309a106cf0000040f0000001402000029000000000402043300000020034000390000001305000029000000000053043500000000001404350000000001040019000000000300001909a106f50000040f000000020210008c000005270000c13d0000027201000041000000000010043909a106e60000040f09a108b10000040f0000000103000367000d0000000303530000000c02000029000000000223034f000000000202043b000c00000001001d000000000102001909a108b10000040f0000000b020000290000000d0300035f000000000223034f000000000202043b000b00000001001d000000000102001909a108b10000040f0000000f020000290000000d0300035f000000000223034f000000000202043b000f00000001001d000000000102001909a108b10000040f00000010020000290000000d0300035f000000000223034f000000000202043b001000000001001d000000000102001909a108b10000040f00000011020000290000000d0300035f000000000223034f000000000202043b0000027302200197001100000001001d000000000102001909a108990000040f00000012020000290000000102200367000000000202043b001200000001001d000000000102001909a108b10000040f00000000070100190000000c010000290000000b020000290000000f0300002900000010040000290000001105000029000000120600002909a108110000040f001100000001001d0000001601000029000000150200002909a107120000040f0000026f01200197000000010210008c000005790000c13d0000001601000029000000150200002909a107120000040f000000000220004c0000007b0000613d0000000101100367000000000101043b000000010200008a0000026e03000041000000000221004b000000000200001900000000020320190000026e011001970000026e0410009c00000000030080190000026e011001670000026e0110009c000000000102001900000000010360190000006002000039001000000002001d000000000110004c0000057b0000c13d09a107b40000040f001000000001001d0000057b0000013d09a108e60000040f000b00000001001d0000000e01000029000001e4021000390000001601000029001200000002001d09a107120000040f000000200220008c000006380000413d0000000101100367000000000101043b09a108b10000040f000e00000001001d0000001601000029000000120200002909a107120000040f000000400220008c000006380000413d00000020011000390000000101100367000000000101043b09a108b10000040f000a00000001001d0000001601000029000000120200002909a107120000040f000000410220008c0000007b0000413d00000040011000390000000101100367000000000101043b000000f801100270001200000001001d0000001b0110008a000000020110008c0000000001000019000000010100403909a107c80000040f0000000d010000290000000101100367000000000101043b000000000110004c0000001201000029000004a50000613d0000027201000041000000000010043909a106e60000040f0000000102100210000000000310004c000004a00000613d000000090300008a000000000332004b000006530000213d00000000311200d9000000020110008c000006530000c13d000000120300002900000000012300190000000801100039000000000231004b000006530000413d09a108b10000040f001200000001001d0000000b01000029000b00000001001d0000000001010433000d00000001001d00000010010000290000000001010433000900000001001d0000000c010000290000000001010433000800000001001d0000000f010000290000000001010433000700000001001d00000011010000290000000001010433000600000001001d0000001601000029000000150200002909a107120000040f00000007010000290000000603000029000000000113001900000008030000290000000001310019000000090300002900000000013100190000000d03000029000000000131001900000000012100190000000e02000029000000000202043300000000012100190000000a02000029000000000202043300000000012100190000001202000029000000000202043300000000012100190000026f0110019709a1094a0000040f000800000001001d0000001601000029000000150200002909a107120000040f00000014030000290000000003030433000d00000001001d000900000002001d001600000003001d00000020023000390000000801000029001500000002001d09a107800000040f00000000020100190000000f0100002909a107800000040f0000000002010019000000110100002909a107800000040f00000000020100190000000c0100002909a107800000040f0000000002010019000000100100002909a107800000040f00000000020100190000000b0100002909a107800000040f00000009040000290000001f0240018f0000000d03000029000000010330036700000000080400190000000504400270000000000540004c000004fc0000613d000000000500001900000005065002100000000007610019000000000663034f000000000606043b00000000006704350000000105500039000000000645004b000004f40000413d000000000520004c0000050b0000613d0000000504400210000000000343034f00000000044100190000000302200210000000000504043300000000052501cf000000000525022f000000000303043b0000010002200089000000000323022f00000000022301cf000000000252019f000000000024043500000000028100190000000000020435000000120100002909a107800000040f00000000020100190000000e0100002909a107800000040f00000000020100190000000a0100002909a107800000040f00000016040000290000000001410049000000200210008a00000000002404350000001f01100039000000200200008a000000000221016f0000000005420019000000000225004b000000000200001900000001020040390000026f0350009c00000013030000290000001501000029000003b10000213d0000000102200190000004010000613d000003b10000013d000000010110008c000006190000c13d0000027201000041000000000010043909a106e60000040f09a108b10000040f0000000103000367000d0000000303530000000c02000029000000000223034f000000000202043b000c00000001001d000000000102001909a108b10000040f0000000f020000290000000d0300035f000000000223034f000000000202043b000f00000001001d000000000102001909a108b10000040f00000010020000290000000d0300035f000000000223034f000000000202043b001000000001001d000000000102001909a108b10000040f00000011020000290000000d0300035f000000000223034f000000000202043b0000027302200197001100000001001d000000000102001909a108990000040f00000012020000290000000102200367000000000202043b001200000001001d000000000102001909a108b10000040f00000000060100190000000c010000290000000f0200002900000010030000290000001104000029000000120500002909a107da0000040f001100000001001d0000001601000029000000150200002909a107120000040f0000026f01200197000000010210008c000006240000c13d0000001601000029000000150200002909a107120000040f000000000220004c0000007b0000613d0000000101100367000000000101043b000000010200008a0000026e03000041000000000221004b000000000200001900000000020320190000026e011001970000026e0410009c00000000030080190000026e011001670000026e0110009c000000000102001900000000010360190000006002000039001000000002001d000000000110004c000006260000c13d09a107b40000040f001000000001001d000006260000013d09a108e60000040f001000000001001d09a109380000040f000f00000001001d0000000e01000029000001e4021000390000001601000029001200000002001d09a107120000040f000000200220008c000006380000413d0000000101100367000000000101043b09a108b10000040f000e00000001001d0000001601000029000000120200002909a107120000040f000000400220008c000006380000413d00000020011000390000000101100367000000000101043b09a108b10000040f000d00000001001d0000001601000029000000120200002909a107120000040f000000410220008c0000007b0000413d00000040011000390000000101100367000000000101043b001200000001001d000000f8011002700000001b0110008a000c00000001001d000000020110008c0000000001000019000000010100403909a107c80000040f0000001201000029000002800110009c000006530000413d0000000c0100002909a108b10000040f001200000001001d00000011010000290000000001010433000c00000001001d0000001001000029001000000001001d0000000001010433000b00000001001d0000001601000029000000150200002909a107120000040f0000000c010000290000000b03000029000000000113001900000000012100190000000f02000029000000000202043300000000012100190000000e02000029000000000202043300000000012100190000000d02000029000000000202043300000000012100190000001202000029000000000202043300000000012100190000026f0110019709a1094a0000040f000a00000001001d0000001601000029000000150200002909a107120000040f0000001403000029000000000403043300000275030000410000002005400039001500000005001d0000000000350435000c00000001001d000b00000002001d001600000004001d00000021024000390000000a0100002909a107800000040f0000000002010019000000110100002909a107800000040f0000000002010019000000100100002909a107800000040f0000000b040000290000001f0240018f0000000c03000029000000010330036700000000080400190000000504400270000000000540004c000005eb0000613d000000000500001900000005065002100000000007610019000000000663034f000000000606043b00000000006704350000000105500039000000000645004b000005e30000413d000000000520004c000005fa0000613d0000000504400210000000000343034f00000000044100190000000302200210000000000504043300000000052501cf000000000525022f000000000303043b0000010002200089000000000323022f00000000022301cf000000000252019f0000000000240435000000000281001900000000000204350000000f0100002909a107800000040f0000000002010019000000120100002909a107800000040f00000000020100190000000e0100002909a107800000040f00000000020100190000000d0100002909a107800000040f00000016040000290000000001410049000000200210008a00000000002404350000001f01100039000000200200008a000000000221016f0000000005420019000000000225004b000000000200001900000001020040390000026f0350009c00000013030000290000001501000029000003b10000213d0000000102200190000004010000613d000003b10000013d00000014010000290000000002010433001600000002001d00000271010000410000000000120435000000040120003909a107080000040f00000016030000290000000002310049000000000103001909a106ff0000040f09a108e60000040f001000000001001d09a109260000040f000f00000001001d0000000e01000029000001e4021000390000001601000029001200000002001d09a107120000040f000000200220008c000006380000413d0000000101100367000000000101043b09a108b10000040f000e00000001001d0000001601000029000000120200002909a107120000040f000000400220008c0000063b0000813d0000000001000019000000000200001909a106ff0000040f00000020011000390000000101100367000000000101043b09a108b10000040f000d00000001001d0000001601000029000000120200002909a107120000040f000000410220008c0000007b0000413d00000040011000390000000101100367000000000101043b001200000001001d000000f8011002700000001b0110008a000c00000001001d000000020110008c0000000001000019000000010100403909a107c80000040f0000001201000029000002800110009c0000065b0000813d000002810100004100000000001004350000001101000039000000040200003900000000001204350000002402000039000000000100001909a106ff0000040f0000000c0100002909a108b10000040f001200000001001d00000011010000290000000001010433000c00000001001d0000001001000029001000000001001d0000000001010433000b00000001001d0000001601000029000000150200002909a107120000040f0000000c010000290000000b03000029000000000113001900000000012100190000000f02000029000000000202043300000000012100190000000e02000029000000000202043300000000012100190000000d02000029000000000202043300000000012100190000001202000029000000000202043300000000012100190000026f0110019709a1094a0000040f000a00000001001d0000001601000029000000150200002909a107120000040f0000001403000029000000000403043300000274030000410000002005400039001500000005001d0000000000350435000c00000001001d000b00000002001d001600000004001d00000021024000390000000a0100002909a107800000040f0000000002010019000000110100002909a107800000040f0000000002010019000000100100002909a107800000040f0000000b040000290000001f0240018f0000000c03000029000000010330036700000000080400190000000504400270000000000540004c000006a10000613d000000000500001900000005065002100000000007610019000000000663034f000000000606043b00000000006704350000000105500039000000000645004b000006990000413d000000000520004c000006b00000613d0000000504400210000000000343034f00000000044100190000000302200210000000000504043300000000052501cf000000000525022f000000000303043b0000010002200089000000000323022f00000000022301cf000000000252019f0000000000240435000000000281001900000000000204350000000f0100002909a107800000040f0000000002010019000000120100002909a107800000040f00000000020100190000000e0100002909a107800000040f00000000020100190000000d0100002909a107800000040f00000016040000290000000001410049000000200210008a00000000002404350000001f01100039000000200200008a000000000221016f0000000005420019000000000225004b000000000200001900000001020040390000026f0350009c00000013030000290000001501000029000003b10000213d0000000102200190000004010000613d000003b10000013d0000026a030000410000026a0410009c000000000103801900000040011002100000026a0420009c00000000020380190000006002200210000000000112019f00000000020004140000026a0420009c0000000002038019000000c002200210000000000112019f00000275011001c7000080100200003909a1099c0000040f0000000102200190000006e30000613d000000000101043b000000000001042d0000000001000019000000000200001909a106ff0000040f0000026a0100004100000000020004140000026a0320009c0000000001024019000000c00110021000000283011001c70000800b0200003909a1099c0000040f0000000102200190000006f20000613d000000000101043b000000000001042d0000000001000019000000000200001909a106ff0000040f0000026a040000410000026a0510009c0000000001048019000000400110021000000000013100190000026a0320009c000000000204801900000060022002100000000001210019000009a20001042e0000026a030000410000026a0420009c00000000020380190000026a0410009c000000000103801900000040011002100000006002200210000000000112019f000009a300010430000000400210003900000284030000410000000000320435000000200210003900000013030000390000000000320435000000200200003900000000002104350000006001100039000000000001042d000000000300003100000000041300490000001f0540008a0000000104000367000000000224034f000000000202043b0000026e06000041000000000752004b000000000700001900000000070640190000026e055001970000026e08200197000000000958004b000000000600a019000000000558013f0000026e0550009c00000000050700190000000005066019000000000550004c0000073c0000613d0000000001120019000000000214034f000000000202043b0000026f0420009c0000073c0000213d000000000323004900000020011000390000026e04000041000000000531004b000000000500001900000000050420190000026e033001970000026e06100197000000000736004b0000000004008019000000000336013f0000026e0330009c00000000030500190000000003046019000000000330004c0000073c0000c13d000000000001042d0000000001000019000000000200001909a106ff0000040f0000000004010019000002850120009c000007750000813d0000003f01200039000000200500008a000000000651016f000000400500003900000000010504330000000006610019000000000716004b000000000700001900000001070040390000026f0860009c000007750000213d0000000107700190000007750000c13d000000000065043500000000002104350000000005420019000000000335004b0000077d0000213d0000001f0520018f000000010440036700000020031000390000000506200270000000000760004c000007630000613d000000000700001900000005087002100000000009830019000000000884034f000000000808043b00000000008904350000000107700039000000000867004b0000075b0000413d000000000750004c000007720000613d0000000506600210000000000464034f00000000066300190000000305500210000000000706043300000000075701cf000000000757022f000000000404043b0000010005500089000000000454022f00000000045401cf000000000474019f000000000046043500000000022300190000000000020435000000000001042d000002810100004100000000001004350000004101000039000000040200003900000000001204350000002402000039000000000100001909a106ff0000040f0000000001000019000000000200001909a106ff0000040f00000000030104330000000004000019000000000534004b0000078a0000813d00000000052400190000002004400039000000000614001900000000060604330000000000650435000007820000013d00000000012300190000000000010435000000000001042d0003000000000002000300000002001d0000004002000039000100000002001d0000000002020433000200000002001d000000200220003909a107800000040f0000000002010019000000030100002909a107800000040f00000002040000290000000001410049000000200210008a00000000002404350000001f01100039000000200200008a000000000221016f0000000001420019000000000221004b000000000200001900000001020040390000026f0310009c000007ac0000213d0000000102200190000007ac0000c13d0000000102000029000000000012043500000000010400190000000300000005000000000001042d000002810100004100000000001004350000004101000039000000040200003900000000001204350000002402000039000000000100001909a106ff0000040f00000040020000390000000001020433000002860310009c000007c00000813d0000004003100039000000000032043500000020021000390000028703000041000000000032043500000001020000390000000000210435000000000001042d000002810100004100000000001004350000004101000039000000040200003900000000001204350000002402000039000000000100001909a106ff0000040f000000000110004c000007cb0000613d000000000001042d0000004001000039000000000101043300000044021000390000028803000041000000000032043500000024021000390000000f03000039000000000032043500000271020000410000000000210435000000040210003900000020030000390000000000320435000000640200003909a106ff0000040f0007000000000002000700000006001d000600000005001d000400000004001d000300000003001d000200000002001d0000004002000039000100000002001d0000000002020433000500000002001d000000200220003909a107800000040f0000000002010019000000020100002909a107800000040f0000000002010019000000030100002909a107800000040f0000000002010019000000040100002909a107800000040f0000000002010019000000060100002909a107800000040f0000000002010019000000070100002909a107800000040f00000005040000290000000001410049000000200210008a00000000002404350000001f01100039000000200200008a000000000221016f0000000001420019000000000221004b000000000200001900000001020040390000026f0310009c000008090000213d0000000102200190000008090000c13d0000000102000029000000000012043500000000010400190000000700000005000000000001042d000002810100004100000000001004350000004101000039000000040200003900000000001204350000002402000039000000000100001909a106ff0000040f0008000000000002000800000007001d000700000006001d000500000005001d000400000004001d000300000003001d000200000002001d0000004002000039000100000002001d0000000002020433000600000002001d000000200220003909a107800000040f0000000002010019000000020100002909a107800000040f0000000002010019000000030100002909a107800000040f0000000002010019000000040100002909a107800000040f0000000002010019000000050100002909a107800000040f0000000002010019000000070100002909a107800000040f0000000002010019000000080100002909a107800000040f00000006040000290000000001410049000000200210008a00000000002404350000001f01100039000000200200008a000000000221016f0000000001420019000000000221004b000000000200001900000001020040390000026f0310009c000008440000213d0000000102200190000008440000c13d0000000102000029000000000012043500000000010400190000000800000005000000000001042d000002810100004100000000001004350000004101000039000000040200003900000000001204350000002402000039000000000100001909a106ff0000040f00000040020000390000000001020433000002860310009c000008640000813d0000004003100039000000000032043500000001020000390000000000210435000000200210003900000000030000310000000103300367000000000400001900000005054002100000000006520019000000000553034f000000000505043b00000000005604350000000104400039000000000540004c000000000500001900000001050060390000000105500190000008580000c13d000000000001042d000002810100004100000000001004350000004101000039000000040200003900000000001204350000002402000039000000000100001909a106ff0000040f0000000002010019000002850120009c000008910000813d0000003f01200039000000200300008a000000000431016f000000400300003900000000010304330000000004410019000000000514004b000000000500001900000001050040390000026f0640009c000008910000213d0000000105500190000008910000c13d000000000043043500000000002104350000001f022000390000000502200270000000000320004c0000088e0000613d000000200310003900000000040000310000000104400367000000000500001900000005065002100000000007630019000000000664034f000000000606043b00000000006704350000000105500039000000000625004b000008860000413d000000000200004c000008900000613d000000000001042d000002810100004100000000001004350000004101000039000000040200003900000000001204350000002402000039000000000100001909a106ff0000040f000000000201001900000040030000390000000001030433000002860410009c000008a90000813d0000004004100039000000000043043500000020031000390000028904000041000000000043043500000060022002100000002103100039000000000023043500000015020000390000000000210435000000000001042d000002810100004100000000001004350000004101000039000000040200003900000000001204350000002402000039000000000100001909a106ff0000040f00020000000000020000007f0210008c000200000001001d000008ce0000a13d09a109800000040f000100000001001d000000020110003909a1086c0000040f0000000002010433000000000220004c000008de0000613d000000200210003900000000030204330000028a033001970000000105000029000000f804500210000000000334019f000002870330004100000000003204350000000302500210000000f802200089000000020300002900000000032301cf000000ff0220008c0000000002030019000000000200201900000021031000390000000000230435000008dc0000013d09a1084c0000040f0000000002010433000000000220004c000008de0000613d0000000204000029000000f8024002100000026e03000041000000000440004c0000000002036019000000200310003900000000040304330000028a04400197000000000224019f00000000002304350000000200000005000000000001042d000002810100004100000000001004350000003201000039000000040200003900000000001204350000002402000039000000000100001909a106ff0000040f000200000000000200000000030100190000026f01300197000000010210008c000009160000613d000000370210008c000009070000a13d000200000001001d09a109800000040f000100000001001d000000020110003909a1086c0000040f0000000002010433000000000220004c0000091e0000613d000000200210003900000000030204330000028a033001970000000105000029000000f804500210000000000334019f0000028b0330004100000000003204350000000302500210000000f802200089000000020300002900000000032301cf000000ff0220008c0000000002030019000000000200201900000021031000390000000000230435000009140000013d000200000003001d09a1084c0000040f0000000002010433000000000220004c0000091e0000613d0000000202000029000000f802200210000000200310003900000000040304330000028a04400197000000000224019f0000026e0220016700000000002304350000000200000005000000000001042d000002810100004100000000001004350000000101000039000000040200003900000000001204350000002402000039000000000100001909a106ff0000040f000002810100004100000000001004350000003201000039000000040200003900000000001204350000002402000039000000000100001909a106ff0000040f09a1084c0000040f0000000002010433000000000220004c000009300000613d000000200210003900000000030204330000028a033001970000028c033001c70000000000320435000000000001042d000002810100004100000000001004350000003201000039000000040200003900000000001204350000002402000039000000000100001909a106ff0000040f09a1084c0000040f0000000002010433000000000220004c000009420000613d000000200210003900000000030204330000028a033001970000028c033001c70000000000320435000000000001042d000002810100004100000000001004350000003201000039000000040200003900000000001204350000002402000039000000000100001909a106ff0000040f000200000000000200000000030100190000026f01300197000000370210008c000009690000a13d000200000001001d09a109800000040f000100000001001d000000020110003909a1086c0000040f0000000002010433000000000220004c000009780000613d000000200210003900000000030204330000028a033001970000000105000029000000f804500210000000000334019f0000028d0330004100000000003204350000000302500210000000f802200089000000020300002900000000032301cf000000ff0220008c0000000002030019000000000200201900000021031000390000000000230435000009760000013d000200000003001d09a1084c0000040f0000000002010433000000000220004c000009780000613d0000000202000029000000f802200210000000200310003900000000040304330000028a04400197000000000242019f0000028c0220004100000000002304350000000200000005000000000001042d000002810100004100000000001004350000003201000039000000040200003900000000001204350000002402000039000000000100001909a106ff0000040f00000080021002700000028e0310009c000000000201a0190000028e0110009c0000000001000019000000100100203900000008031001bf0000026f0420009c000000000103201900000040032002700000026f0420009c000000000203201900000004031001bf0000026a0420009c000000000103201900000020032002700000026a0420009c000000000203201900000002031001bf0000ffff0420008c000000000103201900000010032002700000000002032019000000ff0220008c000000000200001900000001020020390000000001210019000000000001042d0000099f002104230000000102000039000000000001042d0000000002000019000000000001042d000009a100000432000009a20001042e000009a300010430000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000ffffffff0000000200000000000000000000000000000000000000000000000000000000ffffffff00000000000000000000000000000000000000000000000000000000ebe4a3d7000000000000000000000000000000000000000000000000000000008000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000ffffffffffffffff456e636f64696e6720756e737570706f7274656420747800000000000000000008c379a0000000000000000000000000000000000000000000000000000000009a8a0592ac89c5ad3bc6df8224c17b485976f597df104ee20d0df415241f670b000000000000000000000000ffffffffffffffffffffffffffffffffffffffff0100000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000007ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff848e1bfa1ac4e3576b728bda6721b215c70a7799a5b4866282a71bab954baac8000000000000000000000000000000000000000000000000fffffffffffffe1fad7c5bef027816a800da1736444fb58a807ef4c9603b7848673f7e3a68eb14a519b453ce45aaaaf3a300f5a9ec95869b4f28ab10430b572ee218c3a6a5e07d6fc2f8787176b8ac6bf7215b4adcc1e069bf4ab82d9ab1df05a57a91d425935b6e000000000000000000000000000000000000000000000000ffffffffffffff5f1901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000ffffffffffffff7f80800000000000000000000000000000000000000000000000000000000000001b000000000000000000000000000000000000000000000000000000000000004e487b7100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000ffffffffffffff9f0200000200000000000000000000000000000004000000000000000000000000556e737570706f727465642074782074797065000000000000000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000000ffffffffffffffc08100000000000000000000000000000000000000000000000000000000000000496e76616c696420762076616c75650000000000000000000000000000000000940000000000000000000000000000000000000000000000000000000000000000ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffb800000000000000000000000000000000000000000000000000000000000000c000000000000000000000000000000000000000000000000000000000000000f80000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000ffffffffffffffffffffffffffffffff",
-    "0x000000000000000000000000000000000000800d": "0x000d000000000002000b0000000c001f000a0000000b001f00090000000a001f000800000009001f000700000008001f000600000007001f000500000006001f000400000005001f000300000004001f000200000003001f000c0000000103550000006001100270000000330010019d000100000002001f000000800300003900000040010000390000000000310435000000000300041600000001022001900000002e0000c13d000000000230004c000000380000c13d000000020200003900000001022001880000003b0000c13d0000000002000411000000350220009c0000003b0000413d000000000101043300000064021000390000003603000041000000000032043500000044021000390000003703000041000000000032043500000024021000390000002403000039000000000032043500000038020000410000000000210435000000040210003900000020030000390000000000320435000000840200003900c5004a0000040f000000000130004c000000380000c13d000000200200003900000100010000390000000000210439000001200200003900000000000204390000004002000039000000340300004100c500420000040f0000000001000019000000000200001900c5004a0000040f000000000100003100c500510000040f000000600100003900000000020104330000008001000039000000000300001900c500420000040f000000400110021000000000013100190000003303000041000000330420009c000000000203801900000060022002100000000001210019000000c60001042e0000003303000041000000330410009c000000000103801900000040011002100000006002200210000000000121019f000000c70001043000050000000000020000000203000031000000050230008c0000009b0000813d000300000001001d000000200210021000000000012300190000000101100039000000000221004b000000930000413d0000000002000411000000000021041f000000010110008c000000610000c13d0000000500000005000000000001042d000000020100008a000200000001001d0000000002000019000100000003001d000000000123004b000000930000413d0000000001230049000000010110008c0000007b0000a13d00000001012001bf000500000002001d00c500ad0000040f0000000502000029000400000001001d0000000201000029000000000112004b000000930000613d0000000202200039000500000002001d000000000102001900c500ad0000040f000000050200002900000001030000290000000404000029000000000014041e000000650000013d00000001013001900000000001000019000000840000613d000000000103001900c500ad0000040f0000000c02000367000000000202043b000000000021041e0000002001000039000000410200008a0000000303000029000000000331004b0000005f0000813d00000020031000390000000c04000367000000000334034f000000000414034f000000000404043b000000000303043b000000000034041e0000004003100039000000000121004b0000000001030019000000850000a13d000000390100004100000000001004350000001101000039000000040200003900000000001204350000002402000039000000000100001900c5004a0000040f0000004001000039000000000101043300000064021000390000003a03000041000000000032043500000044021000390000003b03000041000000000032043500000024021000390000002103000039000000000032043500000038020000410000000000210435000000040210003900000020030000390000000000320435000000840200003900c5004a0000040f0000000a0210008c000000b30000813d0000000501100210000000200110011a0000000201010031000000000001042d0000004001000039000000000101043300000064021000390000003c03000041000000000032043500000044021000390000003d03000041000000000032043500000024021000390000002603000039000000000032043500000038020000410000000000210435000000040210003900000020030000390000000000320435000000840200003900c5004a0000040f000000c500000432000000c60001042e000000c700010430000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000ffffffff00000002000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000010000666c61670000000000000000000000000000000000000000000000000000000054686973206d6574686f6420726571756972652073797374656d2063616c6c2008c379a0000000000000000000000000000000000000000000000000000000004e487b710000000000000000000000000000000000000000000000000000000064000000000000000000000000000000000000000000000000000000000000004f6e6c79203420696e6465786564206669656c64732061726520616c6c6f77656973746572730000000000000000000000000000000000000000000000000000546865726520617265206f6e6c792031302061636365737369626c65207265670000000000000000000000000000000000000000000000000000000000000000"
-  }
-}
diff --git a/prover/vk_setup_data_generator_server_fri/src/commitment_generator.rs b/prover/vk_setup_data_generator_server_fri/src/commitment_generator.rs
deleted file mode 100644
index 71c595f47441..000000000000
--- a/prover/vk_setup_data_generator_server_fri/src/commitment_generator.rs
+++ /dev/null
@@ -1,60 +0,0 @@
-use zkevm_test_harness::witness::recursive_aggregation::{
-    compute_leaf_vks_and_params_commitment, compute_node_vk_commitment,
-};
-use zksync_prover_fri_types::circuit_definitions::circuit_definitions::recursion_layer::ZkSyncRecursionLayerStorageType;
-use zksync_prover_utils::vk_commitment_helper::{
-    get_toml_formatted_value, read_contract_toml, write_contract_toml,
-};
-use zksync_vk_setup_data_server_fri::get_recursive_layer_vk_for_circuit_type;
-use zksync_vk_setup_data_server_fri::utils::get_leaf_vk_params;
-
-fn main() {
-    vlog::info!("Starting commitment generation!");
-    read_and_update_contract_toml();
-}
-
-fn read_and_update_contract_toml() {
-    let mut contract_doc = read_contract_toml();
-    let (leaf_aggregation_commitment_hex, node_aggregation_commitment_hex) = generate_commitments();
-    contract_doc["contracts"]["FRI_VK_COMMITMENT_LEAF"] =
-        get_toml_formatted_value(leaf_aggregation_commitment_hex);
-    contract_doc["contracts"]["FRI_VK_COMMITMENT_NODE"] =
-        get_toml_formatted_value(node_aggregation_commitment_hex);
-    vlog::info!("Updated toml content: {:?}", contract_doc.to_string());
-    write_contract_toml(contract_doc);
-}
-
-fn generate_commitments() -> (String, String) {
-    let leaf_vk_params = get_leaf_vk_params();
-    let leaf_layer_params = leaf_vk_params
-        .iter()
-        .map(|el| el.1.clone())
-        .collect::<Vec<_>>()
-        .try_into()
-        .unwrap();
-    let leaf_vk_commitment = compute_leaf_vks_and_params_commitment(leaf_layer_params);
-
-    let node_vk = get_recursive_layer_vk_for_circuit_type(
-        ZkSyncRecursionLayerStorageType::NodeLayerCircuit as u8,
-    );
-    let node_vk_commitment = compute_node_vk_commitment(node_vk.clone());
-
-    let leaf_aggregation_commitment_hex = format!("{:?}", leaf_vk_commitment);
-    let node_aggregation_commitment_hex = format!("{:?}", node_vk_commitment);
-    vlog::info!("leaf aggregation commitment {:?}", node_vk_commitment);
-    vlog::info!("node aggregation commitment {:?}", node_vk_commitment);
-    (
-        leaf_aggregation_commitment_hex,
-        node_aggregation_commitment_hex,
-    )
-}
-
-#[cfg(test)]
-mod test {
-    use super::*;
-
-    #[test]
-    fn test_read_and_update_contract_toml() {
-        read_and_update_contract_toml();
-    }
-}
diff --git a/prover/vk_setup_data_generator_server_fri/src/in_memory_setup_data_source.rs b/prover/vk_setup_data_generator_server_fri/src/in_memory_setup_data_source.rs
deleted file mode 100644
index 1ad3e873786c..000000000000
--- a/prover/vk_setup_data_generator_server_fri/src/in_memory_setup_data_source.rs
+++ /dev/null
@@ -1,320 +0,0 @@
-use std::collections::HashMap;
-use std::io::{Error, ErrorKind};
-use zkevm_test_harness::data_source::{BlockDataSource, SetupDataSource, SourceResult};
-use zksync_prover_fri_types::circuit_definitions::circuit_definitions::base_layer::{
-    ZkSyncBaseLayerFinalizationHint, ZkSyncBaseLayerProof, ZkSyncBaseLayerVerificationKey,
-};
-use zksync_prover_fri_types::circuit_definitions::circuit_definitions::recursion_layer::{
-    ZkSyncRecursionLayerFinalizationHint, ZkSyncRecursionLayerProof,
-    ZkSyncRecursionLayerVerificationKey,
-};
-
-pub struct InMemoryDataSource {
-    ///data structures required for holding [`SetupDataSource`] result
-    base_layer_vk: HashMap<u8, ZkSyncBaseLayerVerificationKey>,
-    base_layer_padding_proof: HashMap<u8, ZkSyncBaseLayerProof>,
-    base_layer_finalization_hint: HashMap<u8, ZkSyncBaseLayerFinalizationHint>,
-    recursion_layer_vk: HashMap<u8, ZkSyncRecursionLayerVerificationKey>,
-    recursion_layer_node_vk: Option<ZkSyncRecursionLayerVerificationKey>,
-    recursion_layer_padding_proof: HashMap<u8, ZkSyncRecursionLayerProof>,
-    recursion_layer_finalization_hint: HashMap<u8, ZkSyncRecursionLayerFinalizationHint>,
-    recursion_layer_leaf_padding_proof: Option<ZkSyncRecursionLayerProof>,
-    recursion_layer_node_padding_proof: Option<ZkSyncRecursionLayerProof>,
-    recursion_layer_node_finalization_hint: Option<ZkSyncRecursionLayerFinalizationHint>,
-
-    ///data structures required for holding [`BlockDataSource`] result
-    base_layer_proofs: HashMap<(u8, usize), ZkSyncBaseLayerProof>,
-    leaf_layer_proofs: HashMap<(u8, usize), ZkSyncRecursionLayerProof>,
-    node_layer_proofs: HashMap<(u8, usize, usize), ZkSyncRecursionLayerProof>,
-    scheduler_proof: Option<ZkSyncRecursionLayerProof>,
-}
-
-impl InMemoryDataSource {
-    pub fn new() -> Self {
-        InMemoryDataSource {
-            base_layer_vk: HashMap::new(),
-            base_layer_padding_proof: HashMap::new(),
-            base_layer_finalization_hint: HashMap::new(),
-            recursion_layer_vk: HashMap::new(),
-            recursion_layer_node_vk: None,
-            recursion_layer_padding_proof: HashMap::new(),
-            recursion_layer_finalization_hint: HashMap::new(),
-            recursion_layer_leaf_padding_proof: None,
-            recursion_layer_node_padding_proof: None,
-            recursion_layer_node_finalization_hint: None,
-            base_layer_proofs: HashMap::new(),
-            leaf_layer_proofs: HashMap::new(),
-            node_layer_proofs: HashMap::new(),
-            scheduler_proof: None,
-        }
-    }
-}
-
-impl SetupDataSource for InMemoryDataSource {
-    fn get_base_layer_vk(&self, circuit_type: u8) -> SourceResult<ZkSyncBaseLayerVerificationKey> {
-        self.base_layer_vk
-            .get(&circuit_type)
-            .cloned()
-            .ok_or(Box::new(Error::new(
-                ErrorKind::Other,
-                format!("no data for circuit type {}", circuit_type),
-            )))
-    }
-
-    fn get_base_layer_padding_proof(&self, circuit_type: u8) -> SourceResult<ZkSyncBaseLayerProof> {
-        self.base_layer_padding_proof
-            .get(&circuit_type)
-            .cloned()
-            .ok_or(Box::new(Error::new(
-                ErrorKind::Other,
-                format!("no data for circuit type {}", circuit_type),
-            )))
-    }
-
-    fn get_base_layer_finalization_hint(
-        &self,
-        circuit_type: u8,
-    ) -> SourceResult<ZkSyncBaseLayerFinalizationHint> {
-        self.base_layer_finalization_hint
-            .get(&circuit_type)
-            .cloned()
-            .ok_or(Box::new(Error::new(
-                ErrorKind::Other,
-                format!("no data for circuit type {}", circuit_type),
-            )))
-    }
-
-    fn get_recursion_layer_vk(
-        &self,
-        circuit_type: u8,
-    ) -> SourceResult<ZkSyncRecursionLayerVerificationKey> {
-        self.recursion_layer_vk
-            .get(&circuit_type)
-            .cloned()
-            .ok_or(Box::new(Error::new(
-                ErrorKind::Other,
-                format!("no data for circuit type {}", circuit_type),
-            )))
-    }
-
-    fn get_recursion_layer_node_vk(&self) -> SourceResult<ZkSyncRecursionLayerVerificationKey> {
-        Ok(self.recursion_layer_node_vk.clone().unwrap())
-    }
-
-    fn get_recursion_layer_padding_proof(
-        &self,
-        circuit_type: u8,
-    ) -> SourceResult<ZkSyncRecursionLayerProof> {
-        self.recursion_layer_padding_proof
-            .get(&circuit_type)
-            .cloned()
-            .ok_or(Box::new(Error::new(
-                ErrorKind::Other,
-                format!("no data for circuit type {}", circuit_type),
-            )))
-    }
-
-    fn get_recursion_layer_finalization_hint(
-        &self,
-        circuit_type: u8,
-    ) -> SourceResult<ZkSyncRecursionLayerFinalizationHint> {
-        self.recursion_layer_finalization_hint
-            .get(&circuit_type)
-            .cloned()
-            .ok_or(Box::new(Error::new(
-                ErrorKind::Other,
-                format!("no data for circuit type {}", circuit_type),
-            )))
-    }
-
-    fn get_recursion_layer_leaf_padding_proof(&self) -> SourceResult<ZkSyncRecursionLayerProof> {
-        Ok(self.recursion_layer_leaf_padding_proof.clone().unwrap())
-    }
-
-    fn get_recursion_layer_node_padding_proof(&self) -> SourceResult<ZkSyncRecursionLayerProof> {
-        Ok(self.recursion_layer_node_padding_proof.clone().unwrap())
-    }
-
-    fn get_recursion_layer_node_finalization_hint(
-        &self,
-    ) -> SourceResult<ZkSyncRecursionLayerFinalizationHint> {
-        Ok(self.recursion_layer_node_finalization_hint.clone().unwrap())
-    }
-
-    fn set_base_layer_vk(&mut self, vk: ZkSyncBaseLayerVerificationKey) -> SourceResult<()> {
-        self.base_layer_vk.insert(vk.numeric_circuit_type(), vk);
-        Ok(())
-    }
-
-    fn set_base_layer_padding_proof(&mut self, proof: ZkSyncBaseLayerProof) -> SourceResult<()> {
-        self.base_layer_padding_proof
-            .insert(proof.numeric_circuit_type(), proof);
-        Ok(())
-    }
-
-    fn set_base_layer_finalization_hint(
-        &mut self,
-        hint: ZkSyncBaseLayerFinalizationHint,
-    ) -> SourceResult<()> {
-        self.base_layer_finalization_hint
-            .insert(hint.numeric_circuit_type(), hint);
-        Ok(())
-    }
-
-    fn set_recursion_layer_vk(
-        &mut self,
-        vk: ZkSyncRecursionLayerVerificationKey,
-    ) -> SourceResult<()> {
-        self.recursion_layer_vk
-            .insert(vk.numeric_circuit_type(), vk);
-        Ok(())
-    }
-
-    fn set_recursion_layer_node_vk(
-        &mut self,
-        vk: ZkSyncRecursionLayerVerificationKey,
-    ) -> SourceResult<()> {
-        self.recursion_layer_node_vk = Some(vk);
-        Ok(())
-    }
-
-    fn set_recursion_layer_padding_proof(
-        &mut self,
-        proof: ZkSyncRecursionLayerProof,
-    ) -> SourceResult<()> {
-        self.recursion_layer_padding_proof
-            .insert(proof.numeric_circuit_type(), proof);
-        Ok(())
-    }
-
-    fn set_recursion_layer_finalization_hint(
-        &mut self,
-        hint: ZkSyncRecursionLayerFinalizationHint,
-    ) -> SourceResult<()> {
-        self.recursion_layer_finalization_hint
-            .insert(hint.numeric_circuit_type(), hint);
-        Ok(())
-    }
-
-    fn set_recursion_layer_leaf_padding_proof(
-        &mut self,
-        proof: ZkSyncRecursionLayerProof,
-    ) -> SourceResult<()> {
-        self.recursion_layer_leaf_padding_proof = Some(proof);
-        Ok(())
-    }
-
-    fn set_recursion_layer_node_padding_proof(
-        &mut self,
-        proof: ZkSyncRecursionLayerProof,
-    ) -> SourceResult<()> {
-        self.recursion_layer_node_padding_proof = Some(proof);
-        Ok(())
-    }
-
-    fn set_recursion_layer_node_finalization_hint(
-        &mut self,
-        hint: ZkSyncRecursionLayerFinalizationHint,
-    ) -> SourceResult<()> {
-        self.recursion_layer_node_finalization_hint = Some(hint);
-        Ok(())
-    }
-}
-
-impl BlockDataSource for InMemoryDataSource {
-    fn get_base_layer_proof(
-        &self,
-        circuit_type: u8,
-        index: usize,
-    ) -> SourceResult<ZkSyncBaseLayerProof> {
-        self.base_layer_proofs
-            .get(&(circuit_type, index))
-            .cloned()
-            .ok_or(Box::new(Error::new(
-                ErrorKind::Other,
-                format!(
-                    "no base layer proof for circuit type {} index {}",
-                    circuit_type, index
-                ),
-            )))
-    }
-
-    fn get_leaf_layer_proof(
-        &self,
-        circuit_type: u8,
-        index: usize,
-    ) -> SourceResult<ZkSyncRecursionLayerProof> {
-        self.leaf_layer_proofs
-            .get(&(circuit_type, index))
-            .cloned()
-            .ok_or(Box::new(Error::new(
-                ErrorKind::Other,
-                format!(
-                    "no leaf layer proof for circuit type {} index {}",
-                    circuit_type, index
-                ),
-            )))
-    }
-
-    fn get_node_layer_proof(
-        &self,
-        circuit_type: u8,
-        step: usize,
-        index: usize,
-    ) -> SourceResult<ZkSyncRecursionLayerProof> {
-        self.node_layer_proofs
-            .get(&(circuit_type, step, index))
-            .cloned()
-            .ok_or(Box::new(Error::new(
-                ErrorKind::Other,
-                format!(
-                    "no node layer proof for circuit type {} index {} step {}",
-                    circuit_type, index, step
-                ),
-            )))
-    }
-
-    fn get_scheduler_proof(&self) -> SourceResult<ZkSyncRecursionLayerProof> {
-        self.scheduler_proof.clone().ok_or(Box::new(Error::new(
-            ErrorKind::Other,
-            format!("no scheduler proof"),
-        )))
-    }
-
-    fn set_base_layer_proof(
-        &mut self,
-        index: usize,
-        proof: ZkSyncBaseLayerProof,
-    ) -> SourceResult<()> {
-        let circuit_type = proof.numeric_circuit_type();
-        self.base_layer_proofs.insert((circuit_type, index), proof);
-        Ok(())
-    }
-
-    fn set_leaf_layer_proof(
-        &mut self,
-        index: usize,
-        proof: ZkSyncRecursionLayerProof,
-    ) -> SourceResult<()> {
-        let circuit_type = proof.numeric_circuit_type();
-        self.leaf_layer_proofs.insert((circuit_type, index), proof);
-        Ok(())
-    }
-
-    fn set_node_layer_proof(
-        &mut self,
-        circuit_type: u8,
-        step: usize,
-        index: usize,
-        proof: ZkSyncRecursionLayerProof,
-    ) -> SourceResult<()> {
-        self.node_layer_proofs
-            .insert((circuit_type, step, index), proof);
-        Ok(())
-    }
-
-    fn set_scheduler_proof(&mut self, proof: ZkSyncRecursionLayerProof) -> SourceResult<()> {
-        self.scheduler_proof = Some(proof);
-        Ok(())
-    }
-}
diff --git a/prover/vk_setup_data_generator_server_fri/src/lib.rs b/prover/vk_setup_data_generator_server_fri/src/lib.rs
deleted file mode 100644
index 8c3abe4a4272..000000000000
--- a/prover/vk_setup_data_generator_server_fri/src/lib.rs
+++ /dev/null
@@ -1,345 +0,0 @@
-#![feature(generic_const_exprs)]
-#![feature(allocator_api)]
-
-use std::fs;
-use std::fs::File;
-use std::io::Read;
-use zksync_prover_fri_types::circuit_definitions::aux_definitions::witness_oracle::VmWitnessOracle;
-use zksync_prover_fri_types::circuit_definitions::boojum::algebraic_props::round_function::AbsorptionModeOverwrite;
-use zksync_prover_fri_types::circuit_definitions::boojum::algebraic_props::sponge::GenericAlgebraicSponge;
-
-use zksync_prover_fri_types::circuit_definitions::boojum::cs::implementations::hints::{
-    DenseVariablesCopyHint, DenseWitnessCopyHint,
-};
-use zksync_prover_fri_types::circuit_definitions::boojum::cs::implementations::polynomial_storage::{
-    SetupBaseStorage, SetupStorage,
-};
-use zksync_prover_fri_types::circuit_definitions::boojum::cs::implementations::setup::FinalizationHintsForProver;
-use zksync_prover_fri_types::circuit_definitions::boojum::cs::implementations::verifier::VerificationKey;
-use zksync_prover_fri_types::circuit_definitions::boojum::cs::oracle::merkle_tree::MerkleTreeWithCap;
-use zksync_prover_fri_types::circuit_definitions::boojum::cs::oracle::TreeHasher;
-use zksync_prover_fri_types::circuit_definitions::boojum::field::goldilocks::GoldilocksField;
-use zksync_prover_fri_types::circuit_definitions::boojum::field::{PrimeField, SmallField};
-
-use zksync_prover_fri_types::circuit_definitions::boojum::field::traits::field_like::PrimeFieldLikeVectorized;
-use zksync_prover_fri_types::circuit_definitions::boojum::implementations::poseidon2::Poseidon2Goldilocks;
-use zksync_prover_fri_types::circuit_definitions::boojum::worker::Worker;
-
-use zksync_prover_fri_types::circuit_definitions::circuit_definitions::base_layer::{
-    ZkSyncBaseLayerCircuit, ZkSyncBaseLayerVerificationKey,
-};
-use zksync_prover_fri_types::circuit_definitions::circuit_definitions::recursion_layer::{
-    ZkSyncRecursionLayerStorageType, ZkSyncRecursionLayerVerificationKey,
-};
-use zksync_prover_fri_types::circuit_definitions::{
-    ZkSyncDefaultRoundFunction, BASE_LAYER_CAP_SIZE, BASE_LAYER_FRI_LDE_FACTOR,
-};
-
-use serde::de::DeserializeOwned;
-use serde::{Deserialize, Serialize};
-use zkevm_test_harness::prover_utils::create_base_layer_setup_data;
-use zksync_config::configs::FriProverConfig;
-use zksync_types::proofs::AggregationRound;
-
-pub mod in_memory_setup_data_source;
-pub mod utils;
-use zksync_prover_fri_types::ProverServiceDataKey;
-#[cfg(feature = "gpu")]
-use {shivini::cs::GpuSetup, std::alloc::Global};
-
-#[derive(Debug, Serialize, Deserialize)]
-#[serde(
-    bound = "F: serde::Serialize + serde::de::DeserializeOwned, P: serde::Serialize + serde::de::DeserializeOwned"
-)]
-pub struct ProverSetupData<
-    F: PrimeField + SmallField,
-    P: PrimeFieldLikeVectorized<Base = F>,
-    H: TreeHasher<F>,
-> {
-    pub setup_base: SetupBaseStorage<F, P>,
-    pub setup: SetupStorage<F, P>,
-    #[serde(bound(
-        serialize = "H::Output: serde::Serialize",
-        deserialize = "H::Output: serde::de::DeserializeOwned"
-    ))]
-    pub vk: VerificationKey<F, H>,
-    #[serde(bound(
-        serialize = "H::Output: serde::Serialize",
-        deserialize = "H::Output: serde::de::DeserializeOwned"
-    ))]
-    pub setup_tree: MerkleTreeWithCap<F, H>,
-    pub vars_hint: DenseVariablesCopyHint,
-    pub wits_hint: DenseWitnessCopyHint,
-    pub finalization_hint: FinalizationHintsForProver,
-}
-
-pub type GoldilocksProverSetupData = ProverSetupData<
-    GoldilocksField,
-    GoldilocksField,
-    GenericAlgebraicSponge<
-        GoldilocksField,
-        GoldilocksField,
-        8,
-        12,
-        4,
-        Poseidon2Goldilocks,
-        AbsorptionModeOverwrite,
-    >,
->;
-
-#[cfg(feature = "gpu")]
-#[derive(Debug, Serialize, Deserialize)]
-#[serde(bound = "F: serde::Serialize + serde::de::DeserializeOwned")]
-pub struct GpuProverSetupData<F: PrimeField + SmallField, H: TreeHasher<F>> {
-    pub setup: GpuSetup<Global>,
-    #[serde(bound(
-        serialize = "H::Output: serde::Serialize",
-        deserialize = "H::Output: serde::de::DeserializeOwned"
-    ))]
-    pub vk: VerificationKey<F, H>,
-    pub finalization_hint: FinalizationHintsForProver,
-}
-
-#[cfg(feature = "gpu")]
-pub type GoldilocksGpuProverSetupData = GpuProverSetupData<
-    GoldilocksField,
-    GenericAlgebraicSponge<
-        GoldilocksField,
-        GoldilocksField,
-        8,
-        12,
-        4,
-        Poseidon2Goldilocks,
-        AbsorptionModeOverwrite,
-    >,
->;
-
-pub enum ProverServiceDataType {
-    VerificationKey,
-    SetupData,
-    FinalizationHints,
-}
-
-pub fn get_base_path() -> String {
-    let zksync_home = std::env::var("ZKSYNC_HOME").unwrap_or_else(|_| "/".into());
-    format!(
-        "{}/prover/vk_setup_data_generator_server_fri/data",
-        zksync_home
-    )
-}
-
-pub fn get_file_path(
-    key: ProverServiceDataKey,
-    service_data_type: ProverServiceDataType,
-) -> String {
-    let name = match key.round {
-        AggregationRound::BasicCircuits => {
-            format!("basic_{}", key.circuit_id)
-        }
-        AggregationRound::LeafAggregation => {
-            format!("leaf_{}", key.circuit_id)
-        }
-        AggregationRound::NodeAggregation => "node".to_string(),
-        AggregationRound::Scheduler => "scheduler".to_string(),
-    };
-    match service_data_type {
-        ProverServiceDataType::VerificationKey => {
-            format!("{}/verification_{}_key.json", get_base_path(), name)
-        }
-        ProverServiceDataType::SetupData => {
-            format!(
-                "{}/setup_{}_data.bin",
-                FriProverConfig::from_env().setup_data_path,
-                name
-            )
-        }
-        ProverServiceDataType::FinalizationHints => {
-            format!("{}/finalization_hints_{}.bin", get_base_path(), name)
-        }
-    }
-}
-
-pub fn get_base_layer_vk_for_circuit_type(circuit_type: u8) -> ZkSyncBaseLayerVerificationKey {
-    let filepath = get_file_path(
-        ProverServiceDataKey::new(circuit_type, AggregationRound::BasicCircuits),
-        ProverServiceDataType::VerificationKey,
-    );
-    vlog::info!("Fetching verification key from path: {}", filepath);
-    let text = std::fs::read_to_string(&filepath)
-        .unwrap_or_else(|_| panic!("Failed reading verification key from path: {}", filepath));
-    serde_json::from_str::<ZkSyncBaseLayerVerificationKey>(&text).unwrap_or_else(|_| {
-        panic!(
-            "Failed deserializing verification key from path: {}",
-            filepath
-        )
-    })
-}
-
-pub fn get_recursive_layer_vk_for_circuit_type(
-    circuit_type: u8,
-) -> ZkSyncRecursionLayerVerificationKey {
-    let round = get_round_for_recursive_circuit_type(circuit_type);
-    let filepath = get_file_path(
-        ProverServiceDataKey::new(circuit_type, round),
-        ProverServiceDataType::VerificationKey,
-    );
-    vlog::info!("Fetching verification key from path: {}", filepath);
-    let text = std::fs::read_to_string(&filepath)
-        .unwrap_or_else(|_| panic!("Failed reading verification key from path: {}", filepath));
-    serde_json::from_str::<ZkSyncRecursionLayerVerificationKey>(&text).unwrap_or_else(|_| {
-        panic!(
-            "Failed deserializing verification key from path: {}",
-            filepath
-        )
-    })
-}
-
-pub fn get_round_for_recursive_circuit_type(circuit_type: u8) -> AggregationRound {
-    match circuit_type {
-        circuit_type if circuit_type == ZkSyncRecursionLayerStorageType::SchedulerCircuit as u8 => {
-            AggregationRound::Scheduler
-        }
-        circuit_type if circuit_type == ZkSyncRecursionLayerStorageType::NodeLayerCircuit as u8 => {
-            AggregationRound::NodeAggregation
-        }
-        _ => AggregationRound::LeafAggregation,
-    }
-}
-
-pub fn save_base_layer_vk(vk: ZkSyncBaseLayerVerificationKey) {
-    let circuit_type = vk.numeric_circuit_type();
-    let filepath = get_file_path(
-        ProverServiceDataKey::new(circuit_type, AggregationRound::BasicCircuits),
-        ProverServiceDataType::VerificationKey,
-    );
-    vlog::info!("saving basic verification key to: {}", filepath);
-    std::fs::write(filepath, serde_json::to_string_pretty(&vk).unwrap()).unwrap();
-}
-
-pub fn save_recursive_layer_vk(vk: ZkSyncRecursionLayerVerificationKey) {
-    let circuit_type = vk.numeric_circuit_type();
-    let round = get_round_for_recursive_circuit_type(circuit_type);
-    let filepath = get_file_path(
-        ProverServiceDataKey::new(circuit_type, round),
-        ProverServiceDataType::VerificationKey,
-    );
-    vlog::info!("saving recursive layer verification key to: {}", filepath);
-    std::fs::write(filepath, serde_json::to_string_pretty(&vk).unwrap()).unwrap();
-}
-
-pub fn get_cpu_setup_data_for_circuit_type<F, P, H>(
-    key: ProverServiceDataKey,
-) -> ProverSetupData<F, P, H>
-where
-    F: PrimeField + SmallField + Serialize + DeserializeOwned,
-    P: PrimeFieldLikeVectorized<Base = F> + Serialize + DeserializeOwned,
-    H: TreeHasher<F>,
-    <H as TreeHasher<F>>::Output: Serialize + DeserializeOwned,
-{
-    let filepath = get_file_path(key.clone(), ProverServiceDataType::SetupData);
-    let mut file = File::open(filepath.clone())
-        .unwrap_or_else(|_| panic!("Failed reading setup-data from path: {:?}", filepath));
-    let mut buffer = Vec::new();
-    file.read_to_end(&mut buffer).unwrap_or_else(|_| {
-        panic!(
-            "Failed reading setup-data to buffer from path: {:?}",
-            filepath
-        )
-    });
-    vlog::info!("loading {:?} setup data from path: {}", key, filepath);
-    bincode::deserialize::<ProverSetupData<F, P, H>>(&buffer).unwrap_or_else(|_| {
-        panic!(
-            "Failed deserializing setup-data at path: {:?} for circuit: {:?}",
-            filepath, key
-        )
-    })
-}
-
-#[cfg(feature = "gpu")]
-pub fn get_setup_data_for_circuit_type<F, H>(key: ProverServiceDataKey) -> GpuProverSetupData<F, H>
-where
-    F: PrimeField + SmallField + Serialize + DeserializeOwned,
-    H: TreeHasher<F>,
-    <H as TreeHasher<F>>::Output: Serialize + DeserializeOwned,
-{
-    let filepath = get_file_path(key.clone(), ProverServiceDataType::SetupData);
-    let mut file = File::open(filepath.clone())
-        .unwrap_or_else(|_| panic!("Failed reading setup-data from path: {:?}", filepath));
-    let mut buffer = Vec::new();
-    file.read_to_end(&mut buffer).unwrap_or_else(|_| {
-        panic!(
-            "Failed reading setup-data to buffer from path: {:?}",
-            filepath
-        )
-    });
-    vlog::info!("loading {:?} setup data from path: {}", key, filepath);
-    bincode::deserialize::<GpuProverSetupData<F, H>>(&buffer).unwrap_or_else(|_| {
-        panic!(
-            "Failed deserializing setup-data at path: {:?} for circuit: {:?}",
-            filepath, key
-        )
-    })
-}
-
-pub fn save_setup_data(key: ProverServiceDataKey, serialized_setup_data: &Vec<u8>) {
-    let filepath = get_file_path(key.clone(), ProverServiceDataType::SetupData);
-    vlog::info!("saving {:?} setup data to: {}", key, filepath);
-    std::fs::write(filepath.clone(), serialized_setup_data)
-        .unwrap_or_else(|_| panic!("Failed saving setup-data at path: {:?}", filepath));
-}
-
-pub fn generate_cpu_base_layer_setup_data(
-    circuit: ZkSyncBaseLayerCircuit<
-        GoldilocksField,
-        VmWitnessOracle<GoldilocksField>,
-        ZkSyncDefaultRoundFunction,
-    >,
-) -> GoldilocksProverSetupData {
-    let circuit_type = circuit.numeric_circuit_type();
-    vlog::info!(
-        "starting setup data generator for base layer circuit: {}.",
-        circuit_type
-    );
-    let worker = Worker::new();
-    let (setup_base, setup, vk, setup_tree, vars_hint, wits_hint, finalization_hint) =
-        create_base_layer_setup_data(
-            circuit.clone(),
-            &worker,
-            BASE_LAYER_FRI_LDE_FACTOR,
-            BASE_LAYER_CAP_SIZE,
-        );
-    let key = ProverServiceDataKey::new(circuit_type, AggregationRound::BasicCircuits);
-    let existing_finalization_hint = get_finalization_hints(key);
-    assert_eq!(
-        existing_finalization_hint, finalization_hint,
-        "finalization hint mismatch for circuit: {circuit_type}"
-    );
-    let existing_vk = get_base_layer_vk_for_circuit_type(circuit_type);
-    assert_eq!(
-        existing_vk.into_inner(),
-        vk,
-        "vk mismatch for circuit: {circuit_type}"
-    );
-    ProverSetupData {
-        setup_base,
-        setup,
-        vk,
-        setup_tree,
-        vars_hint,
-        wits_hint,
-        finalization_hint,
-    }
-}
-
-pub fn save_finalization_hints(key: ProverServiceDataKey, hint: &FinalizationHintsForProver) {
-    let filepath = get_file_path(key.clone(), ProverServiceDataType::FinalizationHints);
-    vlog::info!("saving finalization hints for {:?} to: {}", key, filepath);
-    let serialized = bincode::serialize(&hint).expect("Failed to serialize finalization hints");
-    fs::write(filepath, serialized).expect("Failed to write finalization hints to file");
-}
-pub fn get_finalization_hints(key: ProverServiceDataKey) -> FinalizationHintsForProver {
-    let filepath = get_file_path(key, ProverServiceDataType::FinalizationHints);
-    let file = fs::read(filepath).expect("Failed to read finalization hints from file");
-    bincode::deserialize::<FinalizationHintsForProver>(&file)
-        .expect("Finalization hint deserialization failed")
-}
diff --git a/prover/vk_setup_data_generator_server_fri/src/main.rs b/prover/vk_setup_data_generator_server_fri/src/main.rs
deleted file mode 100644
index ed5834b3073f..000000000000
--- a/prover/vk_setup_data_generator_server_fri/src/main.rs
+++ /dev/null
@@ -1,123 +0,0 @@
-#![feature(generic_const_exprs)]
-
-use crate::in_memory_setup_data_source::InMemoryDataSource;
-use zkevm_test_harness::compute_setups::{
-    generate_base_layer_vks_and_proofs, generate_recursive_layer_vks_and_proofs,
-};
-use zkevm_test_harness::data_source::SetupDataSource;
-use zksync_prover_fri_types::circuit_definitions::circuit_definitions::recursion_layer::ZkSyncRecursionLayerStorageType;
-use zksync_prover_fri_types::circuit_definitions::zkevm_circuits::scheduler::aux::BaseLayerCircuitType;
-use zksync_prover_fri_types::ProverServiceDataKey;
-use zksync_types::proofs::AggregationRound;
-use zksync_vk_setup_data_server_fri::{
-    get_round_for_recursive_circuit_type, save_base_layer_vk, save_finalization_hints,
-    save_recursive_layer_vk,
-};
-
-mod in_memory_setup_data_source;
-mod tests;
-mod vk_generator;
-
-fn save_vks(source: &dyn SetupDataSource) {
-    for base_circuit_type in
-        (BaseLayerCircuitType::VM as u8)..=(BaseLayerCircuitType::L1MessagesHasher as u8)
-    {
-        let vk = source
-            .get_base_layer_vk(base_circuit_type)
-            .unwrap_or_else(|_| panic!("No vk exist for circuit type: {}", base_circuit_type));
-        save_base_layer_vk(vk);
-    }
-    for leaf_circuit_type in (ZkSyncRecursionLayerStorageType::LeafLayerCircuitForMainVM as u8)
-        ..=(ZkSyncRecursionLayerStorageType::LeafLayerCircuitForL1MessagesHasher as u8)
-    {
-        let vk = source
-            .get_recursion_layer_vk(leaf_circuit_type)
-            .unwrap_or_else(|_| panic!("No vk exist for circuit type: {}", leaf_circuit_type));
-        save_recursive_layer_vk(vk);
-    }
-    save_recursive_layer_vk(
-        source
-            .get_recursion_layer_node_vk()
-            .expect("No vk exist for node layer circuit"),
-    );
-    save_recursive_layer_vk(
-        source
-            .get_recursion_layer_vk(ZkSyncRecursionLayerStorageType::SchedulerCircuit as u8)
-            .expect("No vk exist for scheduler circuit"),
-    );
-}
-
-fn save_finalization_hints_using_source(source: &dyn SetupDataSource) {
-    for base_circuit_type in
-        (BaseLayerCircuitType::VM as u8)..=(BaseLayerCircuitType::L1MessagesHasher as u8)
-    {
-        let hint = source
-            .get_base_layer_finalization_hint(base_circuit_type)
-            .unwrap_or_else(|_| {
-                panic!(
-                    "No finalization_hint exist for circuit type: {}",
-                    base_circuit_type
-                )
-            })
-            .into_inner();
-        let key = ProverServiceDataKey::new(base_circuit_type, AggregationRound::BasicCircuits);
-        save_finalization_hints(key, &hint);
-    }
-    for leaf_circuit_type in (ZkSyncRecursionLayerStorageType::LeafLayerCircuitForMainVM as u8)
-        ..=(ZkSyncRecursionLayerStorageType::LeafLayerCircuitForL1MessagesHasher as u8)
-    {
-        let hint = source
-            .get_recursion_layer_finalization_hint(leaf_circuit_type)
-            .unwrap_or_else(|_| {
-                panic!(
-                    "No finalization hint exist for circuit type: {}",
-                    leaf_circuit_type
-                )
-            })
-            .into_inner();
-        let key = ProverServiceDataKey::new(
-            leaf_circuit_type,
-            get_round_for_recursive_circuit_type(leaf_circuit_type),
-        );
-        save_finalization_hints(key, &hint);
-    }
-
-    let node_hint = source
-        .get_recursion_layer_node_finalization_hint()
-        .expect("No finalization hint exist for node layer circuit")
-        .into_inner();
-    save_finalization_hints(
-        ProverServiceDataKey::new(
-            ZkSyncRecursionLayerStorageType::NodeLayerCircuit as u8,
-            AggregationRound::NodeAggregation,
-        ),
-        &node_hint,
-    );
-
-    let scheduler_hint = source
-        .get_recursion_layer_finalization_hint(
-            ZkSyncRecursionLayerStorageType::SchedulerCircuit as u8,
-        )
-        .expect("No finalization hint exist for scheduler layer circuit")
-        .into_inner();
-    save_finalization_hints(
-        ProverServiceDataKey::new(
-            ZkSyncRecursionLayerStorageType::SchedulerCircuit as u8,
-            AggregationRound::Scheduler,
-        ),
-        &scheduler_hint,
-    );
-}
-
-fn generate_vks() {
-    let mut in_memory_source = InMemoryDataSource::new();
-    generate_base_layer_vks_and_proofs(&mut in_memory_source).expect("Failed generating base vk's");
-    generate_recursive_layer_vks_and_proofs(&mut in_memory_source)
-        .expect("Failed generating recursive vk's");
-    save_finalization_hints_using_source(&in_memory_source);
-    save_vks(&in_memory_source);
-}
-
-fn main() {
-    generate_vks();
-}
diff --git a/prover/vk_setup_data_generator_server_fri/src/setup_data_generator.rs b/prover/vk_setup_data_generator_server_fri/src/setup_data_generator.rs
deleted file mode 100644
index c1c1502a3e9a..000000000000
--- a/prover/vk_setup_data_generator_server_fri/src/setup_data_generator.rs
+++ /dev/null
@@ -1,184 +0,0 @@
-use zksync_prover_fri_types::circuit_definitions::aux_definitions::witness_oracle::VmWitnessOracle;
-use zksync_prover_fri_types::circuit_definitions::boojum::field::goldilocks::GoldilocksField;
-use zksync_prover_fri_types::circuit_definitions::boojum::worker::Worker;
-use zksync_prover_fri_types::circuit_definitions::circuit_definitions::base_layer::ZkSyncBaseLayerCircuit;
-use zksync_prover_fri_types::circuit_definitions::circuit_definitions::recursion_layer::ZkSyncRecursiveLayerCircuit;
-use zksync_prover_fri_types::circuit_definitions::{
-    ZkSyncDefaultRoundFunction, BASE_LAYER_CAP_SIZE, BASE_LAYER_FRI_LDE_FACTOR,
-};
-
-use structopt::StructOpt;
-use zkevm_test_harness::geometry_config::get_geometry_config;
-use zkevm_test_harness::prover_utils::create_recursive_layer_setup_data;
-use zksync_types::proofs::AggregationRound;
-use zksync_vk_setup_data_server_fri::generate_cpu_base_layer_setup_data;
-use zksync_vk_setup_data_server_fri::utils::{
-    get_basic_circuits, get_leaf_circuits, get_node_circuit, get_scheduler_circuit, CYCLE_LIMIT,
-};
-use zksync_vk_setup_data_server_fri::{
-    get_finalization_hints, get_recursive_layer_vk_for_circuit_type,
-    get_round_for_recursive_circuit_type, save_setup_data, GoldilocksProverSetupData,
-    ProverSetupData,
-};
-
-use zksync_prover_fri_types::ProverServiceDataKey;
-#[cfg(feature = "gpu")]
-use {
-    shivini::cs::setup::GpuSetup, shivini::ProverContext,
-    zksync_vk_setup_data_server_fri::GpuProverSetupData,
-};
-
-#[derive(Debug, StructOpt)]
-#[structopt(
-    name = "Generate setup data for individual circuit",
-    about = "Tool for generating setup data for individual circuit"
-)]
-struct Opt {
-    /// Numeric circuit type valid value are
-    /// 1. for base layer [1-13].
-    /// 2. for recursive layer [1-15].
-    #[structopt(long)]
-    numeric_circuit: u8,
-    /// Boolean representing whether to generate for base layer or for recursive layer.
-    #[structopt(short = "b", long = "is_base_layer")]
-    is_base_layer: bool,
-}
-
-fn main() {
-    let opt = Opt::from_args();
-
-    #[cfg(feature = "gpu")]
-    generate_gpu_setup_data(opt.is_base_layer, opt.numeric_circuit);
-
-    #[cfg(not(feature = "gpu"))]
-    generate_cpu_setup_data(opt.is_base_layer, opt.numeric_circuit);
-}
-
-fn generate_cpu_setup_data(is_base_layer: bool, numeric_circuit: u8) {
-    match is_base_layer {
-        true => {
-            let circuit = get_base_layer_circuit(numeric_circuit);
-            let prover_setup_data = generate_cpu_base_layer_setup_data(circuit);
-            let serialized =
-                bincode::serialize(&prover_setup_data).expect("Failed serializing setup data");
-            save_setup_data(
-                ProverServiceDataKey::new(numeric_circuit, AggregationRound::BasicCircuits),
-                &serialized,
-            );
-        }
-        false => {
-            let circuit = get_recursive_circuit(numeric_circuit);
-            let prover_setup_data = generate_cpu_recursive_layer_setup_data(circuit);
-            let serialized =
-                bincode::serialize(&prover_setup_data).expect("Failed serializing setup data");
-            let round = get_round_for_recursive_circuit_type(numeric_circuit);
-            save_setup_data(
-                ProverServiceDataKey::new(numeric_circuit, round),
-                &serialized,
-            );
-        }
-    }
-}
-
-fn get_base_layer_circuit(
-    id: u8,
-) -> ZkSyncBaseLayerCircuit<
-    GoldilocksField,
-    VmWitnessOracle<GoldilocksField>,
-    ZkSyncDefaultRoundFunction,
-> {
-    get_basic_circuits(CYCLE_LIMIT, get_geometry_config())
-        .into_iter()
-        .find(|circuit| id == circuit.numeric_circuit_type())
-        .unwrap_or_else(|| panic!("No basic circuit found for id: {}", id))
-}
-
-fn get_recursive_circuit(id: u8) -> ZkSyncRecursiveLayerCircuit {
-    let mut recursive_circuits = get_leaf_circuits();
-    recursive_circuits.push(get_node_circuit());
-    recursive_circuits.push(get_scheduler_circuit());
-    recursive_circuits
-        .into_iter()
-        .find(|circuit| id == circuit.numeric_circuit_type())
-        .unwrap_or_else(|| panic!("No recursive circuit found for id: {}", id))
-}
-
-fn generate_cpu_recursive_layer_setup_data(
-    circuit: ZkSyncRecursiveLayerCircuit,
-) -> GoldilocksProverSetupData {
-    let circuit_type = circuit.numeric_circuit_type();
-    vlog::info!(
-        "starting setup data generator for recursive layer circuit: {}.",
-        circuit_type
-    );
-    let worker = Worker::new();
-    let (setup_base, setup, vk, setup_tree, vars_hint, wits_hint, finalization_hint) =
-        create_recursive_layer_setup_data(
-            circuit.clone(),
-            &worker,
-            BASE_LAYER_FRI_LDE_FACTOR,
-            BASE_LAYER_CAP_SIZE,
-        );
-    let key = ProverServiceDataKey::new(
-        circuit_type,
-        get_round_for_recursive_circuit_type(circuit_type),
-    );
-    let existing_finalization_hint = get_finalization_hints(key);
-    assert_eq!(
-        existing_finalization_hint, finalization_hint,
-        "finalization hint mismatch for circuit: {circuit_type}"
-    );
-    let existing_vk = get_recursive_layer_vk_for_circuit_type(circuit_type);
-    assert_eq!(
-        existing_vk.into_inner(),
-        vk,
-        "vk mismatch for circuit: {circuit_type}"
-    );
-    ProverSetupData {
-        setup_base,
-        setup,
-        vk: vk.clone(),
-        setup_tree,
-        vars_hint,
-        wits_hint,
-        finalization_hint,
-    }
-}
-
-#[cfg(feature = "gpu")]
-fn generate_gpu_setup_data(is_base_layer: bool, numeric_circuit: u8) {
-    let context = ProverContext::create().expect("failed initializing gpu prover context");
-    let (cpu_setup_data, round) = match is_base_layer {
-        true => {
-            let circuit = get_base_layer_circuit(numeric_circuit);
-            (
-                generate_cpu_base_layer_setup_data(circuit.clone()),
-                AggregationRound::BasicCircuits,
-            )
-        }
-        false => {
-            let circuit = get_recursive_circuit(numeric_circuit);
-            (
-                generate_cpu_recursive_layer_setup_data(circuit.clone()),
-                get_round_for_recursive_circuit_type(numeric_circuit),
-            )
-        }
-    };
-    let gpu_setup_data = GpuSetup::from_setup_and_hints(
-        cpu_setup_data.setup_base,
-        cpu_setup_data.setup_tree,
-        cpu_setup_data.vars_hint.clone(),
-    )
-    .expect("failed creating GPU base layer setup data");
-    let gpu_prover_setup_data = GpuProverSetupData {
-        setup: gpu_setup_data,
-        vk: cpu_setup_data.vk,
-        finalization_hint: cpu_setup_data.finalization_hint,
-    };
-    let serialized =
-        bincode::serialize(&gpu_prover_setup_data).expect("Failed serializing setup data");
-    save_setup_data(
-        ProverServiceDataKey::new(numeric_circuit, round),
-        &serialized,
-    );
-}
diff --git a/prover/vk_setup_data_generator_server_fri/src/tests.rs b/prover/vk_setup_data_generator_server_fri/src/tests.rs
deleted file mode 100644
index 126ab088ea3a..000000000000
--- a/prover/vk_setup_data_generator_server_fri/src/tests.rs
+++ /dev/null
@@ -1,108 +0,0 @@
-#[cfg(test)]
-mod tests {
-    use proptest::prelude::*;
-    use zksync_prover_fri_types::circuit_definitions::circuit_definitions::recursion_layer::{
-        base_circuit_type_into_recursive_leaf_circuit_type, ZkSyncRecursionLayerStorageType,
-    };
-    use zksync_prover_fri_types::circuit_definitions::zkevm_circuits::scheduler::aux::BaseLayerCircuitType;
-    use zksync_prover_fri_types::ProverServiceDataKey;
-    use zksync_types::proofs::AggregationRound;
-    use zksync_vk_setup_data_server_fri::{
-        get_base_layer_vk_for_circuit_type, get_base_path, get_file_path, get_finalization_hints,
-        get_recursive_layer_vk_for_circuit_type, get_round_for_recursive_circuit_type,
-        ProverServiceDataType,
-    };
-
-    fn all_possible_prover_service_data_key() -> impl Strategy<Value = ProverServiceDataKey> {
-        let mut keys = Vec::with_capacity(30);
-        for circuit_type in 1..=13 {
-            keys.push(ProverServiceDataKey::new(
-                circuit_type,
-                AggregationRound::BasicCircuits,
-            ));
-            let recursive_circuit_type = base_circuit_type_into_recursive_leaf_circuit_type(
-                BaseLayerCircuitType::from_numeric_value(circuit_type),
-            ) as u8;
-            keys.push(ProverServiceDataKey::new(
-                recursive_circuit_type,
-                AggregationRound::LeafAggregation,
-            ));
-        }
-        keys.push(ProverServiceDataKey::new(1, AggregationRound::Scheduler));
-        keys.push(ProverServiceDataKey::new(
-            2,
-            AggregationRound::NodeAggregation,
-        ));
-
-        prop::sample::select(keys)
-    }
-
-    proptest! {
-        #[test]
-        fn test_get_base_layer_vk_for_circuit_type(circuit_id in 1u8..13) {
-            let vk = get_base_layer_vk_for_circuit_type(circuit_id);
-            assert_eq!(circuit_id, vk.numeric_circuit_type());
-        }
-
-        #[test]
-        fn test_get_recursive_layer_vk_for_circuit_type(circuit_id in 1u8..15) {
-            let vk = get_recursive_layer_vk_for_circuit_type(circuit_id);
-            assert_eq!(circuit_id, vk.numeric_circuit_type());
-        }
-
-        #[test]
-        fn test_get_finalization_hints(key in all_possible_prover_service_data_key()) {
-            let result = get_finalization_hints(key);
-
-            assert!(!result.row_finalization_hints.is_empty(), "Row finalization hints should not be empty");
-            assert!(!result.public_inputs.is_empty(), "Public inputs should not be empty");
-
-            assert!(result.nop_gates_to_add > 0, "Nop gates to add should be more than 0");
-            assert!(result.final_trace_len > 0, "Final trace length should be more than 0");
-        }
-
-    }
-
-    // Test get_base_path method
-    #[test]
-    fn test_get_base_path() {
-        let base_path = get_base_path();
-        assert!(!base_path.is_empty(), "Base path should not be empty");
-    }
-
-    // Test get_file_path method
-    #[test]
-    fn test_get_file_path() {
-        let key = ProverServiceDataKey::new(1, AggregationRound::BasicCircuits);
-        let file_path = get_file_path(key, ProverServiceDataType::VerificationKey);
-        assert!(!file_path.is_empty(), "File path should not be empty");
-    }
-
-    // Test ProverServiceDataKey::new method
-    #[test]
-    fn test_proverservicedatakey_new() {
-        let key = ProverServiceDataKey::new(1, AggregationRound::BasicCircuits);
-        assert_eq!(
-            key.circuit_id, 1,
-            "Circuit id should be equal to the given value"
-        );
-        assert_eq!(
-            key.round,
-            AggregationRound::BasicCircuits,
-            "Round should be equal to the given value"
-        );
-    }
-
-    // Test get_round_for_recursive_circuit_type method
-    #[test]
-    fn test_get_round_for_recursive_circuit_type() {
-        let round = get_round_for_recursive_circuit_type(
-            ZkSyncRecursionLayerStorageType::SchedulerCircuit as u8,
-        );
-        assert_eq!(
-            round,
-            AggregationRound::Scheduler,
-            "Round should be scheduler"
-        );
-    }
-}
diff --git a/prover/vk_setup_data_generator_server_fri/src/utils.rs b/prover/vk_setup_data_generator_server_fri/src/utils.rs
deleted file mode 100644
index de09c30b9660..000000000000
--- a/prover/vk_setup_data_generator_server_fri/src/utils.rs
+++ /dev/null
@@ -1,322 +0,0 @@
-use crate::{
-    get_base_layer_vk_for_circuit_type, get_base_path, get_recursive_layer_vk_for_circuit_type,
-};
-use zksync_prover_fri_types::circuit_definitions::aux_definitions::witness_oracle::VmWitnessOracle;
-use zksync_prover_fri_types::circuit_definitions::boojum::field::goldilocks::{GoldilocksExt2, GoldilocksField};
-use zksync_prover_fri_types::circuit_definitions::boojum::gadgets::queue::full_state_queue::FullStateCircuitQueueRawWitness;
-use zksync_prover_fri_types::circuit_definitions::boojum::gadgets::recursion::recursive_tree_hasher::CircuitGoldilocksPoseidon2Sponge;
-use zksync_prover_fri_types::circuit_definitions::boojum::gadgets::traits::allocatable::CSAllocatable;
-use zksync_prover_fri_types::circuit_definitions::circuit_definitions::base_layer::ZkSyncBaseLayerCircuit;
-use zksync_prover_fri_types::circuit_definitions::circuit_definitions::recursion_layer::leaf_layer::ZkSyncLeafLayerRecursiveCircuit;
-use zksync_prover_fri_types::circuit_definitions::circuit_definitions::recursion_layer::node_layer::ZkSyncNodeLayerRecursiveCircuit;
-use zksync_prover_fri_types::circuit_definitions::circuit_definitions::recursion_layer::scheduler::SchedulerCircuit;
-use zksync_prover_fri_types::circuit_definitions::circuit_definitions::recursion_layer::{
-    base_circuit_type_into_recursive_leaf_circuit_type, ZkSyncRecursionLayerStorageType,
-    ZkSyncRecursionProof, ZkSyncRecursiveLayerCircuit, RECURSION_ARITY, SCHEDULER_CAPACITY,
-};
-use zksync_prover_fri_types::circuit_definitions::zk_evm::bytecode_to_code_hash;
-use zksync_prover_fri_types::circuit_definitions::zk_evm::testing::storage::InMemoryStorage;
-use zksync_prover_fri_types::circuit_definitions::zkevm_circuits::recursion::leaf_layer::input::RecursionLeafParametersWitness;
-use zksync_prover_fri_types::circuit_definitions::zkevm_circuits::recursion::leaf_layer::input::{
-    RecursionLeafInput, RecursionLeafInstanceWitness,
-};
-use zksync_prover_fri_types::circuit_definitions::zkevm_circuits::recursion::leaf_layer::LeafLayerRecursionConfig;
-use zksync_prover_fri_types::circuit_definitions::zkevm_circuits::recursion::node_layer::input::{
-    RecursionNodeInput, RecursionNodeInstanceWitness,
-};
-use zksync_prover_fri_types::circuit_definitions::zkevm_circuits::recursion::node_layer::NodeLayerRecursionConfig;
-use zksync_prover_fri_types::circuit_definitions::zkevm_circuits::scheduler::aux::BaseLayerCircuitType;
-use zksync_prover_fri_types::circuit_definitions::zkevm_circuits::scheduler::input::SchedulerCircuitInstanceWitness;
-use zksync_prover_fri_types::circuit_definitions::zkevm_circuits::scheduler::SchedulerConfig;
-use zksync_prover_fri_types::circuit_definitions::{
-    base_layer_proof_config, recursion_layer_proof_config, zk_evm, ZkSyncDefaultRoundFunction,
-};
-use itertools::Itertools;
-use std::collections::{HashMap, VecDeque};
-use std::fs;
-use zkevm_test_harness::compute_setups::{
-    generate_base_layer_vks_and_proofs, generate_recursive_layer_vks_and_proofs,
-};
-use zkevm_test_harness::data_source::BlockDataSource;
-use zkevm_test_harness::ethereum_types::{Address, U256};
-use zkevm_test_harness::external_calls::run;
-use zkevm_test_harness::helper::artifact_utils::{save_predeployed_contracts, TestArtifact};
-use zkevm_test_harness::sha3::{Digest, Keccak256};
-use zkevm_test_harness::toolset::GeometryConfig;
-use zkevm_test_harness::witness::full_block_artifact::{
-    BlockBasicCircuits, BlockBasicCircuitsPublicCompactFormsWitnesses,
-    BlockBasicCircuitsPublicInputs,
-};
-use zkevm_test_harness::witness::recursive_aggregation::compute_leaf_params;
-use zkevm_test_harness::witness::tree::{BinarySparseStorageTree, ZKSyncTestingTree};
-
-use crate::in_memory_setup_data_source::InMemoryDataSource;
-
-pub const CYCLE_LIMIT: usize = 20000;
-
-fn read_witness_artifact(filepath: &str) -> TestArtifact {
-    let text = fs::read_to_string(filepath)
-        .unwrap_or_else(|_| panic!("Failed to read witness artifact from path: {}", filepath));
-    serde_json::from_str(text.as_str()).unwrap()
-}
-
-pub fn get_basic_circuits(
-    cycle_limit: usize,
-    geometry: GeometryConfig,
-) -> Vec<
-    ZkSyncBaseLayerCircuit<
-        GoldilocksField,
-        VmWitnessOracle<GoldilocksField>,
-        ZkSyncDefaultRoundFunction,
-    >,
-> {
-    let path = format!("{}/witness_artifacts.json", get_base_path());
-    let test_artifact = read_witness_artifact(&path);
-    let (base_layer_circuit, _, _, _) = get_circuits(test_artifact, cycle_limit, geometry);
-    base_layer_circuit
-        .into_flattened_set()
-        .into_iter()
-        .dedup_by(|a, b| a.numeric_circuit_type() == b.numeric_circuit_type())
-        .collect()
-}
-
-pub fn get_leaf_circuits() -> Vec<ZkSyncRecursiveLayerCircuit> {
-    let mut circuits = vec![];
-    for base_circuit_type in
-        (BaseLayerCircuitType::VM as u8)..=(BaseLayerCircuitType::L1MessagesHasher as u8)
-    {
-        let input = RecursionLeafInput::placeholder_witness();
-        let vk = get_base_layer_vk_for_circuit_type(base_circuit_type);
-
-        let witness = RecursionLeafInstanceWitness {
-            input,
-            vk_witness: vk.clone().into_inner(),
-            queue_witness: FullStateCircuitQueueRawWitness {
-                elements: VecDeque::new(),
-            },
-            proof_witnesses: VecDeque::new(),
-        };
-
-        let config = LeafLayerRecursionConfig {
-            proof_config: base_layer_proof_config(),
-            vk_fixed_parameters: vk.into_inner().fixed_parameters,
-            capacity: RECURSION_ARITY,
-            _marker: std::marker::PhantomData,
-        };
-
-        let circuit = ZkSyncLeafLayerRecursiveCircuit {
-            base_layer_circuit_type: BaseLayerCircuitType::from_numeric_value(base_circuit_type),
-            witness: witness,
-            config: config,
-            transcript_params: (),
-            _marker: std::marker::PhantomData,
-        };
-
-        let circuit = ZkSyncRecursiveLayerCircuit::leaf_circuit_from_base_type(
-            BaseLayerCircuitType::from_numeric_value(base_circuit_type),
-            circuit,
-        );
-        circuits.push(circuit)
-    }
-    circuits
-}
-
-pub fn get_node_circuit() -> ZkSyncRecursiveLayerCircuit {
-    let input = RecursionNodeInput::placeholder_witness();
-
-    let input_vk = get_recursive_layer_vk_for_circuit_type(
-        ZkSyncRecursionLayerStorageType::LeafLayerCircuitForMainVM as u8,
-    );
-    let witness = RecursionNodeInstanceWitness {
-        input,
-        vk_witness: input_vk.clone().into_inner(),
-        split_points: VecDeque::new(),
-        proof_witnesses: VecDeque::new(),
-    };
-
-    let config = NodeLayerRecursionConfig {
-        proof_config: recursion_layer_proof_config(),
-        vk_fixed_parameters: input_vk.clone().into_inner().fixed_parameters,
-        leaf_layer_capacity: RECURSION_ARITY,
-        node_layer_capacity: RECURSION_ARITY,
-        _marker: std::marker::PhantomData,
-    };
-    let circuit = ZkSyncNodeLayerRecursiveCircuit {
-        witness: witness,
-        config: config,
-        transcript_params: (),
-        _marker: std::marker::PhantomData,
-    };
-    ZkSyncRecursiveLayerCircuit::NodeLayerCircuit(circuit)
-}
-
-pub fn get_scheduler_circuit() -> ZkSyncRecursiveLayerCircuit {
-    let mut scheduler_witness = SchedulerCircuitInstanceWitness::placeholder();
-
-    // node VK
-    let node_vk = get_recursive_layer_vk_for_circuit_type(
-        ZkSyncRecursionLayerStorageType::NodeLayerCircuit as u8,
-    )
-    .into_inner();
-    scheduler_witness.node_layer_vk_witness = node_vk.clone();
-
-    let config = SchedulerConfig {
-        proof_config: recursion_layer_proof_config(),
-        vk_fixed_parameters: node_vk.fixed_parameters,
-        capacity: SCHEDULER_CAPACITY,
-        _marker: std::marker::PhantomData,
-    };
-    let scheduler_circuit = SchedulerCircuit {
-        witness: scheduler_witness,
-        config,
-        transcript_params: (),
-        _marker: std::marker::PhantomData,
-    };
-    ZkSyncRecursiveLayerCircuit::SchedulerCircuit(scheduler_circuit)
-}
-
-#[allow(dead_code)]
-fn get_recursive_layer_proofs() -> Vec<ZkSyncRecursionProof> {
-    let mut in_memory_source = InMemoryDataSource::new();
-    generate_base_layer_vks_and_proofs(&mut in_memory_source).expect("Failed generating base vk's");
-    generate_recursive_layer_vks_and_proofs(&mut in_memory_source)
-        .expect("Failed generating recursive vk's");
-    let mut scheduler_proofs: Vec<ZkSyncRecursionProof> = vec![];
-    for recursive_circuit_type in (ZkSyncRecursionLayerStorageType::LeafLayerCircuitForMainVM as u8)
-        ..=(ZkSyncRecursionLayerStorageType::LeafLayerCircuitForL1MessagesHasher as u8)
-    {
-        let proof = in_memory_source
-            .get_node_layer_proof(recursive_circuit_type, 0, 0)
-            .unwrap();
-        scheduler_proofs.push(proof.into_inner());
-    }
-    scheduler_proofs
-}
-
-pub fn get_leaf_vk_params() -> Vec<(u8, RecursionLeafParametersWitness<GoldilocksField>)> {
-    let mut leaf_vk_commits = vec![];
-
-    for circuit_type in
-        (BaseLayerCircuitType::VM as u8)..=(BaseLayerCircuitType::L1MessagesHasher as u8)
-    {
-        let recursive_circuit_type = base_circuit_type_into_recursive_leaf_circuit_type(
-            BaseLayerCircuitType::from_numeric_value(circuit_type),
-        );
-        let base_vk = get_base_layer_vk_for_circuit_type(circuit_type);
-        let leaf_vk = get_recursive_layer_vk_for_circuit_type(recursive_circuit_type as u8);
-        let params = compute_leaf_params(circuit_type, base_vk, leaf_vk);
-        leaf_vk_commits.push((circuit_type, params));
-    }
-    leaf_vk_commits
-}
-
-fn get_circuits(
-    mut test_artifact: TestArtifact,
-    cycle_limit: usize,
-    geometry: GeometryConfig,
-) -> (
-    BlockBasicCircuits<GoldilocksField, ZkSyncDefaultRoundFunction>,
-    BlockBasicCircuitsPublicInputs<GoldilocksField>,
-    BlockBasicCircuitsPublicCompactFormsWitnesses<GoldilocksField>,
-    SchedulerCircuitInstanceWitness<
-        GoldilocksField,
-        CircuitGoldilocksPoseidon2Sponge,
-        GoldilocksExt2,
-    >,
-) {
-    let round_function = ZkSyncDefaultRoundFunction::default();
-
-    let mut storage_impl = InMemoryStorage::new();
-    let mut tree = ZKSyncTestingTree::empty();
-
-    test_artifact.entry_point_address =
-        *zk_evm::zkevm_opcode_defs::system_params::BOOTLOADER_FORMAL_ADDRESS;
-
-    let predeployed_contracts = test_artifact
-        .predeployed_contracts
-        .clone()
-        .into_iter()
-        .chain(Some((
-            test_artifact.entry_point_address,
-            test_artifact.entry_point_code.clone(),
-        )))
-        .collect::<HashMap<_, _>>();
-    save_predeployed_contracts(&mut storage_impl, &mut tree, &predeployed_contracts);
-
-    let used_bytecodes = HashMap::from_iter(
-        test_artifact
-            .predeployed_contracts
-            .iter()
-            .map(|(_, bytecode)| {
-                (
-                    bytecode_to_code_hash(&bytecode).unwrap().into(),
-                    bytecode.clone(),
-                )
-            })
-            .chain(
-                Some(test_artifact.default_account_code.clone()).map(|bytecode| {
-                    (
-                        bytecode_to_code_hash(&bytecode).unwrap().into(),
-                        bytecode.clone(),
-                    )
-                }),
-            ),
-    );
-
-    let previous_enumeration_index = tree.next_enumeration_index();
-    let previous_root = tree.root();
-    // simualate content hash
-
-    let mut hasher = Keccak256::new();
-    hasher.update(&previous_enumeration_index.to_be_bytes());
-    hasher.update(&previous_root);
-    hasher.update(&0u64.to_be_bytes()); // porter shard
-    hasher.update(&[0u8; 32]); // porter shard
-
-    let mut previous_data_hash = [0u8; 32];
-    (&mut previous_data_hash[..]).copy_from_slice(&hasher.finalize().as_slice());
-
-    let previous_aux_hash = [0u8; 32];
-    let previous_meta_hash = [0u8; 32];
-
-    let mut hasher = Keccak256::new();
-    hasher.update(&previous_data_hash);
-    hasher.update(&previous_meta_hash);
-    hasher.update(&previous_aux_hash);
-
-    let mut previous_content_hash = [0u8; 32];
-    (&mut previous_content_hash[..]).copy_from_slice(&hasher.finalize().as_slice());
-
-    let default_account_codehash =
-        bytecode_to_code_hash(&test_artifact.default_account_code).unwrap();
-    let default_account_codehash = U256::from_big_endian(&default_account_codehash);
-
-    let (
-        basic_block_circuits,
-        basic_block_circuits_inputs,
-        closed_form_inputs,
-        scheduler_partial_input,
-        _,
-    ) = run(
-        Address::zero(),
-        test_artifact.entry_point_address,
-        test_artifact.entry_point_code,
-        vec![],
-        false,
-        default_account_codehash,
-        used_bytecodes,
-        vec![],
-        cycle_limit,
-        round_function.clone(),
-        geometry,
-        storage_impl,
-        &mut tree,
-    );
-
-    (
-        basic_block_circuits,
-        basic_block_circuits_inputs,
-        closed_form_inputs,
-        scheduler_partial_input,
-    )
-}
diff --git a/prover/vk_setup_data_generator_server_fri/src/vk_generator.rs b/prover/vk_setup_data_generator_server_fri/src/vk_generator.rs
deleted file mode 100644
index 6cd09f18a594..000000000000
--- a/prover/vk_setup_data_generator_server_fri/src/vk_generator.rs
+++ /dev/null
@@ -1,62 +0,0 @@
-use zkevm_test_harness::geometry_config::get_geometry_config;
-use zkevm_test_harness::prover_utils::{
-    create_base_layer_setup_data, create_recursive_layer_setup_data,
-};
-use zksync_prover_fri_types::circuit_definitions::boojum::worker::Worker;
-use zksync_prover_fri_types::circuit_definitions::circuit_definitions::base_layer::ZkSyncBaseLayerVerificationKey;
-use zksync_prover_fri_types::circuit_definitions::{
-    BASE_LAYER_CAP_SIZE, BASE_LAYER_FRI_LDE_FACTOR,
-};
-use zksync_vk_setup_data_server_fri::utils::{get_basic_circuits, get_leaf_circuits, CYCLE_LIMIT};
-use zksync_vk_setup_data_server_fri::{
-    get_round_for_recursive_circuit_type, save_base_layer_vk, save_finalization_hints,
-    save_recursive_layer_vk,
-};
-
-use zksync_prover_fri_types::circuit_definitions::circuit_definitions::recursion_layer::ZkSyncRecursionLayerVerificationKey;
-use zksync_prover_fri_types::ProverServiceDataKey;
-use zksync_types::proofs::AggregationRound;
-
-fn main() {
-    vlog::info!("starting vk generator");
-    generate_basic_circuit_vks();
-}
-
-pub fn generate_basic_circuit_vks() {
-    let worker = Worker::new();
-    for circuit in get_basic_circuits(CYCLE_LIMIT, get_geometry_config()) {
-        let circuit_type = circuit.numeric_circuit_type();
-        let (_, _, vk, _, _, _, finalization_hint) = create_base_layer_setup_data(
-            circuit.clone(),
-            &worker,
-            BASE_LAYER_FRI_LDE_FACTOR,
-            BASE_LAYER_CAP_SIZE,
-        );
-        let typed_vk = ZkSyncBaseLayerVerificationKey::from_inner(circuit_type, vk);
-        save_base_layer_vk(typed_vk);
-        let key = ProverServiceDataKey::new(circuit_type, AggregationRound::BasicCircuits);
-        save_finalization_hints(key, &finalization_hint);
-    }
-}
-
-pub fn generate_leaf_layer_vks() {
-    let worker = Worker::new();
-    for circuit in get_leaf_circuits() {
-        let circuit_type = circuit.numeric_circuit_type();
-        let (_setup_base, _setup, vk, _setup_tree, _vars_hint, _wits_hint, finalization_hint) =
-            create_recursive_layer_setup_data(
-                circuit.clone(),
-                &worker,
-                BASE_LAYER_FRI_LDE_FACTOR,
-                BASE_LAYER_CAP_SIZE,
-            );
-
-        let typed_vk = ZkSyncRecursionLayerVerificationKey::from_inner(circuit_type, vk.clone());
-        save_recursive_layer_vk(typed_vk);
-        let key = ProverServiceDataKey::new(
-            circuit_type,
-            get_round_for_recursive_circuit_type(circuit_type),
-        );
-        save_finalization_hints(key, &finalization_hint);
-    }
-}
diff --git a/prover/witness_generator/Cargo.toml b/prover/witness_generator/Cargo.toml
deleted file mode 100644
index 9c3f5ddc092d..000000000000
--- a/prover/witness_generator/Cargo.toml
+++ /dev/null
@@ -1,43 +0,0 @@
-[package]
-name = "zksync_witness_generator"
-version = "1.0.0"
-edition = "2018"
-authors = ["The Matter Labs Team <hello@matterlabs.dev>"]
-homepage = "https://zksync.io/"
-repository = "https://github.com/matter-labs/zksync-era"
-license = "MIT OR Apache-2.0"
-keywords = ["blockchain", "zksync"]
-categories = ["cryptography"]
-publish = false # We don't want to publish our binaries.
-
-[dependencies]
-zksync_dal = { path = "../../core/lib/dal", version = "1.0" }
-zksync_config = { path = "../../core/lib/config", version = "1.0" }
-prometheus_exporter = { path = "../../core/lib/prometheus_exporter", version = "1.0" }
-vlog = { path = "../../core/lib/vlog", version = "1.0" }
-zksync_queued_job_processor = { path = "../../core/lib/queued_job_processor", version = "1.0" }
-vm = { path = "../../core/lib/vm", version = "0.1.0" }
-zksync_object_store = { path = "../../core/lib/object_store", version = "1.0" }
-zksync_types = { path = "../../core/lib/types", version = "1.0" }
-zksync_state = { path = "../../core/lib/state", version = "1.0" }
-zksync_utils = { path = "../../core/lib/utils", version = "1.0" }
-vk_setup_data_generator_server_fri = { path = "../vk_setup_data_generator_server_fri", version = "1.0" }
-zksync_prover_utils = { path = "../../core/lib/prover_utils", version = "1.0" }
-zksync_prover_fri_types = { path = "../prover_fri_types", version = "1.0" }
-zksync_prover_fri_utils = { path = "../prover_fri_utils", version = "1.0" }
-
-zkevm_test_harness = { git = "https://github.com/matter-labs/era-zkevm_test_harness.git", branch = "v1.4.0" }
-circuit_definitions = { git = "https://github.com/matter-labs/era-zkevm_test_harness.git", branch = "v1.4.0", features = ["log_tracing"]}
-zk_evm = { git = "https://github.com/matter-labs/era-zk_evm.git", branch = "v1.4.0" }
-
-tokio = { version = "1", features = ["time"] }
-futures = { version = "0.3", features = ["compat"] }
-metrics = "0.20"
-serde = { version = "1.0", features = ["derive"] }
-serde_json = "1.0"
-async-trait = "0.1"
-bincode = "1"
-rand = "0.8"
-hex = "0.4"
-structopt = "0.3.26"
-ctrlc = { version = "3.1", features = ["termination"] }
diff --git a/prover/witness_generator/README.md b/prover/witness_generator/README.md
deleted file mode 100644
index 9d35fe7e054a..000000000000
--- a/prover/witness_generator/README.md
+++ /dev/null
@@ -1,52 +0,0 @@
-# WitnessGenerator
-
-Please read this
-[doc](https://www.notion.so/matterlabs/Draft-FRI-Prover-Integration-Prover-Shadowing-c4b1373786eb43779a93118be4be5d99)
-for rationale of this binary, alongside the existing one in zk-core.
-
-The component is responsible for generating prover jobs and saving artifacts needed for the next round of proof
-aggregation. That is, every aggregation round needs two sets of input:
-
-- computed proofs from the previous round
-- some artifacts that the witness generator of previous round(s) returns. There are four rounds of proofs for every
-  block, each of them starts with an invocation of `{Round}WitnessGenerator` with a corresponding
-  `WitnessGeneratorJobType`:
-
-## BasicCircuitsWitnessGenerator
-
-- generates basic circuits (circuits like `Main VM` - up to 50 \* 48 = 2400 circuits):
-- input table: `basic_circuit_witness_jobs` (todo SMA-1362: will be renamed from `witness_inputs`)
-- artifact/output table: `leaf_aggregation_jobs` (also creates job stubs in `node_aggregation_jobs` and
-  `scheduler_aggregation_jobs`) value in `aggregation_round` field of `prover_jobs` table: 0
-
-## LeafAggregationWitnessGenerator
-
-- generates leaf aggregation circuits (up to 48 circuits of type `LeafAggregation`)
-- input table: `leaf_aggregation_jobs`
-- artifact/output table: `node_aggregation_jobs`
-- value in `aggregation_round` field of `prover_jobs` table: 1
-
-## NodeAggregationWitnessGenerator
-
-- generates one circuit of type `NodeAggregation`
-- input table: `leaf_aggregation_jobs`
-- value in `aggregation_round` field of `prover_jobs` table: 2
-
-## SchedulerWitnessGenerator
-
-- generates one circuit of type `Scheduler`
-- input table: `scheduler_witness_jobs`
-- value in `aggregation_round` field of `prover_jobs` table: 3
-
-One round of prover generation consists of:
-
-- `WitnessGenerator` picks up the next `queued` job in its input table and processes it (invoking the corresponding
-  helper function in `zkevm_test_harness` repo)
-- it saves the generated circuis to `prover_jobs` table and the other artifacts to its output table
-- the individual proofs are picked up by the provers, processed, and marked as complete.
-- when the last proof for this round is computed, the prover updates the row in the output table setting its status to
-  `queued`
-- `WitnessGenerator` picks up such job and proceeds to the next round
-
-Note that the very first input table (`witness_inputs`) is populated by the tree (as the input artifact for the
-`WitnessGeneratorJobType::BasicCircuits` is the merkle proofs)
diff --git a/prover/witness_generator/rust-toolchain.toml b/prover/witness_generator/rust-toolchain.toml
deleted file mode 100644
index 5d56faf9ae08..000000000000
--- a/prover/witness_generator/rust-toolchain.toml
+++ /dev/null
@@ -1,2 +0,0 @@
-[toolchain]
-channel = "nightly"
diff --git a/prover/witness_generator/src/basic_circuits.rs b/prover/witness_generator/src/basic_circuits.rs
deleted file mode 100644
index 569758e34323..000000000000
--- a/prover/witness_generator/src/basic_circuits.rs
+++ /dev/null
@@ -1,639 +0,0 @@
-use std::hash::Hash;
-use std::sync::Arc;
-use std::{
-    collections::{hash_map::DefaultHasher, HashMap, HashSet},
-    hash::Hasher,
-    time::Instant,
-};
-
-use async_trait::async_trait;
-use zksync_prover_fri_types::circuit_definitions::ZkSyncDefaultRoundFunction;
-use rand::Rng;
-use serde::{Deserialize, Serialize};
-use zksync_prover_fri_types::circuit_definitions::boojum::field::goldilocks::{GoldilocksExt2, GoldilocksField};
-use zksync_prover_fri_types::circuit_definitions::boojum::gadgets::recursion::recursive_tree_hasher::CircuitGoldilocksPoseidon2Sponge;
-use zkevm_test_harness::geometry_config::get_geometry_config;
-use zkevm_test_harness::toolset::GeometryConfig;
-use zkevm_test_harness::witness::full_block_artifact::{
-    BlockBasicCircuits, BlockBasicCircuitsPublicCompactFormsWitnesses,
-    BlockBasicCircuitsPublicInputs,
-};
-use zksync_prover_fri_types::circuit_definitions::zkevm_circuits::scheduler::block_header::BlockAuxilaryOutputWitness;
-use zksync_prover_fri_types::circuit_definitions::zkevm_circuits::scheduler::input::SchedulerCircuitInstanceWitness;
-
-use vm::{HistoryDisabled, StorageOracle, MAX_CYCLES_FOR_TX};
-use zksync_config::configs::FriWitnessGeneratorConfig;
-use zksync_dal::fri_witness_generator_dal::FriWitnessJobStatus;
-use zksync_dal::ConnectionPool;
-use zksync_object_store::{
-    Bucket, ClosedFormInputKey, ObjectStore, ObjectStoreFactory, StoredObject,
-};
-use zksync_prover_fri_utils::get_recursive_layer_circuit_id_for_base_layer;
-use zksync_queued_job_processor::JobProcessor;
-use zksync_state::{PostgresStorage, StorageView};
-use zksync_types::proofs::AggregationRound;
-use zksync_types::{
-    proofs::{BasicCircuitWitnessGeneratorInput, PrepareBasicCircuitsJob},
-    Address, L1BatchNumber, BOOTLOADER_ADDRESS, H256, U256,
-};
-use zksync_utils::{bytes_to_chunks, h256_to_u256, u256_to_h256};
-
-use crate::precalculated_merkle_paths_provider::PrecalculatedMerklePathsProvider;
-use crate::utils::{
-    expand_bootloader_contents, save_base_prover_input_artifacts, AuxOutputWitnessWrapper,
-    ClosedFormInputWrapper, SchedulerPartialInputWrapper,
-};
-
-pub struct BasicCircuitArtifacts {
-    basic_circuits: BlockBasicCircuits<GoldilocksField, ZkSyncDefaultRoundFunction>,
-    basic_circuits_inputs: BlockBasicCircuitsPublicInputs<GoldilocksField>,
-    per_circuit_closed_form_inputs: BlockBasicCircuitsPublicCompactFormsWitnesses<GoldilocksField>,
-    #[allow(dead_code)]
-    scheduler_witness: SchedulerCircuitInstanceWitness<
-        GoldilocksField,
-        CircuitGoldilocksPoseidon2Sponge,
-        GoldilocksExt2,
-    >,
-    aux_output_witness: BlockAuxilaryOutputWitness<GoldilocksField>,
-}
-
-#[derive(Debug)]
-struct BlobUrls {
-    circuit_ids_and_urls: Vec<(u8, String)>,
-    closed_form_inputs_and_urls: Vec<(u8, String, usize)>,
-    scheduler_witness_url: String,
-}
-
-#[derive(Clone)]
-pub struct BasicWitnessGeneratorJob {
-    block_number: L1BatchNumber,
-    job: PrepareBasicCircuitsJob,
-}
-
-#[derive(Debug)]
-pub struct BasicWitnessGenerator {
-    config: Arc<FriWitnessGeneratorConfig>,
-    object_store: Arc<dyn ObjectStore>,
-    public_blob_store: Box<dyn ObjectStore>,
-    connection_pool: ConnectionPool,
-    prover_connection_pool: ConnectionPool,
-}
-
-impl BasicWitnessGenerator {
-    pub async fn new(
-        config: FriWitnessGeneratorConfig,
-        store_factory: &ObjectStoreFactory,
-        public_blob_store: Box<dyn ObjectStore>,
-        connection_pool: ConnectionPool,
-        prover_connection_pool: ConnectionPool,
-    ) -> Self {
-        Self {
-            config: Arc::new(config),
-            object_store: store_factory.create_store().await.into(),
-            public_blob_store,
-            connection_pool,
-            prover_connection_pool,
-        }
-    }
-
-    async fn process_job_impl(
-        object_store: Arc<dyn ObjectStore>,
-        connection_pool: ConnectionPool,
-        prover_connection_pool: ConnectionPool,
-        basic_job: BasicWitnessGeneratorJob,
-        started_at: Instant,
-        config: Arc<FriWitnessGeneratorConfig>,
-    ) -> Option<BasicCircuitArtifacts> {
-        let BasicWitnessGeneratorJob { block_number, job } = basic_job;
-        let shall_force_process_block = config
-            .force_process_block
-            .map_or(false, |block| block == block_number.0);
-
-        if let Some(blocks_proving_percentage) = config.blocks_proving_percentage {
-            // Generate random number in (0; 100).
-            let threshold = rand::thread_rng().gen_range(1..100);
-            // We get value higher than `blocks_proving_percentage` with prob = `1 - blocks_proving_percentage`.
-            // In this case job should be skipped.
-            if threshold > blocks_proving_percentage && !shall_force_process_block {
-                metrics::counter!("server.witness_generator_fri.skipped_blocks", 1);
-                vlog::info!(
-                    "Skipping witness generation for block {}, blocks_proving_percentage: {}",
-                    block_number.0,
-                    blocks_proving_percentage
-                );
-
-                let mut prover_storage = prover_connection_pool.access_storage().await;
-                prover_storage
-                    .fri_witness_generator_dal()
-                    .mark_witness_job(FriWitnessJobStatus::Skipped, block_number)
-                    .await;
-                return None;
-            }
-        }
-
-        metrics::counter!("server.witness_generator_fri.sampled_blocks", 1);
-        vlog::info!(
-            "Starting witness generation of type {:?} for block {}",
-            AggregationRound::BasicCircuits,
-            block_number.0
-        );
-
-        Some(
-            process_basic_circuits_job(
-                &*object_store,
-                config,
-                connection_pool,
-                started_at,
-                block_number,
-                job,
-            )
-            .await,
-        )
-    }
-}
-
-#[async_trait]
-impl JobProcessor for BasicWitnessGenerator {
-    type Job = BasicWitnessGeneratorJob;
-    type JobId = L1BatchNumber;
-    // The artifact is optional to support skipping blocks when sampling is enabled.
-    type JobArtifacts = Option<BasicCircuitArtifacts>;
-
-    const SERVICE_NAME: &'static str = "fri_basic_circuit_witness_generator";
-
-    async fn get_next_job(&self) -> Option<(Self::JobId, Self::Job)> {
-        let mut prover_connection = self.prover_connection_pool.access_storage().await;
-        let last_l1_batch_to_process = self.config.last_l1_batch_to_process();
-
-        match prover_connection
-            .fri_witness_generator_dal()
-            .get_next_basic_circuit_witness_job(last_l1_batch_to_process)
-            .await
-        {
-            Some(block_number) => {
-                vlog::info!(
-                    "Processing FRI basic witness-gen for block {}",
-                    block_number
-                );
-                let started_at = Instant::now();
-                let job = get_artifacts(block_number, &*self.object_store).await;
-                metrics::histogram!(
-                    "prover_fri.witness_generation.blob_fetch_time",
-                    started_at.elapsed(),
-                    "aggregation_round" => format!("{:?}", AggregationRound::BasicCircuits),
-                );
-                Some((block_number, job))
-            }
-            None => None,
-        }
-    }
-
-    async fn save_failure(&self, job_id: L1BatchNumber, _started_at: Instant, error: String) -> () {
-        self.prover_connection_pool
-            .access_storage()
-            .await
-            .fri_witness_generator_dal()
-            .mark_witness_job_failed(&error, job_id)
-            .await;
-    }
-
-    #[allow(clippy::async_yields_async)]
-    async fn process_job(
-        &self,
-        job: BasicWitnessGeneratorJob,
-        started_at: Instant,
-    ) -> tokio::task::JoinHandle<Option<BasicCircuitArtifacts>> {
-        let config = Arc::clone(&self.config);
-        let object_store = Arc::clone(&self.object_store);
-        tokio::spawn(Self::process_job_impl(
-            object_store,
-            self.connection_pool.clone(),
-            self.prover_connection_pool.clone(),
-            job,
-            started_at,
-            config,
-        ))
-    }
-
-    async fn save_result(
-        &self,
-        job_id: L1BatchNumber,
-        started_at: Instant,
-        optional_artifacts: Option<BasicCircuitArtifacts>,
-    ) {
-        match optional_artifacts {
-            None => (),
-            Some(artifacts) => {
-                let blob_started_at = Instant::now();
-                let blob_urls = save_artifacts(
-                    job_id,
-                    artifacts,
-                    &*self.object_store,
-                    &*self.public_blob_store,
-                )
-                .await;
-                metrics::histogram!(
-                    "prover_fri.witness_generation.blob_save_time",
-                    blob_started_at.elapsed(),
-                    "aggregation_round" => format!("{:?}", AggregationRound::BasicCircuits),
-                );
-                update_database(&self.prover_connection_pool, started_at, job_id, blob_urls).await;
-            }
-        }
-    }
-}
-
-async fn process_basic_circuits_job(
-    object_store: &dyn ObjectStore,
-    config: Arc<FriWitnessGeneratorConfig>,
-    connection_pool: ConnectionPool,
-    started_at: Instant,
-    block_number: L1BatchNumber,
-    job: PrepareBasicCircuitsJob,
-) -> BasicCircuitArtifacts {
-    let witness_gen_input =
-        build_basic_circuits_witness_generator_input(&connection_pool, job, block_number).await;
-    let (
-        basic_circuits,
-        basic_circuits_inputs,
-        per_circuit_closed_form_inputs,
-        scheduler_witness,
-        aux_output_witness,
-    ) = generate_witness(object_store, config, connection_pool, witness_gen_input).await;
-    metrics::histogram!(
-        "prover_fri.witness_generation.witness_generation_time",
-        started_at.elapsed(),
-        "aggregation_round" => format!("{:?}", AggregationRound::BasicCircuits),
-    );
-    vlog::info!(
-        "Witness generation for block {} is complete in {:?}",
-        block_number.0,
-        started_at.elapsed()
-    );
-
-    BasicCircuitArtifacts {
-        basic_circuits,
-        basic_circuits_inputs,
-        per_circuit_closed_form_inputs,
-        scheduler_witness,
-        aux_output_witness,
-    }
-}
-
-async fn update_database(
-    prover_connection_pool: &ConnectionPool,
-    started_at: Instant,
-    block_number: L1BatchNumber,
-    blob_urls: BlobUrls,
-) {
-    let mut prover_connection = prover_connection_pool.access_storage().await;
-
-    prover_connection
-        .fri_prover_jobs_dal()
-        .insert_prover_jobs(
-            block_number,
-            blob_urls.circuit_ids_and_urls,
-            AggregationRound::BasicCircuits,
-            0,
-        )
-        .await;
-    prover_connection
-        .fri_witness_generator_dal()
-        .create_aggregation_jobs(
-            block_number,
-            &blob_urls.closed_form_inputs_and_urls,
-            &blob_urls.scheduler_witness_url,
-            get_recursive_layer_circuit_id_for_base_layer,
-        )
-        .await;
-    prover_connection
-        .fri_witness_generator_dal()
-        .mark_witness_job_as_successful(block_number, started_at.elapsed())
-        .await;
-}
-
-async fn get_artifacts(
-    block_number: L1BatchNumber,
-    object_store: &dyn ObjectStore,
-) -> BasicWitnessGeneratorJob {
-    let job = object_store.get(block_number).await.unwrap();
-    BasicWitnessGeneratorJob { block_number, job }
-}
-
-async fn save_artifacts(
-    block_number: L1BatchNumber,
-    artifacts: BasicCircuitArtifacts,
-    object_store: &dyn ObjectStore,
-    public_object_store: &dyn ObjectStore,
-) -> BlobUrls {
-    let circuit_ids_and_urls = save_base_prover_input_artifacts(
-        block_number,
-        artifacts.basic_circuits,
-        object_store,
-        AggregationRound::BasicCircuits,
-    )
-    .await;
-    let closed_form_inputs_and_urls = save_leaf_aggregation_artifacts(
-        block_number,
-        artifacts.basic_circuits_inputs,
-        artifacts.per_circuit_closed_form_inputs,
-        object_store,
-    )
-    .await;
-    let scheduler_witness_url = save_scheduler_artifacts(
-        block_number,
-        artifacts.scheduler_witness,
-        artifacts.aux_output_witness,
-        object_store,
-        public_object_store,
-    )
-    .await;
-
-    BlobUrls {
-        circuit_ids_and_urls,
-        closed_form_inputs_and_urls,
-        scheduler_witness_url,
-    }
-}
-
-async fn save_scheduler_artifacts(
-    block_number: L1BatchNumber,
-    scheduler_partial_input: SchedulerCircuitInstanceWitness<
-        GoldilocksField,
-        CircuitGoldilocksPoseidon2Sponge,
-        GoldilocksExt2,
-    >,
-    aux_output_witness: BlockAuxilaryOutputWitness<GoldilocksField>,
-    object_store: &dyn ObjectStore,
-    public_object_store: &dyn ObjectStore,
-) -> String {
-    let aux_output_witness_wrapper = AuxOutputWitnessWrapper(aux_output_witness);
-    public_object_store
-        .put(block_number, &aux_output_witness_wrapper)
-        .await
-        .unwrap();
-    object_store
-        .put(block_number, &aux_output_witness_wrapper)
-        .await
-        .unwrap();
-    let wrapper = SchedulerPartialInputWrapper(scheduler_partial_input);
-    object_store.put(block_number, &wrapper).await.unwrap()
-}
-
-async fn save_leaf_aggregation_artifacts(
-    block_number: L1BatchNumber,
-    basic_circuits_inputs: BlockBasicCircuitsPublicInputs<GoldilocksField>,
-    per_circuit_closed_form_inputs: BlockBasicCircuitsPublicCompactFormsWitnesses<GoldilocksField>,
-    object_store: &dyn ObjectStore,
-) -> Vec<(u8, String, usize)> {
-    let round_function = ZkSyncDefaultRoundFunction::default();
-    let queues = basic_circuits_inputs
-        .into_recursion_queues(per_circuit_closed_form_inputs, &round_function);
-    let mut circuit_id_urls_with_count = Vec::with_capacity(queues.len());
-    for (circuit_id_ref, recursion_queue_simulator, inputs) in queues {
-        let circuit_id = circuit_id_ref as u8;
-        let key = ClosedFormInputKey {
-            block_number,
-            circuit_id,
-        };
-        let basic_circuit_count = inputs.len();
-        let wrapper = ClosedFormInputWrapper(inputs, recursion_queue_simulator);
-        let blob_url = object_store.put(key, &wrapper).await.unwrap();
-        circuit_id_urls_with_count.push((circuit_id, blob_url, basic_circuit_count))
-    }
-    circuit_id_urls_with_count
-}
-
-// If making changes to this method, consider moving this logic to the DAL layer and make
-// `PrepareBasicCircuitsJob` have all fields of `BasicCircuitWitnessGeneratorInput`.
-async fn build_basic_circuits_witness_generator_input(
-    connection_pool: &ConnectionPool,
-    witness_merkle_input: PrepareBasicCircuitsJob,
-    l1_batch_number: L1BatchNumber,
-) -> BasicCircuitWitnessGeneratorInput {
-    let mut connection = connection_pool.access_storage().await;
-    let block_header = connection
-        .blocks_dal()
-        .get_l1_batch_header(l1_batch_number)
-        .await
-        .unwrap();
-    let initial_heap_content = connection
-        .blocks_dal()
-        .get_initial_bootloader_heap(l1_batch_number)
-        .await
-        .unwrap();
-    let (_, previous_block_timestamp) = connection
-        .blocks_dal()
-        .get_l1_batch_state_root_and_timestamp(l1_batch_number - 1)
-        .await
-        .unwrap();
-    let previous_block_hash = connection
-        .blocks_dal()
-        .get_l1_batch_state_root(l1_batch_number - 1)
-        .await
-        .expect("cannot generate witness before the root hash is computed");
-    BasicCircuitWitnessGeneratorInput {
-        block_number: l1_batch_number,
-        previous_block_timestamp,
-        previous_block_hash,
-        block_timestamp: block_header.timestamp,
-        used_bytecodes_hashes: block_header.used_contract_hashes,
-        initial_heap_content,
-        merkle_paths_input: witness_merkle_input,
-    }
-}
-
-async fn generate_witness(
-    object_store: &dyn ObjectStore,
-    config: Arc<FriWitnessGeneratorConfig>,
-    connection_pool: ConnectionPool,
-    input: BasicCircuitWitnessGeneratorInput,
-) -> (
-    BlockBasicCircuits<GoldilocksField, ZkSyncDefaultRoundFunction>,
-    BlockBasicCircuitsPublicInputs<GoldilocksField>,
-    BlockBasicCircuitsPublicCompactFormsWitnesses<GoldilocksField>,
-    SchedulerCircuitInstanceWitness<
-        GoldilocksField,
-        CircuitGoldilocksPoseidon2Sponge,
-        GoldilocksExt2,
-    >,
-    BlockAuxilaryOutputWitness<GoldilocksField>,
-) {
-    let mut connection = connection_pool.access_storage().await;
-    let header = connection
-        .blocks_dal()
-        .get_l1_batch_header(input.block_number)
-        .await
-        .unwrap();
-    let bootloader_code_bytes = connection
-        .storage_dal()
-        .get_factory_dep(header.base_system_contracts_hashes.bootloader)
-        .await
-        .expect("Bootloader bytecode should exist");
-    let bootloader_code = bytes_to_chunks(&bootloader_code_bytes);
-    let account_bytecode_bytes = connection
-        .storage_dal()
-        .get_factory_dep(header.base_system_contracts_hashes.default_aa)
-        .await
-        .expect("Default aa bytecode should exist");
-    let account_bytecode = bytes_to_chunks(&account_bytecode_bytes);
-    let bootloader_contents = expand_bootloader_contents(&input.initial_heap_content);
-    let account_code_hash = h256_to_u256(header.base_system_contracts_hashes.default_aa);
-
-    let hashes: HashSet<H256> = input
-        .used_bytecodes_hashes
-        .iter()
-        // SMA-1555: remove this hack once updated to the latest version of zkevm_test_harness
-        .filter(|&&hash| hash != h256_to_u256(header.base_system_contracts_hashes.bootloader))
-        .map(|hash| u256_to_h256(*hash))
-        .collect();
-
-    let mut used_bytecodes = connection.storage_dal().get_factory_deps(&hashes).await;
-    if input.used_bytecodes_hashes.contains(&account_code_hash) {
-        used_bytecodes.insert(account_code_hash, account_bytecode);
-    }
-
-    assert_eq!(
-        hashes.len(),
-        used_bytecodes.len(),
-        "{} factory deps are not found in DB",
-        hashes.len() - used_bytecodes.len()
-    );
-
-    // `DbStorageProvider` was designed to be used in API, so it accepts miniblock numbers.
-    // Probably, we should make it work with L1 batch numbers too.
-    let (_, last_miniblock_number) = connection
-        .blocks_dal()
-        .get_miniblock_range_of_l1_batch(input.block_number - 1)
-        .await
-        .expect("L1 batch should contain at least one miniblock");
-    drop(connection);
-
-    let mut tree = PrecalculatedMerklePathsProvider::new(
-        input.merkle_paths_input,
-        input.previous_block_hash.0,
-    );
-    let geometry_config = get_geometry_config();
-    let mut hasher = DefaultHasher::new();
-    geometry_config.hash(&mut hasher);
-    vlog::info!(
-        "generating witness for block {} using geometry config hash: {}",
-        input.block_number.0,
-        hasher.finish()
-    );
-
-    let should_dump_arguments = config
-        .dump_arguments_for_blocks
-        .contains(&input.block_number.0);
-    if should_dump_arguments {
-        save_run_with_fixed_params_args_to_gcs(
-            object_store,
-            input.block_number.0,
-            last_miniblock_number.0,
-            Address::zero(),
-            BOOTLOADER_ADDRESS,
-            bootloader_code.clone(),
-            bootloader_contents.clone(),
-            false,
-            account_code_hash,
-            used_bytecodes.clone(),
-            Vec::default(),
-            MAX_CYCLES_FOR_TX as usize,
-            geometry_config,
-            tree.clone(),
-        )
-        .await;
-    }
-
-    // The following part is CPU-heavy, so we move it to a separate thread.
-    let rt_handle = tokio::runtime::Handle::current();
-    tokio::task::spawn_blocking(move || {
-        let connection = rt_handle.block_on(connection_pool.access_storage());
-        let storage = PostgresStorage::new(rt_handle, connection, last_miniblock_number, true);
-        let storage_view = &mut StorageView::new(storage);
-        let storage_oracle: StorageOracle<HistoryDisabled> =
-            StorageOracle::new(storage_view.as_ptr());
-        zkevm_test_harness::external_calls::run_with_fixed_params(
-            Address::zero(),
-            BOOTLOADER_ADDRESS,
-            bootloader_code,
-            bootloader_contents,
-            false,
-            account_code_hash,
-            used_bytecodes,
-            Vec::default(),
-            MAX_CYCLES_FOR_TX as usize,
-            geometry_config,
-            storage_oracle,
-            &mut tree,
-        )
-    })
-    .await
-    .unwrap()
-}
-
-#[allow(clippy::too_many_arguments)]
-async fn save_run_with_fixed_params_args_to_gcs(
-    object_store: &dyn ObjectStore,
-    l1_batch_number: u32,
-    last_miniblock_number: u32,
-    caller: Address,
-    entry_point_address: Address,
-    entry_point_code: Vec<[u8; 32]>,
-    initial_heap_content: Vec<u8>,
-    zk_porter_is_available: bool,
-    default_aa_code_hash: U256,
-    used_bytecodes: HashMap<U256, Vec<[u8; 32]>>,
-    ram_verification_queries: Vec<(u32, U256)>,
-    cycle_limit: usize,
-    geometry: GeometryConfig,
-    tree: PrecalculatedMerklePathsProvider,
-) {
-    let run_with_fixed_params_input = RunWithFixedParamsInput {
-        l1_batch_number,
-        last_miniblock_number,
-        caller,
-        entry_point_address,
-        entry_point_code,
-        initial_heap_content,
-        zk_porter_is_available,
-        default_aa_code_hash,
-        used_bytecodes,
-        ram_verification_queries,
-        cycle_limit,
-        geometry,
-        tree,
-    };
-    object_store
-        .put(L1BatchNumber(l1_batch_number), &run_with_fixed_params_input)
-        .await
-        .unwrap();
-}
-
-#[derive(Debug, Serialize, Deserialize, Clone, PartialEq)]
-pub struct RunWithFixedParamsInput {
-    pub l1_batch_number: u32,
-    pub last_miniblock_number: u32,
-    pub caller: Address,
-    pub entry_point_address: Address,
-    pub entry_point_code: Vec<[u8; 32]>,
-    pub initial_heap_content: Vec<u8>,
-    pub zk_porter_is_available: bool,
-    pub default_aa_code_hash: U256,
-    pub used_bytecodes: HashMap<U256, Vec<[u8; 32]>>,
-    pub ram_verification_queries: Vec<(u32, U256)>,
-    pub cycle_limit: usize,
-    pub geometry: GeometryConfig,
-    pub tree: PrecalculatedMerklePathsProvider,
-}
-
-impl StoredObject for RunWithFixedParamsInput {
-    const BUCKET: Bucket = Bucket::WitnessInput;
-    type Key<'a> = L1BatchNumber;
-
-    fn encode_key(key: Self::Key<'_>) -> String {
-        format!("run_with_fixed_params_input_{}.bin", key)
-    }
-
-    zksync_object_store::serialize_using_bincode!();
-}
diff --git a/prover/witness_generator/src/leaf_aggregation.rs b/prover/witness_generator/src/leaf_aggregation.rs
deleted file mode 100644
index de1665f95213..000000000000
--- a/prover/witness_generator/src/leaf_aggregation.rs
+++ /dev/null
@@ -1,312 +0,0 @@
-use zkevm_test_harness::witness::recursive_aggregation::{
-    compute_leaf_params, create_leaf_witnesses,
-};
-
-use std::time::Instant;
-
-use async_trait::async_trait;
-use zksync_prover_fri_types::circuit_definitions::boojum::field::goldilocks::GoldilocksField;
-use zksync_prover_fri_types::circuit_definitions::circuit_definitions::base_layer::{
-    ZkSyncBaseLayerClosedFormInput, ZkSyncBaseLayerProof, ZkSyncBaseLayerVerificationKey,
-};
-use zksync_prover_fri_types::circuit_definitions::circuit_definitions::recursion_layer::ZkSyncRecursiveLayerCircuit;
-use zksync_prover_fri_types::circuit_definitions::encodings::recursion_request::RecursionQueueSimulator;
-use zksync_prover_fri_types::FriProofWrapper;
-use zksync_prover_fri_utils::get_recursive_layer_circuit_id_for_base_layer;
-use zksync_vk_setup_data_server_fri::{
-    get_base_layer_vk_for_circuit_type, get_recursive_layer_vk_for_circuit_type,
-};
-
-use crate::utils::{
-    load_proofs_for_job_ids, save_node_aggregations_artifacts,
-    save_recursive_layer_prover_input_artifacts, ClosedFormInputWrapper,
-};
-use zksync_config::configs::FriWitnessGeneratorConfig;
-use zksync_dal::ConnectionPool;
-use zksync_object_store::{ClosedFormInputKey, ObjectStore, ObjectStoreFactory};
-use zksync_prover_fri_types::circuit_definitions::zkevm_circuits::recursion::leaf_layer::input::RecursionLeafParametersWitness;
-use zksync_queued_job_processor::JobProcessor;
-use zksync_types::proofs::{AggregationRound, LeafAggregationJobMetadata};
-use zksync_types::L1BatchNumber;
-
-pub struct LeafAggregationArtifacts {
-    circuit_id: u8,
-    block_number: L1BatchNumber,
-    pub aggregations: Vec<(
-        u64,
-        RecursionQueueSimulator<GoldilocksField>,
-        ZkSyncRecursiveLayerCircuit,
-    )>,
-    #[allow(dead_code)]
-    closed_form_inputs: Vec<ZkSyncBaseLayerClosedFormInput<GoldilocksField>>,
-}
-
-#[derive(Debug)]
-struct BlobUrls {
-    circuit_ids_and_urls: Vec<(u8, String)>,
-    aggregations_urls: String,
-}
-
-pub struct LeafAggregationWitnessGeneratorJob {
-    pub(crate) circuit_id: u8,
-    pub(crate) block_number: L1BatchNumber,
-    pub(crate) closed_form_inputs: ClosedFormInputWrapper,
-    pub(crate) proofs: Vec<ZkSyncBaseLayerProof>,
-    pub(crate) base_vk: ZkSyncBaseLayerVerificationKey,
-    pub(crate) leaf_params: RecursionLeafParametersWitness<GoldilocksField>,
-}
-
-#[derive(Debug)]
-pub struct LeafAggregationWitnessGenerator {
-    #[allow(dead_code)]
-    config: FriWitnessGeneratorConfig,
-    object_store: Box<dyn ObjectStore>,
-    prover_connection_pool: ConnectionPool,
-}
-
-impl LeafAggregationWitnessGenerator {
-    pub async fn new(
-        config: FriWitnessGeneratorConfig,
-        store_factory: &ObjectStoreFactory,
-        prover_connection_pool: ConnectionPool,
-    ) -> Self {
-        Self {
-            config,
-            object_store: store_factory.create_store().await,
-            prover_connection_pool,
-        }
-    }
-
-    pub fn process_job_sync(
-        leaf_job: LeafAggregationWitnessGeneratorJob,
-        started_at: Instant,
-    ) -> LeafAggregationArtifacts {
-        vlog::info!(
-            "Starting witness generation of type {:?} for block {} with circuit {}",
-            AggregationRound::LeafAggregation,
-            leaf_job.block_number.0,
-            leaf_job.circuit_id,
-        );
-        process_leaf_aggregation_job(started_at, leaf_job)
-    }
-}
-
-#[async_trait]
-impl JobProcessor for LeafAggregationWitnessGenerator {
-    type Job = LeafAggregationWitnessGeneratorJob;
-    type JobId = u32;
-    type JobArtifacts = LeafAggregationArtifacts;
-
-    const SERVICE_NAME: &'static str = "fri_leaf_aggregation_witness_generator";
-
-    async fn get_next_job(&self) -> Option<(Self::JobId, Self::Job)> {
-        let mut prover_connection = self.prover_connection_pool.access_storage().await;
-        let metadata = prover_connection
-            .fri_witness_generator_dal()
-            .get_next_leaf_aggregation_job()
-            .await?;
-        vlog::info!("Processing node aggregation job {:?}", metadata.id);
-        Some((
-            metadata.id,
-            prepare_leaf_aggregation_job(metadata, &*self.object_store).await,
-        ))
-    }
-
-    async fn save_failure(&self, job_id: u32, _started_at: Instant, error: String) -> () {
-        self.prover_connection_pool
-            .access_storage()
-            .await
-            .fri_witness_generator_dal()
-            .mark_leaf_aggregation_job_failed(&error, job_id)
-            .await;
-    }
-
-    #[allow(clippy::async_yields_async)]
-    async fn process_job(
-        &self,
-        job: LeafAggregationWitnessGeneratorJob,
-        started_at: Instant,
-    ) -> tokio::task::JoinHandle<LeafAggregationArtifacts> {
-        tokio::task::spawn_blocking(move || Self::process_job_sync(job, started_at))
-    }
-
-    async fn save_result(
-        &self,
-        job_id: u32,
-        started_at: Instant,
-        artifacts: LeafAggregationArtifacts,
-    ) {
-        let block_number = artifacts.block_number;
-        let circuit_id = artifacts.circuit_id;
-        let blob_urls = save_artifacts(artifacts, &*self.object_store).await;
-        update_database(
-            &self.prover_connection_pool,
-            started_at,
-            block_number,
-            job_id,
-            blob_urls,
-            circuit_id,
-        )
-        .await;
-    }
-}
-
-pub async fn prepare_leaf_aggregation_job(
-    metadata: LeafAggregationJobMetadata,
-    object_store: &dyn ObjectStore,
-) -> LeafAggregationWitnessGeneratorJob {
-    let started_at = Instant::now();
-    let closed_form_input = get_artifacts(&metadata, object_store).await;
-    let proofs = load_proofs_for_job_ids(&metadata.prover_job_ids_for_proofs, object_store).await;
-    metrics::histogram!(
-        "prover_fri.witness_generation.blob_fetch_time",
-        started_at.elapsed(),
-        "aggregation_round" => format!("{:?}", AggregationRound::LeafAggregation),
-    );
-    let started_at = Instant::now();
-    let base_vk = get_base_layer_vk_for_circuit_type(metadata.circuit_id);
-    // this is a temp solution to unblock shadow proving.
-    // we should have a method that converts basic circuit id to leaf circuit id as they are different.
-    let leaf_vk = get_recursive_layer_vk_for_circuit_type(metadata.circuit_id + 2);
-    let base_proofs = proofs
-        .into_iter()
-        .map(|wrapper| match wrapper {
-            FriProofWrapper::Base(base_proof) => base_proof,
-            FriProofWrapper::Recursive(_) => {
-                panic!("Expected only base proofs for leaf agg {}", metadata.id)
-            }
-        })
-        .collect::<Vec<_>>();
-    let leaf_params = compute_leaf_params(metadata.circuit_id, base_vk.clone(), leaf_vk);
-    metrics::histogram!(
-        "prover_fri.witness_generation.prepare_job_time",
-        started_at.elapsed(),
-        "aggregation_round" => format!("{:?}", AggregationRound::LeafAggregation),
-    );
-    LeafAggregationWitnessGeneratorJob {
-        circuit_id: metadata.circuit_id,
-        block_number: metadata.block_number,
-        closed_form_inputs: closed_form_input,
-        proofs: base_proofs,
-        base_vk,
-        leaf_params,
-    }
-}
-
-pub fn process_leaf_aggregation_job(
-    started_at: Instant,
-    job: LeafAggregationWitnessGeneratorJob,
-) -> LeafAggregationArtifacts {
-    let circuit_id = job.circuit_id;
-    let subsets = (
-        circuit_id as u64,
-        job.closed_form_inputs.1,
-        job.closed_form_inputs.0,
-    );
-    let leaf_params = (circuit_id, job.leaf_params);
-    let (aggregations, closed_form_inputs) =
-        create_leaf_witnesses(subsets, job.proofs, job.base_vk, leaf_params);
-    metrics::histogram!(
-        "prover_fri.witness_generation.witness_generation_time",
-        started_at.elapsed(),
-        "aggregation_round" => format!("{:?}", AggregationRound::LeafAggregation),
-    );
-    vlog::info!(
-        "Leaf witness generation for block {} with circuit id {}: is complete in {:?}.",
-        job.block_number.0,
-        circuit_id,
-        started_at.elapsed(),
-    );
-
-    LeafAggregationArtifacts {
-        circuit_id,
-        block_number: job.block_number,
-        aggregations,
-        closed_form_inputs,
-    }
-}
-
-async fn update_database(
-    prover_connection_pool: &ConnectionPool,
-    started_at: Instant,
-    block_number: L1BatchNumber,
-    job_id: u32,
-    blob_urls: BlobUrls,
-    circuit_id: u8,
-) {
-    let mut prover_connection = prover_connection_pool.access_storage().await;
-    let mut transaction = prover_connection.start_transaction().await;
-    let number_of_dependent_jobs = blob_urls.circuit_ids_and_urls.len();
-    transaction
-        .fri_prover_jobs_dal()
-        .insert_prover_jobs(
-            block_number,
-            blob_urls.circuit_ids_and_urls,
-            AggregationRound::LeafAggregation,
-            0,
-        )
-        .await;
-    transaction
-        .fri_witness_generator_dal()
-        .update_node_aggregation_jobs_url(
-            block_number,
-            get_recursive_layer_circuit_id_for_base_layer(circuit_id),
-            number_of_dependent_jobs,
-            0,
-            blob_urls.aggregations_urls,
-        )
-        .await;
-    transaction
-        .fri_witness_generator_dal()
-        .mark_leaf_aggregation_as_successful(job_id, started_at.elapsed())
-        .await;
-
-    transaction.commit().await;
-}
-
-async fn get_artifacts(
-    metadata: &LeafAggregationJobMetadata,
-    object_store: &dyn ObjectStore,
-) -> ClosedFormInputWrapper {
-    let key = ClosedFormInputKey {
-        block_number: metadata.block_number,
-        circuit_id: metadata.circuit_id,
-    };
-    object_store
-        .get(key)
-        .await
-        .unwrap_or_else(|_| panic!("leaf aggregation job artifacts missing: {:?}", key))
-}
-
-async fn save_artifacts(
-    artifacts: LeafAggregationArtifacts,
-    object_store: &dyn ObjectStore,
-) -> BlobUrls {
-    let started_at = Instant::now();
-    let aggregations_urls = save_node_aggregations_artifacts(
-        artifacts.block_number,
-        get_recursive_layer_circuit_id_for_base_layer(artifacts.circuit_id),
-        0,
-        artifacts.aggregations.clone(),
-        object_store,
-    )
-    .await;
-    let circuit_ids_and_urls = save_recursive_layer_prover_input_artifacts(
-        artifacts.block_number,
-        artifacts.aggregations,
-        AggregationRound::LeafAggregation,
-        0,
-        object_store,
-        None,
-    )
-    .await;
-    metrics::histogram!(
-        "prover_fri.witness_generation.blob_save_time",
-        started_at.elapsed(),
-        "aggregation_round" => format!("{:?}", AggregationRound::LeafAggregation),
-    );
-    BlobUrls {
-        circuit_ids_and_urls,
-        aggregations_urls,
-    }
-}
diff --git a/prover/witness_generator/src/lib.rs b/prover/witness_generator/src/lib.rs
deleted file mode 100644
index e74077dd44fc..000000000000
--- a/prover/witness_generator/src/lib.rs
+++ /dev/null
@@ -1,4 +0,0 @@
-pub mod leaf_aggregation;
-pub mod node_aggregation;
-pub mod scheduler;
-pub mod utils;
diff --git a/prover/witness_generator/src/main.rs b/prover/witness_generator/src/main.rs
deleted file mode 100644
index 5ac7890daaca..000000000000
--- a/prover/witness_generator/src/main.rs
+++ /dev/null
@@ -1,142 +0,0 @@
-#![feature(generic_const_exprs)]
-
-use prometheus_exporter::run_prometheus_exporter;
-use std::time::Instant;
-use structopt::StructOpt;
-use tokio::sync::watch;
-use zksync_config::configs::{AlertsConfig, FriWitnessGeneratorConfig, PrometheusConfig};
-use zksync_config::ObjectStoreConfig;
-use zksync_dal::{connection::DbVariant, ConnectionPool};
-use zksync_object_store::ObjectStoreFactory;
-use zksync_prover_utils::get_stop_signal_receiver;
-use zksync_queued_job_processor::JobProcessor;
-use zksync_types::proofs::AggregationRound;
-use zksync_types::web3::futures::StreamExt;
-use zksync_utils::wait_for_tasks::wait_for_tasks;
-
-use crate::basic_circuits::BasicWitnessGenerator;
-use crate::leaf_aggregation::LeafAggregationWitnessGenerator;
-use crate::node_aggregation::NodeAggregationWitnessGenerator;
-use crate::scheduler::SchedulerWitnessGenerator;
-
-mod basic_circuits;
-mod leaf_aggregation;
-mod node_aggregation;
-mod precalculated_merkle_paths_provider;
-mod scheduler;
-mod utils;
-
-#[derive(Debug, StructOpt)]
-#[structopt(
-    name = "Run witness generator for different aggregation round",
-    about = "Component for generating witness"
-)]
-struct Opt {
-    /// Number of times witness generator should be run.
-    #[structopt(short = "b", long = "batch_size")]
-    batch_size: Option<usize>,
-    /// aggregation round for the witness generator.
-    #[structopt(short = "r", long = "round")]
-    round: AggregationRound,
-}
-
-#[tokio::main]
-async fn main() {
-    vlog::init();
-    let sentry_guard = vlog::init_sentry();
-    match sentry_guard {
-        Some(_) => vlog::info!(
-            "Starting Sentry url: {}",
-            std::env::var("MISC_SENTRY_URL").unwrap(),
-        ),
-        None => vlog::info!("No sentry url configured"),
-    }
-
-    let opt = Opt::from_args();
-    let started_at = Instant::now();
-    vlog::info!(
-        "initializing the {:?} witness generator, batch size: {:?}",
-        opt.round,
-        opt.batch_size
-    );
-    let use_push_gateway = opt.batch_size.is_some();
-
-    let store_factory = ObjectStoreFactory::from_env();
-    let config = FriWitnessGeneratorConfig::from_env();
-    let prometheus_config = PrometheusConfig::from_env();
-    let connection_pool = ConnectionPool::builder(DbVariant::Master).build().await;
-    let prover_connection_pool = ConnectionPool::builder(DbVariant::Prover).build().await;
-    let (stop_sender, stop_receiver) = watch::channel(false);
-
-    let witness_generator_task = match opt.round {
-        AggregationRound::BasicCircuits => {
-            let public_blob_store = ObjectStoreFactory::new(ObjectStoreConfig::public_from_env())
-                .create_store()
-                .await;
-            let generator = BasicWitnessGenerator::new(
-                config,
-                &store_factory,
-                public_blob_store,
-                connection_pool,
-                prover_connection_pool,
-            )
-            .await;
-            generator.run(stop_receiver, opt.batch_size)
-        }
-        AggregationRound::LeafAggregation => {
-            let generator = LeafAggregationWitnessGenerator::new(
-                config,
-                &store_factory,
-                prover_connection_pool,
-            )
-            .await;
-            generator.run(stop_receiver, opt.batch_size)
-        }
-        AggregationRound::NodeAggregation => {
-            let generator =
-                NodeAggregationWitnessGenerator::new(&store_factory, prover_connection_pool).await;
-            generator.run(stop_receiver, opt.batch_size)
-        }
-        AggregationRound::Scheduler => {
-            let generator =
-                SchedulerWitnessGenerator::new(&store_factory, prover_connection_pool).await;
-            generator.run(stop_receiver, opt.batch_size)
-        }
-    };
-    let tasks = vec![
-        run_prometheus_exporter(
-            prometheus_config.listener_port,
-            use_push_gateway.then(|| {
-                (
-                    prometheus_config.pushgateway_url.clone(),
-                    prometheus_config.push_interval(),
-                )
-            }),
-        ),
-        tokio::spawn(witness_generator_task),
-    ];
-    vlog::info!(
-        "initialized {:?} witness generator in {:?}",
-        opt.round,
-        started_at.elapsed()
-    );
-    metrics::gauge!(
-        "server.init.latency",
-        started_at.elapsed(),
-        "stage" => format!("fri_witness_generator_{:?}", opt.round)
-    );
-
-    let mut stop_signal_receiver = get_stop_signal_receiver();
-    let particular_crypto_alerts = Some(AlertsConfig::from_env().sporadic_crypto_errors_substrs);
-    let graceful_shutdown = None::<futures::future::Ready<()>>;
-    let tasks_allowed_to_finish = false;
-    tokio::select! {
-        _ = wait_for_tasks(tasks, particular_crypto_alerts, graceful_shutdown, tasks_allowed_to_finish) => {},
-        _ = stop_signal_receiver.next() => {
-            vlog::info!("Stop signal received, shutting down");
-        }
-    }
-
-    stop_sender.send(true).ok();
-    vlog::info!("Finished witness generation");
-}
diff --git a/prover/witness_generator/src/node_aggregation.rs b/prover/witness_generator/src/node_aggregation.rs
deleted file mode 100644
index 26c2e29e0d30..000000000000
--- a/prover/witness_generator/src/node_aggregation.rs
+++ /dev/null
@@ -1,344 +0,0 @@
-use std::time::Instant;
-
-use async_trait::async_trait;
-use zksync_prover_fri_types::circuit_definitions::boojum::field::goldilocks::GoldilocksField;
-use zksync_prover_fri_types::circuit_definitions::circuit_definitions::recursion_layer::{
-    ZkSyncRecursionLayerProof, ZkSyncRecursionLayerStorageType,
-    ZkSyncRecursionLayerVerificationKey, ZkSyncRecursiveLayerCircuit,
-};
-use zksync_prover_fri_types::circuit_definitions::encodings::recursion_request::RecursionQueueSimulator;
-
-use zkevm_test_harness::witness::recursive_aggregation::{
-    compute_node_vk_commitment, create_node_witnesses,
-};
-use zksync_prover_fri_types::circuit_definitions::zkevm_circuits::recursion::leaf_layer::input::RecursionLeafParametersWitness;
-use zksync_vk_setup_data_server_fri::get_recursive_layer_vk_for_circuit_type;
-use zksync_vk_setup_data_server_fri::utils::get_leaf_vk_params;
-
-use crate::utils::{
-    load_proofs_for_job_ids, save_node_aggregations_artifacts,
-    save_recursive_layer_prover_input_artifacts, AggregationWrapper,
-};
-use zksync_dal::ConnectionPool;
-use zksync_object_store::{AggregationsKey, ObjectStore, ObjectStoreFactory};
-use zksync_prover_fri_types::FriProofWrapper;
-use zksync_queued_job_processor::JobProcessor;
-use zksync_types::proofs::NodeAggregationJobMetadata;
-use zksync_types::{proofs::AggregationRound, L1BatchNumber};
-
-pub struct NodeAggregationArtifacts {
-    circuit_id: u8,
-    block_number: L1BatchNumber,
-    depth: u16,
-    pub next_aggregations: Vec<(
-        u64,
-        RecursionQueueSimulator<GoldilocksField>,
-        ZkSyncRecursiveLayerCircuit,
-    )>,
-}
-
-#[derive(Debug)]
-struct BlobUrls {
-    node_aggregations_url: String,
-    circuit_ids_and_urls: Vec<(u8, String)>,
-}
-
-#[derive(Clone)]
-pub struct NodeAggregationWitnessGeneratorJob {
-    circuit_id: u8,
-    block_number: L1BatchNumber,
-    depth: u16,
-    aggregations: Vec<(
-        u64,
-        RecursionQueueSimulator<GoldilocksField>,
-        ZkSyncRecursiveLayerCircuit,
-    )>,
-    proofs: Vec<ZkSyncRecursionLayerProof>,
-    leaf_vk: ZkSyncRecursionLayerVerificationKey,
-    node_vk: ZkSyncRecursionLayerVerificationKey,
-    all_leafs_layer_params: Vec<(u8, RecursionLeafParametersWitness<GoldilocksField>)>,
-}
-
-#[derive(Debug)]
-pub struct NodeAggregationWitnessGenerator {
-    object_store: Box<dyn ObjectStore>,
-    prover_connection_pool: ConnectionPool,
-}
-
-impl NodeAggregationWitnessGenerator {
-    pub async fn new(
-        store_factory: &ObjectStoreFactory,
-        prover_connection_pool: ConnectionPool,
-    ) -> Self {
-        Self {
-            object_store: store_factory.create_store().await,
-            prover_connection_pool,
-        }
-    }
-
-    pub fn process_job_sync(
-        job: NodeAggregationWitnessGeneratorJob,
-        started_at: Instant,
-    ) -> NodeAggregationArtifacts {
-        let node_vk_commitment = compute_node_vk_commitment(job.node_vk.clone());
-        vlog::info!(
-            "Starting witness generation of type {:?} for block {} circuit id {} depth {}",
-            AggregationRound::NodeAggregation,
-            job.block_number.0,
-            job.circuit_id,
-            job.depth
-        );
-        let vk = match job.depth {
-            0 => job.leaf_vk,
-            _ => job.node_vk,
-        };
-        let next_aggregations = create_node_witnesses(
-            job.aggregations,
-            job.proofs,
-            vk,
-            node_vk_commitment,
-            &job.all_leafs_layer_params,
-        );
-        metrics::histogram!(
-                    "prover_fri.witness_generation.witness_generation_time",
-                    started_at.elapsed(),
-                    "aggregation_round" => format!("{:?}", AggregationRound::NodeAggregation),
-        );
-        vlog::info!(
-        "Node witness generation for block {} with circuit id {} at depth {} with {} next_aggregations jobs completed in {:?}.",
-        job.block_number.0,
-        job.circuit_id,
-        job.depth,
-        next_aggregations.len(),
-        started_at.elapsed(),
-    );
-
-        NodeAggregationArtifacts {
-            circuit_id: job.circuit_id,
-            block_number: job.block_number,
-            depth: job.depth + 1,
-            next_aggregations,
-        }
-    }
-}
-
-#[async_trait]
-impl JobProcessor for NodeAggregationWitnessGenerator {
-    type Job = NodeAggregationWitnessGeneratorJob;
-    type JobId = u32;
-    type JobArtifacts = NodeAggregationArtifacts;
-
-    const SERVICE_NAME: &'static str = "fri_node_aggregation_witness_generator";
-
-    async fn get_next_job(&self) -> Option<(Self::JobId, Self::Job)> {
-        let mut prover_connection = self.prover_connection_pool.access_storage().await;
-        let metadata = prover_connection
-            .fri_witness_generator_dal()
-            .get_next_node_aggregation_job()
-            .await?;
-        vlog::info!("Processing node aggregation job {:?}", metadata.id);
-        Some((
-            metadata.id,
-            prepare_job(metadata, &*self.object_store).await,
-        ))
-    }
-
-    async fn save_failure(&self, job_id: u32, _started_at: Instant, error: String) -> () {
-        self.prover_connection_pool
-            .access_storage()
-            .await
-            .fri_witness_generator_dal()
-            .mark_node_aggregation_job_failed(&error, job_id)
-            .await;
-    }
-
-    #[allow(clippy::async_yields_async)]
-    async fn process_job(
-        &self,
-        job: NodeAggregationWitnessGeneratorJob,
-        started_at: Instant,
-    ) -> tokio::task::JoinHandle<NodeAggregationArtifacts> {
-        tokio::task::spawn_blocking(move || Self::process_job_sync(job, started_at))
-    }
-
-    async fn save_result(
-        &self,
-        job_id: u32,
-        started_at: Instant,
-        artifacts: NodeAggregationArtifacts,
-    ) {
-        let block_number = artifacts.block_number;
-        let circuit_id = artifacts.circuit_id;
-        let depth = artifacts.depth;
-        let shall_continue_node_aggregations = artifacts.next_aggregations.len() > 1;
-        let blob_urls = save_artifacts(artifacts, &*self.object_store).await;
-        update_database(
-            &self.prover_connection_pool,
-            started_at,
-            job_id,
-            block_number,
-            depth,
-            circuit_id,
-            blob_urls,
-            shall_continue_node_aggregations,
-        )
-        .await;
-    }
-}
-
-pub async fn prepare_job(
-    metadata: NodeAggregationJobMetadata,
-    object_store: &dyn ObjectStore,
-) -> NodeAggregationWitnessGeneratorJob {
-    let started_at = Instant::now();
-    let artifacts = get_artifacts(&metadata, object_store).await;
-    let proofs = load_proofs_for_job_ids(&metadata.prover_job_ids_for_proofs, object_store).await;
-    metrics::histogram!(
-                    "prover_fri.witness_generation.blob_fetch_time",
-                    started_at.elapsed(),
-                    "aggregation_round" => format!("{:?}", AggregationRound::NodeAggregation),
-    );
-    let started_at = Instant::now();
-    let leaf_vk = get_recursive_layer_vk_for_circuit_type(metadata.circuit_id);
-    let node_vk = get_recursive_layer_vk_for_circuit_type(
-        ZkSyncRecursionLayerStorageType::NodeLayerCircuit as u8,
-    );
-
-    let recursive_proofs = proofs
-        .into_iter()
-        .map(|wrapper| match wrapper {
-            FriProofWrapper::Base(_) => {
-                panic!(
-                    "Expected only recursive proofs for node agg {}",
-                    metadata.id
-                )
-            }
-            FriProofWrapper::Recursive(recursive_proof) => recursive_proof,
-        })
-        .collect::<Vec<_>>();
-
-    metrics::histogram!(
-                    "prover_fri.witness_generation.job_preparation_time",
-                    started_at.elapsed(),
-                    "aggregation_round" => format!("{:?}", AggregationRound::NodeAggregation),
-    );
-    NodeAggregationWitnessGeneratorJob {
-        circuit_id: metadata.circuit_id,
-        block_number: metadata.block_number,
-        depth: metadata.depth,
-        aggregations: artifacts.0,
-        proofs: recursive_proofs,
-        leaf_vk,
-        node_vk,
-        all_leafs_layer_params: get_leaf_vk_params(),
-    }
-}
-
-#[allow(clippy::too_many_arguments)]
-async fn update_database(
-    prover_connection_pool: &ConnectionPool,
-    started_at: Instant,
-    id: u32,
-    block_number: L1BatchNumber,
-    depth: u16,
-    circuit_id: u8,
-    blob_urls: BlobUrls,
-    shall_continue_node_aggregations: bool,
-) {
-    let mut prover_connection = prover_connection_pool.access_storage().await;
-    let mut transaction = prover_connection.start_transaction().await;
-    let dependent_jobs = blob_urls.circuit_ids_and_urls.len();
-    match shall_continue_node_aggregations {
-        true => {
-            transaction
-                .fri_prover_jobs_dal()
-                .insert_prover_jobs(
-                    block_number,
-                    blob_urls.circuit_ids_and_urls,
-                    AggregationRound::NodeAggregation,
-                    depth,
-                )
-                .await;
-            transaction
-                .fri_witness_generator_dal()
-                .insert_node_aggregation_jobs(
-                    block_number,
-                    circuit_id,
-                    Some(dependent_jobs as i32),
-                    depth,
-                    &blob_urls.node_aggregations_url,
-                )
-                .await;
-        }
-        false => {
-            let (_, blob_url) = blob_urls.circuit_ids_and_urls[0].clone();
-            transaction
-                .fri_prover_jobs_dal()
-                .insert_prover_job(
-                    block_number,
-                    circuit_id,
-                    depth,
-                    0,
-                    AggregationRound::NodeAggregation,
-                    &blob_url,
-                    true,
-                )
-                .await
-        }
-    }
-
-    transaction
-        .fri_witness_generator_dal()
-        .mark_node_aggregation_as_successful(id, started_at.elapsed())
-        .await;
-
-    transaction.commit().await;
-}
-
-async fn get_artifacts(
-    metadata: &NodeAggregationJobMetadata,
-    object_store: &dyn ObjectStore,
-) -> AggregationWrapper {
-    let key = AggregationsKey {
-        block_number: metadata.block_number,
-        circuit_id: metadata.circuit_id,
-        depth: metadata.depth,
-    };
-    object_store
-        .get(key)
-        .await
-        .unwrap_or_else(|_| panic!("node aggregation job artifacts missing: {:?}", key))
-}
-
-async fn save_artifacts(
-    artifacts: NodeAggregationArtifacts,
-    object_store: &dyn ObjectStore,
-) -> BlobUrls {
-    let started_at = Instant::now();
-    let aggregations_urls = save_node_aggregations_artifacts(
-        artifacts.block_number,
-        artifacts.circuit_id,
-        artifacts.depth,
-        artifacts.next_aggregations.clone(),
-        object_store,
-    )
-    .await;
-    let circuit_ids_and_urls = save_recursive_layer_prover_input_artifacts(
-        artifacts.block_number,
-        artifacts.next_aggregations,
-        AggregationRound::NodeAggregation,
-        artifacts.depth,
-        object_store,
-        Some(artifacts.circuit_id),
-    )
-    .await;
-    metrics::histogram!(
-                    "prover_fri.witness_generation.blob_save_time",
-                    started_at.elapsed(),
-                    "aggregation_round" => format!("{:?}", AggregationRound::NodeAggregation),
-    );
-    BlobUrls {
-        node_aggregations_url: aggregations_urls,
-        circuit_ids_and_urls,
-    }
-}
diff --git a/prover/witness_generator/src/precalculated/tests.rs b/prover/witness_generator/src/precalculated/tests.rs
deleted file mode 100644
index 3d250097900e..000000000000
--- a/prover/witness_generator/src/precalculated/tests.rs
+++ /dev/null
@@ -1,221 +0,0 @@
-use const_decoder::Decoder::Hex;
-
-use std::iter;
-
-use super::PrecalculatedMerklePathsProvider;
-use zksync_types::proofs::{PrepareBasicCircuitsJob, StorageLogMetadata};
-use zksync_types::zkevm_test_harness::witness::tree::{BinarySparseStorageTree, ZkSyncStorageLeaf};
-use zksync_types::U256;
-
-// Sample `StorageLogMetadata` entries. Since we cannot allocate in constants, we store
-// the only Merkle path hash separately.
-const LOGS_AND_PATHS: [(StorageLogMetadata, [u8; 32]); 3] = [
-    generate_storage_log_metadata(
-        b"DDC60818D8F7CFE42514F8EA3CC52806DDC60818D8F7CFE42514F8EA3CC52806",
-        b"12E9FF974B0FAEE514AD4AC50E2BDC6E12E9FF974B0FAEE514AD4AC50E2BDC6E",
-        false,
-        false,
-        1,
-    ),
-    generate_storage_log_metadata(
-        b"BDA1617CC883E2251D3BE0FD9B3F3064BDA1617CC883E2251D3BE0FD9B3F3064",
-        b"D14917FCB067922F92322025D1BA50B4D14917FCB067922F92322025D1BA50B4",
-        true,
-        true,
-        2,
-    ),
-    generate_storage_log_metadata(
-        b"77F035AD50811CFABD956F6F1B48E48277F035AD50811CFABD956F6F1B48E482",
-        b"7CF33B959916CC9B56F21C427ED7CA187CF33B959916CC9B56F21C427ED7CA18",
-        true,
-        true,
-        3,
-    ),
-];
-
-const LEAFS: [ZkSyncStorageLeaf; 2] = [
-    generate_leaf(
-        1,
-        b"AD558076F725ED8B5E5B42920422E9BEAD558076F725ED8B5E5B42920422E9BE",
-    ),
-    generate_leaf(
-        1,
-        b"98A0EADBD6118391B744252DA348873C98A0EADBD6118391B744252DA348873C",
-    ),
-];
-
-const INDICES: [[u8; 32]; 2] = [
-    Hex.decode(b"5534D106E0B590953AC0FC7D65CA3B2E5534D106E0B590953AC0FC7D65CA3B2E"),
-    Hex.decode(b"00309D72EF0AD9786DA9044109E1704B00309D72EF0AD9786DA9044109E1704B"),
-];
-
-const fn generate_leaf(index: u64, value: &[u8]) -> ZkSyncStorageLeaf {
-    ZkSyncStorageLeaf {
-        index,
-        value: Hex.decode(value),
-    }
-}
-
-const fn generate_storage_log_metadata(
-    root_hash: &[u8],
-    merkle_path: &[u8],
-    is_write: bool,
-    first_write: bool,
-    leaf_enumeration_index: u64,
-) -> (StorageLogMetadata, [u8; 32]) {
-    let log = StorageLogMetadata {
-        root_hash: Hex.decode(root_hash),
-        is_write,
-        first_write,
-        merkle_paths: Vec::new(),
-        leaf_hashed_key: U256::zero(),
-        leaf_enumeration_index,
-        value_written: [0; 32],
-        value_read: [0; 32],
-    };
-    (log, Hex.decode(merkle_path))
-}
-
-fn create_provider() -> PrecalculatedMerklePathsProvider {
-    let mut job = PrepareBasicCircuitsJob::new(4);
-    for (mut log, merkle_path) in LOGS_AND_PATHS {
-        log.merkle_paths = vec![merkle_path];
-        job.push_merkle_path(log);
-    }
-    PrecalculatedMerklePathsProvider::new(job, [0_u8; 32])
-}
-
-#[test]
-fn test_filter_renumerate_all_first_writes() {
-    let mut provider = create_provider();
-    for log in &mut provider.pending_leaves {
-        log.first_write = true;
-    }
-
-    let (_, first_writes, updates) =
-        provider.filter_renumerate(INDICES.iter(), LEAFS.iter().copied());
-    assert_eq!(2, first_writes.len());
-    let (first_write_index, first_write_leaf) = first_writes[0];
-    assert_eq!(first_write_index, INDICES[0]);
-    assert_eq!(first_write_leaf.value, LEAFS[0].value);
-    assert_eq!(0, updates.len());
-}
-
-#[test]
-fn test_filter_renumerate_all_repeated_writes() {
-    let mut provider = create_provider();
-    for log in &mut provider.pending_leaves {
-        log.first_write = false;
-    }
-
-    let (_, first_writes, updates) =
-        provider.filter_renumerate(INDICES.iter(), LEAFS.iter().copied());
-    assert_eq!(0, first_writes.len());
-    assert_eq!(2, updates.len());
-    assert_eq!(updates[0].value, LEAFS[0].value);
-    assert_eq!(updates[1].value, LEAFS[1].value);
-}
-
-#[test]
-fn test_filter_renumerate_repeated_writes_with_first_write() {
-    let mut provider = create_provider();
-    for (i, log) in provider.pending_leaves.iter_mut().enumerate() {
-        log.first_write = i == 2;
-    }
-
-    let (_, first_writes, updates) =
-        provider.filter_renumerate(INDICES.iter(), LEAFS.iter().copied());
-    assert_eq!(1, first_writes.len());
-    assert_eq!(1, updates.len());
-    assert_eq!(3, first_writes[0].1.index);
-    assert_eq!(2, updates[0].index);
-}
-
-#[test]
-#[should_panic(expected = "leafs must be of same length as indexes")]
-fn test_filter_renumerate_panic_when_leafs_and_indices_are_of_different_length() {
-    const ANOTHER_LEAF: ZkSyncStorageLeaf = generate_leaf(
-        2,
-        b"72868932BBB002043AF50363EEB65AE172868932BBB002043AF50363EEB65AE1",
-    );
-
-    let provider = create_provider();
-    let leafs = LEAFS.iter().copied().chain([ANOTHER_LEAF]);
-    provider.filter_renumerate(INDICES.iter(), leafs);
-}
-
-#[test]
-#[should_panic(expected = "indexes must be of same length as leafs and pending leaves")]
-fn test_filter_renumerate_panic_when_indices_and_pending_leaves_are_of_different_length() {
-    const ANOTHER_INDEX: [u8; 32] =
-        Hex.decode(b"930058748339A83E06F0D1D22937E92A930058748339A83E06F0D1D22937E92A");
-
-    let provider = create_provider();
-    let indices = INDICES.iter().chain([&ANOTHER_INDEX]);
-    provider.filter_renumerate(indices, LEAFS.iter().copied());
-}
-
-#[test]
-fn vec_and_vec_deque_serializations_are_compatible() {
-    let logs = create_provider().pending_leaves;
-    let serialized = bincode::serialize(&logs).unwrap();
-    let logs_vec: Vec<StorageLogMetadata> = bincode::deserialize(&serialized).unwrap();
-    assert_eq!(logs, logs_vec);
-    let serialized_deque = bincode::serialize(&logs_vec).unwrap();
-    assert_eq!(serialized_deque, serialized);
-}
-
-#[test]
-fn provider_serialization() {
-    let provider = create_provider();
-
-    let serialized = bincode::serialize(&provider).unwrap();
-    // Check that logs are serialized in the natural order.
-    let needle = LOGS_AND_PATHS[0].0.root_hash;
-    let mut windows = serialized.windows(needle.len());
-    windows.position(|window| *window == needle).unwrap();
-    let needle = LOGS_AND_PATHS[1].0.root_hash;
-    windows.position(|window| *window == needle).unwrap();
-    let needle = LOGS_AND_PATHS[2].0.root_hash;
-    windows.position(|window| *window == needle).unwrap();
-
-    let deserialized: PrecalculatedMerklePathsProvider = bincode::deserialize(&serialized).unwrap();
-    assert_eq!(deserialized, provider);
-}
-
-#[test]
-fn initializing_provider_with_compacted_merkle_paths() {
-    let mut provider = create_provider();
-    for log in &mut provider.pending_leaves {
-        let empty_merkle_paths = iter::repeat([0; 32]).take(255);
-        log.merkle_paths.splice(0..0, empty_merkle_paths);
-    }
-
-    // First log entry: read
-    let query = provider.get_leaf(&[0; 32]);
-    assert!(!query.first_write);
-    assert!(query.merkle_path[0..255]
-        .iter()
-        .all(|hash| *hash == [0; 32]));
-
-    // Second log entry: first write
-    let query = provider.get_leaf(&[0; 32]);
-    assert!(query.first_write);
-    assert!(query.merkle_path[0..255]
-        .iter()
-        .all(|hash| *hash == [0; 32]));
-    assert_ne!(query.merkle_path[255], [0; 32]);
-
-    let query = provider.insert_leaf(
-        &[0; 32],
-        ZkSyncStorageLeaf {
-            index: 2,
-            value: [0; 32],
-        },
-    );
-    assert!(query.first_write);
-    assert!(query.merkle_path[0..255]
-        .iter()
-        .all(|hash| *hash == [0; 32]));
-    assert_ne!(query.merkle_path[255], [0; 32]);
-}
diff --git a/prover/witness_generator/src/precalculated_merkle_paths_provider.rs b/prover/witness_generator/src/precalculated_merkle_paths_provider.rs
deleted file mode 100644
index 56c56b157cb4..000000000000
--- a/prover/witness_generator/src/precalculated_merkle_paths_provider.rs
+++ /dev/null
@@ -1,263 +0,0 @@
-use serde::{Deserialize, Serialize};
-
-use zkevm_test_harness::witness::tree::{BinaryHasher, EnumeratedBinaryLeaf, LeafQuery};
-
-use zksync_types::proofs::{PrepareBasicCircuitsJob, StorageLogMetadata};
-
-use zk_evm::blake2::Blake2s256;
-use zkevm_test_harness::witness::tree::BinarySparseStorageTree;
-use zkevm_test_harness::witness::tree::ZkSyncStorageLeaf;
-
-#[derive(Debug, Clone, PartialEq, Deserialize, Serialize)]
-pub struct PrecalculatedMerklePathsProvider {
-    // We keep the root hash of the last processed leaf, as it is needed by the the witness generator.
-    pub root_hash: [u8; 32],
-    // The ordered list of expected leaves to be interacted with
-    pub pending_leaves: Vec<StorageLogMetadata>,
-    // The index that would be assigned to the next new leaf
-    pub next_enumeration_index: u64,
-    // For every Storage Write Log we expect two invocations: `get_leaf` and `insert_leaf`.
-    // We set this flag to `true` after the initial `get_leaf` is invoked.
-    pub is_get_leaf_invoked: bool,
-}
-
-impl PrecalculatedMerklePathsProvider {
-    pub fn new(input: PrepareBasicCircuitsJob, root_hash: [u8; 32]) -> Self {
-        let next_enumeration_index = input.next_enumeration_index();
-        vlog::debug!("Initializing PrecalculatedMerklePathsProvider. Initial root_hash: {:?}, initial next_enumeration_index: {:?}", root_hash, next_enumeration_index);
-        Self {
-            root_hash,
-            pending_leaves: input.into_merkle_paths().collect(),
-            next_enumeration_index,
-            is_get_leaf_invoked: false,
-        }
-    }
-}
-
-impl BinarySparseStorageTree<256, 32, 32, 8, 32, Blake2s256, ZkSyncStorageLeaf>
-    for PrecalculatedMerklePathsProvider
-{
-    fn empty() -> Self {
-        unreachable!("`empty` must not be invoked by the witness generator code");
-    }
-
-    fn next_enumeration_index(&self) -> u64 {
-        self.next_enumeration_index
-    }
-
-    fn set_next_enumeration_index(&mut self, _value: u64) {
-        unreachable!(
-            "`set_next_enumeration_index` must not be invoked by the witness generator code"
-        );
-    }
-
-    fn root(&self) -> [u8; 32] {
-        self.root_hash
-    }
-
-    fn get_leaf(&mut self, index: &[u8; 32]) -> LeafQuery<256, 32, 32, 32, ZkSyncStorageLeaf> {
-        vlog::trace!(
-            "Invoked get_leaf({:?}). pending leaves size: {:?}. current root: {:?}",
-            index,
-            self.pending_leaves.len(),
-            self.root()
-        );
-        assert!(
-            !self.is_get_leaf_invoked,
-            "`get_leaf()` invoked more than once or get_leaf is invoked when insert_leaf was expected"
-        );
-        let next = self.pending_leaves.first().unwrap_or_else(|| {
-            panic!(
-                "invoked `get_leaf({:?})` with empty `pending_leaves`",
-                index
-            )
-        });
-        self.root_hash = next.root_hash;
-
-        assert_eq!(
-            &next.leaf_hashed_key_array(),
-            index,
-            "`get_leaf` hashed key mismatch"
-        );
-
-        let mut res = LeafQuery {
-            leaf: ZkSyncStorageLeaf {
-                index: next.leaf_enumeration_index,
-                value: next.value_read,
-            },
-            first_write: next.first_write,
-            index: *index,
-            merkle_path: next.clone().into_merkle_paths_array(),
-        };
-
-        if next.is_write {
-            // If it is a write, the next invocation will be `insert_leaf` with the very same parameters
-            self.is_get_leaf_invoked = true;
-            if res.first_write {
-                res.leaf.index = 0;
-            }
-        } else {
-            // If it is a read, the next invocation will relate to the next `pending_leaf`
-            self.pending_leaves.remove(0);
-        };
-
-        res
-    }
-
-    fn insert_leaf(
-        &mut self,
-        index: &[u8; 32],
-        leaf: ZkSyncStorageLeaf,
-    ) -> LeafQuery<256, 32, 32, 32, ZkSyncStorageLeaf> {
-        vlog::trace!(
-            "Invoked insert_leaf({:?}). pending leaves size: {:?}. current root: {:?}",
-            index,
-            self.pending_leaves.len(),
-            self.root()
-        );
-
-        assert!(
-            self.is_get_leaf_invoked,
-            "`get_leaf()` is expected to be invoked before `insert_leaf()`"
-        );
-        let next = self.pending_leaves.remove(0);
-        self.root_hash = next.root_hash;
-
-        assert!(
-            next.is_write,
-            "invoked `insert_leaf({:?})`, but get_leaf() expected",
-            index
-        );
-
-        assert_eq!(
-            &next.leaf_hashed_key_array(),
-            index,
-            "insert_leaf hashed key mismatch",
-        );
-
-        assert_eq!(
-            &next.value_written, &leaf.value,
-            "insert_leaf enumeration index mismatch",
-        );
-
-        // reset is_get_leaf_invoked for the next get/insert invocation
-        self.is_get_leaf_invoked = false;
-
-        // if this insert was in fact the very first insert, it should bump the `next_enumeration_index`
-        self.next_enumeration_index = self
-            .next_enumeration_index
-            .max(next.leaf_enumeration_index + 1);
-
-        LeafQuery {
-            leaf: ZkSyncStorageLeaf {
-                index: next.leaf_enumeration_index,
-                value: next.value_written,
-            },
-            first_write: next.first_write,
-            index: *index,
-            merkle_path: next.into_merkle_paths_array(),
-        }
-    }
-
-    // Method to segregate the given leafs into 2 types:
-    //  * leafs that are updated for first time
-    //  * leafs that are not updated for the first time.
-    // The consumer of method must ensure that the length of passed argument indexes and leafs are same,
-    // and the merkle paths specified during the initialization must contains same number of write
-    // leaf nodes as that of the leafs passed as argument.
-    fn filter_renumerate<'a>(
-        &self,
-        mut indexes: impl Iterator<Item = &'a [u8; 32]>,
-        mut leafs: impl Iterator<Item = ZkSyncStorageLeaf>,
-    ) -> (
-        u64,
-        Vec<([u8; 32], ZkSyncStorageLeaf)>,
-        Vec<ZkSyncStorageLeaf>,
-    ) {
-        vlog::trace!(
-            "invoked filter_renumerate(), pending leaves size: {:?}",
-            self.pending_leaves.len()
-        );
-        let mut first_writes = vec![];
-        let mut updates = vec![];
-        let write_pending_leaves = self
-            .pending_leaves
-            .iter()
-            .filter(|&l| l.is_write)
-            .collect::<Vec<&StorageLogMetadata>>();
-        let write_pending_leaves_iter = write_pending_leaves.iter();
-        let mut length = 0;
-        for (&pending_leaf, (idx, mut leaf)) in
-            write_pending_leaves_iter.zip((&mut indexes).zip(&mut leafs))
-        {
-            leaf.set_index(pending_leaf.leaf_enumeration_index);
-            if pending_leaf.first_write {
-                first_writes.push((*idx, leaf));
-            } else {
-                updates.push(leaf);
-            }
-            length += 1;
-        }
-        assert_eq!(
-            length,
-            write_pending_leaves.len(),
-            "pending leaves: len({}) must be of same length as leafs and indexes: len({})",
-            write_pending_leaves.len(),
-            length
-        );
-        assert!(
-            indexes.next().is_none(),
-            "indexes must be of same length as leafs and pending leaves: len({})",
-            write_pending_leaves.len()
-        );
-        assert!(
-            leafs.next().is_none(),
-            "leafs must be of same length as indexes and pending leaves: len({})",
-            write_pending_leaves.len()
-        );
-        (self.next_enumeration_index, first_writes, updates)
-    }
-
-    fn verify_inclusion(
-        root: &[u8; 32],
-        query: &LeafQuery<256, 32, 32, 32, ZkSyncStorageLeaf>,
-    ) -> bool {
-        //copied from zkevm_test_harness/src/witness/tree/mod.rs with minor changes
-        vlog::trace!(
-            "invoked verify_inclusion. Index: {:?}, root: {:?})",
-            query.index,
-            root
-        );
-
-        let mut leaf_bytes = vec![0u8; 8 + 32]; // can make a scratch space somewhere later on
-        leaf_bytes[8..].copy_from_slice(query.leaf.value());
-
-        let leaf_index_bytes = query.leaf.current_index().to_be_bytes();
-        leaf_bytes[0..8].copy_from_slice(&leaf_index_bytes);
-
-        let leaf_hash = Blake2s256::leaf_hash(&leaf_bytes);
-
-        let mut current_hash = leaf_hash;
-        for level in 0..256 {
-            let (l, r) = if is_right_side_node(&query.index, level) {
-                (&query.merkle_path[level], &current_hash)
-            } else {
-                (&current_hash, &query.merkle_path[level])
-            };
-
-            let this_level_hash = Blake2s256::node_hash(level, l, r);
-
-            current_hash = this_level_hash;
-        }
-
-        root == &current_hash
-    }
-}
-
-fn is_right_side_node<const N: usize>(index: &[u8; N], depth: usize) -> bool {
-    debug_assert!(depth < N * 8);
-    let byte_idx = depth / 8;
-    let bit_idx = depth % 8;
-
-    index[byte_idx] & (1u8 << bit_idx) != 0
-}
diff --git a/prover/witness_generator/src/scheduler.rs b/prover/witness_generator/src/scheduler.rs
deleted file mode 100644
index b214d46f2f2a..000000000000
--- a/prover/witness_generator/src/scheduler.rs
+++ /dev/null
@@ -1,246 +0,0 @@
-use std::convert::TryInto;
-
-use std::time::Instant;
-
-use async_trait::async_trait;
-use zksync_prover_fri_types::circuit_definitions::boojum::field::goldilocks::{GoldilocksExt2, GoldilocksField};
-use zksync_prover_fri_types::circuit_definitions::boojum::gadgets::recursion::recursive_tree_hasher::CircuitGoldilocksPoseidon2Sponge;
-use zksync_prover_fri_types::circuit_definitions::circuit_definitions::recursion_layer::scheduler::SchedulerCircuit;
-use zksync_prover_fri_types::circuit_definitions::circuit_definitions::recursion_layer::{
-    ZkSyncRecursionLayerStorageType, ZkSyncRecursionLayerVerificationKey,
-    ZkSyncRecursiveLayerCircuit, SCHEDULER_CAPACITY,
-};
-use zksync_prover_fri_types::circuit_definitions::recursion_layer_proof_config;
-use zksync_prover_fri_types::circuit_definitions::zkevm_circuits::scheduler::input::SchedulerCircuitInstanceWitness;
-use zksync_prover_fri_types::circuit_definitions::zkevm_circuits::scheduler::SchedulerConfig;
-use zksync_vk_setup_data_server_fri::get_recursive_layer_vk_for_circuit_type;
-use zksync_vk_setup_data_server_fri::utils::get_leaf_vk_params;
-
-use crate::utils::{load_proofs_for_job_ids, SchedulerPartialInputWrapper};
-use zksync_dal::ConnectionPool;
-use zksync_object_store::{FriCircuitKey, ObjectStore, ObjectStoreFactory};
-use zksync_prover_fri_types::{CircuitWrapper, FriProofWrapper};
-use zksync_queued_job_processor::JobProcessor;
-use zksync_types::proofs::AggregationRound;
-use zksync_types::L1BatchNumber;
-
-pub struct SchedulerArtifacts {
-    pub scheduler_circuit: ZkSyncRecursiveLayerCircuit,
-}
-
-#[derive(Clone)]
-pub struct SchedulerWitnessGeneratorJob {
-    block_number: L1BatchNumber,
-    scheduler_witness: SchedulerCircuitInstanceWitness<
-        GoldilocksField,
-        CircuitGoldilocksPoseidon2Sponge,
-        GoldilocksExt2,
-    >,
-    node_vk: ZkSyncRecursionLayerVerificationKey,
-}
-
-#[derive(Debug)]
-pub struct SchedulerWitnessGenerator {
-    object_store: Box<dyn ObjectStore>,
-    prover_connection_pool: ConnectionPool,
-}
-
-impl SchedulerWitnessGenerator {
-    pub async fn new(
-        store_factory: &ObjectStoreFactory,
-        prover_connection_pool: ConnectionPool,
-    ) -> Self {
-        Self {
-            object_store: store_factory.create_store().await,
-            prover_connection_pool,
-        }
-    }
-
-    pub fn process_job_sync(
-        job: SchedulerWitnessGeneratorJob,
-        started_at: Instant,
-    ) -> SchedulerArtifacts {
-        vlog::info!(
-            "Starting fri witness generation of type {:?} for block {}",
-            AggregationRound::Scheduler,
-            job.block_number.0
-        );
-        let config = SchedulerConfig {
-            proof_config: recursion_layer_proof_config(),
-            vk_fixed_parameters: job.node_vk.into_inner().fixed_parameters,
-            capacity: SCHEDULER_CAPACITY,
-            _marker: std::marker::PhantomData,
-        };
-
-        let scheduler_circuit = SchedulerCircuit {
-            witness: job.scheduler_witness,
-            config,
-            transcript_params: (),
-            _marker: std::marker::PhantomData,
-        };
-        metrics::histogram!(
-                    "prover_fri.witness_generation.witness_generation_time",
-                    started_at.elapsed(),
-                    "aggregation_round" => format!("{:?}", AggregationRound::Scheduler),
-        );
-
-        vlog::info!(
-            "Scheduler generation for block {} is complete in {:?}",
-            job.block_number.0,
-            started_at.elapsed()
-        );
-
-        SchedulerArtifacts {
-            scheduler_circuit: ZkSyncRecursiveLayerCircuit::SchedulerCircuit(scheduler_circuit),
-        }
-    }
-}
-
-#[async_trait]
-impl JobProcessor for SchedulerWitnessGenerator {
-    type Job = SchedulerWitnessGeneratorJob;
-    type JobId = L1BatchNumber;
-    type JobArtifacts = SchedulerArtifacts;
-
-    const SERVICE_NAME: &'static str = "fri_scheduler_witness_generator";
-
-    async fn get_next_job(&self) -> Option<(Self::JobId, Self::Job)> {
-        let mut prover_connection = self.prover_connection_pool.access_storage().await;
-
-        let l1_batch_number = prover_connection
-            .fri_witness_generator_dal()
-            .get_next_scheduler_witness_job()
-            .await?;
-        let proof_job_ids = prover_connection
-            .fri_scheduler_dependency_tracker_dal()
-            .get_final_prover_job_ids_for(l1_batch_number)
-            .await;
-
-        Some((
-            l1_batch_number,
-            prepare_job(l1_batch_number, proof_job_ids, &*self.object_store).await,
-        ))
-    }
-
-    async fn save_failure(&self, job_id: L1BatchNumber, _started_at: Instant, error: String) -> () {
-        self.prover_connection_pool
-            .access_storage()
-            .await
-            .fri_witness_generator_dal()
-            .mark_scheduler_job_failed(&error, job_id)
-            .await;
-    }
-
-    #[allow(clippy::async_yields_async)]
-    async fn process_job(
-        &self,
-        job: SchedulerWitnessGeneratorJob,
-        started_at: Instant,
-    ) -> tokio::task::JoinHandle<SchedulerArtifacts> {
-        tokio::task::spawn_blocking(move || Self::process_job_sync(job, started_at))
-    }
-
-    async fn save_result(
-        &self,
-        job_id: L1BatchNumber,
-        started_at: Instant,
-        artifacts: SchedulerArtifacts,
-    ) {
-        let key = FriCircuitKey {
-            block_number: job_id,
-            circuit_id: 1,
-            sequence_number: 0,
-            depth: 0,
-            aggregation_round: AggregationRound::Scheduler,
-        };
-        let blob_save_started_at = Instant::now();
-        let scheduler_circuit_blob_url = self
-            .object_store
-            .put(key, &CircuitWrapper::Recursive(artifacts.scheduler_circuit))
-            .await
-            .unwrap();
-        metrics::histogram!(
-                    "prover_fri.witness_generation.blob_save_time",
-                    blob_save_started_at.elapsed(),
-                    "aggregation_round" => format!("{:?}", AggregationRound::Scheduler),
-        );
-
-        let mut prover_connection = self.prover_connection_pool.access_storage().await;
-        let mut transaction = prover_connection.start_transaction().await;
-        transaction
-            .fri_prover_jobs_dal()
-            .insert_prover_job(
-                job_id,
-                1,
-                0,
-                0,
-                AggregationRound::Scheduler,
-                &scheduler_circuit_blob_url,
-                false,
-            )
-            .await;
-
-        transaction
-            .fri_witness_generator_dal()
-            .mark_scheduler_job_as_successful(job_id, started_at.elapsed())
-            .await;
-
-        transaction.commit().await;
-    }
-}
-
-pub async fn prepare_job(
-    l1_batch_number: L1BatchNumber,
-    proof_job_ids: [u32; 13],
-    object_store: &dyn ObjectStore,
-) -> SchedulerWitnessGeneratorJob {
-    let started_at = Instant::now();
-    let proofs = load_proofs_for_job_ids(&proof_job_ids, object_store).await;
-    metrics::histogram!(
-                    "prover_fri.witness_generation.blob_fetch_time",
-                    started_at.elapsed(),
-                    "aggregation_round" => format!("{:?}", AggregationRound::Scheduler),
-    );
-    let recursive_proofs = proofs
-        .into_iter()
-        .map(|wrapper| match wrapper {
-            FriProofWrapper::Base(_) => {
-                panic!(
-                    "Expected only recursive proofs for scheduler l1 batch {}",
-                    l1_batch_number
-                )
-            }
-            FriProofWrapper::Recursive(recursive_proof) => recursive_proof.into_inner(),
-        })
-        .collect::<Vec<_>>();
-
-    let started_at = Instant::now();
-    let node_vk = get_recursive_layer_vk_for_circuit_type(
-        ZkSyncRecursionLayerStorageType::NodeLayerCircuit as u8,
-    );
-    let SchedulerPartialInputWrapper(mut scheduler_witness) =
-        object_store.get(l1_batch_number).await.unwrap();
-    scheduler_witness.node_layer_vk_witness = node_vk.clone().into_inner();
-
-    scheduler_witness.proof_witnesses = recursive_proofs.into();
-
-    let leaf_vk_commits = get_leaf_vk_params();
-    let leaf_layer_params = leaf_vk_commits
-        .iter()
-        .map(|el| el.1.clone())
-        .collect::<Vec<_>>()
-        .try_into()
-        .unwrap();
-    scheduler_witness.leaf_layer_parameters = leaf_layer_params;
-    metrics::histogram!(
-                "prover_fri.witness_generation.prepare_job_time",
-                started_at.elapsed(),
-                "aggregation_round" => format!("{:?}", AggregationRound::Scheduler),
-    );
-
-    SchedulerWitnessGeneratorJob {
-        block_number: l1_batch_number,
-        scheduler_witness,
-        node_vk,
-    }
-}
diff --git a/prover/witness_generator/src/utils.rs b/prover/witness_generator/src/utils.rs
deleted file mode 100644
index 7cff834a3258..000000000000
--- a/prover/witness_generator/src/utils.rs
+++ /dev/null
@@ -1,206 +0,0 @@
-use zksync_prover_fri_types::circuit_definitions::boojum::field::goldilocks::GoldilocksExt2;
-use zksync_prover_fri_types::circuit_definitions::boojum::gadgets::recursion::recursive_tree_hasher::CircuitGoldilocksPoseidon2Sponge;
-use zksync_prover_fri_types::circuit_definitions::circuit_definitions::base_layer::{
-    ZkSyncBaseLayerClosedFormInput,
-};
-use zksync_prover_fri_types::circuit_definitions::circuit_definitions::recursion_layer::{
-    ZkSyncRecursiveLayerCircuit,
-};
-
-use zksync_prover_fri_types::circuit_definitions::encodings::recursion_request::RecursionQueueSimulator;
-
-use zkevm_test_harness::boojum::field::goldilocks::GoldilocksField;
-use zkevm_test_harness::witness::full_block_artifact::BlockBasicCircuits;
-use zksync_prover_fri_types::circuit_definitions::zkevm_circuits::scheduler::input::SchedulerCircuitInstanceWitness;
-use zksync_prover_fri_types::circuit_definitions::ZkSyncDefaultRoundFunction;
-
-use zkevm_test_harness::zkevm_circuits::scheduler::block_header::BlockAuxilaryOutputWitness;
-use zksync_config::constants::USED_BOOTLOADER_MEMORY_BYTES;
-use zksync_object_store::{
-    serialize_using_bincode, AggregationsKey, Bucket, ClosedFormInputKey, FriCircuitKey,
-    ObjectStore, StoredObject,
-};
-use zksync_prover_fri_types::{CircuitWrapper, FriProofWrapper};
-use zksync_types::proofs::AggregationRound;
-use zksync_types::{L1BatchNumber, U256};
-
-pub fn expand_bootloader_contents(packed: &[(usize, U256)]) -> Vec<u8> {
-    let mut result: Vec<u8> = Vec::new();
-    result.resize(USED_BOOTLOADER_MEMORY_BYTES, 0);
-
-    for (offset, value) in packed {
-        value.to_big_endian(&mut result[(offset * 32)..(offset + 1) * 32]);
-    }
-
-    result.to_vec()
-}
-
-#[derive(serde::Serialize, serde::Deserialize)]
-pub struct ClosedFormInputWrapper(
-    pub(crate) Vec<ZkSyncBaseLayerClosedFormInput<GoldilocksField>>,
-    pub(crate) RecursionQueueSimulator<GoldilocksField>,
-);
-
-impl StoredObject for ClosedFormInputWrapper {
-    const BUCKET: Bucket = Bucket::LeafAggregationWitnessJobsFri;
-    type Key<'a> = ClosedFormInputKey;
-
-    fn encode_key(key: Self::Key<'_>) -> String {
-        let ClosedFormInputKey {
-            block_number,
-            circuit_id,
-        } = key;
-        format!("closed_form_inputs_{block_number}_{circuit_id}.bin")
-    }
-
-    serialize_using_bincode!();
-}
-
-#[derive(serde::Serialize, serde::Deserialize)]
-pub struct AggregationWrapper(
-    pub  Vec<(
-        u64,
-        RecursionQueueSimulator<GoldilocksField>,
-        ZkSyncRecursiveLayerCircuit,
-    )>,
-);
-
-impl StoredObject for AggregationWrapper {
-    const BUCKET: Bucket = Bucket::NodeAggregationWitnessJobsFri;
-    type Key<'a> = AggregationsKey;
-
-    fn encode_key(key: Self::Key<'_>) -> String {
-        let AggregationsKey {
-            block_number,
-            circuit_id,
-            depth,
-        } = key;
-        format!("aggregations_{block_number}_{circuit_id}_{depth}.bin")
-    }
-
-    serialize_using_bincode!();
-}
-
-#[derive(serde::Serialize, serde::Deserialize)]
-pub struct SchedulerPartialInputWrapper(
-    pub  SchedulerCircuitInstanceWitness<
-        GoldilocksField,
-        CircuitGoldilocksPoseidon2Sponge,
-        GoldilocksExt2,
-    >,
-);
-
-impl StoredObject for SchedulerPartialInputWrapper {
-    const BUCKET: Bucket = Bucket::SchedulerWitnessJobsFri;
-    type Key<'a> = L1BatchNumber;
-
-    fn encode_key(key: Self::Key<'_>) -> String {
-        format!("scheduler_witness_{key}.bin")
-    }
-
-    serialize_using_bincode!();
-}
-
-#[derive(serde::Serialize, serde::Deserialize)]
-pub struct AuxOutputWitnessWrapper(pub BlockAuxilaryOutputWitness<GoldilocksField>);
-
-impl StoredObject for AuxOutputWitnessWrapper {
-    const BUCKET: Bucket = Bucket::SchedulerWitnessJobsFri;
-    type Key<'a> = L1BatchNumber;
-
-    fn encode_key(key: Self::Key<'_>) -> String {
-        format!("aux_output_witness_{key}.bin")
-    }
-
-    serialize_using_bincode!();
-}
-
-pub async fn save_base_prover_input_artifacts(
-    block_number: L1BatchNumber,
-    circuits: BlockBasicCircuits<GoldilocksField, ZkSyncDefaultRoundFunction>,
-    object_store: &dyn ObjectStore,
-    aggregation_round: AggregationRound,
-) -> Vec<(u8, String)> {
-    let circuits = circuits.into_flattened_set();
-    let mut ids_and_urls = Vec::with_capacity(circuits.len());
-    for (sequence_number, circuit) in circuits.into_iter().enumerate() {
-        let circuit_id = circuit.numeric_circuit_type();
-        let circuit_key = FriCircuitKey {
-            block_number,
-            sequence_number,
-            circuit_id,
-            aggregation_round,
-            depth: 0,
-        };
-        let blob_url = object_store
-            .put(circuit_key, &CircuitWrapper::Base(circuit))
-            .await
-            .unwrap();
-        ids_and_urls.push((circuit_id, blob_url));
-    }
-    ids_and_urls
-}
-
-pub async fn save_recursive_layer_prover_input_artifacts(
-    block_number: L1BatchNumber,
-    aggregations: Vec<(
-        u64,
-        RecursionQueueSimulator<GoldilocksField>,
-        ZkSyncRecursiveLayerCircuit,
-    )>,
-    aggregation_round: AggregationRound,
-    depth: u16,
-    object_store: &dyn ObjectStore,
-    base_layer_circuit_id: Option<u8>,
-) -> Vec<(u8, String)> {
-    let mut ids_and_urls = Vec::with_capacity(aggregations.len());
-    for (sequence_number, (_, _, circuit)) in aggregations.into_iter().enumerate() {
-        let circuit_id = base_layer_circuit_id.unwrap_or_else(|| circuit.numeric_circuit_type());
-        let circuit_key = FriCircuitKey {
-            block_number,
-            sequence_number,
-            circuit_id,
-            aggregation_round,
-            depth,
-        };
-        let blob_url = object_store
-            .put(circuit_key, &CircuitWrapper::Recursive(circuit))
-            .await
-            .unwrap();
-        ids_and_urls.push((circuit_id, blob_url));
-    }
-    ids_and_urls
-}
-
-pub async fn save_node_aggregations_artifacts(
-    block_number: L1BatchNumber,
-    circuit_id: u8,
-    depth: u16,
-    aggregations: Vec<(
-        u64,
-        RecursionQueueSimulator<GoldilocksField>,
-        ZkSyncRecursiveLayerCircuit,
-    )>,
-    object_store: &dyn ObjectStore,
-) -> String {
-    let key = AggregationsKey {
-        block_number,
-        circuit_id,
-        depth,
-    };
-    object_store
-        .put(key, &AggregationWrapper(aggregations))
-        .await
-        .unwrap()
-}
-
-pub async fn load_proofs_for_job_ids(
-    job_ids: &[u32],
-    object_store: &dyn ObjectStore,
-) -> Vec<FriProofWrapper> {
-    let mut proofs = Vec::with_capacity(job_ids.len());
-    for &job_id in job_ids {
-        proofs.push(object_store.get(job_id).await.unwrap());
-    }
-    proofs
-}
diff --git a/prover/witness_generator/tests/basic_test.rs b/prover/witness_generator/tests/basic_test.rs
deleted file mode 100644
index ad328f5a2cfa..000000000000
--- a/prover/witness_generator/tests/basic_test.rs
+++ /dev/null
@@ -1,125 +0,0 @@
-use std::time::Instant;
-
-use serde::Serialize;
-use zksync_config::ObjectStoreConfig;
-use zksync_object_store::{AggregationsKey, FriCircuitKey, ObjectStoreFactory};
-use zksync_types::proofs::{
-    AggregationRound, LeafAggregationJobMetadata, NodeAggregationJobMetadata,
-};
-use zksync_types::L1BatchNumber;
-
-use zksync_prover_fri_types::CircuitWrapper;
-use zksync_prover_fri_utils::get_recursive_layer_circuit_id_for_base_layer;
-use zksync_witness_generator::leaf_aggregation::{
-    prepare_leaf_aggregation_job, LeafAggregationWitnessGenerator,
-};
-use zksync_witness_generator::node_aggregation::NodeAggregationWitnessGenerator;
-use zksync_witness_generator::scheduler::SchedulerWitnessGenerator;
-use zksync_witness_generator::utils::AggregationWrapper;
-use zksync_witness_generator::{node_aggregation, scheduler};
-
-fn compare_serialized<T: Serialize>(expected: &T, actual: &T) {
-    let serialized_expected = bincode::serialize(expected).unwrap();
-    let serialized_actual = bincode::serialize(actual).unwrap();
-    assert_eq!(serialized_expected, serialized_actual);
-}
-
-#[tokio::test]
-async fn test_leaf_witness_gen() {
-    let mut object_store_config = ObjectStoreConfig::from_env();
-    object_store_config.file_backed_base_path = "./tests/data/leaf/".to_owned();
-    let object_store = ObjectStoreFactory::new(object_store_config)
-        .create_store()
-        .await;
-
-    let circuit_id = 4;
-    let block_number = L1BatchNumber(125010);
-    let key = AggregationsKey {
-        block_number,
-        circuit_id: get_recursive_layer_circuit_id_for_base_layer(circuit_id),
-        depth: 0,
-    };
-    let expected_aggregation = object_store
-        .get::<AggregationWrapper>(key)
-        .await
-        .expect("expected aggregation missing");
-    let leaf_aggregation_job_metadata = LeafAggregationJobMetadata {
-        id: 1,
-        block_number,
-        circuit_id,
-        prover_job_ids_for_proofs: vec![4639043, 4639044, 4639045],
-    };
-
-    let job = prepare_leaf_aggregation_job(leaf_aggregation_job_metadata, &*object_store).await;
-
-    let artifacts = LeafAggregationWitnessGenerator::process_job_sync(job, Instant::now());
-    let aggregations = AggregationWrapper(artifacts.aggregations);
-    compare_serialized(&expected_aggregation, &aggregations);
-}
-
-#[tokio::test]
-#[ignore] // re-enable with new artifacts
-async fn test_node_witness_gen() {
-    let mut object_store_config = ObjectStoreConfig::from_env();
-    object_store_config.file_backed_base_path = "./tests/data/node/".to_owned();
-    let object_store = ObjectStoreFactory::new(object_store_config)
-        .create_store()
-        .await;
-
-    let circuit_id = 8;
-    let block_number = L1BatchNumber(127856);
-    let key = AggregationsKey {
-        block_number,
-        circuit_id,
-        depth: 1,
-    };
-    let expected_aggregation = object_store
-        .get::<AggregationWrapper>(key)
-        .await
-        .expect("expected aggregation missing");
-    let node_aggregation_job_metadata = NodeAggregationJobMetadata {
-        id: 1,
-        block_number,
-        circuit_id,
-        depth: 0,
-        prover_job_ids_for_proofs: vec![5211320],
-    };
-
-    let job = node_aggregation::prepare_job(node_aggregation_job_metadata, &*object_store).await;
-
-    let artifacts = NodeAggregationWitnessGenerator::process_job_sync(job, Instant::now());
-    let aggregations = AggregationWrapper(artifacts.next_aggregations);
-    compare_serialized(&expected_aggregation, &aggregations);
-}
-
-#[tokio::test]
-#[ignore] // re-enable with new artifacts
-async fn test_scheduler_witness_gen() {
-    let mut object_store_config = ObjectStoreConfig::from_env();
-    object_store_config.file_backed_base_path = "./tests/data/scheduler/".to_owned();
-    let object_store = ObjectStoreFactory::new(object_store_config)
-        .create_store()
-        .await;
-    let block_number = L1BatchNumber(128599);
-    let key = FriCircuitKey {
-        block_number,
-        circuit_id: 1,
-        sequence_number: 0,
-        depth: 0,
-        aggregation_round: AggregationRound::Scheduler,
-    };
-    let expected_circuit = object_store
-        .get(key)
-        .await
-        .expect("expected scheduler circuit missing");
-    let proof_job_ids = [
-        5639969, 5627082, 5627084, 5627083, 5627086, 5627085, 5631320, 5627090, 5627091, 5627092,
-        5627093, 5627094, 5629097,
-    ];
-
-    let job = scheduler::prepare_job(block_number, proof_job_ids, &*object_store).await;
-
-    let artifacts = SchedulerWitnessGenerator::process_job_sync(job, Instant::now());
-    let circuit = CircuitWrapper::Recursive(artifacts.scheduler_circuit);
-    compare_serialized(&expected_circuit, &circuit);
-}
diff --git a/prover/witness_generator/tests/data/leaf/leaf_aggregation_witness_jobs_fri/closed_form_inputs_125010_4.bin b/prover/witness_generator/tests/data/leaf/leaf_aggregation_witness_jobs_fri/closed_form_inputs_125010_4.bin
deleted file mode 100644
index fbbc2ddf9d60..000000000000
Binary files a/prover/witness_generator/tests/data/leaf/leaf_aggregation_witness_jobs_fri/closed_form_inputs_125010_4.bin and /dev/null differ
diff --git a/prover/witness_generator/tests/data/leaf/node_aggregation_witness_jobs_fri/aggregations_125010_6_0.bin b/prover/witness_generator/tests/data/leaf/node_aggregation_witness_jobs_fri/aggregations_125010_6_0.bin
deleted file mode 100644
index 88056c4d43b2..000000000000
Binary files a/prover/witness_generator/tests/data/leaf/node_aggregation_witness_jobs_fri/aggregations_125010_6_0.bin and /dev/null differ
diff --git a/prover/witness_generator/tests/data/leaf/proofs_fri/proof_4639043.bin b/prover/witness_generator/tests/data/leaf/proofs_fri/proof_4639043.bin
deleted file mode 100644
index 33cf91d0a0cf..000000000000
Binary files a/prover/witness_generator/tests/data/leaf/proofs_fri/proof_4639043.bin and /dev/null differ
diff --git a/prover/witness_generator/tests/data/leaf/proofs_fri/proof_4639044.bin b/prover/witness_generator/tests/data/leaf/proofs_fri/proof_4639044.bin
deleted file mode 100644
index b7bc18275fa1..000000000000
Binary files a/prover/witness_generator/tests/data/leaf/proofs_fri/proof_4639044.bin and /dev/null differ
diff --git a/prover/witness_generator/tests/data/leaf/proofs_fri/proof_4639045.bin b/prover/witness_generator/tests/data/leaf/proofs_fri/proof_4639045.bin
deleted file mode 100644
index cd7ce1b31e7b..000000000000
Binary files a/prover/witness_generator/tests/data/leaf/proofs_fri/proof_4639045.bin and /dev/null differ
diff --git a/prover/witness_generator/tests/data/node/node_aggregation_witness_jobs_fri/aggregations_127856_8_0.bin b/prover/witness_generator/tests/data/node/node_aggregation_witness_jobs_fri/aggregations_127856_8_0.bin
deleted file mode 100644
index 49efbb500e01..000000000000
Binary files a/prover/witness_generator/tests/data/node/node_aggregation_witness_jobs_fri/aggregations_127856_8_0.bin and /dev/null differ
diff --git a/prover/witness_generator/tests/data/node/node_aggregation_witness_jobs_fri/aggregations_127856_8_1.bin b/prover/witness_generator/tests/data/node/node_aggregation_witness_jobs_fri/aggregations_127856_8_1.bin
deleted file mode 100644
index 2f3ea43b1df8..000000000000
Binary files a/prover/witness_generator/tests/data/node/node_aggregation_witness_jobs_fri/aggregations_127856_8_1.bin and /dev/null differ
diff --git a/prover/witness_generator/tests/data/node/proofs_fri/proof_5211320.bin b/prover/witness_generator/tests/data/node/proofs_fri/proof_5211320.bin
deleted file mode 100644
index db3ba392658b..000000000000
Binary files a/prover/witness_generator/tests/data/node/proofs_fri/proof_5211320.bin and /dev/null differ
diff --git a/prover/witness_generator/tests/data/scheduler/proofs_fri/proof_5627082.bin b/prover/witness_generator/tests/data/scheduler/proofs_fri/proof_5627082.bin
deleted file mode 100644
index 633280c683f9..000000000000
Binary files a/prover/witness_generator/tests/data/scheduler/proofs_fri/proof_5627082.bin and /dev/null differ
diff --git a/prover/witness_generator/tests/data/scheduler/proofs_fri/proof_5627083.bin b/prover/witness_generator/tests/data/scheduler/proofs_fri/proof_5627083.bin
deleted file mode 100644
index 32c83fa1738c..000000000000
Binary files a/prover/witness_generator/tests/data/scheduler/proofs_fri/proof_5627083.bin and /dev/null differ
diff --git a/prover/witness_generator/tests/data/scheduler/proofs_fri/proof_5627084.bin b/prover/witness_generator/tests/data/scheduler/proofs_fri/proof_5627084.bin
deleted file mode 100644
index 56d64de891ba..000000000000
Binary files a/prover/witness_generator/tests/data/scheduler/proofs_fri/proof_5627084.bin and /dev/null differ
diff --git a/prover/witness_generator/tests/data/scheduler/proofs_fri/proof_5627085.bin b/prover/witness_generator/tests/data/scheduler/proofs_fri/proof_5627085.bin
deleted file mode 100644
index f158420ae1da..000000000000
Binary files a/prover/witness_generator/tests/data/scheduler/proofs_fri/proof_5627085.bin and /dev/null differ
diff --git a/prover/witness_generator/tests/data/scheduler/proofs_fri/proof_5627086.bin b/prover/witness_generator/tests/data/scheduler/proofs_fri/proof_5627086.bin
deleted file mode 100644
index 7d06213b71cb..000000000000
Binary files a/prover/witness_generator/tests/data/scheduler/proofs_fri/proof_5627086.bin and /dev/null differ
diff --git a/prover/witness_generator/tests/data/scheduler/proofs_fri/proof_5627090.bin b/prover/witness_generator/tests/data/scheduler/proofs_fri/proof_5627090.bin
deleted file mode 100644
index f6c405290c09..000000000000
Binary files a/prover/witness_generator/tests/data/scheduler/proofs_fri/proof_5627090.bin and /dev/null differ
diff --git a/prover/witness_generator/tests/data/scheduler/proofs_fri/proof_5627091.bin b/prover/witness_generator/tests/data/scheduler/proofs_fri/proof_5627091.bin
deleted file mode 100644
index 6942d2286390..000000000000
Binary files a/prover/witness_generator/tests/data/scheduler/proofs_fri/proof_5627091.bin and /dev/null differ
diff --git a/prover/witness_generator/tests/data/scheduler/proofs_fri/proof_5627092.bin b/prover/witness_generator/tests/data/scheduler/proofs_fri/proof_5627092.bin
deleted file mode 100644
index b4bfe15a3d01..000000000000
Binary files a/prover/witness_generator/tests/data/scheduler/proofs_fri/proof_5627092.bin and /dev/null differ
diff --git a/prover/witness_generator/tests/data/scheduler/proofs_fri/proof_5627093.bin b/prover/witness_generator/tests/data/scheduler/proofs_fri/proof_5627093.bin
deleted file mode 100644
index 6b9234a54e20..000000000000
Binary files a/prover/witness_generator/tests/data/scheduler/proofs_fri/proof_5627093.bin and /dev/null differ
diff --git a/prover/witness_generator/tests/data/scheduler/proofs_fri/proof_5627094.bin b/prover/witness_generator/tests/data/scheduler/proofs_fri/proof_5627094.bin
deleted file mode 100644
index 6e218471c364..000000000000
Binary files a/prover/witness_generator/tests/data/scheduler/proofs_fri/proof_5627094.bin and /dev/null differ
diff --git a/prover/witness_generator/tests/data/scheduler/proofs_fri/proof_5629097.bin b/prover/witness_generator/tests/data/scheduler/proofs_fri/proof_5629097.bin
deleted file mode 100644
index 3e9a2bfa60f7..000000000000
Binary files a/prover/witness_generator/tests/data/scheduler/proofs_fri/proof_5629097.bin and /dev/null differ
diff --git a/prover/witness_generator/tests/data/scheduler/proofs_fri/proof_5631320.bin b/prover/witness_generator/tests/data/scheduler/proofs_fri/proof_5631320.bin
deleted file mode 100644
index f5a449e9e628..000000000000
Binary files a/prover/witness_generator/tests/data/scheduler/proofs_fri/proof_5631320.bin and /dev/null differ
diff --git a/prover/witness_generator/tests/data/scheduler/proofs_fri/proof_5639969.bin b/prover/witness_generator/tests/data/scheduler/proofs_fri/proof_5639969.bin
deleted file mode 100644
index 7f8d408cb45b..000000000000
Binary files a/prover/witness_generator/tests/data/scheduler/proofs_fri/proof_5639969.bin and /dev/null differ
diff --git a/prover/witness_generator/tests/data/scheduler/prover_jobs_fri/128599_0_1_Scheduler_0.bin b/prover/witness_generator/tests/data/scheduler/prover_jobs_fri/128599_0_1_Scheduler_0.bin
deleted file mode 100644
index 87a7ff4d3752..000000000000
Binary files a/prover/witness_generator/tests/data/scheduler/prover_jobs_fri/128599_0_1_Scheduler_0.bin and /dev/null differ
diff --git a/prover/witness_generator/tests/data/scheduler/scheduler_witness_jobs_fri/scheduler_witness_128599.bin b/prover/witness_generator/tests/data/scheduler/scheduler_witness_jobs_fri/scheduler_witness_128599.bin
deleted file mode 100644
index ef71a25737ab..000000000000
Binary files a/prover/witness_generator/tests/data/scheduler/scheduler_witness_jobs_fri/scheduler_witness_128599.bin and /dev/null differ
diff --git a/prover/witness_vector_generator/Cargo.toml b/prover/witness_vector_generator/Cargo.toml
deleted file mode 100644
index aa89d8a3e4c6..000000000000
--- a/prover/witness_vector_generator/Cargo.toml
+++ /dev/null
@@ -1,30 +0,0 @@
-[package]
-name = "zksync_witness_vector_generator"
-version = "1.0.0"
-edition = "2021"
-
-# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
-
-[dependencies]
-zksync_types = { path = "../../core/lib/types", version = "1.0" }
-zksync_dal = { path = "../../core/lib/dal", version = "1.0" }
-zksync_config = { path = "../../core/lib/config", version = "1.0" }
-zksync_object_store = { path = "../../core/lib/object_store", version = "1.0" }
-zksync_prover_fri_utils = { path = "../prover_fri_utils", version = "1.0" }
-zksync_utils = { path = "../../core/lib/utils", version = "1.0" }
-prometheus_exporter = { path = "../../core/lib/prometheus_exporter", version = "1.0" }
-zksync_prover_fri_types = { path = "../prover_fri_types", version = "1.0" }
-zksync_prover_utils = {path = "../../core/lib/prover_utils", version = "1.0" }
-zksync_queued_job_processor = { path = "../../core/lib/queued_job_processor", version = "1.0" }
-vk_setup_data_generator_server_fri = { path = "../vk_setup_data_generator_server_fri", version = "1.0" }
-vlog = { path = "../../core/lib/vlog", version = "1.0" }
-
-structopt = "0.3.26"
-tokio = { version = "1", features = ["time"] }
-futures = { version = "0.3", features = ["compat"] }
-ctrlc = { version = "3.1", features = ["termination"] }
-metrics = "0.20.0"
-serde = { version = "1.0", features = ["derive"] }
-async-trait = "0.1"
-queues = "1.1.0"
-bincode = "1.0"
diff --git a/prover/witness_vector_generator/README.md b/prover/witness_vector_generator/README.md
deleted file mode 100644
index ff4013c0d619..000000000000
--- a/prover/witness_vector_generator/README.md
+++ /dev/null
@@ -1,7 +0,0 @@
-# Witness vector generator
-
-Used to generate witness vectors using circuit and sending them to prover over TCP.
-
-## running
-
-`zk f cargo +nightly-2023-05-31 run --release --bin zksync_witness_vector_generator`
diff --git a/prover/witness_vector_generator/src/generator.rs b/prover/witness_vector_generator/src/generator.rs
deleted file mode 100644
index 081614ada8ff..000000000000
--- a/prover/witness_vector_generator/src/generator.rs
+++ /dev/null
@@ -1,207 +0,0 @@
-use std::time::{Duration, Instant};
-
-use async_trait::async_trait;
-use tokio::task::JoinHandle;
-
-use tokio::time::sleep;
-use zksync_config::configs::fri_prover_group::CircuitIdRoundTuple;
-use zksync_config::configs::FriWitnessVectorGeneratorConfig;
-use zksync_dal::ConnectionPool;
-use zksync_object_store::ObjectStore;
-use zksync_prover_fri_types::circuit_definitions::boojum::field::goldilocks::GoldilocksField;
-use zksync_prover_fri_types::circuit_definitions::circuit_definitions::recursion_layer::ZkSyncRecursionLayerStorageType;
-use zksync_prover_fri_types::{CircuitWrapper, ProverJob, WitnessVectorArtifacts};
-use zksync_prover_fri_utils::fetch_next_circuit;
-use zksync_prover_fri_utils::get_numeric_circuit_id;
-use zksync_prover_fri_utils::socket_utils::send_assembly;
-use zksync_queued_job_processor::JobProcessor;
-use zksync_types::proofs::{AggregationRound, GpuProverInstanceStatus, SocketAddress};
-use zksync_vk_setup_data_server_fri::get_finalization_hints;
-
-pub struct WitnessVectorGenerator {
-    blob_store: Box<dyn ObjectStore>,
-    pool: ConnectionPool,
-    circuit_ids_for_round_to_be_proven: Vec<CircuitIdRoundTuple>,
-    zone: String,
-    config: FriWitnessVectorGeneratorConfig,
-}
-
-impl WitnessVectorGenerator {
-    pub fn new(
-        blob_store: Box<dyn ObjectStore>,
-        prover_connection_pool: ConnectionPool,
-        circuit_ids_for_round_to_be_proven: Vec<CircuitIdRoundTuple>,
-        zone: String,
-        config: FriWitnessVectorGeneratorConfig,
-    ) -> Self {
-        Self {
-            blob_store,
-            pool: prover_connection_pool,
-            circuit_ids_for_round_to_be_proven,
-            zone,
-            config,
-        }
-    }
-
-    pub fn generate_witness_vector(job: ProverJob) -> WitnessVectorArtifacts {
-        let mut key = job.setup_data_key.clone();
-        if key.round == AggregationRound::NodeAggregation {
-            key.circuit_id = ZkSyncRecursionLayerStorageType::NodeLayerCircuit as u8;
-        }
-        let finalization_hints = get_finalization_hints(key);
-        let mut cs = match job.circuit_wrapper.clone() {
-            CircuitWrapper::Base(base_circuit) => {
-                base_circuit.synthesis::<GoldilocksField>(&finalization_hints)
-            }
-            CircuitWrapper::Recursive(recursive_circuit) => {
-                recursive_circuit.synthesis::<GoldilocksField>(&finalization_hints)
-            }
-        };
-        WitnessVectorArtifacts::new(cs.materialize_witness_vec(), job)
-    }
-}
-
-#[async_trait]
-impl JobProcessor for WitnessVectorGenerator {
-    type Job = ProverJob;
-    type JobId = u32;
-    type JobArtifacts = WitnessVectorArtifacts;
-    const SERVICE_NAME: &'static str = "WitnessVectorGenerator";
-
-    async fn get_next_job(&self) -> Option<(Self::JobId, Self::Job)> {
-        let mut storage = self.pool.access_storage().await;
-        let mut fri_prover_dal = storage.fri_prover_jobs_dal();
-        let job = fetch_next_circuit(
-            &mut fri_prover_dal,
-            &*self.blob_store,
-            &self.circuit_ids_for_round_to_be_proven,
-        )
-        .await?;
-        Some((job.job_id, job))
-    }
-
-    async fn save_failure(&self, job_id: Self::JobId, _started_at: Instant, error: String) {
-        self.pool
-            .access_storage()
-            .await
-            .fri_prover_jobs_dal()
-            .save_proof_error(job_id, error)
-            .await;
-    }
-
-    async fn process_job(
-        &self,
-        job: ProverJob,
-        _started_at: Instant,
-    ) -> JoinHandle<Self::JobArtifacts> {
-        tokio::task::spawn_blocking(move || Self::generate_witness_vector(job))
-    }
-
-    async fn save_result(
-        &self,
-        job_id: Self::JobId,
-        started_at: Instant,
-        artifacts: WitnessVectorArtifacts,
-    ) {
-        metrics::histogram!(
-            "prover_fri.witness_vector_generator.gpu_witness_vector_generation_time",
-            started_at.elapsed(),
-            "circuit_type" => get_numeric_circuit_id(&artifacts.prover_job.circuit_wrapper).to_string(),
-        );
-        vlog::info!("Finished witness vector generation for job: {job_id} in zone: {:?} took: {started_at:?}", self.zone);
-
-        let _now = Instant::now();
-        let mut serialized: Vec<u8> =
-            bincode::serialize(&artifacts).expect("Failed to serialize witness vector artifacts");
-
-        let now = Instant::now();
-        let mut attempts = 0;
-
-        while now.elapsed() < self.config.prover_instance_wait_timeout() {
-            let prover = self
-                .pool
-                .access_storage()
-                .await
-                .fri_gpu_prover_queue_dal()
-                .lock_available_prover(
-                    self.config.max_prover_reservation_duration(),
-                    self.config.specialized_group_id,
-                    self.zone.clone(),
-                )
-                .await;
-
-            if let Some(address) = prover {
-                let result = send_assembly(job_id, &mut serialized, &address);
-                handle_send_result(&result, job_id, &address, &self.pool, self.zone.clone()).await;
-
-                if result.is_ok() {
-                    return;
-                }
-
-                vlog::warn!(
-                    "Could not send witness vector to {address:?}. Prover group {}, zone {}, \
-                         job {job_id}, send attempt {attempts}.",
-                    self.config.specialized_group_id,
-                    self.zone,
-                );
-                attempts += 1;
-            } else {
-                sleep(self.config.prover_instance_poll_time()).await;
-            }
-        }
-        vlog::trace!(
-            "Not able to get any free prover instance for sending witness vector for job: {job_id}"
-        );
-    }
-}
-
-async fn handle_send_result(
-    result: &Result<(Duration, u64), String>,
-    job_id: u32,
-    address: &SocketAddress,
-    pool: &ConnectionPool,
-    zone: String,
-) {
-    match result {
-        Ok((elapsed, len)) => {
-            let blob_size_in_gb = len / (1024 * 1024 * 1024);
-
-            vlog::trace!(
-                "Sent assembly of size: {blob_size_in_gb}GB successfully, took: {elapsed:?} \
-                 for job: {job_id} to: {address:?}"
-            );
-            metrics::histogram!(
-                "prover_fri.witness_vector_generator.blob_sending_time",
-                *elapsed,
-                "blob_size_in_gb" => blob_size_in_gb.to_string(),
-            );
-
-            pool.access_storage()
-                .await
-                .fri_prover_jobs_dal()
-                .update_status(job_id, "in_gpu_proof")
-                .await;
-        }
-
-        Err(err) => {
-            vlog::trace!(
-                "Failed sending assembly to address: {address:?}, socket not reachable \
-                 reason: {err}"
-            );
-
-            // mark prover instance in gpu_prover_queue dead
-            pool.access_storage()
-                .await
-                .fri_gpu_prover_queue_dal()
-                .update_prover_instance_status(address.clone(), GpuProverInstanceStatus::Dead, zone)
-                .await;
-
-            // mark the job as failed
-            pool.access_storage()
-                .await
-                .fri_prover_jobs_dal()
-                .save_proof_error(job_id, "prover instance unreachable".to_string())
-                .await;
-        }
-    }
-}
diff --git a/prover/witness_vector_generator/src/lib.rs b/prover/witness_vector_generator/src/lib.rs
deleted file mode 100644
index 365bdf1cc0d3..000000000000
--- a/prover/witness_vector_generator/src/lib.rs
+++ /dev/null
@@ -1,3 +0,0 @@
-#![feature(generic_const_exprs)]
-
-pub mod generator;
diff --git a/prover/witness_vector_generator/src/main.rs b/prover/witness_vector_generator/src/main.rs
deleted file mode 100644
index e642d5b59c0d..000000000000
--- a/prover/witness_vector_generator/src/main.rs
+++ /dev/null
@@ -1,82 +0,0 @@
-#![feature(generic_const_exprs)]
-
-use prometheus_exporter::run_prometheus_exporter;
-use structopt::StructOpt;
-use tokio::{sync::oneshot, sync::watch};
-
-use crate::generator::WitnessVectorGenerator;
-use zksync_config::configs::fri_prover_group::FriProverGroupConfig;
-use zksync_config::configs::{AlertsConfig, FriWitnessVectorGeneratorConfig, PrometheusConfig};
-use zksync_dal::connection::DbVariant;
-use zksync_dal::ConnectionPool;
-use zksync_object_store::ObjectStoreFactory;
-use zksync_prover_utils::region_fetcher::get_zone;
-use zksync_queued_job_processor::JobProcessor;
-use zksync_utils::wait_for_tasks::wait_for_tasks;
-
-mod generator;
-
-#[derive(Debug, StructOpt)]
-#[structopt(
-    name = "zksync_witness_vector_generator",
-    about = "Tool for generating witness vectors for circuits"
-)]
-struct Opt {
-    /// Number of times witness_vector_generator should be run.
-    #[structopt(short = "n", long = "n_iterations")]
-    number_of_iterations: Option<usize>,
-}
-
-#[tokio::main]
-async fn main() {
-    vlog::init();
-    let opt = Opt::from_args();
-    let config = FriWitnessVectorGeneratorConfig::from_env();
-    let prometheus_config = PrometheusConfig {
-        listener_port: config.prometheus_listener_port,
-        pushgateway_url: config.prometheus_pushgateway_url.clone(),
-        push_interval_ms: config.prometheus_push_interval_ms,
-    };
-    let pool = ConnectionPool::builder(DbVariant::Prover).build().await;
-    let blob_store = ObjectStoreFactory::from_env().create_store().await;
-    let circuit_ids_for_round_to_be_proven = FriProverGroupConfig::from_env()
-        .get_circuit_ids_for_group_id(config.specialized_group_id)
-        .unwrap_or(vec![]);
-    let zone = get_zone().await;
-    let witness_vector_generator = WitnessVectorGenerator::new(
-        blob_store,
-        pool,
-        circuit_ids_for_round_to_be_proven,
-        zone,
-        config,
-    );
-
-    let (stop_sender, stop_receiver) = watch::channel(false);
-
-    let (stop_signal_sender, stop_signal_receiver) = oneshot::channel();
-    let mut stop_signal_sender = Some(stop_signal_sender);
-    ctrlc::set_handler(move || {
-        if let Some(stop_signal_sender) = stop_signal_sender.take() {
-            stop_signal_sender.send(()).ok();
-        }
-    })
-    .expect("Error setting Ctrl+C handler");
-
-    vlog::info!("Starting witness vector generation");
-
-    let tasks = vec![
-        run_prometheus_exporter(prometheus_config.listener_port, None),
-        tokio::spawn(witness_vector_generator.run(stop_receiver, opt.number_of_iterations)),
-    ];
-
-    let particular_crypto_alerts = Some(AlertsConfig::from_env().sporadic_crypto_errors_substrs);
-    let graceful_shutdown = None::<futures::future::Ready<()>>;
-    let tasks_allowed_to_finish = false;
-    tokio::select! {
-        _ = wait_for_tasks(tasks, particular_crypto_alerts, graceful_shutdown, tasks_allowed_to_finish) => {},
-        _ = stop_signal_receiver => {
-            vlog::info!("Stop signal received, shutting down");
-        }
-    };
-    stop_sender.send(true).ok();
-}
diff --git a/prover/witness_vector_generator/tests/basic_test.rs b/prover/witness_vector_generator/tests/basic_test.rs
deleted file mode 100644
index 3361a44b028a..000000000000
--- a/prover/witness_vector_generator/tests/basic_test.rs
+++ /dev/null
@@ -1,32 +0,0 @@
-use std::fs;
-use zksync_prover_fri_types::{CircuitWrapper, ProverJob, ProverServiceDataKey};
-use zksync_types::proofs::AggregationRound;
-use zksync_types::L1BatchNumber;
-use zksync_witness_vector_generator::generator::WitnessVectorGenerator;
-
-#[test]
-fn test_generate_witness_vector() {
-    let filename = "./tests/data/base_layer_main_vm.bin";
-    let file = fs::read(filename).expect("failed reading circuit");
-    let circuit_wrapper = bincode::deserialize::<CircuitWrapper>(&file)
-        .expect("circuit wrapper deserialization failed");
-    let key = ProverServiceDataKey {
-        circuit_id: 1,
-        round: AggregationRound::BasicCircuits,
-    };
-    let job = ProverJob {
-        block_number: L1BatchNumber(1),
-        job_id: 1,
-        circuit_wrapper,
-        setup_data_key: key,
-    };
-    let vector = WitnessVectorGenerator::generate_witness_vector(job);
-    assert!(!vector.witness_vector.all_values.is_empty());
-    assert!(!vector.witness_vector.multiplicities.is_empty());
-    assert!(!vector.witness_vector.public_inputs_locations.is_empty());
-    let serialized = bincode::serialize(&vector).expect("failed to serialize witness vector");
-    assert!(
-        serialized.len() < 1_000_000_000,
-        "The size of the serialized vector shall be less than 1GB"
-    );
-}
diff --git a/prover/witness_vector_generator/tests/data/base_layer_main_vm.bin b/prover/witness_vector_generator/tests/data/base_layer_main_vm.bin
deleted file mode 100644
index 64fa6fe6cd46..000000000000
Binary files a/prover/witness_vector_generator/tests/data/base_layer_main_vm.bin and /dev/null differ
diff --git a/sdk/zksync-rs/Cargo.toml b/sdk/zksync-rs/Cargo.toml
index 3827dc1c0273..6cf7ff69b40d 100644
--- a/sdk/zksync-rs/Cargo.toml
+++ b/sdk/zksync-rs/Cargo.toml
@@ -5,11 +5,11 @@ authors = ["The Matter Labs Team <hello@matterlabs.dev>"]
 edition = "2018"
 
 [dependencies]
-zksync_types = { path = "../../core/lib/types", version = "1.0" }
-zksync_utils = { path = "../../core/lib/utils", version = "1.0" }
-zksync_eth_client = { path = "../../core/lib/eth_client", version = "1.0" }
-zksync_eth_signer = { path = "../../core/lib/eth_signer", version = "1.0" }
-zksync_web3_decl = { path = "../../core/lib/web3_decl", version = "1.0", default-features = false, features = [
+zksync_types = { path = "../../core/lib/types" }
+zksync_utils = { path = "../../core/lib/utils" }
+zksync_eth_client = { path = "../../core/lib/eth_client" }
+zksync_eth_signer = { path = "../../core/lib/eth_signer" }
+zksync_web3_decl = { path = "../../core/lib/web3_decl", default-features = false, features = [
     "client",
 ] }
 
@@ -20,7 +20,7 @@ num = { version = "0.3.1", features = ["serde"] }
 thiserror = "1.0"
 
 [dev-dependencies]
-zksync_config = { path = "../../core/lib/config", version = "1.0" }
+zksync_config = { path = "../../core/lib/config" }
 tokio = { version = "1", features = ["full"] }
 anyhow = "1.0"
 hex = "0.4"
diff --git a/sdk/zksync-rs/src/operations/transfer.rs b/sdk/zksync-rs/src/operations/transfer.rs
index ef47b1a28144..85d90c61fd23 100644
--- a/sdk/zksync-rs/src/operations/transfer.rs
+++ b/sdk/zksync-rs/src/operations/transfer.rs
@@ -176,6 +176,7 @@ where
             common_data,
             execute: tx,
             received_timestamp_ms: 0,
+            raw_bytes: None,
         };
         self.wallet
             .provider
diff --git a/sdk/zksync-web3.js/src/types.ts b/sdk/zksync-web3.js/src/types.ts
index 8f0323a8d9b9..b055a5d43788 100644
--- a/sdk/zksync-web3.js/src/types.ts
+++ b/sdk/zksync-web3.js/src/types.ts
@@ -221,7 +221,7 @@ export interface TransactionDetails {
     isL1Originated: boolean;
     status: string;
     fee: BigNumberish;
-    gasPerPubdata?: BigNumberish;
+    gasPerPubdata: BigNumberish;
     initiatorAddress: Address;
     receivedAt: Date;
     ethCommitTxHash?: string;
diff --git a/yarn.lock b/yarn.lock
index 338905333b71..4f2f692171b2 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -1928,6 +1928,13 @@
   dependencies:
     antlr4ts "^0.5.0-alpha.4"
 
+"@solidity-parser/parser@^0.16.0":
+  version "0.16.1"
+  resolved "https://registry.yarnpkg.com/@solidity-parser/parser/-/parser-0.16.1.tgz#f7c8a686974e1536da0105466c4db6727311253c"
+  integrity sha512-PdhRFNhbTtu3x8Axm0uYpqOy/lODYQK+MlYSgqIsq2L8SFYEHJPHNUiOTAJbDGzNjjr1/n9AcIayxafR/fWmYw==
+  dependencies:
+    antlr4ts "^0.5.0-alpha.4"
+
 "@szmarczak/http-timer@^1.1.2":
   version "1.1.2"
   resolved "https://registry.yarnpkg.com/@szmarczak/http-timer/-/http-timer-1.1.2.tgz#b1665e2c461a2cd92f4c1bbf50d5454de0d4b421"
@@ -11443,12 +11450,12 @@ solidity-comments-extractor@^0.0.7:
   integrity sha512-wciNMLg/Irp8OKGrh3S2tfvZiZ0NEyILfcRCXCD4mp7SgK/i9gzLfhY2hY7VMCQJ3kH9UB9BzNdibIVMchzyYw==
 
 solidity-coverage@^0.8.2:
-  version "0.8.2"
-  resolved "https://registry.yarnpkg.com/solidity-coverage/-/solidity-coverage-0.8.2.tgz#bc39604ab7ce0a3fa7767b126b44191830c07813"
-  integrity sha512-cv2bWb7lOXPE9/SSleDO6czkFiMHgP4NXPj+iW9W7iEKLBk7Cj0AGBiNmGX3V1totl9wjPrT0gHmABZKZt65rQ==
+  version "0.8.4"
+  resolved "https://registry.yarnpkg.com/solidity-coverage/-/solidity-coverage-0.8.4.tgz#c57a21979f5e86859c5198de9fbae2d3bc6324a5"
+  integrity sha512-xeHOfBOjdMF6hWTbt42iH4x+7j1Atmrf5OldDPMxI+i/COdExUxszOswD9qqvcBTaLGiOrrpnh9UZjSpt4rBsg==
   dependencies:
     "@ethersproject/abi" "^5.0.9"
-    "@solidity-parser/parser" "^0.14.1"
+    "@solidity-parser/parser" "^0.16.0"
     chalk "^2.4.2"
     death "^1.1.0"
     detect-port "^1.3.0"